diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java index 7fc5202..4212eee 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java @@ -50,9 +50,11 @@ public class HikCommunityInfoServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String communityName = (String)params.get("communityName"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(communityName), "COMMUNITY_NAME", communityName); return wrapper; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java index 07f8896..b51fd24 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java @@ -50,9 +50,11 @@ public class HikDeviceInfoServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String communityId = (String)params.get("communityId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(communityId), "COMMUNITY_ID", communityId); return wrapper; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java index 3173018..d0f8f06 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java @@ -63,6 +63,15 @@ public class RentContractInfoController { return new Result(); } + @NoRepeatSubmit + @PostMapping("send") + public Result send(@RequestBody RentContractInfoDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + rentContractInfoService.send(dto); + return new Result(); + } + @NoRepeatSubmit @PostMapping("update") public Result update(@RequestBody RentContractInfoDTO dto) { diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java index 64d9e37..14068e4 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java @@ -67,6 +67,16 @@ public interface RentContractInfoService extends BaseService page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -233,6 +254,52 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl { + try { + HikPersonFormDTO person = new HikPersonFormDTO(); + person.setFaceUrl(item.getImgList().get(0).getFileUrl()); + person.setMobile(item.getMobile()); + person.setCredentialType(NumConstant.ONE); + person.setCredentialNumber(item.getIdCard()); + person.setPersonName(item.getName()); + person.setGender(NumConstant.ONE_NEG); + String personId = hkDeviceUtil.sendPerson(person); + + if (StringUtils.isNotBlank(personId)) { + HikAuthorityFormDTO authority = new HikAuthorityFormDTO(); + authority.setPersonType(NumConstant.ONE); + authority.setPersonId(personId); + + Map communityParams = new HashMap<>(4); + communityParams.put("communityName", dto.getVillageName()); + List communityList = hikCommunityInfoService.list(communityParams); + + communityList.forEach(community -> { + authority.setCommunityId(community.getCommunityId()); + + Map deviceParams = new HashMap<>(4); + deviceParams.put("communityName", dto.getVillageName()); + List deviceList = hikDeviceInfoService.list(deviceParams); + + deviceList.forEach(device -> { + authority.setDeviceId(device.getDeviceId()); + + hkDeviceUtil.authorityIssued(authority); + }); + }); + } + } catch (EpmetException e) { + HikErrorInfoDTO error = new HikErrorInfoDTO(); + error.setIdCard(item.getIdCard()); + error.setErrorInfo(e.getMessage()); + hikErrorInfoService.save(error); + } + }); + } + @Override @Transactional(rollbackFor = Exception.class) public void update(RentContractInfoDTO dto) {