From a75556c788ec4539d4b429ca0ce5de35b3d9bd36 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Wed, 26 Jan 2022 12:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E5=8A=A8=E4=BA=BA=E5=8F=A3=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=B8=8D=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FloatingPopulationServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/com/tenlion/commonpopulation/service/floatingpopulation/impl/FloatingPopulationServiceImpl.java b/src/main/java/cn/com/tenlion/commonpopulation/service/floatingpopulation/impl/FloatingPopulationServiceImpl.java index f70e04d..4119ad1 100644 --- a/src/main/java/cn/com/tenlion/commonpopulation/service/floatingpopulation/impl/FloatingPopulationServiceImpl.java +++ b/src/main/java/cn/com/tenlion/commonpopulation/service/floatingpopulation/impl/FloatingPopulationServiceImpl.java @@ -351,7 +351,7 @@ public class FloatingPopulationServiceImpl extends DefaultBaseService implements info.setkey_of_follow("是"); } jObj.put("data", info.saveCheckToJson()); - //kafkaTemplate.send("tableSync", jObj.toJSONString()); + kafkaTemplate.send("tableSync", jObj.toJSONString()); } @Override @@ -360,13 +360,16 @@ public class FloatingPopulationServiceImpl extends DefaultBaseService implements jObj.put("tableNumber", "C0009"); jObj.put("uid", params.get("floatingPopulationId").toString()); jObj.put("action", action); + Map query = new HashMap<>(); + query.put("floatingPopulationId",params.get("floatingPopulationId").toString()); + FloatingPopulationDTO floatingPopulation = floatingPopulationDao.getFloatingPopulation(params); FloatingPopulation info = new FloatingPopulation(); info.setid_card_number(params.get("idCardNumber") == null ? null : params.get("idCardNumber").toString()); info.setfull_name(params.get("fullName") == null ? "" : params.get("fullName").toString()); - info.setlocation_all(params.get("areaNames") == null ? null : params.get("areaNames").toString()); - info.setlocation_code(params.get("areaCode") == null ? null : params.get("areaCode").toString()); - if(params.get("areaCode") != null && !"".equals(params.get("areaCode").toString())){ - AreaDTO areaDTO = areaService.getByCode(params.get("areaCode").toString()); + info.setlocation_all(floatingPopulation.getAreaNames()); + info.setlocation_code(floatingPopulation.getAreaCode()); + if(floatingPopulation.getAreaCode() != null && !"".equals(floatingPopulation.getAreaCode())){ + AreaDTO areaDTO = areaService.getByCode(floatingPopulation.getAreaCode()); info.setlocation_area(areaDTO == null ? null : areaDTO.getAreaName()); } info.setinflow_reason(params.get("inflowReason") == null ? null : params.get("inflowReason").toString());