【情报二期】数据域服务 - 预警数据批量入库代码调整

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

@@ -145,7 +145,7 @@ public class CtrlDao {
      * @return
      */
     public boolean 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, zrdwdm, zrdwmc, zrbmdm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwdm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, cjsj, gxsj) 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, zrdwdm, zrdwmc, zrbmdm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwdm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, cjsj, gxsj) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
         try {
             int[] insertRows = gaussDBJdbcTemplate.batchUpdate(sql, warningInfoList);
             return insertRows.length == warningInfoList.size();
@@ -168,7 +168,7 @@ public class CtrlDao {
         Integer pageNum = queryDTO.getPageNum() == null ? Constants.NUM_1 : queryDTO.getPageNum();
         Integer pageSize = queryDTO.getPageSize() == null ? queryMaxCount : queryDTO.getPageSize();
         List<Map<String, Object>> warningInfoList = new ArrayList<>();
-        StringBuilder sql = new StringBuilder("select rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, yjztmc, yjsj, zrdwdm, zrdwmc, zrbmdm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwdm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, cjsj, gxsj from t_ctrl_warning_info where 1 = 1");
+        StringBuilder sql = new StringBuilder("select rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, yjztmc, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwdm, zrdwmc, zrbmdm, zrbmmc, sqr_xm, sqr_sfzh, sqr_jh, sqr_dwdm, sqr_dwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, ywly, cjsj, gxsj from t_ctrl_warning_info where 1 = 1");
         // 1.根据任务ID过滤
         if(StringUtils.isNotBlank(taskId)){
             sql.append(" and rwbh = '");

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

@@ -51,7 +51,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
         executor.execute(() -> {
             if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
                 try {
-                    this.dataConsume();
+//                    this.dataConsume();
                 } catch (Exception e) {
                     log.error("【QBEQSJYCTRL】 数据处理服务启动异常", e);
                 }
@@ -131,9 +131,9 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                         String zrmjlxfs = String.valueOf(ctrlTaskInfo.get("zrmjlxfs"));
                         String zrdwdm = String.valueOf(ctrlTaskInfo.get("zrdwdm"));
                         String zrbmdm = String.valueOf(ctrlTaskInfo.get("zrbmdm"));
+                        // 生成预警信息编号
                         String yjxxbh = String.valueOf(generator.nextId());
                         Integer yjzt = 0;
-
                         // 如果布控资源为AUTH表
                         if(Constants.TABLE_AUTH_RES_ID.equals(resourceId)){
                             // 1. ========================= 过滤基站号为空的数据
@@ -159,7 +159,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         String centerLat = loc.getString("lat");
                                         String radius = loc.getString("radius");
                                         if(GeoUtils.isPointInCircle(Double.valueOf(lat), Double.valueOf(lon), Double.valueOf(centerLat), Double.valueOf(centerLon), Double.valueOf(radius))){
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
+                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
                                             break;
                                         }
                                     } else {   // 布控区域是一般多边形
@@ -171,16 +171,16 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                             coordinates.add(new Coordinate(Double.valueOf(vertexLon), Double.valueOf(vertexLat)));
                                         }
                                         if(GeoUtils.isPointInPolygon(coordinates, new Coordinate(Double.valueOf(lon), Double.valueOf(lat)))){
-                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
+                                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
                                             break;
                                         }
                                     }
                                 }
                             } else {   // 如果不存在布控区域信息，则默认布控区域范围为全天津市，直接入库
-                                warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
+                                warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
                             }
                         } else {   // 如果是其他类布控资源，则直接保存入库
-                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
+                            warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjry_xm, yjry_sfzh, yjry_sjh, yjxxsm, yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwdm, CommonUtil.getConfValueByKey(zrdwdm), zrbmdm, CommonUtil.getConfValueByKey(zrbmdm), sqrxm, sqrsfzh, sqrjh, sqrdwdm, sqrdwmc, yjry_lb, yjry_bq, gkjb, gkjbmc, resourceId, yjsj, yjsj});
                         }
                     }
                 }

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

@@ -41,8 +41,6 @@ public class CtrlService {
     private String multiThreadEnabled;
     @Value("${thread.num}")
     private int threadNum;
-    @Value("${res.auth.code}")
-    private String resAUTHCode;
     @Value("${ctrl.txt.output.path}")
     private String ctrlTxtOutputPath;
     @Value("${stop.ctrl.txt.output.path}")