智能锁修改

zd-modules/zd-smartlock/src/main/java/com/zd/smartlock/service/impl/SlApplyApprovalServiceImpl.java

@@ -114,7 +114,10 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
                 //审核通过，刷新审核状态
                 opendoorApply.setApplyStatus(2L);
                 //审核通过后，添加人员并且授权
-                authPower(opendoorApply.getId());
+               String str =  authPower(opendoorApply.getId());
+               if(!"ok".equals(str)){
+                   throw new ServiceException(str);
+               }
             }
         }else if(slApplyApproval.getApprovaStatus()==2){
             //驳回
@@ -173,12 +176,14 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      * 审批通过后人员密码授权处理
      * @param applyId 申请id
      */
-    public int authPower(Long applyId){
+    public String authPower(Long applyId){
 
         //人员1 授权结果
         Boolean auths1=false;
         //人员2授权结果
         Boolean auths2=false;
+        //返回值
+        String strMsg="ok";
         //查询申请记录
         SlOpendoorApply opendoorApply = slOpendoorApplyMapper.selectSlOpendoorApplyById(applyId);
 
@@ -186,7 +191,7 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
         subjectRelation.setSubjectId(opendoorApply.getSubjectId());
         List<SlSubjectRelationVo>  listsubRla = slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
         if(listsubRla.size()!=2){
-            throw  new ServiceException("该实验室暂未绑定双锁！");
+            strMsg="该实验室暂未绑定双锁！";
         }
 
         Map<String,Object> detalisMap = new HashMap<>();
@@ -199,10 +204,13 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
         user.setPersonsex(opendoorApply.getUserSex()==null?1+"":0+"");
         //人员类别（1=学生，2=教职工，3=临时人员）
         user.setPersontype("1");
+        //电话
+        user.setPersonmobile(opendoorApply.getPhonenumber());
         Map<String,Object> map1= SmartlockUtil.addUser(user,listsubRla.get(0).getLockRoomId());
 
         if(!SmartlockUtil.resultMsg.equals(map1.get("resultMsg").toString())){
-            throw  new ServiceException("人员："+opendoorApply.getUserName()+"，授权失败，请联系管理员");
+            strMsg="人员："+opendoorApply.getUserName()+"，授权失败，原因："+map1.get("resultMsg")+"，请联系管理员";
+            return strMsg;
         }else {
             auths1=true;
         }
@@ -221,16 +229,20 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
         user.setPersonsex(opendoorApply.getUserSex2()==null?1+"":0+"");
         //人员类别（1=学生，2=教职工，3=临时人员）
         user.setPersontype("1");
+        //电话
+        user.setPersonmobile(opendoorApply.getPhonenumber2());
         Map<String,Object> map2= SmartlockUtil.addUser(user,listsubRla.get(1).getLockRoomId());
 
         if(!SmartlockUtil.resultMsg.equals(map2.get("resultMsg").toString())){
-            throw  new ServiceException("人员："+opendoorApply.getUserName()+"，授权失败，请联系管理员");
+            strMsg="人员："+opendoorApply.getUserName()+"，授权失败，原因："+map2.get("resultMsg")+"，请联系管理员";
+            return strMsg;
         }else {
             auths2=true;
         }
 
         //人员入住办理成功,发送短信提示
         if(auths1 && auths2){
+            System.out.println("=============双人授权成功，下发短信================");
             String msg1="开门申请成功，门锁编号："+listsubRla.get(0).getLockCode()+"密码："+map1.get("password");
             String msg2="开门申请成功，门锁编号："+listsubRla.get(1).getLockCode()+"密码："+map1.get("password");
         }
@@ -241,6 +253,7 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
         detalisMap.put("人员2密码",map2.get("password"));
 
         opendoorApply.setIllustrate(detalisMap.toString());
-       return slOpendoorApplyMapper.updateSlOpendoorApply(opendoorApply);
+        slOpendoorApplyMapper.updateSlOpendoorApply(opendoorApply);
+        return strMsg;
     }
 }