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());