Quellcode durchsuchen

【情报二期】数据域服务 - 布控资源表消费逻辑开发

peifj vor 1 Monat
Ursprung
Commit
67179c3690

+ 32 - 338
src/main/java/com/hhwy/qbeqsjy/common/Constants.java

@@ -11,6 +11,30 @@ import java.util.Locale;
  */
 public class Constants {
 
+    // 单人预警-本市进京-客运乘车
+    public static final String MODEL_CODE_BSJJ_KYCC = "DRYJ-BSJJ-KYCC";
+    // 单人预警-外省来津-民航订票
+    public static final String MODEL_CODE_WSLJ_MHDP = "DRYJ-WSLJ-MHDP";
+    // 单人预警-跨省轨迹-民航订票
+    public static final String MODEL_CODE_KSGJ_MHDP = "DRYJ-KSGJ-MHDP";
+    // 单人预警-本市敏感区域-旅客住店
+    public static final String MODEL_CODE_BSMGQY_LKZD = "DRYJ-BSMGQY-LKZD";
+    // 单人预警-本市敏感区域-网吧上网
+    public static final String MODEL_CODE_BSMGQY_WBSW = "DRYJ-BSMGQY-WBSW";
+    // 单人预警-本市敏感区域-地铁
+    public static final String MODEL_CODE_BSMGQY_DT = "DRYJ-BSMGQY-DT";
+    // 单人预警-本市进京-手机热点
+    public static final String MODEL_CODE_BSJJ_SJRD = "DRYJ-BSJJ-SJRD";
+    // 单人预警-本市进京-巡逻盘查
+    public static final String MODEL_CODE_BSJJ_XLPC = "DRYJ-BSJJ-XLPC";
+    // 单人预警-本市进京-站点检查
+    public static final String MODEL_CODE_BSJJ_ZDJC = "DRYJ-BSJJ-ZDJC";
+    // 单人预警-本市进京-火车站电围
+    public static final String MODEL_CODE_BSJJ_HCZDW = "DRYJ-BSJJ-HCZDW";
+    // 单人预警-本市进京-火车站人脸感知
+    public static final String MODEL_CODE_BSJJ_HCZRLGZ = "DRYJ-BSJJ-HCZRLGZ";
+    // 单人预警-本市敏感区域-本市人脸
+    public static final String MODEL_CODE_BSMGQY_BSRL = "DRYJ-BSMGQY-BSRL";
     // 数据资源编码:同火车
     public static final String RES_CODE_THC = "01A1201001039";
     // 数据资源编码:同航班
@@ -25,14 +49,18 @@ public class Constants {
     public static final String URLENCODED_RSP_TYPE = "application/x-www-form-urlencoded";
     // 地区代码:天津
     public static final String AREA_CODE_TJ = "120000";
-    // 任务标识:单人预警
-    public static final String TASK_DRYJ = "DRYJ";
-    // 任务标识:聚集预警
-    public static final String TASK_JJYJ = "JJYJ";
     // 默认布控系统编号
     public static final String DEFAULT_SYSID = "QBEQSJYCTRL";
     // 预警状态:未读
     public static final String YJZT_WD = "未读";
+    // 预警类型:单人预警
+    public static final String YJLX_DRYJ = "单人预警";
+    // 预警类型:聚集预警
+    public static final String YJLX_JJYJ = "聚集预警";
+    // 预警区域名称:火车站
+    public static final String QYMC_HCZ = "火车站";
+    // 预警区域名称:天津市
+    public static final String QYMC_TJS = "天津市";
     public static final String MULTI_THREAD_ENABLED_FLAG = "true";
     // 一次请求的最大等待时间
     public static final int WAIT_TIME = 30000;
@@ -65,25 +93,6 @@ public class Constants {
     // 会话超时时间
     public static final String SESSION_TIMEOUT_MS = "session.timeout.ms";
 
-    /**
-     * UTF-8 字符集
-     */
-    public static final String UTF8 = "UTF-8";
-
-    /**
-     * GBK 字符集
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * 系统语言
-     */
-    public static final Locale DEFAULT_LOCALE = Locale.SIMPLIFIED_CHINESE;
-
-    /**
-     * www主域
-     */
-    public static final String WWW = "www.";
 
     /**
      * http请求
@@ -95,135 +104,6 @@ public class Constants {
      */
     public static final String HTTPS = "https://";
 
-    /**
-     * 通用成功标识
-     */
-    public static final String SUCCESS = "0";
-
-    /**
-     * 通用失败标识
-     */
-    public static final String FAIL = "1";
-
-    /**
-     * 登录成功
-     */
-    public static final String LOGIN_SUCCESS = "Success";
-
-    /**
-     * 注销
-     */
-    public static final String LOGOUT = "Logout";
-
-    /**
-     * 注册
-     */
-    public static final String REGISTER = "Register";
-
-    /**
-     * 登录失败
-     */
-    public static final String LOGIN_FAIL = "Error";
-
-    /**
-     * 所有权限标识
-     */
-    public static final String ALL_PERMISSION = "*:*:*";
-
-    /**
-     * 管理员角色权限标识
-     */
-    public static final String SUPER_ADMIN = "admin";
-
-    /**
-     * 角色权限分隔符
-     */
-    public static final String ROLE_DELIMETER = ",";
-
-    /**
-     * 权限标识分隔符
-     */
-    public static final String PERMISSION_DELIMETER = ",";
-
-    /**
-     * 验证码有效期(分钟)
-     */
-    public static final Integer CAPTCHA_EXPIRATION = 2;
-
-    /**
-     * 令牌
-     */
-    public static final String TOKEN = "token";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String TOKEN_PREFIX = "Bearer ";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String LOGIN_USER_KEY = "login_user_key";
-
-    /**
-     * 用户ID
-     */
-    public static final String JWT_USERID = "userid";
-
-    /**
-     * 用户名称
-     */
-    public static final String JWT_USERNAME = Claims.SUBJECT;
-
-    /**
-     * 用户头像
-     */
-    public static final String JWT_AVATAR = "avatar";
-
-    /**
-     * 创建时间
-     */
-    public static final String JWT_CREATED = "created";
-
-    /**
-     * 用户权限
-     */
-    public static final String JWT_AUTHORITIES = "authorities";
-
-    /**
-     * 资源映射路径 前缀
-     */
-    public static final String RESOURCE_PREFIX = "/profile";
-
-    /**
-     * RMI 远程方法调用
-     */
-    public static final String LOOKUP_RMI = "rmi:";
-
-    /**
-     * LDAP 远程方法调用
-     */
-    public static final String LOOKUP_LDAP = "ldap:";
-
-    /**
-     * LDAPS 远程方法调用
-     */
-    public static final String LOOKUP_LDAPS = "ldaps:";
-
-    /**
-     * 自动识别json对象白名单配置(仅允许解析的包名,范围越小越安全)
-     */
-    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
-
-    /**
-     * 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
-     */
-    public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.quartz.task" };
-
-    /**
-     * 定时任务违规的字符
-     */
-    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
     public static final String CTRL_ING_MSG = "布控任务正在执行中";
     public static final String STOP_CTRL_ING_MSG = "停控任务正在执行中";
     public static final String PARAMS_EMPTY_MSG = "请求参数为空";
@@ -276,212 +156,26 @@ public class Constants {
     public static final String STOP_CTRL_SUCCESS = "2";
     public static final String STOP_CTRL_FAILURE = "3";
 
-
-    public static final int SUCCESSSTATUS = 200;
-    public static final int ERRSTATUS = 400;
     public static final String STR_NUM_0 = "0";
     public static final String STR_NUM_1 = "1";
     public static final long NUM_1539100800 = 1539100800L;
-    public static final double TJ_LON = 117.217;
-    public static final double TJ_LAT = 39.14;
     public static final long L_1000 = 1000L;
     public static final Double D_6 = 6.0d;
     public static final Double D_0 = 0.0d;
     public static final long L_0 = 0L;
-    public static final long NUMBER_5000L = 5000L;
     public static final long NUMBER_3000L = 3000L;
-    public static final long NUMBER_2000L = 2000L;
-    public static final int NUM_7776000 = 7776000;
-    public static final int NUM_900000 = 900000;
-    public static final int NUM_259200 = 259200;
-    public static final int NUM_180000 = 180000;
-    public static final int NUM_60000 = 60000;
     public static final int NUM_30000 = 30000;
-    public static final int NUM_86400 = 86400;
-    public static final int NUM_23456 = 23456;
-    public static final int NUM_9000 = 9000;
-    public static final int NUM_7200 = 7200;
-    public static final int NUM_6500 = 6500;
     public static final int NUM_5000 = 5000;
     public static final int NUM_1000 = 1000;
-    public static final int NUM_300 = 300;
-    public static final int NUM_200 = 200;
-    public static final int NUM_180 = 180;
-    public static final int NUM_81 = 81;
-    public static final int NUM_60 = 60;
-    public static final int NUM_46 = 46;
-    public static final int NUM_45 = 45;
-    public static final int NUM_30 = 30;
-    public static final int NUM_25 = 25;
-    public static final int NUM_20 = 20;
-    public static final int NUM_16 = 16;
-    public static final int NUM_14 = 14;
-    public static final int NUM_12 = 12;
-    public static final int NUM_11 = 11;
     public static final int NUM_10 = 10;
-    public static final int NUM_9 = 9;
-    public static final int NUM_8 = 8;
-    public static final int NUM_7 = 7;
-    public static final int NUM_6 = 6;
-    public static final int NUM_5 = 5;
-    public static final int NUM_4 = 4;
     public static final int NUM_3 = 3;
     public static final int NUM_2 = 2;
     public static final int NUM_1 = 1;
     public static final int NUM_0 = 0;
-
-    public static final String HENG_XIAN = "-";
-    public static final String MAO_HAO = ":";
-    public static final String KONG_GE = " ";
-
     public static final String CTRL_PROCESS_SUCESS = "1001";
     public static final String CTRL_EXIST = "1005";
     public static final String STOP_CTRL_EXIST = "1006";
 
-    public static final String DATACODE = "6000";
-    public static final String PARSE_FLAG_UNDONE = "0";
-    public static final String PARSE_FLAG_NOT = "1";
-    public static final String PARSE_FLAG_NOINFO = "2";
-    public static final String PARSE_FLAG_DONE = "3";
-    public static final String DATASOURCE_EXTRACT = "1";
-    public static final String IMEI_FLAG_COMPLETE = "1";
-    public static final String IMEI_FLAG_ERROR = "2";
-    public static final String NEWMOBILE_FLAG_UNDONE = "0";
-    public static final String NEWMOBILE_FLAG_PROCESSING = "1";
-    public static final String NEWMOBILE_FLAG_COMPLETE = "2";
-    public static final String NEWMOBILE_TAG_DEFAULT = "0";
-    public static final String NEWMOBILE_TAG_STEADY = "1";
-    public static final String NEWMOBILE_TAG_TEST = "2";
-    public static final String PERSONINFO_FLAG_COMPLETE = "1";
-
-    public static final String QQ_DICT = "1030001";
-    public static final String WX_DICT = "1030036";
-    public static final String ZJLX_DICT_IDNO = "ZJLX-430";
-    public static final String AJRYLX_DICT_DANGSHIREN = "AJRYLX-5";
-    public static final String ACTIVE_TRACE_DICT_HOMETYPE = "1";
-    public static final String ACTIVE_TRACE_DICT_WORKTYPE = "2";
-
-    /*public static final String PROPS_FILE ="config/tj-my-jzdata.properties";*/
-    public static final Integer TIMEOUT = 10;
-    public static final String SPLITSTR = "\u0019";
-    public static final String PHONE_REGEX = "^1[0-9]{10}$";
-    public static final String IDNO_REGEX = "";
-    public static final Integer MAXWAIT = 60000;
-    public static final Integer RUNSMILLIS = 60000;
-    public static final Integer MINTIME = 300000;
-    public static final Integer CONNECTSIZE = 20;
-
-    // 程序名称  日志使用
-    public static final String SERVICE_NAME = "SKPW_DB_TOOL --->";
-
-
-
-    /**
-     * 返回status值对应说明
-     */
-    public static final String STATUS_200_MSG = "成功!";
-    public static final String STATUS_500_MSG = "系统内部处理异常";
-    public static final String STATUS_585_MSG = "参数校验异常";
-    public static final String STATUS_587_MSG = "数据库原始数据异常";
-    public static final String STATUS_588_MSG = "传入token信息异常";
-
-    /**
-     * status值
-     */
-    public static final int STATUS_200 = 200;
-    public static final int STATUS_500 = 500;
-    public static final int STATUS_585 = 585;
-    public static final int STATUS_587 = 587;
-    public static final int STATUS_588 = 588;
-
-
-    //http连接配置
-    public static final int SOCKET_TIME_OUT = 1800000;
-    public static final int CONNECT_TIME_OUT =600000;
-    public static final int REQUEST_TIME_OUT =600000;
-
-
-
-    public static final String  ACTIVE_HOME_TYPE = "1";
-
-    /**
-     * 经纬度查询名址
-     */
-    public static final String GET_LT_ADDR = "http://GIS_IP:GIS_Port/FHGis/geocoder/inverse?";
-    //http://15.88.28.115:9150/FHGis/geocoder/inverse?lon=117.435962&lat=39.672619
-
-    /**
-     * 名址查经纬度
-     */
-    public static final String GET_ADDR_LT = "http://GIS_IP:GIS_Port/FHGis/geocoder/forward?address=";
-    //http://15.88.28.115:9150/FHGis/geocoder/forward?address=宝坻区水苑小区
-
-    /**
-     * 查人员活跃地
-     */
-    public static final String GET_ACTIVE_ADDR = "http://location_Ip:location_Port/trace_detail/v4/location/active/account?";
-    //http://15.88.28.145:8686/trace_detail/v4/location/active/account?accounttype=tel&account=18920718758&starttime=1579752238&endtime=1580875438
-
-    /**
-     * 推荐地址类型: 优先级依次是 1---5   1:最准确   5最差
-     */
-    public static final Integer 	EXACT_ADDR_TYPE_1 = 1;
-    public static final String 	EXACT_ADDR_TYPE_1_VALUE = "活跃居住地推荐(准确度最高)";
-
-    public static final Integer 	EXACT_ADDR_TYPE_2 = 2;
-    public static final String 	EXACT_ADDR_TYPE_2_VALUE = "依据活跃地所属行政区划推荐的明址(可信度适中)";
-
-    public static final Integer 	EXACT_ADDR_TYPE_3 = 3;
-    public static final String 	EXACT_ADDR_TYPE_3_VALUE = "活跃地基站地址(位置可信度高,但无实际住址)";
-
-    public static final Integer 	EXACT_ADDR_TYPE_4 = 4;
-    public static final String 	EXACT_ADDR_TYPE_4_VALUE = "无活跃信息, 推荐系统地址(可信度低)";
-
-    public static final Integer 	EXACT_ADDR_TYPE_5 = -1;
-    public static final String 	EXACT_ADDR_TYPE_5_VALUE = "无名址信息、无活跃信息";
 
-    public static final String MOBILE_ADDR_SERVICE_URL = "http://mobileAddrServiceIP:mobileAddrServicePort/api/v1/addrService/active";
-    public static final String MOBILE_ADDR_SERVICE_URL_BY_KEPLER = "http://keplerIP:keplerIP/gateway/FH_TJ_ADDRESS_EXACT/api/v1/addrService/active";
 
-    // 日志操作类型
-    public static final String LOG_TYPE_INSERT = "INSERT";
-    public static final String LOG_TYPE_UPDATE = "UPDATE";
-    public static final String LOG_TYPE_QUERY = "QUERY";
-    public static final String LOG_TYPE_DELETE = "DELETE";
-    public static final String LOG_TYPE_LOGIN = "LOGIN";
-    public static final String LOG_TYPE_LOGOUT = "LOGOUT";
-    public static final String LOG_TYPE_TREAT = "TREAT";
-    public static final String LOG_TYPE_MONITOR = "MONITOR";
-    public static final String LOG_TYPE_DISMONITOR = "DISMONITOR";
-    public static final String LOG_TYPE_IMPORT = "IMPORT";
-    public static final String LOG_TYPE_EXPORT = "EXPORT";
-    public static final String LOG_TYPE_INTERRUPT = "INTERRUPT";
-    public static final String LOG_TYPE_CANCEL = "CANCEL";
-    public static final String LOG_TYPE_EXEC = "EXEC";
-    public static final String LOG_TYPE_APPROVAL = "APPROVAL";
-    public static final String LOG_TYPE_COMMENT = "COMMENT";
-    public static final String LOG_TYPE_FEEDBACK = "FEEDBACK";
-    public static final String LOG_TYPE_STAMP = "STAMP";
-    public static final String LOG_TYPE_BROWSE = "BROWSE";
-    public static final String LOG_TYPE_REDO = "REDO";
-    public static final String LOG_TYPE_COUNT = "COUNT";
-    public static final String LOG_TYPE_PROJECT = "PROJECT";
-    public static final String LOG_TYPE_BACKUP = "BACKUP";
-    public static final String LOG_TYPE_ENABLED = "ENABLED";
-    public static final String LOG_TYPE_DISABLED = "DISABLED";
-    public static final String LOG_TYPE_UPLOAD = "UPLOAD";
-    public static final String LOG_TYPE_DOWNLOAD = "DOWNLOAD";
-    public static final String LOG_TYPE_REFRESH = "REFRESH";
-    public static final String LOG_TYPE_LOGIN_FAIL = "LOGIN_FAIL";
-    public static final String LOG_TYPE_USE_FUNCTION = "USE_FUNCTION";
-    public static final String LOG_TYPE_QUERY_MATCH_WHITELIST = "QUERY_MATCH_WHITELIST";
-    public static final String LOG_TYPE_MOVE = "MOVE";
-    public static final String LOG_TYPE_ARCHIVECASE = "ARCHIVECASE";
-    public static final String LOG_TYPE_CONTROL = "CONTROL";
-    public static final String LOG_TYPE_HANDOVER = "HANDOVER";
-    public static final String LOG_TYPE_MERGE = "MERGE";
-    public static final String LOG_TYPE_OVERCASE = "OVERCASE";
-    public static final String LOG_TYPE_BATCH_QUERY = "BATCH_QUERY";
-    public static final String LOG_TYPE_RELEASE = "RELEASE";
-    public static final String LOG_TYPE_SHARE = "SHARE";
 }

+ 2 - 2
src/main/java/com/hhwy/qbeqsjy/dao/CtrlDao.java

@@ -179,7 +179,7 @@ public class CtrlDao {
      * @return
      */
     public int batchInsertWarningInfo(List<Object[]> warningInfoList){
-        String sql = "insert into t_ctrl_warning_info (rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, yjztmc, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrdwmc, zrbmbm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, jd, wd, cjsj, gxsj, yjglry_xm, yjglry_sfzh, yjglry_sjh, yjqymc, yjcsmc) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        String sql = "insert into t_ctrl_warning_info (rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, yjztmc, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrdwmc, zrbmbm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, jd, wd, cjsj, gxsj, yjglry_xm, yjglry_sfzh, yjglry_sjh, yjqymc, yjcsmc, yjlx, yjlxmc) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
         try {
             int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, warningInfoList);
             return insertRows.length;
@@ -272,7 +272,7 @@ public class CtrlDao {
      */
     public List<Map<String, Object>> queryWarningInfoByInc(Timestamp startQueryTime, Timestamp newMaxCreateTime){
         List<Map<String, Object>> warningInfoList = new ArrayList<>();
-        String sql = "select rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, yjztmc, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrdwmc, zrbmbm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, jd, wd, cjsj, gxsj, yjglry_xm, yjglry_sfzh, yjglry_sjh, yjqymc, yjcsmc from t_ctrl_warning_info where yjsj > ? and yjsj <= ? order by yjsj desc";
+        String sql = "select rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, yjztmc, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrdwmc, zrbmbm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, jd, wd, cjsj, gxsj, yjglry_xm, yjglry_sfzh, yjglry_sjh, yjqymc, yjcsmc, yjlx, yjlxmc from t_ctrl_warning_info where yjsj > ? and yjsj <= ? order by yjsj desc";
         try {
             warningInfoList = gaussdbJdbcTemplate.queryForList(sql, startQueryTime, newMaxCreateTime);
             log.info("【增量查询布控任务预警结果数据成功】 数据量:{}", warningInfoList.size());

+ 112 - 105
src/main/java/com/hhwy/qbeqsjy/kafka/service/ConsumeService.java

@@ -144,6 +144,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                     String yjxxbh = String.valueOf(generator.nextId());
                     // 预警状态默认为0(未读)
                     Integer yjzt = 0;
+                    // 预警类型默认为1(单人预警)
+                    Integer yjlx = 1;
                     Date currentTime = new Date();
                     // 根据clueId中的任务编号、线索值、线索类型查询对应的布控任务相关信息(包含任务信息、数据资源信息、区域信息、线索信息)
                     List<Map<String, Object>> ctrlTaskInfoList = ctrlDao.queryCtrlTaskInfo(rwbh, clue, clueType);
@@ -175,6 +177,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                         String zrbmbm = String.valueOf(ctrlTaskInfo.get("zrbmbm"));
                         // 根据任务编号查询对应的模型配置信息
                         List<Map<String, Object>> modelInfoList = ctrlDao.queryCtrlTaskModelInfo(rwbh);
+
                         if(resCodeAUTH.equals(resourceCode)){   // =========== AUTH认证数据
                             // 1. ========================= 过滤基站号、经纬度为空的数据
                             String baseStationId = oriField.getString("BASE_STATION_ID");
@@ -216,7 +219,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         if(GeoUtils.isPointInCircle(Double.valueOf(lat84), Double.valueOf(lon84), Double.valueOf(centerLat84), Double.valueOf(centerLon84), Double.valueOf(radius))){
                                             yjxxsm.append(",所在区域:");
                                             yjxxsm.append(areaName);
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, currentTime, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName});
+                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, currentTime, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ});
                                             yjxxsm.setLength(0);
                                             break;
                                         }
@@ -231,22 +234,23 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         if(GeoUtils.isPointInPolygon(coordinates, new Coordinate(Double.valueOf(lon84), Double.valueOf(lat84)))){
                                             yjxxsm.append(",所在区域:");
                                             yjxxsm.append(areaName);
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, currentTime, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName});
+                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, currentTime, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ});
                                             yjxxsm.setLength(0);
                                             break;
                                         }
                                     }
                                 }
                             } else {   // 如果不存在布控区域信息,则默认布控区域范围为全天津市,预警数据直接入库
-                                warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, currentTime, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, "天津市", addressName});
+                                warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, currentTime, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, Constants.QYMC_TJS, addressName, yjlx, Constants.YJLX_DRYJ});
                                 yjxxsm.setLength(0);
                             }
-                            yjxxsm.setLength(0);
                         } else if(resCodeKy.equals(resourceCode)){   // =========== 客运数据
                             // 票号
-                            String ph = oriField.getString("TRAIN_TIC_NO");
+                            String trainTicNo = oriField.getString("TRAIN_TIC_NO");
+                            String ph = StringUtils.isNotBlank(trainTicNo)? trainTicNo : "暂无";
                             // 旅客姓名
-                            String lkXm = oriField.getString("PASS_NAME");
+                            String passName = oriField.getString("PASS_NAME");
+                            String lkXm = StringUtils.isNotBlank(passName)? passName : yjryXm;
                             // 旅客身份证号
                             String lkSfzh = oriField.getString("PASS_CRED_NUM");
                             // 旅客手机
@@ -315,14 +319,12 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(cph);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSJJ-KYCC".equals(mxbh)){   // 单人预警-本市进京-客运乘车
-                                    if(StringUtils.isNotBlank(sfdxzqhdm) && StringUtils.isNotBlank(mddxzqhdm)){
+                                if(Constants.MODEL_CODE_BSJJ_KYCC.equals(mxbh)){   // 单人预警-本市进京-客运乘车
+                                    if(StringUtils.isNotBlank(sfdxzqhdm) && StringUtils.isNotBlank(mddxzqhdm) && "12".equals(sfdxzqhdm.substring(0, 2)) && "11".equals(mddxzqhdm.substring(0, 2))){
                                         // 业务需求:始发地:天津,目的地:北京
-                                        if("12".equals(sfdxzqhdm.substring(0, 2)) && "11".equals(mddxzqhdm.substring(0, 2))){
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkXm, lkSfzh, lkSjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeKy, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, null});
-                                            yjxxsm.setLength(0);
-                                            break;
-                                        }
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkXm, lkSfzh, lkSjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeKy, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, null, yjlx, Constants.YJLX_DRYJ});
+                                        yjxxsm.setLength(0);
+                                        break;
                                     }
                                 }
                             }
@@ -397,24 +399,20 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(ddsj);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-WSLJ-MHDP".equals(mxbh)){   // 单人预警-外省来津-民航订票
-                                    if(StringUtils.isNotBlank(ddjcdm)){
+                                if(Constants.MODEL_CODE_WSLJ_MHDP.equals(mxbh)){   // 单人预警-外省来津-民航订票
+                                    if(StringUtils.isNotBlank(ddjcdm) && "TSN".equals(ddjcdm.trim())){
                                         // 业务需求:到达机场代码为TSN(天津滨海国际机场)
-                                        if("TSN".equals(ddjcdm.trim())){
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdp, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc});
-                                            yjxxsm.setLength(0);
-                                            break;
-                                        }
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdp, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc, yjlx, Constants.YJLX_DRYJ});
+                                        yjxxsm.setLength(0);
+                                        break;
                                     }
-                                } else if ("DRYJ-KSGJ-MHDP".equals(mxbh)) {   // 单人预警-跨省轨迹-民航订票
-                                    if(StringUtils.isNotBlank(qfjcdm) && StringUtils.isNotBlank(ddjcmc)){
-                                        String mddShi = (String) modelInfoMap.get("mdd_shi");
+                                } else if (Constants.MODEL_CODE_KSGJ_MHDP.equals(mxbh)) {   // 单人预警-跨省轨迹-民航订票
+                                    String mddShi = (String) modelInfoMap.get("mdd_shi");
+                                    if(StringUtils.isNotBlank(qfjcdm) && StringUtils.isNotBlank(ddjcmc) && "TSN".equals(qfjcdm.trim()) && ddjcmc.trim().contains(mddShi)){
                                         // 业务需求:起飞机场代码为TSN(天津滨海国际机场),到达机场须属于当前任务所记录的目的地市
-                                        if("TSN".equals(qfjcdm.trim()) && ddjcmc.trim().contains(mddShi)){
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdp, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc});
-                                            yjxxsm.setLength(0);
-                                            break;
-                                        }
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdp, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc, yjlx, Constants.YJLX_DRYJ});
+                                        yjxxsm.setLength(0);
+                                        break;
                                     }
                                 }
                             }
@@ -489,11 +487,11 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                 String mxbh = (String) modelInfoMap.get("mxbh");
                                 /*if("DRYJ-BSJJ-LKZD".equals(mxbh)){   // 单人预警-本市进京-旅客住店
                                     // --- todo
-                                    // 该需求不合理,待定
+                                    // 用户域实现
                                 }
                                 else*/
                                 // 业务需求:线索人员所住旅馆位置须在当前任务所记录的布控区域范围内
-                                if("DRYJ-BSMGQY-LKZD".equals(mxbh)){   // 单人预警-本市敏感区域-旅客住店
+                                if(Constants.MODEL_CODE_BSMGQY_LKZD.equals(mxbh)){   // 单人预警-本市敏感区域-旅客住店
                                     JSONArray areaInfoList = JSON.parseArray(bkqyxx);
                                     for (Object obj : areaInfoList) {
                                         JSONObject ctrlAreaInfo = (JSONObject) obj;
@@ -508,7 +506,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                 String centerLat84 = loc.getString("lat");
                                                 String radius = loc.getString("radius");
                                                 if(GeoUtils.isPointInCircle(Double.valueOf(lgwd), Double.valueOf(lgjd), Double.valueOf(centerLat84), Double.valueOf(centerLon84), Double.valueOf(radius))){
-                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeJnryzs, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz});
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeJnryzs, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz, yjlx, Constants.YJLX_DRYJ});
                                                     yjxxsm.setLength(0);
                                                     break;
                                                 }
@@ -521,7 +519,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     coordinates.add(new Coordinate(Double.valueOf(vertexLon84), Double.valueOf(vertexLat84)));
                                                 }
                                                 if(GeoUtils.isPointInPolygon(coordinates, new Coordinate(Double.valueOf(lgjd), Double.valueOf(lgwd)))){
-                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeJnryzs, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz});
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeJnryzs, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz, yjlx, Constants.YJLX_DRYJ});
                                                     yjxxsm.setLength(0);
                                                     break;
                                                 }
@@ -583,11 +581,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(yycsmc);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSMGQY-WBSW".equals(mxbh)){   // 单人预警-本市敏感区域-网吧上网
-                                    // --- todo
+                                if(Constants.MODEL_CODE_BSMGQY_WBSW.equals(mxbh)){   // 单人预警-本市敏感区域-网吧上网
                                     // 表中无经、纬度数据,无法判断是否出现在布控区域
                                     // 暂时不做过滤处理
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, swryXm, swrySfzh, swryLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeWbsw, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, yycsmc});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, swryXm, swrySfzh, swryLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeWbsw, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, yycsmc, yjlx, Constants.YJLX_DRYJ});
                                     yjxxsm.setLength(0);
                                     break;
                                 }
@@ -650,11 +647,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(dtxlxx);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSMGQY-DT".equals(mxbh)){   // 单人预警-本市敏感区域-地铁
-                                    // --- todo
+                                if(Constants.MODEL_CODE_BSMGQY_DT.equals(mxbh)){   // 单人预警-本市敏感区域-地铁
                                     // 表中无经、纬度数据,无法判断是否出现在布控区域
                                     // 暂时不做过滤处理
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, ckXm, ckSfzh, ckLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDt, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, czmc});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, ckXm, ckSfzh, ckLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDt, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, czmc, yjlx, Constants.YJLX_DRYJ});
                                     yjxxsm.setLength(0);
                                     break;
                                 }
@@ -716,9 +712,9 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(StringUtils.isNotBlank(addressName)? addressName : "暂无");
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSJJ-SJRD".equals(mxbh)){   // 单人预警-本市进京-手机热点
+                                if(Constants.MODEL_CODE_BSJJ_SJRD.equals(mxbh)){   // 单人预警-本市进京-手机热点
                                     // 不做过滤处理
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeSjrd, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, null, addressName});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeSjrd, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, null, addressName, yjlx, Constants.YJLX_DRYJ});
                                     yjxxsm.setLength(0);
                                     break;
                                 }
@@ -832,9 +828,9 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(StringUtils.isNotBlank(addressName)? addressName : "暂无");
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSJJ-XLPC".equals(mxbh)){   // 单人预警-本市进京-巡逻盘查
+                                if(Constants.MODEL_CODE_BSJJ_XLPC.equals(mxbh)){   // 单人预警-本市进京-巡逻盘查
                                     // 不做过滤处理
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, lxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeXlpc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, pcdJd, pcdWd, currentTime, currentTime, null, null, null, null, addressName});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, lxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeXlpc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, pcdJd, pcdWd, currentTime, currentTime, null, null, null, null, addressName, yjlx, Constants.YJLX_DRYJ});
                                     yjxxsm.setLength(0);
                                     break;
                                 }
@@ -899,9 +895,9 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(jczmc);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSJJ-ZDJC".equals(mxbh)){   // 单人预警-本市进京-站点检查
+                                if(Constants.MODEL_CODE_BSJJ_ZDJC.equals(mxbh)){   // 单人预警-本市进京-站点检查
                                     // 不做过滤处理
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeZdjc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, jczmc});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeZdjc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, jczmc, yjlx, Constants.YJLX_DRYJ});
                                     yjxxsm.setLength(0);
                                     break;
                                 }
@@ -960,17 +956,17 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(sbbh);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSJJ-HCZDW".equals(mxbh)){   // 单人预警-本市进京-火车站电围
+                                if(Constants.MODEL_CODE_BSJJ_HCZDW.equals(mxbh)){   // 单人预警-本市进京-火车站电围
                                     // 业务需求:只保留命中点位在火车站区域内的数据
                                     if(GeoUtils.isPointInCircle(Double.valueOf(jzdqWd), Double.valueOf(jzdqJd), Double.valueOf(centerPointLatHcz), Double.valueOf(centerPointLonHcz), Double.valueOf(radiusHcz))){
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDzwl, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jzdqJd, jzdqWd, currentTime, currentTime, null, null, null, "火车站", addressName});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDzwl, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jzdqJd, jzdqWd, currentTime, currentTime, null, null, null, Constants.QYMC_HCZ, addressName, yjlx, Constants.YJLX_DRYJ});
                                         yjxxsm.setLength(0);
                                         break;
                                     }
                                 }
                             }
                             yjxxsm.setLength(0);
-                        } else if (resCodeRlgz.equals(resourceCode)) {   // =========== 人脸感知(火车站)
+                        } else if (resCodeRlgz.equals(resourceCode)) {   // =========== 人脸感知(火车站/本市
                             // 抓拍机编号
                             String snashoMachNo = oriField.getString("SNASHO_MACH_NO");
                             String zpjbh = StringUtils.isNotBlank(snashoMachNo)? snashoMachNo : "暂无";
@@ -1005,74 +1001,85 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                 JSONObject rspJSONObj = JSON.parseObject(rspStr);
                                 addressName = rspJSONObj.getString("fullAddress");
                             }
-                            yjxxsm.append("火车站人脸感知 - 抓拍机编号:");
-                            yjxxsm.append(zpjbh);
-                            yjxxsm.append(",抓拍机名称:");
-                            yjxxsm.append(zpjmc);
-                            yjxxsm.append(",告警人员证件号码:");
-                            yjxxsm.append(gjryZjhm);
-                            yjxxsm.append(",告警时间:");
-                            yjxxsm.append(gjsj);
-                            yjxxsm.append(",人脸图片文件路径:");
-                            yjxxsm.append(rltpwjlj);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-BSJJ-HCZRLGZ".equals(mxbh)){   // 单人预警-本市进京-火车站人脸感知
+                                if(Constants.MODEL_CODE_BSJJ_HCZRLGZ.equals(mxbh)){   // 单人预警-本市进京-火车站人脸感知
                                     // 业务需求:只保留命中点位在火车站区域内的数据
                                     if(GeoUtils.isPointInCircle(Double.valueOf(wd), Double.valueOf(jd), Double.valueOf(centerPointLatHcz), Double.valueOf(centerPointLonHcz), Double.valueOf(radiusHcz))){
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, "火车站", addressName});
+                                        yjxxsm.append("火车站人脸感知 - 抓拍机编号:");
+                                        yjxxsm.append(zpjbh);
+                                        yjxxsm.append(",抓拍机名称:");
+                                        yjxxsm.append(zpjmc);
+                                        yjxxsm.append(",告警人员证件号码:");
+                                        yjxxsm.append(gjryZjhm);
+                                        yjxxsm.append(",告警时间:");
+                                        yjxxsm.append(gjsj);
+                                        yjxxsm.append(",人脸图片文件路径:");
+                                        yjxxsm.append(rltpwjlj);
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, Constants.QYMC_HCZ, addressName, yjlx, Constants.YJLX_DRYJ});
+                                        yjxxsm.setLength(0);
+                                    }
+                                } else if (Constants.MODEL_CODE_BSMGQY_BSRL.equals(mxbh)) {   // 单人预警-本市敏感区域-本市人脸
+                                    // 业务需求:只保留命中点位在当前任务记录的布控区域内的数据
+                                    yjxxsm.append("本市人脸 - 抓拍机编号:");
+                                    yjxxsm.append(zpjbh);
+                                    yjxxsm.append(",抓拍机名称:");
+                                    yjxxsm.append(zpjmc);
+                                    yjxxsm.append(",告警人员证件号码:");
+                                    yjxxsm.append(gjryZjhm);
+                                    yjxxsm.append(",告警时间:");
+                                    yjxxsm.append(gjsj);
+                                    yjxxsm.append(",人脸图片文件路径:");
+                                    yjxxsm.append(rltpwjlj);
+                                    // 过滤不在布控区域范围的数据
+                                    JSONArray areaInfoList = JSON.parseArray(bkqyxx);
+                                    if(areaInfoList != null && areaInfoList.size() > 0){
+                                        for (Object obj : areaInfoList) {
+                                            JSONObject ctrlAreaInfo = (JSONObject) obj;
+                                            String areaName = (String) ctrlAreaInfo.get("qymc");
+                                            Integer geoType = (Integer) ctrlAreaInfo.get("qyjhlx");
+                                            JSONObject locationJSONObj = JSON.parseObject(String.valueOf(ctrlAreaInfo.get("qyfwjwdjhFh")));
+                                            JSONArray locationSet = locationJSONObj.getJSONArray("location");
+                                            // 如果出现多个布控区域范围存在重叠,并且命中点位也恰巧出现在重叠区域的极端情况,目前则只保存命中第一个布控区域时的一份数据,不再继续判断
+                                            if(Constants.NUM_0 == geoType){
+                                                JSONObject loc = locationSet.getJSONObject(0);
+                                                String centerLon84 = loc.getString("lon");
+                                                String centerLat84 = loc.getString("lat");
+                                                String radius = loc.getString("radius");
+                                                if(GeoUtils.isPointInCircle(Double.valueOf(wd), Double.valueOf(jd), Double.valueOf(centerLat84), Double.valueOf(centerLon84), Double.valueOf(radius))){
+                                                    yjxxsm.append(",所在区域:");
+                                                    yjxxsm.append(areaName);
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ});
+                                                    yjxxsm.setLength(0);
+                                                    break;
+                                                }
+                                            } else {
+                                                List<Coordinate> coordinates = new ArrayList<>();
+                                                for (Object item : locationSet) {
+                                                    JSONObject loc = (JSONObject) item;
+                                                    String vertexLon84 = loc.getString("lon");
+                                                    String vertexLat84 = loc.getString("lat");
+                                                    coordinates.add(new Coordinate(Double.valueOf(vertexLon84), Double.valueOf(vertexLat84)));
+                                                }
+                                                if(GeoUtils.isPointInPolygon(coordinates, new Coordinate(Double.valueOf(jd), Double.valueOf(wd)))){
+                                                    yjxxsm.append(",所在区域:");
+                                                    yjxxsm.append(areaName);
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ});
+                                                    yjxxsm.setLength(0);
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, Constants.QYMC_TJS, addressName, yjlx, Constants.YJLX_DRYJ});
                                         yjxxsm.setLength(0);
                                         break;
                                     }
                                 }
                             }
                             yjxxsm.setLength(0);
-                        } else if (resCodeGmszy.equals(resourceCode)) {   // =========== 购买散装油   todo
-                            // 抓拍机编号
-                            String snashoMachNo = oriField.getString("SNASHO_MACH_NO");
-                            String zpjbh = StringUtils.isNotBlank(snashoMachNo)? snashoMachNo : "暂无";
-                            // 抓拍机名称
-                            String snashoMachDesig = oriField.getString("SNASHO_MACH_DESIG");
-                            String zpjmc = StringUtils.isNotBlank(snashoMachDesig)? snashoMachDesig : "暂无";
-                            // 证件号码
-                            String credNum = oriField.getString("CRED_NUM");
-                            String gjryZjhm = StringUtils.isNotBlank(credNum)? credNum : "暂无";
-                            // 告警时间   ---样例:20250329061228
-                            String alarmTime = oriField.getString("ALARM_TIME");
-                            String gjsj = StringUtils.isNotBlank(alarmTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(alarmTime)) : "暂无";
-                            // 人脸图片文件路径
-                            String perFacePictureFilePath = oriField.getString("PER_FACE_PICTURE_FILE_PATH");
-                            String rltpwjlj = StringUtils.isNotBlank(perFacePictureFilePath)? perFacePictureFilePath : "暂无";
-                            // 经度
-                            String jd = oriField.getString("LON");
-                            // 纬度
-                            String wd = oriField.getString("LAT");
-                            String addressName = null;
-                            if(StringUtils.isNotBlank(wd) && StringUtils.isNotBlank(jd)){
-                                double[] jwdBD = GpsCoordinateUtils.calWGS84toBD09(Double.valueOf(wd), Double.valueOf(jd));
-                                String rspStr = httpClient.sendGetRequst(addressQueryUrl.replace("x", String.valueOf(jwdBD[1])).replace("y", String.valueOf(jwdBD[0])), null);
-                                JSONObject rspJSONObj = JSON.parseObject(rspStr);
-                                addressName = rspJSONObj.getString("fullAddress");
-                            }
-                            yjxxsm.append("购买散装油 - 抓拍机编号:");
-                            yjxxsm.append(zpjbh);
-                            yjxxsm.append(",抓拍机名称:");
-                            yjxxsm.append(zpjmc);
-                            yjxxsm.append(",告警人员证件号码:");
-                            yjxxsm.append(gjryZjhm);
-                            yjxxsm.append(",告警时间:");
-                            yjxxsm.append(gjsj);
-                            yjxxsm.append(",人脸图片文件路径:");
-                            yjxxsm.append(rltpwjlj);
-                            for (Map<String, Object> modelInfoMap : modelInfoList) {
-                                String mxbh = (String) modelInfoMap.get("mxbh");
-                                if("DRYJ-FXXW-GMSZY".equals(mxbh)){   // 单人预警-风险行为-购买散装油
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, "火车站", addressName});
-                                    yjxxsm.setLength(0);
-                                    break;
-                                }
-                            }
-                            yjxxsm.setLength(0);
+                        } else if (resCodeGmszy.equals(resourceCode)) {   // =========== 购买散装油
+                            // ------ todo
                         }
                     }
                 }

+ 3 - 1
src/main/java/com/hhwy/qbeqsjy/service/SameTravelService.java

@@ -149,6 +149,8 @@ public class SameTravelService {
         if(dataList.size() > 0){
             // 预警状态默认为0(未读)
             Integer yjzt = 0;
+            // 预警类型默认为2(聚集预警)
+            Integer yjlx = 2;
             // 预警时间
             Date yjsj = new Date();
             for (JSONObject item : dataList) {
@@ -183,7 +185,7 @@ public class SameTravelService {
                     String zrbmbm = String.valueOf(ctrlTaskInfo.get("zrbmbm"));
                     // 生成预警信息编号
                     String yjxxbh = String.valueOf(generator.nextId());
-                    warningInfoList.add(new Object[]{taskId, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, jjyjDataMap.get("yjxxsm"), yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jjyjDataMap.get("jd"), jjyjDataMap.get("wd"), yjsj, yjsj, jjyjDataMap.get("yjflryXm"), jjyjDataMap.get("yjglrySfzh"), jjyjDataMap.get("yjglrySjh"), jjyjDataMap.get("yjqymc"), jjyjDataMap.get("yjcsmc")});
+                    warningInfoList.add(new Object[]{taskId, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, jjyjDataMap.get("yjxxsm"), yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKey(zrdwbm), zrbmbm, CommonUtil.getConfValueByKey(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jjyjDataMap.get("jd"), jjyjDataMap.get("wd"), yjsj, yjsj, jjyjDataMap.get("yjflryXm"), jjyjDataMap.get("yjglrySfzh"), jjyjDataMap.get("yjglrySjh"), jjyjDataMap.get("yjqymc"), jjyjDataMap.get("yjcsmc"), yjlx, Constants.YJLX_JJYJ});
                 }
             }
             if(warningInfoList.size() > 0){

+ 14 - 14
src/main/resources/application.properties

@@ -87,7 +87,7 @@ res.code.auth=134B102
 # \u5BA2\u8FD0\u6570\u636E
 res.code.ky=991C1516
 # \u94C1\u8DEF\u8BA2\u7968
-res.code.tldp=991C1398
+#res.code.tldp=991C1398
 # \u6C11\u822A\u8BA2\u7968
 res.code.mhdp=991C1233
 # \u5883\u5185\u4EBA\u5458\u4F4F\u5BBF
@@ -136,31 +136,31 @@ tx.query.max.count=5000
 
 
 # \uFF08\u60C5\u62A5\u4E8C\u671F\uFF09\u7528\u6237\u57DF\u6A21\u578B\u7F16\u53F7\u4E0E\u70FD\u706B\u76D8\u53E4\u5E73\u53F0\u6570\u636E\u8D44\u6E90\u7F16\u7801\u5B57\u5178
-DRYJ-BSJJ-TLDP=991C1398
+#DRYJ-BSJJ-TLDP=991C1398
 DRYJ-BSJJ-KYCC=991C1516
-DRYJ-BSJJ-HCZRLGZ=
-DRYJ-BSJJ-HCZDW=
-DRYJ-BSJJ-ZDJC=
+DRYJ-BSJJ-HCZRLGZ=991C2304
+DRYJ-BSJJ-HCZDW=991C1356
+DRYJ-BSJJ-ZDJC=01C1200002316
 DRYJ-BSJJ-GSSFZ=
-DRYJ-BSJJ-XLPC=
+DRYJ-BSJJ-XLPC=01C1200001942
 DRYJ-BSJJ-JJJZ=
-DRYJ-BSJJ-SJRD=
+DRYJ-BSJJ-SJRD=01C1200002597
 DRYJ-BSJJ-BJWiFi=
 DRYJ-BSJJ-ZJTL=
 DRYJ-BSJJ-LKZD=991C1223
 DRYJ-BSJJ-YKRL=
 DRYJ-BSJJ-YKGJ=
-DRYJ-KSGJ-TLDP=991C1398
+#DRYJ-KSGJ-TLDP=991C1398
 DRYJ-KSGJ-MHDP=991C1233
-DRYJ-WSLJ-TLDP=991C1398
+#DRYJ-WSLJ-TLDP=991C1398
 DRYJ-WSLJ-MHDP=991C1233
-DRYJ-WSLJ-HCZRLGZ=
-DRYJ-WSLJ-HCZDW=
-DRYJ-BSMGQY-BSRL=
+DRYJ-WSLJ-HCZRLGZ=991C2304
+DRYJ-WSLJ-HCZDW=991C1356
+DRYJ-BSMGQY-BSRL=991C2304
 DRYJ-BSMGQY-BSJZ=
 DRYJ-BSMGQY-DZJC=
-DRYJ-BSMGQY-DT=
-DRYJ-BSMGQY-WBSW=
+DRYJ-BSMGQY-DT=01C1200002598
+DRYJ-BSMGQY-WBSW=991C1071
 DRYJ-BSMGQY-LKZD=991C1223
 DRYJ-FXXW-GMSZY=
 DRYJ-FXXW-SSGJCY=