拆分逻辑

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -177,6 +177,7 @@
                 <!--大华-->
                 <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
                 <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -235,6 +236,7 @@
                 <!--大华-->
                 <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
                 <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -297,6 +299,7 @@
                 <!--大华-->
                 <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
                 <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -354,6 +357,7 @@
                 <!--大华-->
                 <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
                 <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -414,6 +418,7 @@
                 <!--大华-->
                 <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
                 <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
     </profiles>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/DhCloudProperties.java

@@ -14,16 +14,22 @@ import org.springframework.context.annotation.Configuration;
 public class DhCloudProperties {
 
     /**
-     * 应用ID
+     * URL
      */
     private String url;
 
     /**
-     * 应用KEY
+     * 账号
      */
     private String loginName;
 
 
+    /**
+     * 账号密码
+     */
+    private String loginPass;
+
+
     public String getUrl() {
         return url;
     }
@@ -40,4 +46,11 @@ public class DhCloudProperties {
         this.loginName = loginName;
     }
 
+    public String getLoginPass() {
+        return loginPass;
+    }
+
+    public void setLoginPass(String loginPass) {
+        this.loginPass = loginPass;
+    }
 }

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

@@ -86,6 +86,7 @@ public class VisitVisitorController {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         visitVisitorService.visit(dto);
+        visitVisitorService.doorAuthority(dto);
         return new Result();
     }
 

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

@@ -89,6 +89,16 @@ public interface VisitVisitorService extends BaseService<VisitVisitorEntity> {
      */
     void visit(VisitVisitorFormDTO dto);
 
+    /**
+     * 临时授权
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    void doorAuthority(VisitVisitorFormDTO dto);
+
     /**
      * 人流量
      *

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java

@@ -131,7 +131,12 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
             entity.setAgencyPids(result.getData().getAgencyPids());
         }
         insert(entity);
-        send(dto);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void doorAuthority(VisitVisitorFormDTO dto) {
+        sendAuth(dto);
     }
 
     @Override
@@ -151,7 +156,7 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
      * @author zhy
      * @date 2022/7/28 9:13
      */
-    private void send(VisitVisitorFormDTO dto) {
+    private void sendAuth(VisitVisitorFormDTO dto) {
         DhPersonFormDTO formDTO = new DhPersonFormDTO();
         formDTO.setPaperType("身份证");
         formDTO.setPaperNumber(dto.getIdCard());
@@ -164,4 +169,16 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
         dhDeviceUtil.addPersonAuth(formDTO, dto.getFaceImg());
     }
 
+    /**
+     * 删除权限
+     *
+     * @param idCard
+     * @return void
+     * @author zhy
+     * @date 2022/7/28 9:13
+     */
+    private void delAuth(String idCard) {
+        dhDeviceUtil.dataHandle(idCard.substring(idCard.length() - 10));
+    }
+
 }

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

@@ -120,9 +120,9 @@ public class DhDeviceUtil {
         dto.setLoginName(dhCloudProperties.getLoginName());
         String pwd;
         try {
-            pwd = RSAUtils.getPwdByRsa(publicKey, "hg123456");
+            pwd = RSAUtils.getPwdByRsa(publicKey, dhCloudProperties.getLoginPass());
         } catch (Exception e) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "密码加密失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "loginPass加密失败");
         }
         dto.setLoginPass(pwd);
 
@@ -175,7 +175,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
 
@@ -220,7 +220,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询人员列表失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询人员列表失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
 
@@ -231,9 +231,12 @@ public class DhDeviceUtil {
         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);
+        if (!ids.isEmpty()) {
+            DhPersonDelFormDTO del = new DhPersonDelFormDTO();
+            del.setPersonIds(ids);
+            delPerson(del);
+        }
+
     }
 
     /**
@@ -267,7 +270,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询卡片列表失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询卡片列表失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
 
@@ -354,7 +357,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份列表失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份列表失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
         JSONArray jsonArray = JSON.parseArray(registerResult.toString());
@@ -398,7 +401,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询开门计划失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询开门计划失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
 
@@ -443,7 +446,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
 
@@ -472,10 +475,9 @@ public class DhDeviceUtil {
      * @date 2022/5/23 11:04
      */
     public Long addPerson(DhPersonFormDTO dto) {
-        // 先退卡
-        cardHandle(dto.getCode());
-        // 再删人员
-        personHandle(dto.getCode());
+        // 数据预处理
+        dataHandle(dto.getCode());
+
         String url = dhCloudProperties.getUrl().concat(ADD_PERSON);
         String urlParam = getDhUrlParams();
         url = url + urlParam;
@@ -505,7 +507,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增人员失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增人员失败!" + result.getErrMsg());
         }
         Object registerResult = result.getData();
         if (null != registerResult) {
@@ -545,7 +547,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员头像失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员头像失败!" + result.getErrMsg());
         } else {
             return "success";
         }
@@ -604,7 +606,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "人员开卡失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "人员开卡失败!" + result.getErrMsg());
         } else {
             return cardFormDTO.getCardNumber();
         }
@@ -659,7 +661,7 @@ public class DhDeviceUtil {
         }
         if (!result.getSuccess()) {
             logger.info(result.getErrMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员权限失败");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下发人员权限失败!" + result.getErrMsg());
         } else {
             return "success";
         }
@@ -756,5 +758,19 @@ public class DhDeviceUtil {
         return sb.toString().toUpperCase();
     }
 
+    /**
+     * 退卡，然后删除人员
+     *
+     * @param code
+     * @return void
+     * @author zhy
+     * @date 2022/8/3 10:48
+     */
+    public void dataHandle(String code) {
+        // 先退卡
+        cardHandle(code);
+        // 再删人员
+        personHandle(code);
+    }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml

@@ -136,6 +136,7 @@ dh:
   cloud:
     url: @dh.cloud.url@
     loginName: @dh.cloud.loginName@
+    loginPass: @dh.cloud.loginPass@
 
 # 停机选项
 shutdown: