完善

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhLoginPassFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhLoginPassFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String loginName;
+
+    private String loginPass;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonDelFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonDelFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> personIds;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonListFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private String code;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPublicKeyFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPublicKeyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String loginName;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java

@@ -52,7 +52,9 @@ public class DhDeviceUtil {
     private final String GET_PERSON_IDENTITY = "/CardSolution/card/person/personidentity";
     private final String GET_DOOR_PLAN = "/CardSolution/card/accessControl/timeQuantum/1/page";
     private final String GET_DOOR_CHANNEL = "/CardSolution/card/accessControl/channel/bycondition/combined";
-    private final String ADD_PERSON = " /CardSolution/card/person";
+    private final String ADD_PERSON = "/CardSolution/card/person";
+    private final String LIST_PERSON = "/CardSolution/card/person/bycondition/combined";
+    private final String DEL_PERSON = "/CardSolution/card/person/delete";
     private final String ADD_PERSON_IMG = "/CardSolution/common/saveMobileBase64ImageToByte";
     private final String ADD_AUTH = "/CardSolution/card/accessControl/doorAuthority/update";
     private final String OPEN_CARD = "/CardSolution/card/card/open/batch";
@@ -73,10 +75,13 @@ public class DhDeviceUtil {
         }
 
         String url = dhCloudProperties.getUrl().concat(GET_PUBLIC_KEY);
-        Map<String, Object> paramsMap = new HashMap<>(4);
+        Map<String, String> paramsMap = new HashMap<>(4);
-        paramsMap.put("loginName", dhCloudProperties.getLoginName());
+
+        DhPublicKeyFormDTO dto = new DhPublicKeyFormDTO();
+        dto.setLoginName(dhCloudProperties.getLoginName());
+
+        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
 
-        String data = HttpClientManager.getInstance().sendPost(url, paramsMap).getData();
         if (null == data) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "publicKey获取失败");
         }
@@ -85,10 +90,10 @@ public class DhDeviceUtil {
         if (!toResult.containsKey("publicKey")) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "publicKey获取失败");
         }
-        String accessToken = toResult.get("publicKey").toString();
+        String publicKey = toResult.get("publicKey").toString();
 
-        redisUtils.set(key, accessToken, RedisUtils.MINUTE_THIRTY_EXPIRE);
+        redisUtils.set(key, publicKey, RedisUtils.MINUTE_THIRTY_EXPIRE);
-        return accessToken;
+        return publicKey;
     }
 
     /**
@@ -107,11 +112,20 @@ public class DhDeviceUtil {
         }
 
         String url = dhCloudProperties.getUrl().concat(GET_LOGIN_PASS);
-        Map<String, Object> paramsMap = new HashMap<>(8);
+        Map<String, String> paramsMap = new HashMap<>(4);
-        paramsMap.put("loginName", dhCloudProperties.getLoginName());
+
-        paramsMap.put("loginPass", publicKey);
+        DhLoginPassFormDTO dto = new DhLoginPassFormDTO();
+        dto.setLoginName(dhCloudProperties.getLoginName());
+        String pwd;
+        try {
+            pwd = RSAUtils.getPwdByRsa(publicKey, "hg123456");
+        } catch (Exception e) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "密码加密失败");
+        }
+        dto.setLoginPass(pwd);
+
+        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
 
-        String data = HttpClientManager.getInstance().sendPost(url, paramsMap).getData();
         if (null == data) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "loginPass获取失败");
         }
@@ -142,12 +156,12 @@ public class DhDeviceUtil {
         String urlParam = getDhUrlParams();
         url = url + urlParam;
 
-        Map<String, String> paramsMap = new HashMap<>(4);
+        Map<String, Object> paramsMap = new HashMap<>(4);
-        DhDeptFormDTO dto = new DhDeptFormDTO();
+//        DhDeptFormDTO dto = new DhDeptFormDTO();
-        dto.setName("访客部门");
+//        dto.setName("访客部门");
-        dto.setParentId(1L);
+//        dto.setParentId(1L);
 
-        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
+        String data = HttpClientManager.getInstance().sendGet(url, paramsMap).getData();
 
         if (null == data) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败");
@@ -162,16 +176,84 @@ public class DhDeviceUtil {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败");
         }
         Object registerResult = result.getData();
+
+        JSONArray jsonArray = JSON.parseArray(registerResult.toString());
+        for (int i = 0; i < jsonArray.size(); i++) {
+            if ("临时人员".equals(jsonArray.getJSONObject(i).get("name").toString())) {
+                return Long.parseLong(jsonArray.getJSONObject(i).get("id").toString());
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 人员预处理
+     *
+     * @param
+     * @return java.lang.String
+     * @author zhy
+     * @date 2022/5/23 10:08
+     */
+    public void personHandle(String code) {
+        String url = dhCloudProperties.getUrl().concat(LIST_PERSON);
+        String urlParam = getDhUrlParams();
+        url = url + urlParam;
+
+        Map<String, String> paramsMap = new HashMap<>(4);
+        DhPersonListFormDTO dto = new DhPersonListFormDTO();
+        dto.setPageNum(1);
+        dto.setPageSize(10);
+        dto.setCode(code);
+
+        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
+
+        if (null == data) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询人员列表失败");
+        }
+        JSONObject toResult = JSON.parseObject(data);
+        DhResult result = ConvertUtils.mapToEntity(toResult, DhResult.class);
+        if (null != toResult.get("success")) {
+            result.setCode(200);
+        }
+        if (!result.getSuccess()) {
+            logger.info(result.getErrMsg());
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询人员列表失败");
+        }
+        Object registerResult = result.getData();
+
         JSONObject jsonObject = JSON.parseObject(registerResult.toString());
-        if (null != jsonObject) {
+
-            return Long.parseLong(jsonObject.toString());
+        List<Integer> ids = new ArrayList<>();
+        JSONArray jsonArray = JSON.parseArray(jsonObject.get("pageData").toString());
+        for (int i = 0; i < jsonArray.size(); i++) {
+            ids.add(Integer.parseInt(jsonArray.getJSONObject(i).get("id").toString()));
+        }
+        DhPersonDelFormDTO del = new DhPersonDelFormDTO();
+        del.setPersonIds(ids);
+        delPerson(del);
+    }
+
+
+    /**
+     * 删除人员
+     *
+     * @param
+     * @return java.lang.String
+     * @author zhy
+     * @date 2022/5/23 10:08
+     */
+    public void delPerson(DhPersonDelFormDTO dto) {
+        String url = dhCloudProperties.getUrl().concat(DEL_PERSON);
+        String urlParam = getDhUrlParams();
+        url = url + urlParam;
+
+        Map<String, String> paramsMap = new HashMap<>(4);
+
+        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
+        if (null == data) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "删除人员失败");
         }
-//        JSONArray jsonArray = JSON.parseArray(registerResult.toString());
-//        JSONObject jsonObject = jsonArray.getJSONObject(0);
-//        if (null != jsonObject) {
-//            return Long.parseLong(jsonObject.get("deptId").toString());
-//        }
-        return 0L;
     }
 
     /**
@@ -187,14 +269,14 @@ public class DhDeviceUtil {
         String urlParam = getDhUrlParams();
         url = url + urlParam;
 
-        Map<String, String> paramsMap = new HashMap<>(4);
+        Map<String, Object> paramsMap = new HashMap<>(4);
-        DhIdentityFormDTO dto = new DhIdentityFormDTO();
+//        DhIdentityFormDTO dto = new DhIdentityFormDTO();
-        dto.setName("访客");
+//        dto.setName("访客");
-        dto.setSubsidyAmount(0D);
+//        dto.setSubsidyAmount(0D);
-        dto.setIsCashRecharge(1);
+//        dto.setIsCashRecharge(1);
-        dto.setIsMachineRecharge(1);
+//        dto.setIsMachineRecharge(1);
 
-        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
+        String data = HttpClientManager.getInstance().sendGet(url, paramsMap).getData();
 
         if (null == data) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份列表失败");
@@ -210,10 +292,12 @@ public class DhDeviceUtil {
         }
         Object registerResult = result.getData();
         JSONArray jsonArray = JSON.parseArray(registerResult.toString());
-        JSONObject jsonObject = jsonArray.getJSONObject(0);
+        for (int i = 0; i < jsonArray.size(); i++) {
-        if (null != jsonObject) {
+            if ("默认身份".equals(jsonArray.getJSONObject(i).get("name").toString())) {
-            return jsonObject.get("id").toString();
+                return jsonArray.getJSONObject(i).get("id").toString();
+            }
         }
+
         return "";
     }
 
@@ -319,17 +403,18 @@ public class DhDeviceUtil {
      * @date 2022/5/23 11:04
      */
     public Long addPerson(DhPersonFormDTO dto) {
+        personHandle(dto.getCode());
         String url = dhCloudProperties.getUrl().concat(ADD_PERSON);
         String urlParam = getDhUrlParams();
         url = url + urlParam;
 
         Long deptId = getDept();
-        if (0L == deptId) {
+        if (null == deptId) {
-            return null;
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询临时人员部门失败");
         }
         String identity = getIdentity();
         if (StringUtils.isBlank(identity)) {
-            return null;
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份失败");
         }
         dto.setDeptId(deptId);
         dto.setPersonIdentityId(identity);
@@ -351,9 +436,8 @@ public class DhDeviceUtil {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增人员失败");
         }
         Object registerResult = result.getData();
-        JSONObject jsonObject = JSON.parseObject(registerResult.toString());
+        if (null != registerResult) {
-        if (null != jsonObject) {
+            return Long.parseLong(registerResult.toString());
-            return Long.parseLong(jsonObject.toString());
         }
         return null;
     }
@@ -410,7 +494,7 @@ public class DhDeviceUtil {
     public String addPersonCard(DhPersonFormDTO dto) {
         Long personId = addPerson(dto);
         if (personId == null) {
-            return "添加人员信息失败";
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "添加人员信息失败");
         }
         DhPersonCardFormDTO cardFormDTO = new DhPersonCardFormDTO();
         String url = dhCloudProperties.getUrl().concat(OPEN_CARD);