【情报二期】数据域服务 - 预警信息新增是否推送二、三道字段

src/main/java/com/hhwy/qbeqsjy/controller/CtrlController.java

@@ -187,6 +187,24 @@ public class CtrlController {
     }
 
 
+    /**
+     * 保存(用户域)预警接收群组信息
+     */
+    @PostMapping("/saveGroupInfo")
+    public AjaxResult saveGroupInfo(@RequestBody JSONObject reqBody){
+        JSONArray groupInfoList = reqBody.getJSONArray("groupInfo");
+        if(groupInfoList.isEmpty()){
+            return AjaxResult.error(Constants.PARAMS_EMPTY_MSG);
+        }
+        try{
+            return ctrlService.saveGroupInfo(groupInfoList)? AjaxResult.success() : AjaxResult.error();
+        } catch (Exception e){
+            log.error("保存预警接收群组信息发生异常", e);
+        }
+        return AjaxResult.error(Constants.SERVER_ERROR_MSG);
+    }
+
+
 
 
 

src/main/java/com/hhwy/qbeqsjy/dao/CtrlDao.java

@@ -130,7 +130,7 @@ public class CtrlDao {
      * @return
      */
     public boolean batchInsertCtrlTaskInfo(List<Object[]> ctrlTaskInfoList){
-        String sql = "insert into t_ctrl_task_info (rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, bkkssj, bkjssj, bkzyxx, bkqyxx, ryxm, zjlxdm, zjhm, hjd, sjh, yzzt, xszt, lxdh, rylb, rybq, gkjb, gkjbmc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrbmbm, cjsj) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        String sql = "insert into t_ctrl_task_info (rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, bkkssj, bkjssj, bkzyxx, bkqyxx, sftsed, sftssd, ryxm, zjlxdm, zjhm, hjd, sjh, yzzt, xszt, lxdh, rylb, rybq, gkjb, gkjbmc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrbmbm, cjsj) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
         try {
             int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, ctrlTaskInfoList);
             return insertRows.length == ctrlTaskInfoList.size();
@@ -141,6 +141,36 @@ public class CtrlDao {
     }
 
 
+    /**
+     * 同步用户域预警接收群组信息（二、三道防线民警信息）
+     */
+    public boolean batchInsertGroupInfo(List<Object[]> groupInfoDataList){
+        String sql = "insert into t_sfj_yjjsqzxx (zzlxbm, zzlxmc, bkdwbm, bkdwmc, fxlx, fxlxmc, bkddbm, bkddmc, fxmj_xm, fxmj_jh, fxmj_sfzh, fxmj_sjh, ydzt, ydztmc, czzt, czztmc, fkzt, fkztmc, jsbmbm, jsbmmc, jsdwbm, jsdwmc, jsrylx, jsrylxmc, ljscbz, cjsj, gxsj) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        try {
+            int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, groupInfoDataList);
+            return insertRows.length == groupInfoDataList.size();
+        } catch (Exception e){
+            log.error("【批量插入预警接收群组信息发生异常】 异常信息：", e);
+        }
+        return false;
+    }
+
+
+    /**
+     * 根据 更新时间 删除数据域预警接收群组信息，完成数据更新
+     */
+    public boolean deleteGroupInfo(Date gxsj){
+        String sql = "delete from t_sfj_yjjsqzxx where gxsj < ?";
+        try {
+            int deleteRows = gaussdbJdbcTemplate.update(sql, gxsj);
+            return deleteRows > 0;
+        } catch (Exception e){
+            log.error("【删除预警接收群组信息发生异常】 异常信息：", e);
+        }
+        return false;
+    }
+
+
     /**
      * 批量插入布控任务对应模型配置相关信息
      * 同步用户域布控任务模型配置信息，为后期预警结果数据作过滤筛选使用
@@ -168,7 +198,7 @@ public class CtrlDao {
      */
     public List<Map<String, Object>> queryCtrlTaskInfo(String taskId, String clue, String clueType){
         List<Map<String, Object>> ctrlTaskInfoList = new ArrayList<>();
-        StringBuilder sql = new StringBuilder("select rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, bkkssj, bkjssj, bkzyxx, bkqyxx, ryxm, zjlxdm, zjhm, hjd, sjh, yzzt, xszt, lxdh, rylb, rybq, gkjb, gkjbmc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrbmbm from t_ctrl_task_info where rwbh = '");
+        StringBuilder sql = new StringBuilder("select rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwbm, sqr_dwmc, bkkssj, bkjssj, bkzyxx, bkqyxx, sftsed, sftssd, ryxm, zjlxdm, zjhm, hjd, sjh, yzzt, xszt, lxdh, rylb, rybq, gkjb, gkjbmc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrbmbm from t_ctrl_task_info where rwbh = '");
         sql.append(taskId);
         sql.append("'");
         if(clueCodePhone.equals(clueType)){
@@ -210,7 +240,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, yjlx, yjlxmc, yjry_zwh, yjglry_zwh, yjry_rlurl, ed_fxmj_sfzh, sd_fxmj_sfzh) 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, yjry_zwh, yjglry_zwh, yjry_rlurl, ed_fxmj_sfzh, sd_fxmj_sfzh, sftsed, sftssd) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
         try {
             int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, warningInfoList);
             return insertRows.length;
@@ -324,8 +354,8 @@ 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, yjlx, yjlxmc, yjry_zwh, yjglry_zwh, yjry_rlurl, ed_fxmj_sfzh, sd_fxmj_sfzh 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, yjry_zwh, yjglry_zwh, yjry_rlurl, ed_fxmj_sfzh, sd_fxmj_sfzh from t_ctrl_warning_info where cjsj > ? and cjsj <= ? order by cjsj 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, yjry_zwh, yjglry_zwh, yjry_rlurl, ed_fxmj_sfzh, sd_fxmj_sfzh, sftsed, sftssd 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, yjry_zwh, yjglry_zwh, yjry_rlurl, ed_fxmj_sfzh, sd_fxmj_sfzh, sftsed, sftssd from t_ctrl_warning_info where cjsj > ? and cjsj <= ? order by cjsj desc";
         try {
             warningInfoList = gaussdbJdbcTemplate.queryForList(sql, startQueryTime, newMaxCreateTime);
             log.info("【增量查询处理后预警结果数据成功】 数据量：{}", warningInfoList.size());

src/main/java/com/hhwy/qbeqsjy/kafka/service/ConsumeService.java

@@ -175,6 +175,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                         String zrmjlxfs = String.valueOf(ctrlTaskInfo.get("zrmjlxfs"));
                         String zrdwbm = String.valueOf(ctrlTaskInfo.get("zrdwbm"));
                         String zrbmbm = String.valueOf(ctrlTaskInfo.get("zrbmbm"));
+                        Integer sftsed = (Integer) ctrlTaskInfo.get("sftsed");
+                        Integer sftssd = (Integer) ctrlTaskInfo.get("sftssd");
                         // 根据任务编号查询对应的模型配置信息
                         List<Map<String, Object>> modelInfoList = ctrlDao.queryCtrlTaskModelInfo(rwbh);
 
@@ -234,7 +236,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                             Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh(areaCode);
                                             String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                             String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                             break;
                                         }
                                     } else {   // 布控区域是一般多边形
@@ -264,7 +266,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                             Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh(areaCode);
                                             String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                             String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lon84, lat84, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                             break;
                                         }
                                     }
@@ -278,7 +280,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(captureTimeStr);
                                     yjxxsm.append("出现在");
                                     yjxxsm.append(addressName);
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(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, null, null, null, null, null});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(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, null, null, null, null, null, sftsed, sftssd});
                                 }
                             }
                         } else if(resCodeKy.equals(resourceCode)){   // =========== 客运数据
@@ -351,7 +353,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(zh);
                                         yjxxsm.append("，车牌号：");
                                         yjxxsm.append(cph);
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkXm, lkSfzh, lkSjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, dpsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, null, yjlx, Constants.YJLX_DRYJ, seatNo, null, null, null, null});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkXm, lkSfzh, lkSjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, dpsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, null, yjlx, Constants.YJLX_DRYJ, seatNo, null, null, null, null, sftsed, sftssd});
                                         break;
                                     }
                                 }
@@ -425,7 +427,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                                         yjxxsm.append("，到达时间：");
                                         yjxxsm.append(ddsj);
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdpDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdpDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                         break;
                                     }
                                 } else if (Constants.MODEL_CODE_KSGJ_MHDP.equals(mxbh)) {   // 单人预警-跨省轨迹-民航订票
@@ -449,7 +451,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                                         yjxxsm.append("，到达时间：");
                                         yjxxsm.append(ddsj);
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdpDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, lkzwm, zjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeMhdpDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, ddjcmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                         break;
                                     }
                                 }
@@ -549,7 +551,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh(areaCode);
                                                     String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                                     String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, rzsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, rzsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                                     break;
                                                 }
                                             } else {   // 多边形区域
@@ -584,7 +586,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh(areaCode);
                                                     String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                                     String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, rzsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, rzrXm, rzrSfzh, rzrLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, rzsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, lgjd, lgwd, currentTime, currentTime, null, null, null, qymc, lgdz, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                                     break;
                                                 }
                                             }
@@ -649,7 +651,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(swjssj);
                                     yjxxsm.append("，营业场所名称：");
                                     yjxxsm.append(yycsmc);
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, swryXm, swrySfzh, swryLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, swkssjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, yycsmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, swryXm, swrySfzh, swryLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, swkssjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, yycsmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                     break;
                                 }
                             }
@@ -713,7 +715,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(zjh);
                                     yjxxsm.append("，地铁线路信息：");
                                     yjxxsm.append(dtxlxx);
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, ckXm, ckSfzh, ckLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, sksjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, czmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, ckXm, ckSfzh, ckLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, sksjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, czmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                     break;
                                 }
                             }
@@ -775,7 +777,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(glsj);
                                     yjxxsm.append("，位置信息：");
                                     yjxxsm.append(StringUtils.isNotBlank(addressName)? addressName : "暂无");
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, glsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, null, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, glsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, null, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                     break;
                                 }
                             }
@@ -887,7 +889,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(ywlx);
                                     yjxxsm.append("，盘查地位置信息：");
                                     yjxxsm.append(StringUtils.isNotBlank(addressName)? addressName : "暂无");
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, lxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, pcsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, pcdJd, pcdWd, currentTime, currentTime, null, null, null, null, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, lxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, pcsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, pcdJd, pcdWd, currentTime, currentTime, null, null, null, null, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                     break;
                                 }
                             }
@@ -957,7 +959,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(zjyxqsrq);
                                     yjxxsm.append("，证件有效终止日期：");
                                     yjxxsm.append(zjyxzzrq);
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, jcsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, jczmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null});
+                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, xm, sfzh, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, jcsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, null, null, currentTime, currentTime, null, null, null, null, jczmc, yjlx, Constants.YJLX_DRYJ, null, null, null, null, null, sftsed, sftssd});
                                     break;
                                 }
                             }
@@ -1022,7 +1024,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh("TJZ");
                                         String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                         String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDzwlDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jzdqJd, jzdqWd, currentTime, currentTime, null, null, null, Constants.QYMC_TJZ, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDzwlDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jzdqJd, jzdqWd, currentTime, currentTime, null, null, null, Constants.QYMC_TJZ, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                         break;
                                     }
                                 }
@@ -1083,7 +1085,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         Map<String, String> tjzFxmjxxMap = ctrlDao.queryFxmjxxByQybh("TJZ");
                                         String edFxmjSfzh = tjzFxmjxxMap.get("edFxmjSfzh");
                                         String sdFxmjSfzh = tjzFxmjxxMap.get("sdFxmjSfzh");
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, Constants.QYMC_TJZ, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, Constants.QYMC_TJZ, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                     }
                                 } else if (Constants.MODEL_CODE_BSMGQY_BSRL.equals(mxbh)) {   // 单人预警-本市敏感区域-本市人脸
                                     // 业务需求：只保留命中点位在当前任务记录的布控区域内的数据
@@ -1127,7 +1129,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh(areaCode);
                                                     String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                                     String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                                     break;
                                                 }
                                             } else {
@@ -1162,7 +1164,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     Map<String, String> fxmjxxMap = ctrlDao.queryFxmjxxByQybh(areaCode);
                                                     String edFxmjSfzh = fxmjxxMap.get("edFxmjSfzh");
                                                     String sdFxmjSfzh = fxmjxxMap.get("sdFxmjSfzh");
-                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh});
+                                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsjDateObj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jd, wd, currentTime, currentTime, null, null, null, areaName, addressName, yjlx, Constants.YJLX_DRYJ, null, null, null, edFxmjSfzh, sdFxmjSfzh, sftsed, sftssd});
                                                     break;
                                                 }
                                             }

src/main/java/com/hhwy/qbeqsjy/service/CtrlService.java

@@ -42,10 +42,10 @@ public class CtrlService {
     private String multiThreadEnabled;
     @Value("${thread.num}")
     private int threadNum;
-    @Value("${ctrl.txt.output.path}")
+    /*@Value("${ctrl.txt.output.path}")
     private String ctrlTxtOutputPath;
     @Value("${stop.ctrl.txt.output.path}")
-    private String stopCtrlTxtOutputPath;
+    private String stopCtrlTxtOutputPath;*/
     @Resource
     private CtrlDao ctrlDao;
     @Value("${uniCtrl.add.url}")
@@ -523,6 +523,8 @@ public class CtrlService {
         String sqrDwmc = taskInfo.getString("sqrDwmc");
         Date bkkssj = taskInfo.getDate("bkkssj");
         Date bkjssj = taskInfo.getDate("bkjssj");
+        Integer sftsed = taskInfo.getInteger("sftsed");
+        Integer sftssd = taskInfo.getInteger("sftssd");
         // 将用户域传来的模型编号转换为数据域烽火盘古平台数据资源编码
         List<String> resourceCodeList = new ArrayList<>();
         for (Object item : modelIdListInfo) {
@@ -550,7 +552,7 @@ public class CtrlService {
                 String zrmjlxfs = clueObj.getString("zrmjlxfs");
                 String zrdwbm = clueObj.getString("zrdwbm");
                 String zrbmbm = clueObj.getString("zrbmbm");
-                ctrlTaskInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, bkkssj, bkjssj, JSON.toJSONString(resourceCodeList), areaInfo.toJSONString(), ryxm, zjlxdm, zjhm, hjd, sjh, yzzt, xszt, rylb, rybq, gkjb, gkjbmc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrbmbm, cjsj});
+                ctrlTaskInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, bkkssj, bkjssj, JSON.toJSONString(resourceCodeList), areaInfo.toJSONString(), sftsed, sftssd, ryxm, zjlxdm, zjhm, hjd, sjh, yzzt, xszt, rylb, rybq, gkjb, gkjbmc, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, zrbmbm, cjsj});
             }
         }
         for (Object item : modelInfo) {
@@ -592,6 +594,53 @@ public class CtrlService {
     }
 
 
+    /**
+     * 保存用户域预警接收群组信息
+     */
+    @Transactional
+    public boolean saveGroupInfo(JSONArray groupInfoList){
+        List<Object[]> groupInfoDataList = new ArrayList<>();
+        Date currentTime = new Date();
+        for (Object item : groupInfoList) {
+            JSONObject groupInfoObj = (JSONObject) item;
+            String zzlxbm = groupInfoObj.getString("zzlxbm");
+            String zzlxmc = groupInfoObj.getString("zzlxmc");
+            String bkdwbm = groupInfoObj.getString("bkdwbm");
+            String bkdwmc = groupInfoObj.getString("bkdwmc");
+            Integer fxlx = groupInfoObj.getInteger("fxlx");
+            String fxlxmc = groupInfoObj.getString("fxlxmc");
+            String bkddbm = groupInfoObj.getString("bkddbm");
+            String bkddmc = groupInfoObj.getString("bkddmc");
+            String fxmjXm = groupInfoObj.getString("fxmjXm");
+            String fxmjJh = groupInfoObj.getString("fxmjJh");
+            String fxmjSfzh = groupInfoObj.getString("fxmjSfzh");
+            String fxmjSjh = groupInfoObj.getString("fxmjSjh");
+            Integer ydzt = groupInfoObj.getInteger("ydzt");
+            String ydztmc = groupInfoObj.getString("ydztmc");
+            Integer czzt = groupInfoObj.getInteger("czzt");
+            String czztmc = groupInfoObj.getString("czztmc");
+            Integer fkzt = groupInfoObj.getInteger("fkzt");
+            String fkztmc = groupInfoObj.getString("fkztmc");
+            String jsbmbm = groupInfoObj.getString("jsbmbm");
+            String jsbmmc = groupInfoObj.getString("jsbmmc");
+            String jsdwbm = groupInfoObj.getString("jsdwbm");
+            String jsdwmc = groupInfoObj.getString("jsdwmc");
+            Integer jsrylx = groupInfoObj.getInteger("jsrylx");
+            String jsrylxmc = groupInfoObj.getString("jsrylxmc");
+            Integer ljscbz = groupInfoObj.getInteger("ljscbz");
+            Date cjsj = groupInfoObj.getDate("cjsj");
+            groupInfoDataList.add(new Object[]{zzlxbm, zzlxmc, bkdwbm, bkdwmc, fxlx, fxlxmc, bkddbm, bkddmc, fxmjXm, fxmjJh, fxmjSfzh, fxmjSjh, ydzt, ydztmc, czzt, czztmc, fkzt, fkztmc, jsbmbm, jsbmmc, jsdwbm, jsdwmc, jsrylx, jsrylxmc, ljscbz, cjsj, currentTime});
+        }
+        boolean insFlag = ctrlDao.batchInsertGroupInfo(groupInfoDataList);
+        if(insFlag){
+            log.info("预警接收群组信息保存成功 数据量：{}", groupInfoDataList.size());
+            boolean delFlag = ctrlDao.deleteGroupInfo(currentTime);
+            return insFlag & delFlag;
+        }
+        return false;
+    }
+
+
 
 
 }

src/main/java/com/hhwy/qbeqsjy/service/SameTravelService.java

@@ -186,11 +186,13 @@ public class SameTravelService {
                     String zrmjlxfs = String.valueOf(ctrlTaskInfo.get("zrmjlxfs"));
                     String zrdwbm = String.valueOf(ctrlTaskInfo.get("zrdwbm"));
                     String zrbmbm = String.valueOf(ctrlTaskInfo.get("zrbmbm"));
+                    Integer sftsed = (Integer) ctrlTaskInfo.get("sftsed");
+                    Integer sftssd = (Integer) ctrlTaskInfo.get("sftssd");
                     // 生成预警信息编号
                     String yjxxbh = String.valueOf(generator.nextId());
                     Date yjsj = (Date) jjyjDataMap.get("yjsj");
                     if(yjsj != null && yjsj.compareTo(bkkssj) >= 0 && yjsj.compareTo(bkjssj) <= 0){
-                        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.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jjyjDataMap.get("jd"), jjyjDataMap.get("wd"), currentTime, currentTime, jjyjDataMap.get("yjflryXm"), jjyjDataMap.get("yjglrySfzh"), jjyjDataMap.get("yjglrySjh"), jjyjDataMap.get("yjqymc"), jjyjDataMap.get("yjcsmc"), yjlx, Constants.YJLX_JJYJ, jjyjDataMap.get("yjryZwh"), jjyjDataMap.get("yjglryZwh"), null});
+                        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.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jjyjDataMap.get("jd"), jjyjDataMap.get("wd"), currentTime, currentTime, jjyjDataMap.get("yjflryXm"), jjyjDataMap.get("yjglrySfzh"), jjyjDataMap.get("yjglrySjh"), jjyjDataMap.get("yjqymc"), jjyjDataMap.get("yjcsmc"), yjlx, Constants.YJLX_JJYJ, jjyjDataMap.get("yjryZwh"), jjyjDataMap.get("yjglryZwh"), null, null, null, sftsed, sftssd});
                     }
                 }
             }

src/main/resources/application.properties

@@ -73,8 +73,8 @@ multi.thread.enabled=false
 # \u6267\u884C\u4EFB\u52A1\u7684\u7EBF\u7A0B\u6570\u91CF - \u5F53[multi.thread.enabled=true]\u65F6\u8BE5\u914D\u7F6E\u751F\u6548\uFF0C\u5426\u5219\u65E0\u6548
 thread.num=5
 # \u4EE5.txt\u6587\u4EF6\u8BB0\u5F55\u5E03/\u505C\u63A7\u5931\u8D25\u7EBF\u7D22\u6570\u636E\u8F93\u51FA\u8DEF\u5F84
-ctrl.txt.output.path=/home/QBEQSJY/ctrl_error/
-stop.ctrl.txt.output.path=/home/QBEQSJY/stop_ctrl_error/
+#ctrl.txt.output.path=/home/QBEQSJY/ctrl_error/
+#stop.ctrl.txt.output.path=/home/QBEQSJY/stop_ctrl_error/
 #ctrl.txt.output.path=C:\\Users\\Administrator\\Desktop\\pfj\\qbeqsjy\\ctrl_error
 #stop.ctrl.txt.output.path=C:\\Users\\Administrator\\Desktop\\pfj\\qbeqsjy\\stop_ctrl_error
 # \u9884\u8B66\u6570\u636E\u67E5\u8BE2\u4E00\u6B21\u6700\u5927\u8FD4\u56DE\u6570\u636E\u6761\u6570\uFF0C\u9ED8\u8BA410000\u6761