From c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Tue, 24 Jun 2025 21:06:48 +0800
Subject: [PATCH] Merge branch 'gzdyh_prod'
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java | 343 +++++++++++++++++++++++++++-----------------------------
1 files changed, 164 insertions(+), 179 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java
index 7275edf..a21f981 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java
@@ -74,6 +74,7 @@
List<String> canalSecondList = new ArrayList<>();
canalSecondList.add("12");
canalSecondList.add("13");
+ canalSecondList.add("07");
// 获取东八区的当前时间
ZonedDateTime now = ZonedDateTime.now(TARGET_ZONE);
// 计算前30分钟的开始和结束（基于东八区）
@@ -155,97 +156,89 @@
String certiNo = "";
String plaintiffs = "";
String phone = "";
- if ("07".equals(canalSecond)) {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
- uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
- uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- } else if ("12".equals(canalSecond) || "13".equals(canalSecond)) {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
- uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
- uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- try {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfo())) {
- JSONObject jsonObject = JSON.parseObject(gridCaseInfoDTO.getExtInfo());
- zrga = jsonObject.get("tcdwMc").toString();
- zrmj = jsonObject.get("zrmj").toString();
- fxdj = jsonObject.get("fxdj").toString();
- jfmc = jsonObject.get("jfmc").toString();
- registerSaveDTO.setGridHandle(zrga + "--" + zrmj);
- }
- } catch (Exception e) {
- log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
- }
- try {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoTcqk())) {
- List<Map<String, Object>> expInfoTcqkMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoTcqk(),
- new TypeReference<List<Map<String, Object>>>() {
- });
- for (Map expInfoMap : expInfoTcqkMapList) {
- tcr = expInfoMap.get("tcr").toString();
- tcqk = expInfoMap.get("tcqk").toString();
- tcjg = expInfoMap.get("tcjgMc").toString();
- tcfa = expInfoMap.get("tcfa").toString();
- }
- }
- } catch (Exception e) {
- log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
- }
- registerSaveDTO.setTcqk(uploadPolice + " -- " + uploadPolicePhone + " -- " + fxdj + " -- " + zrmj + " -- " + tcr + " -- " + tcfa + " -- " + tcqk);
- try {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoRisk())) {
- List<Map<String, Object>> expInfoMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoRisk(),
- new TypeReference<List<Map<String, Object>>>() {
- });
- List<CasePersonDTO> casePersonDTOList = new ArrayList<>();
- for (Map expInfoMap : expInfoMapList) {
- CasePersonDTO casePersonDTO = new CasePersonDTO();
- String name = "";
- certiNo = "";
- String mobile = "";
- if (StringUtils.isNotBlank(expInfoMap.get("cardNumber").toString())) {
- certiNo = expInfoMap.get("cardNumber").toString();
- }
- if (StringUtils.isNotBlank(expInfoMap.get("name").toString())) {
- name = expInfoMap.get("name").toString();
- }
- if (StringUtils.isNotBlank(expInfoMap.get("contactPhone").toString())) {
- mobile = expInfoMap.get("contactPhone").toString();
- }
- casePersonDTO.setMobile(mobile);
- casePersonDTO.setTrueName(name);
- casePersonDTO.setCertiNo(certiNo);
- casePersonDTOList.add(casePersonDTO);
- gridEvent.setCertiNo(certiNo);
- if (StringUtils.isNotBlank(plaintiffs)) {
- if (!plaintiffs.contains(name))
- plaintiffs = plaintiffs + "," + name;
- } else {
- plaintiffs = name;
- }
- if (StringUtils.isNotBlank(phone)) {
- if (!phone.contains(mobile))
- phone = phone + "," + mobile;
- } else {
- phone = mobile;
- }
- if (StringUtils.isNotBlank(gridEvent.getCertiNo())) {
- gridEvent.setCertiNo(gridEvent.getCertiNo() + "," + certiNo);
- } else {
- gridEvent.setCertiNo(certiNo);
- }
- }
- registerSaveDTO.setPersonList(casePersonDTOList);
- }
- } catch (Exception e) {
- log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
+ uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
+ }
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
+ uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
+ }
+ try {
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfo())) {
+ JSONObject jsonObject = JSON.parseObject(gridCaseInfoDTO.getExtInfo());
+ zrga = jsonObject.get("tcdwMc").toString();
+ zrmj = jsonObject.get("zrmj").toString();
+ fxdj = jsonObject.get("fxdj").toString();
+ jfmc = jsonObject.get("jfmc").toString();
+ registerSaveDTO.setGridHandle(zrga + "--" + zrmj);
}
+ } catch (Exception e) {
+ log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
+ }
+ try {
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoTcqk())) {
+ List<Map<String, Object>> expInfoTcqkMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoTcqk(),
+ new TypeReference<List<Map<String, Object>>>() {
+ });
+ for (Map expInfoMap : expInfoTcqkMapList) {
+ tcr = expInfoMap.get("tcr").toString();
+ tcqk = expInfoMap.get("tcqk").toString();
+ tcjg = expInfoMap.get("tcjgMc").toString();
+ tcfa = expInfoMap.get("tcfa").toString();
+ }
+ }
+ } catch (Exception e) {
+ log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
+ }
+ registerSaveDTO.setTcqk(uploadPolice + " -- " + uploadPolicePhone + " -- " + fxdj + " -- " + zrmj + " -- " + tcr + " -- " + tcfa + " -- " + tcqk);
+ try {
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoRisk())) {
+ List<Map<String, Object>> expInfoMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoRisk(),
+ new TypeReference<List<Map<String, Object>>>() {
+ });
+ List<CasePersonDTO> casePersonDTOList = new ArrayList<>();
+ for (Map expInfoMap : expInfoMapList) {
+ CasePersonDTO casePersonDTO = new CasePersonDTO();
+ String name = "";
+ certiNo = "";
+ String mobile = "";
+ if (StringUtils.isNotBlank(expInfoMap.get("cardNumber").toString())) {
+ certiNo = expInfoMap.get("cardNumber").toString();
+ }
+ if (StringUtils.isNotBlank(expInfoMap.get("name").toString())) {
+ name = expInfoMap.get("name").toString();
+ }
+ if (StringUtils.isNotBlank(expInfoMap.get("contactPhone").toString())) {
+ mobile = expInfoMap.get("contactPhone").toString();
+ }
+ casePersonDTO.setMobile(mobile);
+ casePersonDTO.setTrueName(name);
+ casePersonDTO.setCertiNo(certiNo);
+ casePersonDTOList.add(casePersonDTO);
+ gridEvent.setCertiNo(certiNo);
+
+ if (StringUtils.isNotBlank(plaintiffs)) {
+ if (!plaintiffs.contains(name))
+ plaintiffs = plaintiffs + "," + name;
+ } else {
+ plaintiffs = name;
+ }
+ if (StringUtils.isNotBlank(phone)) {
+ if (!phone.contains(mobile))
+ phone = phone + "," + mobile;
+ } else {
+ phone = mobile;
+ }
+ if (StringUtils.isNotBlank(gridEvent.getCertiNo())) {
+ gridEvent.setCertiNo(gridEvent.getCertiNo() + "," + certiNo);
+ } else {
+ gridEvent.setCertiNo(certiNo);
+ }
+ }
+ registerSaveDTO.setPersonList(casePersonDTOList);
+ }
+ } catch (Exception e) {
+ log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
}
registerSaveDTO.setId(IdUtils.getNewTimeId());
BeanUtils.copyProperties(gridCaseInfoDTO, gridEvent);
@@ -329,7 +322,6 @@
registerSaveDTO.setPhone(phone);
String dyhUnitId = gridCaseTaskService.getGridUnitIdByUnitId(gridCode);
if (StringUtils.isNotBlank(dyhUnitId)) {
- registerSaveDTO.setWantUnitId(dyhUnitId);
} else {
log.info("网格组织查询不到对应组织：" + gridCode);
}
@@ -378,6 +370,7 @@
List<String> canalSecondList = new ArrayList<>();
canalSecondList.add("12");
canalSecondList.add("13");
+ canalSecondList.add("07");
log.info("startTime:" + startTime);
log.info("endTime:" + endTime);
// 定义一个列表，用于存储需要查询的网格代码
@@ -447,97 +440,89 @@
String certiNo = "";
String plaintiffs = "";
String phone = "";
- if ("07".equals(canalSecond)) {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
- uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
- uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- } else if ("12".equals(canalSecond) || "13".equals(canalSecond)) {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
- uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
- uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
- }
- try {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfo())) {
- JSONObject jsonObject = JSON.parseObject(gridCaseInfoDTO.getExtInfo());
- zrga = jsonObject.get("tcdwMc").toString();
- zrmj = jsonObject.get("zrmj").toString();
- fxdj = jsonObject.get("fxdj").toString();
- jfmc = jsonObject.get("jfmc").toString();
- registerSaveDTO.setGridHandle(zrga + "--" + zrmj);
- }
- } catch (Exception e) {
- log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
- }
- try {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoTcqk())) {
- List<Map<String, Object>> expInfoTcqkMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoTcqk(),
- new TypeReference<List<Map<String, Object>>>() {
- });
- for (Map expInfoMap : expInfoTcqkMapList) {
- tcr = expInfoMap.get("tcr").toString();
- tcqk = expInfoMap.get("tcqk").toString();
- tcjg = expInfoMap.get("tcjgMc").toString();
- tcfa = expInfoMap.get("tcfa").toString();
- }
- }
- } catch (Exception e) {
- log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
- }
- registerSaveDTO.setTcqk(uploadPolice + " -- " + uploadPolicePhone + " -- " + fxdj + " -- " + zrmj + " -- " + tcr + " -- " + tcfa + " -- " + tcqk);
- try {
- if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoRisk())) {
- List<Map<String, Object>> expInfoMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoRisk(),
- new TypeReference<List<Map<String, Object>>>() {
- });
- List<CasePersonDTO> casePersonDTOList = new ArrayList<>();
- for (Map expInfoMap : expInfoMapList) {
- CasePersonDTO casePersonDTO = new CasePersonDTO();
- String name = "";
- certiNo = "";
- String mobile = "";
- if (StringUtils.isNotBlank(expInfoMap.get("cardNumber").toString())) {
- certiNo = expInfoMap.get("cardNumber").toString();
- }
- if (StringUtils.isNotBlank(expInfoMap.get("name").toString())) {
- name = expInfoMap.get("name").toString();
- }
- if (StringUtils.isNotBlank(expInfoMap.get("contactPhone").toString())) {
- mobile = expInfoMap.get("contactPhone").toString();
- }
- casePersonDTO.setMobile(mobile);
- casePersonDTO.setTrueName(name);
- casePersonDTO.setCertiNo(certiNo);
- casePersonDTOList.add(casePersonDTO);
- gridEvent.setCertiNo(certiNo);
- if (StringUtils.isNotBlank(plaintiffs)) {
- if (!plaintiffs.contains(name))
- plaintiffs = plaintiffs + "," + name;
- } else {
- plaintiffs = name;
- }
- if (StringUtils.isNotBlank(phone)) {
- if (!phone.contains(mobile))
- phone = phone + "," + mobile;
- } else {
- phone = mobile;
- }
- if (StringUtils.isNotBlank(gridEvent.getCertiNo())) {
- gridEvent.setCertiNo(gridEvent.getCertiNo() + "," + certiNo);
- } else {
- gridEvent.setCertiNo(certiNo);
- }
- }
- registerSaveDTO.setPersonList(casePersonDTOList);
- }
- } catch (Exception e) {
- log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
+ uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
+ }
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
+ uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
+ }
+ try {
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfo())) {
+ JSONObject jsonObject = JSON.parseObject(gridCaseInfoDTO.getExtInfo());
+ zrga = jsonObject.get("tcdwMc").toString();
+ zrmj = jsonObject.get("zrmj").toString();
+ fxdj = jsonObject.get("fxdj").toString();
+ jfmc = jsonObject.get("jfmc").toString();
+ registerSaveDTO.setGridHandle(zrga + "--" + zrmj);
}
+ } catch (Exception e) {
+ log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
+ }
+ try {
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoTcqk())) {
+ List<Map<String, Object>> expInfoTcqkMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoTcqk(),
+ new TypeReference<List<Map<String, Object>>>() {
+ });
+ for (Map expInfoMap : expInfoTcqkMapList) {
+ tcr = expInfoMap.get("tcr").toString();
+ tcqk = expInfoMap.get("tcqk").toString();
+ tcjg = expInfoMap.get("tcjgMc").toString();
+ tcfa = expInfoMap.get("tcfa").toString();
+ }
+ }
+ } catch (Exception e) {
+ log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
+ }
+ registerSaveDTO.setTcqk(uploadPolice + " -- " + uploadPolicePhone + " -- " + fxdj + " -- " + zrmj + " -- " + tcr + " -- " + tcfa + " -- " + tcqk);
+ try {
+ if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoRisk())) {
+ List<Map<String, Object>> expInfoMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoRisk(),
+ new TypeReference<List<Map<String, Object>>>() {
+ });
+ List<CasePersonDTO> casePersonDTOList = new ArrayList<>();
+ for (Map expInfoMap : expInfoMapList) {
+ CasePersonDTO casePersonDTO = new CasePersonDTO();
+ String name = "";
+ certiNo = "";
+ String mobile = "";
+ if (StringUtils.isNotBlank(expInfoMap.get("cardNumber").toString())) {
+ certiNo = expInfoMap.get("cardNumber").toString();
+ }
+ if (StringUtils.isNotBlank(expInfoMap.get("name").toString())) {
+ name = expInfoMap.get("name").toString();
+ }
+ if (StringUtils.isNotBlank(expInfoMap.get("contactPhone").toString())) {
+ mobile = expInfoMap.get("contactPhone").toString();
+ }
+ casePersonDTO.setMobile(mobile);
+ casePersonDTO.setTrueName(name);
+ casePersonDTO.setCertiNo(certiNo);
+ casePersonDTOList.add(casePersonDTO);
+ gridEvent.setCertiNo(certiNo);
+
+ if (StringUtils.isNotBlank(plaintiffs)) {
+ if (!plaintiffs.contains(name))
+ plaintiffs = plaintiffs + "," + name;
+ } else {
+ plaintiffs = name;
+ }
+ if (StringUtils.isNotBlank(phone)) {
+ if (!phone.contains(mobile))
+ phone = phone + "," + mobile;
+ } else {
+ phone = mobile;
+ }
+ if (StringUtils.isNotBlank(gridEvent.getCertiNo())) {
+ gridEvent.setCertiNo(gridEvent.getCertiNo() + "," + certiNo);
+ } else {
+ gridEvent.setCertiNo(certiNo);
+ }
+ }
+ registerSaveDTO.setPersonList(casePersonDTOList);
+ }
+ } catch (Exception e) {
+ log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
}
registerSaveDTO.setId(IdUtils.getNewTimeId());
registerSaveDTO.setCreateTime(DateUtils.StringToDate(gridCaseInfoDTO.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
--
Gitblit v1.8.0