【情报二期】数据域服务 - 调整部分预警数据消费处理逻辑

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

@@ -35,10 +35,10 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
 
     @Value("${topic.name}")
     private String topic;
-    @Value("${clue.code.phone}")
+    /*@Value("${clue.code.phone}")
     private String clueCodePhone;
     @Value("${clue.code.idCard}")
-    private String clueCodeIdCard;
+    private String clueCodeIdCard;*/
     @Value("${address.query.url}")
     private String addressQueryUrl;
     @Value("${centerPoint.lon.tjz}")
@@ -121,7 +121,6 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
     public void process(KafkaConsumer<Integer, String> consumer, String topic) {
         consumer.subscribe(Collections.singletonList(topic));
         while (true) {
-            // 间隔30秒拉取一次数据
             log.info("间隔30秒拉取一次数据......");
             ConsumerRecords<Integer, String> records = consumer.poll(Constants.WAIT_TIME);
             if (records != null && records.count() > 0) {
@@ -194,11 +193,12 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             // 命中点位地址名称
                             String addressName = rspJSONObj.getString("fullAddress");
                             // 预警时间
-                            String captureTime = TimeTool.timeStampToDateString(Long.valueOf(oriField.getString("CAPTURE_TIME")));
-                            Date captureTimeDateObj = new Date(Long.valueOf(oriField.getString("CAPTURE_TIME")) * 1000);
+                            Long captureTime = Long.valueOf(oriField.getString("CAPTURE_TIME"));
+                            String captureTimeStr = TimeTool.timeStampToDateString(captureTime);
+                            Date captureTimeDateObj = new Date(captureTime * 1000);
                             yjxxsm.append(yjryXm);
                             yjxxsm.append("于");
-                            yjxxsm.append(captureTime);
+                            yjxxsm.append(captureTimeStr);
                             yjxxsm.append("出现在");
                             yjxxsm.append(addressName);
                             // 将烽火的百度坐标系经纬度值转换为84坐标系经纬度值
@@ -244,7 +244,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                         }
                                     }
                                 }
-                            } else {   // 如果不存在布控区域，则默认布控区域范围为全天津市，预警数据直接入库
+                            } else {   // 如果不存在布控区域，则默认布控区域范围为天津市
                                 if(captureTimeDateObj.compareTo(bkkssj) >= 0 && captureTimeDateObj.compareTo(bkjssj) <= 0){
                                     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});
                                     yjxxsm.setLength(0);
@@ -252,8 +252,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             }
                         } else if(resCodeKy.equals(resourceCode)){   // =========== 客运数据
                             // 票号
-                            String trainTicNo = oriField.getString("TRAIN_TIC_NO");
-                            String ph = StringUtils.isNotBlank(trainTicNo)? trainTicNo : "暂无";
+                            /*String trainTicNo = oriField.getString("TRAIN_TIC_NO");
+                            String ph = StringUtils.isNotBlank(trainTicNo)? trainTicNo : "暂无";*/
                             // 旅客姓名
                             String passName = oriField.getString("PASS_NAME");
                             String lkXm = StringUtils.isNotBlank(passName)? passName : yjryXm;
@@ -262,20 +262,15 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             // 旅客手机
                             String passMob = oriField.getString("PASS_MOB");
                             String lkSjh = StringUtils.isNotBlank(passMob)? passMob : yjrySjh;
-//                            String ccrq = oriField.getString("RIDING_DATE");              // 乘车日期
                             // 检票时间   ---样例：20200929073509
                             String cheticTime = oriField.getString("CHETIC_TIME");
                             String jpsj = StringUtils.isNotBlank(cheticTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(cheticTime)) : "暂无";
-//                            String jpkyz = oriField.getString("CHETIC_PASSTA_NAME");      // 检票客运站
                             // 检票车次号
                             String cheticTrainNo = oriField.getString("CHETIC_TRAIN_NO");
                             String jpcch = StringUtils.isNotBlank(cheticTrainNo)? cheticTrainNo : "暂无";
-//                            String bc = oriField.getString("SHIFT");                      // 班次
                             // 座号
                             String seatNo = oriField.getString("SEAT_NO");
                             String zh = StringUtils.isNotBlank(seatNo)? seatNo : "暂无";
-//                            String pj = oriField.getString("VEHTIC_PRIC");                // 票价
-//                            String zffs = oriField.getString("PAYM_METH_NAME");           // 支付方式
                             // 车牌号
                             String vehPlateNum = oriField.getString("VEH_PLATE_NUM");
                             String cph = StringUtils.isNotBlank(vehPlateNum)? vehPlateNum : "暂无";
@@ -287,29 +282,24 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             // 目的地站点
                             String destStatiName = oriField.getString("DEST_STATI_NAME");
                             String mddzdmc = StringUtils.isNotBlank(destStatiName)? destStatiName : "暂无";
-                            String mddxzqhdm = oriField.getString("DEST_ADDI_CODE");      // 目的地行政区划代码
+                            // 目的地行政区划代码
+                            String mddxzqhdm = oriField.getString("DEST_ADDI_CODE");
                             // 订票时间   ---样例：20200929061228
                             String booticTime = oriField.getString("BOOTIC_TIME");
-                            String dpsj = StringUtils.isNotBlank(booticTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(booticTime)) : "暂无";
+                            String dpsjStr = StringUtils.isNotBlank(booticTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(booticTime)) : "暂无";
                             Date dpsjDateObj = StringUtils.isNotBlank(booticTime)? new Date(TimeTool.dateStringToTimeStamp3(booticTime) * 1000) : null;
-//                            String dpfs = oriField.getString("BOOTIC_METH");              // 订票方式
                             // 发车时间   ---样例：20200929061228
                             String depTimeDtime = oriField.getString("DEP_TIME_DTIME");
                             String fcsj = StringUtils.isNotBlank(depTimeDtime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(depTimeDtime)) : "暂无";
-//                            String ddsj = oriField.getString("ARR_TIME");                 // 到达时间
-//                            String lxrXm = oriField.getString("CTCT_PERSON_NAME");        // 联系人姓名
-//                            String lxrLxdh = oriField.getString("CTCT_PERSON_CTCT_TEL");  // 联系人联系电话
-                            String captureTimeKy = TimeTool.timeStampToDateString(Long.valueOf(oriField.getString("CAPTURE_TIME")));
-                            yjxxsm.append("客运数据 - 票号：");
-                            yjxxsm.append(ph);
-                            yjxxsm.append("，旅客姓名：");
+                            /*String captureTimeKy = TimeTool.timeStampToDateString(Long.valueOf(oriField.getString("CAPTURE_TIME")));*/
+                            yjxxsm.append("客运数据 - 旅客姓名：");
                             yjxxsm.append(lkXm);
                             yjxxsm.append("，旅客身份证号：");
                             yjxxsm.append(lkSfzh);
                             yjxxsm.append("，旅客手机号：");
                             yjxxsm.append(lkSjh);
                             yjxxsm.append("，订票时间：");
-                            yjxxsm.append(dpsj);
+                            yjxxsm.append(dpsjStr);
                             yjxxsm.append("，发车时间：");
                             yjxxsm.append(fcsj);
                             yjxxsm.append("，始发站：");
@@ -338,8 +328,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.setLength(0);
                         } else if (resCodeMhdp.equals(resourceCode)) {   // =========== 民航订票数据
                             // 订座记录编号
-                            String ordseatRecoNo = oriField.getString("ORDSEAT_RECO_NO");
-                            String dzjlbh = StringUtils.isNotBlank(ordseatRecoNo)? ordseatRecoNo : "暂无";
+                            /*String ordseatRecoNo = oriField.getString("ORDSEAT_RECO_NO");
+                            String dzjlbh = StringUtils.isNotBlank(ordseatRecoNo)? ordseatRecoNo : "暂无";*/
                             // 旅客中文名
                             String passName = oriField.getString("PASS_NAME");
                             String lkzwm = StringUtils.isNotBlank(passName)? passName : "暂无";
@@ -351,8 +341,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String carrOrgaAirlineName = oriField.getString("CARR_ORGA_AIRLINE_NAME");
                             String cyhkgs = StringUtils.isNotBlank(carrOrgaAirlineName)? carrOrgaAirlineName : "暂无";
                             // 责任航空公司
-                            String respUnitAirlineName = oriField.getString("RESP_UNIT_AIRLINE_NAME");
-                            String zrhkgs = StringUtils.isNotBlank(respUnitAirlineName)? respUnitAirlineName : "暂无";
+                            /*String respUnitAirlineName = oriField.getString("RESP_UNIT_AIRLINE_NAME");
+                            String zrhkgs = StringUtils.isNotBlank(respUnitAirlineName)? respUnitAirlineName : "暂无";*/
                             // 航班号
                             String flinum = oriField.getString("FLINUM");
                             String hbh = StringUtils.isNotBlank(flinum)? flinum : "暂无";
@@ -360,15 +350,12 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String flyInitNrtAirportName = oriField.getString("FLY_INIT_NRT_AIRPORT_NAME");
                             String qfjcmc = StringUtils.isNotBlank(flyInitNrtAirportName)? flyInitNrtAirportName : "暂无";
                             // 起飞机场代码
-                            String flyInitNrtAirportCode = oriField.getString("FLY_INIT_NRT_AIRPORT_CODE");
-                            String qfjcdm = StringUtils.isNotBlank(flyInitNrtAirportCode)? flyInitNrtAirportCode : "暂无";
+                            String qfjcdm = oriField.getString("FLY_INIT_NRT_AIRPORT_CODE");
 //                            String qfzcs = oriField.getString("FLY_INIT_ADDR_CITY_NAME");      // 起飞站城市
                             // 到达机场
-                            String arrAtAirAirportName = oriField.getString("ARR_AT_AIR_AIRPORT_NAME");
-                            String ddjcmc = StringUtils.isNotBlank(arrAtAirAirportName)? arrAtAirAirportName : "暂无";
+                            String ddjcmc = oriField.getString("ARR_AT_AIR_AIRPORT_NAME");
                             // 到达机场代码
-                            String arrAtAirAirportCode = oriField.getString("ARR_AT_AIR_AIRPORT_CODE");
-                            String ddjcdm = StringUtils.isNotBlank(arrAtAirAirportCode)? arrAtAirAirportCode : "暂无";
+                            String ddjcdm = oriField.getString("ARR_AT_AIR_AIRPORT_CODE");
 //                            String ddzcs = oriField.getString("ARR_ADDR_CITY_NAME");           // 到达站城市
 //                            String cfrq = oriField.getString("STAOFF_DATE");                   // 出发日期
                             // 出发时间   ---样例：20200929061228
@@ -383,18 +370,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
 //                            String dpsj = oriField.getString("BOOTIC_TIME");                   // 订票时间
                             // 截获时间   ---样例：20200929061228
                             String captureTime = oriField.getString("CAPTURE_TIME");
-                            String captureTimeMhdp = StringUtils.isNotBlank(captureTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(captureTime)) : "暂无";
+                            /*String captureTimeMhdp = StringUtils.isNotBlank(captureTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(captureTime)) : "暂无";*/
                             Date captureTimeMhdpDateObj = StringUtils.isNotBlank(captureTime)? new Date(TimeTool.dateStringToTimeStamp3(captureTime) * 1000) : null;
-                            yjxxsm.append("民航订票 - 订座记录编号：");
-                            yjxxsm.append(dzjlbh);
-                            yjxxsm.append("，旅客中文名：");
+                            yjxxsm.append("民航订票 - 旅客中文名：");
                             yjxxsm.append(lkzwm);
                             yjxxsm.append("，旅客证件号码：");
                             yjxxsm.append(zjhm);
                             yjxxsm.append("，承运航空公司：");
                             yjxxsm.append(cyhkgs);
-                            yjxxsm.append("，责任航空公司：");
-                            yjxxsm.append(zrhkgs);
                             yjxxsm.append("，航班号：");
                             yjxxsm.append(hbh);
                             yjxxsm.append("，起飞机场：");
@@ -402,7 +385,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append("，出发时间：");
                             yjxxsm.append(cfsj);
                             yjxxsm.append("，到达机场：");
-                            yjxxsm.append(ddjcmc);
+                            yjxxsm.append(StringUtils.isNotBlank(ddjcmc)? ddjcmc : "暂无");
                             yjxxsm.append("，到达时间：");
                             yjxxsm.append(ddsj);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
@@ -474,9 +457,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
 //                            String rzr2Sfzh = oriField.getString("ADMIS_PER_TWO_CERT_NO");      // 入住人2身份证号
 //                            String rzr2Lxfs = oriField.getString("ADMIS_PER_TWO_CTCT_TEL");     // 入住人2联系方式
                             String captureTimeJnryzs = TimeTool.timeStampToDateString(Long.valueOf(oriField.getString("CAPTURE_TIME")));
-                            yjxxsm.append("旅馆住宿 - 旅馆编号：");
-                            yjxxsm.append(lgbh);
-                            yjxxsm.append("，旅馆名称：");
+                            yjxxsm.append("旅馆住宿 - 旅馆名称：");
                             yjxxsm.append(lgmc);
                             yjxxsm.append("，旅馆地址：");
                             yjxxsm.append(lgdz);
@@ -561,8 +542,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String swjssj = StringUtils.isNotBlank(intenetEndTime)? TimeTool.timeStampToDateString(TimeTool.dateStringToTimeStamp3(intenetEndTime)) : "暂无";
 //                            String swsc = oriField.getString("INTENET_TIME_LENGTH");    // 上网时长
                             // 营业场所编号
-                            String premNo = oriField.getString("PREM_NO");
-                            String yycsbh = StringUtils.isNotBlank(premNo)? premNo : "暂无";
+                            /*String premNo = oriField.getString("PREM_NO");
+                            String yycsbh = StringUtils.isNotBlank(premNo)? premNo : "暂无";*/
                             // 营业场所名称
                             String premDesig = oriField.getString("PREM_DESIG");
                             String yycsmc = StringUtils.isNotBlank(premDesig)? premDesig : "暂无";
@@ -585,8 +566,6 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(swkssj);
                             yjxxsm.append("，上网结束时间：");
                             yjxxsm.append(swjssj);
-                            yjxxsm.append("，营业场所编号：");
-                            yjxxsm.append(yycsbh);
                             yjxxsm.append("，营业场所名称：");
                             yjxxsm.append(yycsmc);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
@@ -620,14 +599,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String czmMc = oriField.getString("CZM_MC");
                             String czmc = StringUtils.isNotBlank(czmMc)? czmMc : "暂无";
                             // 分类名称
-                            String flMc = oriField.getString("FL_MC");
-                            String flmc = StringUtils.isNotBlank(flMc)? flMc : "暂无";
+                            /*String flMc = oriField.getString("FL_MC");
+                            String flmc = StringUtils.isNotBlank(flMc)? flMc : "暂无";*/
                             // 进出站标识名称
                             String jczBsMc = oriField.getString("JCZ_BS_MC");
                             String jczbsmc = StringUtils.isNotBlank(jczBsMc)? jczBsMc : "暂无";
                             // 交易类型名称
-                            String jyLexMc = oriField.getString("JY_LEX_MC");
-                            String jylxmc = StringUtils.isNotBlank(jyLexMc)? jyLexMc : "暂无";
+                            /*String jyLexMc = oriField.getString("JY_LEX_MC");
+                            String jylxmc = StringUtils.isNotBlank(jyLexMc)? jyLexMc : "暂无";*/
                             // 闸机号
                             String zhjhJyqk = oriField.getString("ZHJH_JYQK");
                             String zjh = StringUtils.isNotBlank(zhjhJyqk)? zhjhJyqk : "暂无";
@@ -647,12 +626,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(sksj);
                             yjxxsm.append("，车站名称：");
                             yjxxsm.append(czmc);
-                            yjxxsm.append("，分类名称：");
-                            yjxxsm.append(flmc);
                             yjxxsm.append("，进出站标识名称：");
                             yjxxsm.append(jczbsmc);
-                            yjxxsm.append("，交易类型名称：");
-                            yjxxsm.append(jylxmc);
                             yjxxsm.append("，闸机号：");
                             yjxxsm.append(zjh);
                             yjxxsm.append("，地铁线路信息：");
@@ -663,7 +638,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                 if(Constants.MODEL_CODE_BSMGQY_DT.equals(mxbh) && sksjDateObj.compareTo(bkkssj) >= 0 && sksjDateObj.compareTo(bkjssj) <= 0){
                                     // 表中无经、纬度数据，无法判断是否出现在布控区域
                                     // 暂时不做过滤处理
-                                    warningInfoList.add(new Object[]{rwbh, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, ckXm, ckSfzh, ckLxdh, yjxxsm.toString(), yjzt, Constants.YJZT_WD, captureTimeDt, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.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});
+                                    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});
                                     yjxxsm.setLength(0);
                                     break;
                                 }
@@ -674,8 +649,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String yddhSrc = oriField.getString("YDDH");
                             String yddh = StringUtils.isNotBlank(yddhSrc)? yddhSrc : yjrySjh;
                             // 城际设备信息编号
-                            String chjiSbeXxbh = oriField.getString("CHJI_SBE_XXBH");
-                            String cjsbxxbh = StringUtils.isNotBlank(chjiSbeXxbh)? chjiSbeXxbh : "暂无";
+                            /*String chjiSbeXxbh = oriField.getString("CHJI_SBE_XXBH");
+                            String cjsbxxbh = StringUtils.isNotBlank(chjiSbeXxbh)? chjiSbeXxbh : "暂无";*/
                             // 国际移动用户识别码，IMSI
                             String gjydyhsbm = oriField.getString("GJYDYHSBM");
                             String imsi = StringUtils.isNotBlank(gjydyhsbm)? gjydyhsbm : "暂无";
@@ -683,14 +658,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String gjydsbsfdm = oriField.getString("GJYDSBSFDM");
                             String imei = StringUtils.isNotBlank(gjydsbsfdm)? gjydsbsfdm : "暂无";
                             // 交换机信息编号
-                            String jhjXxbh = oriField.getString("JHJ_XXBH");
-                            String jhjxxbh = StringUtils.isNotBlank(jhjXxbh)? jhjXxbh : "暂无";
+                            /*String jhjXxbh = oriField.getString("JHJ_XXBH");
+                            String jhjxxbh = StringUtils.isNotBlank(jhjXxbh)? jhjXxbh : "暂无";*/
                             // 位置区域信息编号
                             String wzhQuyXxbh = oriField.getString("WZH_QUY_XXBH");
                             String wzqyxxbh = StringUtils.isNotBlank(wzhQuyXxbh)? wzhQuyXxbh : "暂无";
                             // 小区信息编号
-                            String xiqXxbh = oriField.getString("XIQ_XXBH");
-                            String xqxxbh = StringUtils.isNotBlank(xiqXxbh)? xiqXxbh : "暂无";
+                            /*String xiqXxbh = oriField.getString("XIQ_XXBH");
+                            String xqxxbh = StringUtils.isNotBlank(xiqXxbh)? xiqXxbh : "暂无";*/
                             // 经度
                             String jd = oriField.getString("DQJD");
                             // 纬度
@@ -710,18 +685,12 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             }
                             yjxxsm.append("手机热点 - 移动电话：");
                             yjxxsm.append(yddh);
-                            yjxxsm.append("，城际设备信息编号：");
-                            yjxxsm.append(cjsbxxbh);
                             yjxxsm.append("，IMSI：");
                             yjxxsm.append(imsi);
                             yjxxsm.append("，IMEI：");
                             yjxxsm.append(imei);
-                            yjxxsm.append("，交换机信息编号：");
-                            yjxxsm.append(jhjxxbh);
                             yjxxsm.append("，位置区域信息编号：");
                             yjxxsm.append(wzqyxxbh);
-                            yjxxsm.append("，小区信息编号：");
-                            yjxxsm.append(xqxxbh);
                             yjxxsm.append("，关联时间：");
                             yjxxsm.append(glsj);
                             yjxxsm.append("，位置信息：");
@@ -739,14 +708,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.setLength(0);
                         } else if (resCodeXlpc.equals(resourceCode)) {   // =========== 巡逻盘查（人员）
                             // 卡口信息ID
-                            String kakXxId = oriField.getString("KAK_XXID");
-                            String kkxxId = StringUtils.isNotBlank(kakXxId)? kakXxId : "暂无";
+                            /*String kakXxId = oriField.getString("KAK_XXID");
+                            String kkxxId = StringUtils.isNotBlank(kakXxId)? kakXxId : "暂无";*/
                             // 卡口名称
                             String kakMc = oriField.getString("KAK_MC");
                             String kkmc = StringUtils.isNotBlank(kakMc)? kakMc : "暂无";
                             // 终端型号
-                            String zhdXh = oriField.getString("ZHD_XH");
-                            String zdxh = StringUtils.isNotBlank(zhdXh)? zhdXh : "暂无";
+                            /*String zhdXh = oriField.getString("ZHD_XH");
+                            String zdxh = StringUtils.isNotBlank(zhdXh)? zhdXh : "暂无";*/
                             // 终端串号简要情况
                             String zhdChaJyqk = oriField.getString("ZHD_CHA_JYQK");
                             String zdchjyqk = StringUtils.isNotBlank(zhdChaJyqk)? zhdChaJyqk : "暂无";
@@ -780,8 +749,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             String pacMjJh = oriField.getString("PAC_MJ_JH");
                             String pcmjJh = StringUtils.isNotBlank(pacMjJh)? pacMjJh : "暂无";
                             // 盘查民警账号
-                            String pacMjZh = oriField.getString("PAC_MJ_ZH");
-                            String pcmjZh = StringUtils.isNotBlank(pacMjZh)? pacMjZh : "暂无";
+                            /*String pacMjZh = oriField.getString("PAC_MJ_ZH");
+                            String pcmjZh = StringUtils.isNotBlank(pacMjZh)? pacMjZh : "暂无";*/
                             // 盘查民警所属单位名称
                             String pacMjSsDwmc = oriField.getString("PAC_MJ_SS_DWMC");
                             String pcmjSsdwmc = StringUtils.isNotBlank(pacMjSsDwmc)? pacMjSsDwmc : "暂无";
@@ -820,20 +789,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(jzdxxdz);
                             yjxxsm.append("，盘查时间：");
                             yjxxsm.append(pcsj);
-                            yjxxsm.append("，卡口ID：");
-                            yjxxsm.append(kkxxId);
                             yjxxsm.append("，卡口名称：");
                             yjxxsm.append(kkmc);
-                            yjxxsm.append("，终端型号：");
-                            yjxxsm.append(zdxh);
                             yjxxsm.append("，终端串号：");
                             yjxxsm.append(zdchjyqk);
                             yjxxsm.append("，盘查民警姓名：");
                             yjxxsm.append(pcmjXm);
                             yjxxsm.append("，盘查民警警号：");
                             yjxxsm.append(pcmjJh);
-                            yjxxsm.append("，盘查民警账号：");
-                            yjxxsm.append(pcmjZh);
                             yjxxsm.append("，盘查民警所属单位名称：");
                             yjxxsm.append(pcmjSsdwmc);
                             yjxxsm.append("，盘查处理结果：");
@@ -896,10 +859,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(xm);
                             yjxxsm.append("，人员身份证号：");
                             yjxxsm.append(sfzh);
+                            yjxxsm.append("，人员照片：");
+                            yjxxsm.append(ryzpUrl);
                             yjxxsm.append("，民族：");
                             yjxxsm.append(mz);
                             yjxxsm.append("，地址：");
                             yjxxsm.append(dz);
+                            yjxxsm.append("，检查警员编号：");
+                            yjxxsm.append(jybh);
                             yjxxsm.append("，检查时间：");
                             yjxxsm.append(jcsj);
                             yjxxsm.append("，检查站名称：");
@@ -910,10 +877,6 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(zjyxqsrq);
                             yjxxsm.append("，证件有效终止日期：");
                             yjxxsm.append(zjyxzzrq);
-                            yjxxsm.append("，人员照片：");
-                            yjxxsm.append(ryzpUrl);
-                            yjxxsm.append("，警员编号：");
-                            yjxxsm.append(jybh);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
                                 // 单人预警-本市进京-站点检查
@@ -942,8 +905,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
 //                            String spName = oriField.getString("SP_NAME");
 //                            String yysmc = StringUtils.isNotBlank(spName)? spName : "暂无";
                             // 设备编号
-                            String equipmentNo = oriField.getString("EQUIPMENT_NO");
-                            String sbbh = StringUtils.isNotBlank(equipmentNo)? equipmentNo : "暂无";
+                            /*String equipmentNo = oriField.getString("EQUIPMENT_NO");
+                            String sbbh = StringUtils.isNotBlank(equipmentNo)? equipmentNo : "暂无";*/
                             // 所在地区编号
 //                            String szdqbh = oriField.getString("IN_THE_AREA_NO");
                             // 厂商编号
@@ -975,8 +938,6 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.append(imei);
                             yjxxsm.append("，手机MAC地址：");
                             yjxxsm.append(sjMac);
-                            yjxxsm.append("，设备编号：");
-                            yjxxsm.append(sbbh);
                             for (Map<String, Object> modelInfoMap : modelInfoList) {
                                 String mxbh = (String) modelInfoMap.get("mxbh");
                                 if(Constants.MODEL_CODE_BSJJ_HCZDW.equals(mxbh)){   // 单人预警-本市进京-火车站电围
@@ -991,8 +952,8 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                             yjxxsm.setLength(0);
                         } else if (resCodeRlgz.equals(resourceCode)) {   // =========== 人脸感知（火车站/本市）
                             // 抓拍机编号
-                            String snashoMachNo = oriField.getString("SNASHO_MACH_NO");
-                            String zpjbh = StringUtils.isNotBlank(snashoMachNo)? snashoMachNo : "暂无";
+                            /*String snashoMachNo = oriField.getString("SNASHO_MACH_NO");
+                            String zpjbh = StringUtils.isNotBlank(snashoMachNo)? snashoMachNo : "暂无";*/
                             // 抓拍机名称
                             String snashoMachDesig = oriField.getString("SNASHO_MACH_DESIG");
                             String zpjmc = StringUtils.isNotBlank(snashoMachDesig)? snashoMachDesig : "暂无";
@@ -1030,9 +991,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                 if(Constants.MODEL_CODE_BSJJ_HCZRLGZ.equals(mxbh)){   // 单人预警-本市进京-火车站人脸感知
                                     // 业务需求：只保留命中点位在火车站区域内的数据
                                     if(GeoUtils.isPointInCircle(Double.valueOf(wd), Double.valueOf(jd), Double.valueOf(centerPointLatTJZ), Double.valueOf(centerPointLonTJZ), Double.valueOf(radiusTJZ)) && gjsjDateObj.compareTo(bkkssj) >= 0 && gjsjDateObj.compareTo(bkjssj) <= 0){
-                                        yjxxsm.append("火车站人脸感知 - 抓拍机编号：");
-                                        yjxxsm.append(zpjbh);
-                                        yjxxsm.append("，抓拍机名称：");
+                                        yjxxsm.append("火车站人脸感知 - 抓拍机名称：");
                                         yjxxsm.append(zpjmc);
                                         yjxxsm.append("，告警人员证件号码：");
                                         yjxxsm.append(gjryZjhm);
@@ -1045,9 +1004,7 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                     }
                                 } else if (Constants.MODEL_CODE_BSMGQY_BSRL.equals(mxbh)) {   // 单人预警-本市敏感区域-本市人脸
                                     // 业务需求：只保留命中点位在当前任务记录的布控区域内的数据
-                                    yjxxsm.append("本市人脸 - 抓拍机编号：");
-                                    yjxxsm.append(zpjbh);
-                                    yjxxsm.append("，抓拍机名称：");
+                                    yjxxsm.append("本市人脸 - 抓拍机名称：");
                                     yjxxsm.append(zpjmc);
                                     yjxxsm.append("，告警人员证件号码：");
                                     yjxxsm.append(gjryZjhm);
@@ -1094,13 +1051,14 @@ public class ConsumeService implements ApplicationListener<ContextRefreshedEvent
                                                 }
                                             }
                                         }
-                                    } else {
+                                    }
+                                    /*else {
                                         if(gjsjDateObj.compareTo(bkkssj) >= 0 && gjsjDateObj.compareTo(bkjssj) <= 0){
                                             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_TJS, addressName, yjlx, Constants.YJLX_DRYJ});
                                             yjxxsm.setLength(0);
                                             break;
                                         }
-                                    }
+                                    }*/
                                 }
                             }
                             yjxxsm.setLength(0);

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

@@ -127,7 +127,7 @@ public class SameTravelService {
                     JSONArray dataInfo = jsonObject.getJSONArray("DataInfo");
                     if(dataInfo != null && dataInfo.size() > 0){   // 存在命中数据
                         JSONArray dataItems = jsonObject.getJSONArray("DataItems");
-                        // 格式化存储预警结果数据，形如：[{"xm": "1", "zjhm": "111"}, {"xm": "2", "zjhm": "222"}, ...]
+                        // 格式化存储预警结果数据，形如：[{"xm": "1", "zjhm": "111"}, {"xm": "2", "zjhm": "222"}]
                         for (Object obj : dataInfo) {
                             JSONArray dataRow = (JSONArray) obj;
                             JSONObject rowData = new JSONObject();
@@ -153,7 +153,7 @@ public class SameTravelService {
             // 预警类型默认为2（聚集预警）
             Integer yjlx = 2;
             // 预警时间
-            Date yjsj = new Date();
+            Date currentTime = new Date();
             for (JSONObject item : dataList) {
                 // 根据数据资源编码构造对应预警信息说明
                 Map<String, Object> jjyjDataMap = buildYjxxsmByResourceCode(resourceCode, item);
@@ -188,7 +188,10 @@ public class SameTravelService {
                     String zrbmbm = String.valueOf(ctrlTaskInfo.get("zrbmbm"));
                     // 生成预警信息编号
                     String yjxxbh = String.valueOf(generator.nextId());
-                    warningInfoList.add(new Object[]{taskId, rwmc, rwlx, rwlxmc, rwdxlxmc, yjxxbh, yjryXm, yjrySfzh, yjrySjh, jjyjDataMap.get("yjxxsm"), yjzt, Constants.YJZT_WD, yjsj, zrjz, zrmjid, zrmjxm, zrmjjh, zrmjlxfs, zrdwbm, CommonUtil.getConfValueByKeyDept(zrdwbm), zrbmbm, CommonUtil.getConfValueByKeyDept(zrbmbm), sqrXm, sqrSfzh, sqrJh, sqrDwbm, sqrDwmc, yjryLb, yjryBq, gkjb, gkjbmc, resourceCode, jjyjDataMap.get("jd"), jjyjDataMap.get("wd"), yjsj, yjsj, jjyjDataMap.get("yjflryXm"), jjyjDataMap.get("yjglrySfzh"), jjyjDataMap.get("yjglrySjh"), jjyjDataMap.get("yjqymc"), jjyjDataMap.get("yjcsmc"), yjlx, Constants.YJLX_JJYJ});
+                    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});
+                    }
                 }
             }
             if(warningInfoList.size() > 0){
@@ -288,6 +291,7 @@ public class SameTravelService {
             jjyjDataMap.put("yjglryXm", xm2);
             jjyjDataMap.put("yjglrySfzh", zjhm2);
             jjyjDataMap.put("yjglrySjh", null);
+            jjyjDataMap.put("yjsj", StringUtils.isNotBlank(facRq)? new Date(TimeTool.dateStringToTimeStamp2(facRq) * 1000) : null);
         }
         // 同航班
         if (Constants.RES_CODE_THB.equals(resourceCode)){
@@ -301,7 +305,7 @@ public class SameTravelService {
             String ddjcmc = CommonUtil.getConfValueByKeyAirport(ddjcXxdm);
             String cfrq = data.getString("DD_CFA_RQ");
             String ddrq = data.getString("DD_DD_RQ");
-            String gtdpXxbh = data.getString("GTDP_XXBH");
+            /*String gtdpXxbh = data.getString("GTDP_XXBH");*/
             yjxxsm.append(xm);
             yjxxsm.append("(身份证号：");
             yjxxsm.append(zjhm);
@@ -317,12 +321,11 @@ public class SameTravelService {
             yjxxsm.append(cfrq);
             yjxxsm.append("，到达日期：");
             yjxxsm.append(ddrq);
-            yjxxsm.append("，共同订票信息编号：");
-            yjxxsm.append(gtdpXxbh);
             jjyjDataMap.put("yjxxsm", yjxxsm.toString());
             jjyjDataMap.put("yjglryXm", xm2);
             jjyjDataMap.put("yjglrySfzh", zjhm2);
             jjyjDataMap.put("yjglrySjh", null);
+            jjyjDataMap.put("yjsj", StringUtils.isNotBlank(cfrq)? new Date(TimeTool.dateStringToTimeStamp2(cfrq) * 1000) : null);
         }
         // 同宾馆
         if (Constants.RES_CODE_TBG.equals(resourceCode)) {
@@ -390,6 +393,7 @@ public class SameTravelService {
             jjyjDataMap.put("yjglrySjh", null);
             jjyjDataMap.put("yjqymc", null);
             jjyjDataMap.put("yjcsmc", rzlgxxArr[0]);
+            jjyjDataMap.put("yjsj", StringUtils.isNotBlank(rzsj)? new Date(TimeTool.dateStringToTimeStamp(rzsj) * 1000) : null);
         }
         // 同长途客运
         if (Constants.RES_CODE_TCTKY.equals(resourceCode)){
@@ -424,6 +428,7 @@ public class SameTravelService {
             jjyjDataMap.put("yjglryXm", xm2);
             jjyjDataMap.put("yjglrySfzh", zjhm2);
             jjyjDataMap.put("yjglrySjh", null);
+            jjyjDataMap.put("yjsj", StringUtils.isNotBlank(fcjdsj)? new Date(TimeTool.dateStringToTimeStamp2(fcjdsj) * 1000) : null);
         }
         // 同民航进港
         /*if (Constants.RES_CODE_TMHJG.equals(resourceCode)) {