diff --git a/epmet-plugins-common/src/main/java/com/epmet/plugin/commons/redis/RedisKeys.java b/epmet-plugins-common/src/main/java/com/epmet/plugin/commons/redis/RedisKeys.java
new file mode 100644
index 0000000..b5f3a6e
--- /dev/null
+++ b/epmet-plugins-common/src/main/java/com/epmet/plugin/commons/redis/RedisKeys.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有,侵权必究!
+ */
+
+package com.epmet.plugin.commons.redis;
+
+/**
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class RedisKeys {
+
+ /**
+ * redis前缀
+ */
+ private static String rootPrefix = "epmet:";
+
+ /**
+ * 海康accessToken
+ */
+ public static String getHikTokenKey() {
+ return "hik:token";
+ }
+
+}
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikErrorInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikErrorInfoDTO.java
index 958606d..a06778c 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikErrorInfoDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikErrorInfoDTO.java
@@ -71,4 +71,9 @@ public class HikErrorInfoDTO implements Serializable {
*/
private String errorInfo;
+ /**
+ * 引用ID
+ */
+ private String referenceId;
+
}
\ No newline at end of file
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/entity/HikErrorInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/entity/HikErrorInfoEntity.java
index d4598a7..134ea93 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/entity/HikErrorInfoEntity.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/entity/HikErrorInfoEntity.java
@@ -41,4 +41,8 @@ public class HikErrorInfoEntity extends BaseEpmetEntity {
*/
private String errorInfo;
+ /**
+ * 引用ID
+ */
+ private String referenceId;
}
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 2055525..d026706 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
@@ -72,7 +72,7 @@ public class HikCommunityInfoServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
- wrapper.eq(StringUtils.isNotBlank(communityName), "COMMUNITY_NAME", communityName);
+ wrapper.like(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/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 d0f8f06..5516860 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
@@ -72,6 +72,14 @@ public class RentContractInfoController {
return new Result();
}
+ @NoRepeatSubmit
+ @PostMapping("resend/{id}")
+ public Result resend(@PathVariable("id") String id) {
+ //效验数据
+ rentContractInfoService.resend(id);
+ 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/controller/RentTenantInfoController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
index 4286065..4601409 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
@@ -7,14 +7,11 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.plugin.power.dto.hik.form.HikAuthorityFormDTO;
-import com.epmet.plugin.power.dto.hik.form.HikPersonFormDTO;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO;
import com.epmet.plugin.power.modules.rent.excel.RentTenantInfoExcel;
import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService;
-import com.epmet.plugin.power.modules.utils.HkDeviceUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,9 +33,6 @@ public class RentTenantInfoController {
@Autowired
private RentTenantInfoService rentTenantInfoService;
- @Autowired
- private HkDeviceUtil hkDeviceUtil;
-
@RequestMapping("page")
public Result> page(@RequestParam Map params) {
PageData page = rentTenantInfoService.page(params);
@@ -97,25 +91,4 @@ public class RentTenantInfoController {
ExcelUtils.exportExcelToTarget(response, null, list, RentTenantInfoExcel.class);
}
- @GetMapping("test")
- public Result test(@RequestParam Map params, HttpServletResponse response) throws Exception {
- HikPersonFormDTO dto = new HikPersonFormDTO();
- dto.setPersonName("张三");
- dto.setGender(1);
- dto.setCredentialType(1);
- dto.setCredentialNumber("350781196403072329");
- dto.setMobile("17890987654");
- dto.setFaceUrl("https://ai-security-protection.oss-cn-qingdao.aliyuncs.com/test/20220501/b714a5d77e46449980ad7d6dcf3d3aab.jpg");
-
- HikAuthorityFormDTO dto1 = new HikAuthorityFormDTO();
-dto1.setPersonType(1);
-dto1.setPersonId("91704aafae7849529460809e04102a1e");
-dto1.setCommunityId("98b6060a7b8e408dbc3278a5b4fcfe2b");
-dto1.setDeviceId("edbc991eb97445e698f709f3710a6fd4");
-
-
- return new Result().ok(hkDeviceUtil.authorityIssued(dto1));
- }
-
-
}
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 14068e4..742834f 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
@@ -77,6 +77,16 @@ public interface RentContractInfoService extends BaseService {
try {
+ Map delParams = new HashMap<>();
+ delParams.put("idCard", item.getIdCard());
+ hikErrorInfoService.deletePhysical(delParams);
+
HikPersonFormDTO person = new HikPersonFormDTO();
person.setFaceUrl(item.getImgList().get(0).getFileUrl());
person.setMobile(item.getMobile());
@@ -295,11 +300,21 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl paramsMap = new HashMap<>(8);
paramsMap.put("client_id", hikCloudProperties.getClient());
@@ -65,6 +76,8 @@ public class HkDeviceUtil {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "AccessToken获取失败");
}
String accessToken = "Bearer ".concat(toResult.get("access_token").toString());
+
+ redisUtils.set(key, accessToken, RedisUtils.HOUR_ONE_EXPIRE);
return accessToken;
}