开发完成门禁上报政务功能

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

@@ -58,6 +58,9 @@ public class HcGovConstant {
     //修改位置
     public static final String EDIT_LOCATION_ACTION = "EDIT_LOCATION";
 
+    //开门记录
+    public static final String ADD_INOUT_RECORD_ACTION = "ADD_INOUT_RECORD";
+
     public static void generatorProducerSign(JSONObject header, JSONObject body, String code) {
 
         String newSign = AuthenticationFactory.md5(header.getString("tranId") + header.getString("reqTime") + body.toJSONString() + code).toLowerCase();

service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovAdapt.java

@@ -15,25 +15,33 @@
  */
 package com.java110.job.adapt.hcGov.inoutRecord;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
 import com.java110.dto.community.CommunityAttrDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.communityLocationAttr.CommunityLocationAttrDto;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.machine.MachineDto;
 import com.java110.entity.order.Business;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.ICommunityLocationAttrInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcGov.HcGovConstant;
 import com.java110.job.adapt.hcGov.asyn.BaseHcGovSendAsyn;
-import com.java110.po.community.CommunityLocationPo;
+import com.java110.po.machine.MachineRecordPo;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 /**
- * 新增位置同步HC政务接口
+ * 开门记录同步HC政务接口
  * <p>
  * 接口协议地址： https://gitee.com/java110/microCommunityInformation/tree/master/info-doc#1%E6%A5%BC%E6%A0%8B%E4%B8%8A%E4%BC%A0
  *
@@ -48,46 +56,37 @@ public class AddInoutRecordToHcGovAdapt extends DatabusAdaptImpl {
     @Autowired
     private BaseHcGovSendAsyn baseHcGovSendAsynImpl;
 
+    @Autowired
+    private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityLocationAttrInnerServiceSMO communityLocationAttrInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
 
     /**
-     * @param business   当前处理业务
-     * @param businesses 所有业务信息
+     * @param customBusinessDatabusDto 当前处理业务
      */
     @Override
-    public void execute(Business business, List<Business> businesses) {
-        JSONObject data = business.getData();
-        if (data.containsKey(CommunityLocationPo.class.getSimpleName())) {
-            Object bObj = data.get(CommunityLocationPo.class.getSimpleName());
-            JSONArray businessCommunityLocations = null;
-            if (bObj instanceof JSONObject) {
-                businessCommunityLocations = new JSONArray();
-                businessCommunityLocations.add(bObj);
-            } else if (bObj instanceof List) {
-                businessCommunityLocations = JSONArray.parseArray(JSONObject.toJSONString(bObj));
-            } else {
-                businessCommunityLocations = (JSONArray) bObj;
-            }
-            //JSONObject businessCommunityLocation = data.getJSONObject("businessCommunityLocation");
-            for (int bCommunityLocationIndex = 0; bCommunityLocationIndex < businessCommunityLocations.size(); bCommunityLocationIndex++) {
-                JSONObject businessCommunityLocation = businessCommunityLocations.getJSONObject(bCommunityLocationIndex);
-                doAddCommunityLocation(business, businessCommunityLocation);
-
-            }
-        }
+    public void customExchange(CustomBusinessDatabusDto customBusinessDatabusDto) {
+        JSONObject data = customBusinessDatabusDto.getData();
+        doInoutRecord(null, data);
     }
 
-    private void doAddCommunityLocation(Business business, JSONObject businessCommunityLocation) {
+    private void doInoutRecord(Business business, JSONObject businessInoutRecord) {
 
-        CommunityLocationPo communityLocationPo = BeanConvertUtil.covertBean(businessCommunityLocation, CommunityLocationPo.class);
+        MachineRecordPo machineRecordPo = BeanConvertUtil.covertBean(businessInoutRecord, MachineRecordPo.class);
         CommunityDto communityDto = new CommunityDto();
-        communityDto.setCommunityId(communityLocationPo.getCommunityId());
+        communityDto.setCommunityId(machineRecordPo.getCommunityId());
         List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
 
         Assert.listNotNull(communityDtos, "未包含小区信息");
         CommunityDto tmpCommunityDto = communityDtos.get(0);
         String extCommunityId = "";
         String communityId = tmpCommunityDto.getCommunityId();
-        String communityLocationId = communityLocationPo.getLocationId();
+        String machineRecordId = machineRecordPo.getMachineRecordId();
 
         for (CommunityAttrDto communityAttrDto : tmpCommunityDto.getCommunityAttrDtos()) {
             if (HcGovConstant.EXT_COMMUNITY_ID.equals(communityAttrDto.getSpecCd())) {
@@ -95,11 +94,55 @@ public class AddInoutRecordToHcGovAdapt extends DatabusAdaptImpl {
             }
         }
 
+        //查询设备对应的位置
+        MachineDto machineDto = new MachineDto();
+        machineDto.setCommunityId(communityId);
+        machineDto.setMachineId(machineRecordPo.getMachineId());
+        List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+
+        Assert.listOnlyOne(machineDtos, "不包含 设备信息");
+
+        String locationId = machineDtos.get(0).getLocationTypeCd();
+
+        CommunityLocationAttrDto communityLocationAttrDto = new CommunityLocationAttrDto();
+        communityLocationAttrDto.setCommunityId(machineDtos.get(0).getCommunityId());
+        communityLocationAttrDto.setLocationId(locationId);
+        communityLocationAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID);
+        List<CommunityLocationAttrDto> communityLocationAttrDtos
+                = communityLocationAttrInnerServiceSMOImpl.queryCommunityLocationAttrs(communityLocationAttrDto);
+
+        Assert.listOnlyOne(communityLocationAttrDtos, "未找到 位置外部ID");
+
+        FileRelDto fileRelDto = new FileRelDto();
+        fileRelDto.setRelTypeCd("60000");
+        fileRelDto.setObjId(machineRecordPo.getMachineRecordId());
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+        String url = "";
+        String imgUrl = MappingCache.getValue("IMG_PATH");
+        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
+        if (fileRelDtos != null && fileRelDtos.size() > 0) {
+            url = imgUrl + fileRelDtos.get(0).getFileRealName();
+        }
+
         JSONObject body = new JSONObject();
-        body.put("name", communityLocationPo.getLocationName());
+        body.put("extLocationId", communityLocationAttrDtos.get(0).getValue());
+        body.put("name", machineRecordPo.getName());
+        body.put("openTypeCd", machineRecordPo.getOpenTypeCd());
+        body.put("tel", machineRecordPo.getTel());
+        body.put("idCard", machineRecordPo.getIdCard());
+        body.put("recordTypeCd", machineRecordPo.getRecordTypeCd());
+        body.put("faceUrl", url);
+        String state = "F";
+        if (StringUtil.isNumber(machineRecordPo.getSimilar())) {
+            double similar = Double.parseDouble(machineRecordPo.getSimilar());
+            if (similar > 0.5) {
+                state = "C";
+            }
+        }
+        body.put("state", state);
 
-        JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId, HcGovConstant.ADD_LOCATION_ACTION, HcGovConstant.COMMUNITY_SECURE);
-        baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, communityLocationId, HcGovConstant.COMMUNITY_SECURE);
+        JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId, HcGovConstant.ADD_INOUT_RECORD_ACTION, HcGovConstant.COMMUNITY_SECURE);
+        baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, machineRecordId, HcGovConstant.COMMUNITY_SECURE);
     }
 
 }

service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovReturnAdapt.java

@@ -15,20 +15,13 @@
  */
 package com.java110.job.adapt.hcGov.inoutRecord;
 
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.communityLocationAttr.CommunityLocationAttrDto;
-import com.java110.dto.hcGovTranslate.HcGovTranslateDto;
 import com.java110.dto.reportData.ReportDataDto;
 import com.java110.intf.common.IHcGovTranslateInnerServiceSMO;
 import com.java110.intf.community.ICommunityLocationAttrInnerServiceSMO;
-import com.java110.job.adapt.hcGov.HcGovConstant;
 import com.java110.job.adapt.hcGov.IReportReturnDataAdapt;
-import com.java110.po.communityLocationAttr.CommunityLocationAttrPo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 新增楼栋同步HC政务接口 返回
  * <p>
@@ -47,33 +40,7 @@ public class AddInoutRecordToHcGovReturnAdapt implements IReportReturnDataAdapt
     @Override
     public void reportReturn(ReportDataDto reportDataDto, String extCommunityId) {
 
-        HcGovTranslateDto hcGovTranslateDto = new HcGovTranslateDto();
-        hcGovTranslateDto.setTranId(reportDataDto.getReportDataHeaderDto().getTranId());
-        hcGovTranslateDto.setServiceCode(reportDataDto.getReportDataHeaderDto().getServiceCode());
-        List<HcGovTranslateDto> hcGovTranslateDtos = hcGovTranslateInnerServiceSMOImpl.queryHcGovTranslates(hcGovTranslateDto);
-        if (hcGovTranslateDtos == null || hcGovTranslateDtos.size() < 1) {
-            throw new IllegalArgumentException("查询推送报文失败。不是同一订单信息");
-        }
-
-        CommunityLocationAttrDto communityLocationAttrDto = new CommunityLocationAttrDto();
-        communityLocationAttrDto.setLocationId(hcGovTranslateDtos.get(0).getObjId());
-        communityLocationAttrDto.setCommunityId(hcGovTranslateDtos.get(0).getCommunityId());
-        communityLocationAttrDto.setSpecCd( HcGovConstant.EXT_COMMUNITY_ID);
-        List<CommunityLocationAttrDto> communityLocationAttrDtos = communityLocationAttrInnerServiceSMOImpl.queryCommunityLocationAttrs(communityLocationAttrDto);
-
-        CommunityLocationAttrPo communityLocationAttrPo = new CommunityLocationAttrPo();
-        communityLocationAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_locationId));
-        communityLocationAttrPo.setLocationId(communityLocationAttrDto.getLocationId());
-        communityLocationAttrPo.setCommunityId(communityLocationAttrDto.getCommunityId());
-        communityLocationAttrPo.setSpecCd(communityLocationAttrDto.getSpecCd());
-        communityLocationAttrPo.setValue(reportDataDto.getReportDataBodyDto().getString("extLocationId"));
-        if (communityLocationAttrDtos == null || communityLocationAttrDtos.size() < 1) {
-            int flag = communityLocationAttrInnerServiceSMOImpl.saveCommunityLocationAttr(communityLocationAttrPo);
-            if (flag < 1) {
-                throw new IllegalArgumentException("保存楼栋属性失败");
-            }
-        }
-
+        //todo 这个开门记录 可以不记录 返回的ID因为后期用不到
 
     }
 }