Эх сурвалжийг харах

【情报二期】数据域服务 - 预警信息新增二、三道防线民警身份证号字段

peifj 3 долоо хоног өмнө
parent
commit
6f63af492b

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

@@ -210,7 +210,7 @@ public class CtrlDao {
      * @return
      * @return
      */
      */
     public int batchInsertWarningInfo(List<Object[]> warningInfoList){
     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) 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) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
         try {
         try {
             int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, warningInfoList);
             int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, warningInfoList);
             return insertRows.length;
             return insertRows.length;
@@ -324,8 +324,8 @@ public class CtrlDao {
      */
      */
     public List<Map<String, Object>> queryWarningInfoByInc(Timestamp startQueryTime, Timestamp newMaxCreateTime){
     public List<Map<String, Object>> queryWarningInfoByInc(Timestamp startQueryTime, Timestamp newMaxCreateTime){
         List<Map<String, Object>> warningInfoList = new ArrayList<>();
         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 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 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 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 from t_ctrl_warning_info where cjsj > ? and cjsj <= ? order by cjsj desc";
         try {
         try {
             warningInfoList = gaussdbJdbcTemplate.queryForList(sql, startQueryTime, newMaxCreateTime);
             warningInfoList = gaussdbJdbcTemplate.queryForList(sql, startQueryTime, newMaxCreateTime);
             log.info("【增量查询处理后预警结果数据成功】 数据量:{}", warningInfoList.size());
             log.info("【增量查询处理后预警结果数据成功】 数据量:{}", warningInfoList.size());
@@ -372,38 +372,41 @@ public class CtrlDao {
 
 
 
 
     /**
     /**
-     * 批量插入布控任务线索人员数据
+     * 根据区域编号查询防线民警信息
-     * @param clueInfoList
-     * @return
      */
      */
-    /*public boolean batchInsertCtrlClueInfo(List<Object[]> clueInfoList){
+    public Map<String, String> queryFxmjxxByQybh(String qybh){
-        String sql = "insert into t_ctrl_clue_info (rwbh, ryxm, zjlxdm, zjhm, hjd, sjh, xswjbh, xswjm, yzzt, yzztmc, xszt, rylb, rybq, gkjb, gkjbmc, cjsj) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        Map<String, String> fxmjxxMap = new HashMap<>();
+        String sql = "select fxlx, fxmj_sfzh from t_sfj_yjjsqzxx where bkddbm = ? and (fxlx = 2 or fxlx = 3)";
         try {
         try {
-            int[] insertRows = gaussdbJdbcTemplate.batchUpdate(sql, clueInfoList);
+            List<Map<String, Object>> fxmjxxList = gaussdbJdbcTemplate.queryForList(sql, qybh);
-            return insertRows.length == clueInfoList.size();
+            if(fxmjxxList != null && !fxmjxxList.isEmpty()){
+                StringBuilder edFxmjSfzh = new StringBuilder();
+                StringBuilder sdFxmjSfzh = new StringBuilder();
+                for (Map<String, Object> fxmjxx : fxmjxxList) {
+                    Integer fxlx = (Integer) fxmjxx.get("fxlx");
+                    String fxmjSfzh = (String) fxmjxx.get("fxmj_sfzh");
+                    if(StringUtils.isNotBlank(fxmjSfzh)){
+                        if(fxlx == 2){
+                            edFxmjSfzh.append(fxmjSfzh);
+                            edFxmjSfzh.append(",");
+                        } else {
+                            sdFxmjSfzh.append(fxmjSfzh);
+                            sdFxmjSfzh.append(",");
+                        }
+                    }
+                }
+                fxmjxxMap.put("edFxmjSfzh", edFxmjSfzh.toString());
+                fxmjxxMap.put("sdFxmjSfzh", sdFxmjSfzh.toString());
+            }
         } catch (Exception e){
         } catch (Exception e){
-            log.error("【批量插入布控任务线索人员数据发生异常】 异常信息:", e);
+            log.error("【查询布控区域对应二、三道防线民警信息发生异常】 异常信息:", e);
         }
         }
-        return false;
+        return fxmjxxMap;
-    }*/
+    }
+
+
 
 
 
 
-    /**
-     * 根据 数据资源业务ID 查询对应的模型配置字典信息
-     * @param resourceId
-     * @return
-     */
-    /*public Map<String, Object> queryModelDictInfo(Integer resourceId){
-        Map<String, Object> modelDictInfoMap = new HashMap<>();
-        String sql = "select id, yjzdlxbm, yjzdlxmc, ejzdlxbm, ejzdlxmc, sanjzdlxbm, sanjzdlxmc, sjzdlxbm, sjzdlxmc, wjzdlxbm, wjzdlxmc, ljzdlxbm, ljzdlxmc, bz from t_model_dict_info where id = ?";
-        try {
-            modelDictInfoMap = gaussdbJdbcTemplate.queryForMap(sql, resourceId);
-            log.info("【根据数据资源业务ID查询对应模型配置字典信息成功】");
-        } catch (Exception e){
-            log.error("【根据数据资源业务ID查询对应模型配置字典信息发生异常】 异常信息:", e);
-        }
-        return modelDictInfoMap;
-    }*/
 
 
 
 
 
 

+ 43 - 18
src/main/java/com/hhwy/qbeqsjy/kafka/service/ConsumeService.java

@@ -86,7 +86,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
         executor.execute(() -> {
         executor.execute(() -> {
             if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
             if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
                 try {
                 try {
-                    this.dataConsume();
+//                    this.dataConsume();
                 } catch (Exception e) {
                 } catch (Exception e) {
                     log.error("【QBEQSJYCTRL】 数据消费服务发生异常", e);
                     log.error("【QBEQSJYCTRL】 数据消费服务发生异常", e);
                 }
                 }
@@ -231,7 +231,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                 yjxxsm.append(",命中区域:");
                                                 yjxxsm.append(",命中区域:");
                                                 yjxxsm.append(areaName);
                                                 yjxxsm.append(areaName);
                                             }
                                             }
-                                            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});
+                                            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});
                                             break;
                                             break;
                                         }
                                         }
                                     } else {   // 布控区域是一般多边形
                                     } else {   // 布控区域是一般多边形
@@ -258,7 +261,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                 yjxxsm.append(",命中区域:");
                                                 yjxxsm.append(",命中区域:");
                                                 yjxxsm.append(areaName);
                                                 yjxxsm.append(areaName);
                                             }
                                             }
-                                            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});
+                                            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});
                                             break;
                                             break;
                                         }
                                         }
                                     }
                                     }
@@ -272,7 +278,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(captureTimeStr);
                                     yjxxsm.append(captureTimeStr);
                                     yjxxsm.append("出现在");
                                     yjxxsm.append("出现在");
                                     yjxxsm.append(addressName);
                                     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});
+                                    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});
                                 }
                                 }
                             }
                             }
                         } else if(resCodeKy.equals(resourceCode)){   // =========== 客运数据
                         } else if(resCodeKy.equals(resourceCode)){   // =========== 客运数据
@@ -345,7 +351,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(zh);
                                         yjxxsm.append(zh);
                                         yjxxsm.append(",车牌号:");
                                         yjxxsm.append(",车牌号:");
                                         yjxxsm.append(cph);
                                         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});
+                                        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});
                                         break;
                                         break;
                                     }
                                     }
                                 }
                                 }
@@ -419,7 +425,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                                         yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                                         yjxxsm.append(",到达时间:");
                                         yjxxsm.append(",到达时间:");
                                         yjxxsm.append(ddsj);
                                         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});
+                                        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});
                                         break;
                                         break;
                                     }
                                     }
                                 } else if (Constants.MODEL_CODE_KSGJ_MHDP.equals(mxbh)) {   // 单人预警-跨省轨迹-民航订票
                                 } else if (Constants.MODEL_CODE_KSGJ_MHDP.equals(mxbh)) {   // 单人预警-跨省轨迹-民航订票
@@ -443,7 +449,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                                         yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                                         yjxxsm.append(",到达时间:");
                                         yjxxsm.append(",到达时间:");
                                         yjxxsm.append(ddsj);
                                         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});
+                                        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});
                                         break;
                                         break;
                                     }
                                     }
                                 }
                                 }
@@ -508,6 +514,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     JSONArray areaInfoList = JSON.parseArray(bkqyxx);
                                     JSONArray areaInfoList = JSON.parseArray(bkqyxx);
                                     for (Object obj : areaInfoList) {
                                     for (Object obj : areaInfoList) {
                                         JSONObject ctrlAreaInfo = (JSONObject) obj;
                                         JSONObject ctrlAreaInfo = (JSONObject) obj;
+                                        String areaCode = (String) ctrlAreaInfo.get("qybh");
                                         String qymc = (String) ctrlAreaInfo.get("qymc");
                                         String qymc = (String) ctrlAreaInfo.get("qymc");
                                         Integer qyjhlx = (Integer) ctrlAreaInfo.get("qyjhlx");
                                         Integer qyjhlx = (Integer) ctrlAreaInfo.get("qyjhlx");
                                         JSONObject locationJSONObj = JSON.parseObject(String.valueOf(ctrlAreaInfo.get("qyfwjwdjhFh")));
                                         JSONObject locationJSONObj = JSON.parseObject(String.valueOf(ctrlAreaInfo.get("qyfwjwdjhFh")));
@@ -539,7 +546,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     yjxxsm.append(fjh);
                                                     yjxxsm.append(fjh);
                                                     yjxxsm.append(",命中区域:");
                                                     yjxxsm.append(",命中区域:");
                                                     yjxxsm.append(qymc);
                                                     yjxxsm.append(qymc);
-                                                    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});
+                                                    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});
                                                     break;
                                                     break;
                                                 }
                                                 }
                                             } else {   // 多边形区域
                                             } else {   // 多边形区域
@@ -571,7 +581,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                     yjxxsm.append(fjh);
                                                     yjxxsm.append(fjh);
                                                     yjxxsm.append(",命中区域:");
                                                     yjxxsm.append(",命中区域:");
                                                     yjxxsm.append(qymc);
                                                     yjxxsm.append(qymc);
-                                                    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});
+                                                    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});
                                                     break;
                                                     break;
                                                 }
                                                 }
                                             }
                                             }
@@ -636,7 +649,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(swjssj);
                                     yjxxsm.append(swjssj);
                                     yjxxsm.append(",营业场所名称:");
                                     yjxxsm.append(",营业场所名称:");
                                     yjxxsm.append(yycsmc);
                                     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});
+                                    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});
                                     break;
                                     break;
                                 }
                                 }
                             }
                             }
@@ -700,7 +713,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(zjh);
                                     yjxxsm.append(zjh);
                                     yjxxsm.append(",地铁线路信息:");
                                     yjxxsm.append(",地铁线路信息:");
                                     yjxxsm.append(dtxlxx);
                                     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});
+                                    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});
                                     break;
                                     break;
                                 }
                                 }
                             }
                             }
@@ -762,7 +775,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(glsj);
                                     yjxxsm.append(glsj);
                                     yjxxsm.append(",位置信息:");
                                     yjxxsm.append(",位置信息:");
                                     yjxxsm.append(StringUtils.isNotBlank(addressName)? addressName : "暂无");
                                     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});
+                                    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});
                                     break;
                                     break;
                                 }
                                 }
                             }
                             }
@@ -874,7 +887,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(ywlx);
                                     yjxxsm.append(ywlx);
                                     yjxxsm.append(",盘查地位置信息:");
                                     yjxxsm.append(",盘查地位置信息:");
                                     yjxxsm.append(StringUtils.isNotBlank(addressName)? addressName : "暂无");
                                     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});
+                                    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});
                                     break;
                                     break;
                                 }
                                 }
                             }
                             }
@@ -944,7 +957,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     yjxxsm.append(zjyxqsrq);
                                     yjxxsm.append(zjyxqsrq);
                                     yjxxsm.append(",证件有效终止日期:");
                                     yjxxsm.append(",证件有效终止日期:");
                                     yjxxsm.append(zjyxzzrq);
                                     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});
+                                    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});
                                     break;
                                     break;
                                 }
                                 }
                             }
                             }
@@ -1006,7 +1019,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(",手机MAC地址:");
                                         yjxxsm.append(",手机MAC地址:");
                                         yjxxsm.append(sjMac);
                                         yjxxsm.append(sjMac);
                                         yjxxsm.append(",命中区域:天津站");
                                         yjxxsm.append(",命中区域:天津站");
-                                        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});
+                                        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});
                                         break;
                                         break;
                                     }
                                     }
                                 }
                                 }
@@ -1064,7 +1080,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(",位置信息:");
                                         yjxxsm.append(",位置信息:");
                                         yjxxsm.append(addressName);
                                         yjxxsm.append(addressName);
                                         yjxxsm.append(",命中区域:天津站");
                                         yjxxsm.append(",命中区域:天津站");
-                                        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});
+                                        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});
                                     }
                                     }
                                 } else if (Constants.MODEL_CODE_BSMGQY_BSRL.equals(mxbh)) {   // 单人预警-本市敏感区域-本市人脸
                                 } else if (Constants.MODEL_CODE_BSMGQY_BSRL.equals(mxbh)) {   // 单人预警-本市敏感区域-本市人脸
                                     // 业务需求:只保留命中点位在当前任务记录的布控区域内的数据
                                     // 业务需求:只保留命中点位在当前任务记录的布控区域内的数据
@@ -1105,7 +1124,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                         yjxxsm.append(",命中区域:");
                                                         yjxxsm.append(",命中区域:");
                                                         yjxxsm.append(areaName);
                                                         yjxxsm.append(areaName);
                                                     }
                                                     }
-                                                    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});
+                                                    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});
                                                     break;
                                                     break;
                                                 }
                                                 }
                                             } else {
                                             } else {
@@ -1137,7 +1159,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                         yjxxsm.append(",命中区域:");
                                                         yjxxsm.append(",命中区域:");
                                                         yjxxsm.append(areaName);
                                                         yjxxsm.append(areaName);
                                                     }
                                                     }
-                                                    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});
+                                                    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});
                                                     break;
                                                     break;
                                                 }
                                                 }
                                             }
                                             }

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

@@ -64,8 +64,8 @@ fwkfpt.serviceId=673976555399020544
 
 
 # \u534E\u4E3A - kafka\u914D\u7F6E
 # \u534E\u4E3A - kafka\u914D\u7F6E
 # kafka\u96C6\u7FA4\u8BA4\u8BC1\u914D\u7F6E\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
 # kafka\u96C6\u7FA4\u8BA4\u8BC1\u914D\u7F6E\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
-#kafka.properties.path=/home/QBEQSJY/kafka/
+kafka.properties.path=/home/QBEQSJY/kafka/
-kafka.properties.path=C:\\Users\\Administrator\\Desktop\\pfj\\idea_project\\QBEQSJY\\src\\main\\resources\\kafka\\
+#kafka.properties.path=C:\\Users\\Administrator\\Desktop\\pfj\\idea_project\\QBEQSJY\\src\\main\\resources\\kafka\\
 # \u4E1A\u52A1topic
 # \u4E1A\u52A1topic
 topic.name=UNICTRL_DATA_QBEQSJYCTRL_V1.0
 topic.name=UNICTRL_DATA_QBEQSJYCTRL_V1.0
 # \u662F\u5426\u5F00\u542F\u591A\u7EBF\u7A0B\u6267\u884C\u4EFB\u52A1 - false\uFF1A\u9ED8\u8BA4\u53EA\u5F00\u542F\u4E00\u4E2A\u5B50\u7EBF\u7A0B
 # \u662F\u5426\u5F00\u542F\u591A\u7EBF\u7A0B\u6267\u884C\u4EFB\u52A1 - false\uFF1A\u9ED8\u8BA4\u53EA\u5F00\u542F\u4E00\u4E2A\u5B50\u7EBF\u7A0B
@@ -73,10 +73,10 @@ 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
 # \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
 thread.num=5
 # \u4EE5.txt\u6587\u4EF6\u8BB0\u5F55\u5E03/\u505C\u63A7\u5931\u8D25\u7EBF\u7D22\u6570\u636E\u8F93\u51FA\u8DEF\u5F84
 # \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/
+ctrl.txt.output.path=/home/QBEQSJY/ctrl_error/
-#stop.ctrl.txt.output.path=/home/QBEQSJY/stop_ctrl_error/
+stop.ctrl.txt.output.path=/home/QBEQSJY/stop_ctrl_error/
-ctrl.txt.output.path=C:\\Users\\Administrator\\Desktop\\pfj\\qbeqsjy\\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
+#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
 # \u9884\u8B66\u6570\u636E\u67E5\u8BE2\u4E00\u6B21\u6700\u5927\u8FD4\u56DE\u6570\u636E\u6761\u6570\uFF0C\u9ED8\u8BA410000\u6761
 query.max.count=10000
 query.max.count=10000