From ce73c6a47a5c8aa8bc81947a92fbf2419bef496e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 07 九月 2021 09:06:11 +0800
Subject: [PATCH] 开发完成门禁上报政务功能
---
service-job/src/main/java/com/java110/job/adapt/hcGov/HcGovConstant.java | 3 +
service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovAdapt.java | 109 +++++++++++++++++++++++++-----------
service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovReturnAdapt.java | 35 -----------
3 files changed, 80 insertions(+), 67 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcGov/HcGovConstant.java b/service-job/src/main/java/com/java110/job/adapt/hcGov/HcGovConstant.java
index 393e77a..a6881b5 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcGov/HcGovConstant.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcGov/HcGovConstant.java
@@ -58,6 +58,9 @@
//淇敼浣嶇疆
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();
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovAdapt.java
index a899b7f..0ac9457 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovAdapt.java
+++ b/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鏀垮姟鎺ュ彛
+ * 寮�闂ㄨ褰曞悓姝C鏀垮姟鎺ュ彛
* <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 @@
@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 @@
}
}
- JSONObject body = new JSONObject();
- body.put("name", communityLocationPo.getLocationName());
+ //鏌ヨ璁惧瀵瑰簲鐨勪綅缃�
+ MachineDto machineDto = new MachineDto();
+ machineDto.setCommunityId(communityId);
+ machineDto.setMachineId(machineRecordPo.getMachineId());
+ List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
- JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId, HcGovConstant.ADD_LOCATION_ACTION, HcGovConstant.COMMUNITY_SECURE);
- baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, communityLocationId, HcGovConstant.COMMUNITY_SECURE);
+ 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("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_INOUT_RECORD_ACTION, HcGovConstant.COMMUNITY_SECURE);
+ baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, machineRecordId, HcGovConstant.COMMUNITY_SECURE);
}
}
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovReturnAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovReturnAdapt.java
index e7d8f5f..3d80402 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovReturnAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovReturnAdapt.java
@@ -15,19 +15,12 @@
*/
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鏀垮姟鎺ュ彛 杩斿洖
@@ -47,33 +40,7 @@
@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 杩欎釜寮�闂ㄨ褰� 鍙互涓嶈褰� 杩斿洖鐨処D鍥犱负鍚庢湡鐢ㄤ笉鍒�
}
}
--
Gitblit v1.8.0