【情报二期】数据域服务 - 更新配置文件

src/main/java/com/hhwy/qbeqsjy/common/Constants.java

@@ -57,8 +57,8 @@ public class Constants {
     public static final String YJLX_DRYJ = "单人预警";
     // 预警类型：聚集预警
     public static final String YJLX_JJYJ = "聚集预警";
-    // 预警区域名称：火车站
-    public static final String QYMC_HCZ = "火车站";
+    // 预警区域名称：天津站
+    public static final String QYMC_TJZ = "天津站";
     // 预警区域名称：天津市
     public static final String QYMC_TJS = "天津市";
     public static final String MULTI_THREAD_ENABLED_FLAG = "true";

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

@@ -39,12 +39,12 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
     private String clueCodeIdCard;
     @Value("${address.query.url}")
     private String addressQueryUrl;
-    @Value("${centerPoint.lon.hcz}")
-    private String centerPointLonHcz;
-    @Value("${centerPoint.lat.hcz}")
-    private String centerPointLatHcz;
-    @Value("${radius.hcz}")
-    private String radiusHcz;
+    @Value("${centerPoint.lon.tjz}")
+    private String centerPointLonTJZ;
+    @Value("${centerPoint.lat.tjz}")
+    private String centerPointLatTJZ;
+    @Value("${radius.tjz}")
+    private String radiusTJZ;
     @Value("${res.code.auth}")
     private String resCodeAUTH;
     /*@Value("${res.code.tldp}")
@@ -958,8 +958,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                 String mxbh = (String) modelInfoMap.get("mxbh");
                                 if(Constants.MODEL_CODE_BSJJ_HCZDW.equals(mxbh)){   // 单人预警-本市进京-火车站电围
                                     // 业务需求：只保留命中点位在火车站区域内的数据
-                                    if(GeoUtils.isPointInCircle(Double.valueOf(jzdqWd), Double.valueOf(jzdqJd), Double.valueOf(centerPointLatHcz), Double.valueOf(centerPointLonHcz), Double.valueOf(radiusHcz))){
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDzwl, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.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_HCZ, addressName, yjlx, Constants.YJLX_DRYJ});
+                                    if(GeoUtils.isPointInCircle(Double.valueOf(jzdqWd), Double.valueOf(jzdqJd), Double.valueOf(centerPointLatTJZ), Double.valueOf(centerPointLonTJZ), Double.valueOf(radiusTJZ))){
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yddh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDzwl, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.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});
                                         yjxxsm.setLength(0);
                                         break;
                                     }
@@ -1005,7 +1005,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                 String mxbh = (String) modelInfoMap.get("mxbh");
                                 if(Constants.MODEL_CODE_BSJJ_HCZRLGZ.equals(mxbh)){   // 单人预警-本市进京-火车站人脸感知
                                     // 业务需求：只保留命中点位在火车站区域内的数据
-                                    if(GeoUtils.isPointInCircle(Double.valueOf(wd), Double.valueOf(jd), Double.valueOf(centerPointLatHcz), Double.valueOf(centerPointLonHcz), Double.valueOf(radiusHcz))){
+                                    if(GeoUtils.isPointInCircle(Double.valueOf(wd), Double.valueOf(jd), Double.valueOf(centerPointLatTJZ), Double.valueOf(centerPointLonTJZ), Double.valueOf(radiusTJZ))){
                                         yjxxsm.append("火车站人脸感知 - 抓拍机编号：");
                                         yjxxsm.append(zpjbh);
                                         yjxxsm.append("，抓拍机名称：");
@@ -1016,7 +1016,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         yjxxsm.append(gjsj);
                                         yjxxsm.append("，人脸图片文件路径：");
                                         yjxxsm.append(rltpwjlj);
-                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.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_HCZ, addressName, yjlx, Constants.YJLX_DRYJ});
+                                        warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, gjryZjhm, yjrySjh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, gjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.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});
                                         yjxxsm.setLength(0);
                                     }
                                 } else if (Constants.MODEL_CODE_BSMGQY_BSRL.equals(mxbh)) {   // 单人预警-本市敏感区域-本市人脸

src/main/resources/application.properties

@@ -110,11 +110,11 @@ res.code.rlgz=991C2304
 res.code.gmszy=991C3201000512
 
 
-# \u706B\u8F66\u7AD9\uFF08\u5929\u6D25\u7AD9\uFF09\u5706\u5F62\u533A\u57DF\u5706\u5FC3\u70B9\u7ECF\u7EAC\u5EA6\uFF0884\u5750\u6807\u7CFB\uFF09
-centerPoint.lon.hcz=117.xxx
-centerPoint.lat.hcz=39.xxx
+# \u5929\u6D25\u7AD9\u5706\u5F62\u533A\u57DF\u5706\u5FC3\u70B9\u7ECF\u7EAC\u5EA6\uFF0884\u5750\u6807\u7CFB\uFF09
+centerPoint.lon.tjz=117.xxx
+centerPoint.lat.tjz=39.xxx
 # \u534A\u5F84\uFF0C\u5355\u4F4D\uFF1A\u7C73
-radius.hcz=500
+radius.tjz=500
 
 
 # \u540C\u884C\u7C7B\u6570\u636E\u8D44\u6E90\u6807\u8BC6\u7B26