Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

service-job/src/main/java/com/java110/job/adapt/hcGov/asyn/impl/BaseHcGovSendAsynImpl.java

@@ -62,10 +62,10 @@ public class BaseHcGovSendAsynImpl implements BaseHcGovSendAsyn {
         hcGovTranslatePo.setSign(heard.getString("sign"));
         hcGovTranslatePo.setState(ReportDataHeaderDto.RETUR_CODE);
         hcGovTranslatePo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        hcGovTranslatePo.setRemark("物业系统自动推送楼栋信息到政务系统");
+        hcGovTranslatePo.setRemark("物业系统自动推送信息到政务系统");
         int flag = hcGovTranslateInnerServiceSMOImpl.saveHcGovTranslate(hcGovTranslatePo);
         if (flag < 1) {
-            throw new IllegalArgumentException("物业系统保存楼栋推送报文日志失败");
+            throw new IllegalArgumentException("物业系统保存推送报文日志失败");
         }
         HcGovTranslateDetailPo hcGovTranslateDetailPo = new HcGovTranslateDetailPo();
         hcGovTranslateDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
@@ -74,7 +74,7 @@ public class BaseHcGovSendAsynImpl implements BaseHcGovSendAsyn {
         hcGovTranslateDetailPo.setReqBody(paramIn.toJSONString());
         flag = hcGovTranslateDetailInnerServiceSMOImpl.saveHcGovTranslateDetail(hcGovTranslateDetailPo);
         if (flag < 1) {
-            throw new IllegalArgumentException("物业系统保存楼栋推送报文明细日志失败");
+            throw new IllegalArgumentException("物业系统保存推送报文明细日志失败");
         }
     }
 
@@ -92,14 +92,14 @@ public class BaseHcGovSendAsynImpl implements BaseHcGovSendAsyn {
         hcGovTranslatePo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         int flag = hcGovTranslateInnerServiceSMOImpl.updateHcGovTranslate(hcGovTranslatePo);
         if (flag < 1) {
-            throw new IllegalArgumentException("更新物业系统保存楼栋日志失败");
+            throw new IllegalArgumentException("更新物业系统保存日志失败");
         }
         HcGovTranslateDetailPo hcGovTranslateDetailPo = new HcGovTranslateDetailPo();
         hcGovTranslateDetailPo.setTranId(hcGovTranslatePo.getTranId());
         hcGovTranslateDetailPo.setResBody(paramIn.toJSONString());
         flag = hcGovTranslateDetailInnerServiceSMOImpl.updateHcGovTranslateDetail(hcGovTranslateDetailPo);
         if (flag < 1) {
-            throw new IllegalArgumentException("物业系统保存楼栋推送报文明细日志失败");
+            throw new IllegalArgumentException("物业系统保存推送报文明细日志失败");
         }
     }
 

service-job/src/main/java/com/java110/job/adapt/hcGov/staff/AddStaffToHcGovAdapt.java

@@ -111,7 +111,7 @@ public class AddStaffToHcGovAdapt extends DatabusAdaptImpl {
         communityMemberDto.setMemberId(SoreId);
         List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
         JSONArray extCommunityId = new JSONArray();
-        //
+        //获取商户对应所有小区的外部编码
         getCommunityExtId(communityMemberDtos, extCommunityId);
 
         if (extCommunityId == null || extCommunityId.size() < 1) {
@@ -133,8 +133,8 @@ public class AddStaffToHcGovAdapt extends DatabusAdaptImpl {
 
         body.put("staffInfo", getCarateStaffInfo(userPo));
 
-        JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId.getString(0), ACTION_TYPE, HcGovConstant.COMMUNITY_SECURE);
-        baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, extCommunityId.getString(0), SoreId, HcGovConstant.COMMUNITY_SECURE);
+        JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, "622021090866160001", ACTION_TYPE, HcGovConstant.COMMUNITY_SECURE);
+        baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, "622021090866160001", SoreId, HcGovConstant.COMMUNITY_SECURE);
     }
 
     public void getCommunityExtId(List<CommunityMemberDto> communityMemberDtos, JSONArray extCommunityId) {