代码格式化

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlApplyApprovalController.java

@@ -28,8 +28,7 @@ import java.util.Map;
 @RestController
 @Api(tags = "【申请审核】")
 @RequestMapping("/smartlock/approval")
-public class SlApplyApprovalController extends BaseController
-{
+public class SlApplyApprovalController extends BaseController {
     @Autowired
     private ISlApplyApprovalService slApplyApprovalService;
 
@@ -40,8 +39,7 @@ public class SlApplyApprovalController extends BaseController
     //@PreAuthorize(hasPermi = "laboratory:approval:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询申请审核列表")
-    public TableDataInfo<SlApplyApproval> list(SlApplyApproval slApplyApproval)
-    {
+    public TableDataInfo<SlApplyApproval> list(SlApplyApproval slApplyApproval) {
         startPage();
         List<SlApplyApproval> list = slApplyApprovalService.selectSlApplyApprovalList(slApplyApproval);
         return getDataTable(list);
@@ -54,8 +52,7 @@ public class SlApplyApprovalController extends BaseController
     //@PreAuthorize(hasPermi = "laboratory:approval:export")
     @Log(title = "申请审核", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SlApplyApproval slApplyApproval) throws IOException
-    {
+    public void export(HttpServletResponse response, SlApplyApproval slApplyApproval) throws IOException {
         List<SlApplyApproval> list = slApplyApprovalService.selectSlApplyApprovalList(slApplyApproval);
         ExcelUtil<SlApplyApproval> util = new ExcelUtil<SlApplyApproval>(SlApplyApproval.class);
         util.exportExcel(response, list, "申请审核数据");
@@ -67,8 +64,7 @@ public class SlApplyApprovalController extends BaseController
     @ApiOperation(value = "获取申请审核详细信息")
     //@PreAuthorize(hasPermi = "laboratory:approval:query")
     @GetMapping(value = "/{id}")
-    public ResultData<SlApplyApproval> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<SlApplyApproval> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(slApplyApprovalService.selectSlApplyApprovalById(id));
     }
 
@@ -79,8 +75,7 @@ public class SlApplyApprovalController extends BaseController
     //@PreAuthorize(hasPermi = "laboratory:approval:add")
     @Log(title = "申请审核", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody SlApplyApproval slApplyApproval)
-    {
+    public ResultData add(@RequestBody SlApplyApproval slApplyApproval) {
         return ResultData.result(slApplyApprovalService.insertSlApplyApproval(slApplyApproval));
     }
 
@@ -91,9 +86,8 @@ public class SlApplyApprovalController extends BaseController
     //@PreAuthorize(hasPermi = "laboratory:approval:edit")
     @Log(title = "申请审核", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody SlApplyApproval slApplyApproval)
-    {
-        return  ResultData.result(slApplyApprovalService.updateSlApplyApproval(slApplyApproval));
+    public ResultData edit(@RequestBody SlApplyApproval slApplyApproval) {
+        return ResultData.result(slApplyApprovalService.updateSlApplyApproval(slApplyApproval));
     }
 
     /**
@@ -103,8 +97,7 @@ public class SlApplyApprovalController extends BaseController
     //@PreAuthorize(hasPermi = "laboratory:approval:remove")
     @Log(title = "申请审核", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(slApplyApprovalService.deleteSlApplyApprovalByIds(ids));
     }
 
@@ -117,9 +110,8 @@ public class SlApplyApprovalController extends BaseController
      */
     @ApiOperation(value = "门锁短信审核")
     @GetMapping("/sysMsgApprova")
-    public AjaxResult sysMsgApprova(String phone, String content, Long lockApplyId)
-    {   // msg:异常说明  status:处理状态（ok-成功  error-失败）
-        Map<String,Object> map = slApplyApprovalService.sysMsgApprova(phone,content,lockApplyId);
+    public AjaxResult sysMsgApprova(String phone, String content, Long lockApplyId) {   // msg:异常说明  status:处理状态（ok-成功  error-失败）
+        Map<String, Object> map = slApplyApprovalService.sysMsgApprova(phone, content, lockApplyId);
         return AjaxResult.success(map);
     }
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlOpendoorApplyController.java

@@ -35,8 +35,7 @@ import java.util.List;
 @RestController
 @Api(tags = "【申请开门】")
 @RequestMapping("/smartlock/openDoorApply")
-public class SlOpendoorApplyController extends BaseController
-{
+public class SlOpendoorApplyController extends BaseController {
     @Autowired
     private ISlOpendoorApplyService slOpendoorApplyService;
 
@@ -46,18 +45,17 @@ public class SlOpendoorApplyController extends BaseController
     /**
      * 查询申请开门列表
      */
-    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询申请开门列表")
-    public TableDataInfo<SlOpendoorApplyVo> list(SlOpendoorApplyVo slOpendoorApply)
-    {
+    public TableDataInfo<SlOpendoorApplyVo> list(SlOpendoorApplyVo slOpendoorApply) {
         //获取登录用户
         // SysUser sysUser = tokenService.getLoginUser().getSysUser();
 
-        startPage("creat_time","descending");
+        startPage("creat_time", "descending");
         List<SlOpendoorApplyVo> list = slOpendoorApplyService.selectSlOpendoorApplyList(slOpendoorApply);
-        for (SlOpendoorApplyVo vo:list) {
-            if(vo.getLoseTime().getTime()<System.currentTimeMillis()){
+        for (SlOpendoorApplyVo vo : list) {
+            if (vo.getLoseTime().getTime() < System.currentTimeMillis()) {
                 vo.setApplyStatus(2L);
             }
         }
@@ -70,15 +68,14 @@ public class SlOpendoorApplyController extends BaseController
     //@PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ "applyList")
     @GetMapping("/applyList")
     @ApiOperation(value = "查询申请开门列表")
-    public TableDataInfo<SlOpendoorApplyVo> applylist(SlOpendoorApplyVo slOpendoorApply)
-    {
+    public TableDataInfo<SlOpendoorApplyVo> applylist(SlOpendoorApplyVo slOpendoorApply) {
         //获取登录用户
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         slOpendoorApply.setUserId(sysUser.getUserId());
-        startPage("creat_time","descending");
+        startPage("creat_time", "descending");
         List<SlOpendoorApplyVo> list = slOpendoorApplyService.selectSlOpendoorApplyList(slOpendoorApply);
-        for (SlOpendoorApplyVo vo:list) {
-            if(vo.getLoseTime().getTime()<System.currentTimeMillis()){
+        for (SlOpendoorApplyVo vo : list) {
+            if (vo.getLoseTime().getTime() < System.currentTimeMillis()) {
                 vo.setApplyStatus(2L);
             }
         }
@@ -90,16 +87,15 @@ public class SlOpendoorApplyController extends BaseController
      */
     @GetMapping("/listStudent")
     @ApiOperation(value = "查询申请开门列表(学生端)")
-    public TableDataInfo<SlOpendoorApplyVo> listStudent(SlOpendoorApplyVo slOpendoorApply)
-    {
+    public TableDataInfo<SlOpendoorApplyVo> listStudent(SlOpendoorApplyVo slOpendoorApply) {
         //获取登录用户
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         slOpendoorApply.setUserId(sysUser.getUserId());
 
-        startPage("creat_time","descending");
+        startPage("creat_time", "descending");
         List<SlOpendoorApplyVo> list = slOpendoorApplyService.selectSlOpendoorApplyListStudent(slOpendoorApply);
-        for (SlOpendoorApplyVo vo:list) {
-            if(vo.getLoseTime().getTime()<System.currentTimeMillis()){
+        for (SlOpendoorApplyVo vo : list) {
+            if (vo.getLoseTime().getTime() < System.currentTimeMillis()) {
                 vo.setApplyStatus(2L);
             }
         }
@@ -110,11 +106,10 @@ public class SlOpendoorApplyController extends BaseController
      * 导出申请开门列表
      */
     @ApiOperation(value = "导出申请开门列表")
-    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ PerFun.EXPORT)
+    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY + PerFun.EXPORT)
     @Log(title = "申请开门", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SlOpendoorApplyVo slOpendoorApply) throws IOException
-    {
+    public void export(HttpServletResponse response, SlOpendoorApplyVo slOpendoorApply) throws IOException {
         List<SlOpendoorApplyVo> list = slOpendoorApplyService.selectSlOpendoorApplyList(slOpendoorApply);
         ExcelUtil<SlOpendoorApplyVo> util = new ExcelUtil<SlOpendoorApplyVo>(SlOpendoorApplyVo.class);
         util.exportExcel(response, list, "申请开门数据");
@@ -124,10 +119,9 @@ public class SlOpendoorApplyController extends BaseController
      * 获取申请开门详细信息
      */
     @ApiOperation(value = "获取申请开门详细信息")
-    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ PerFun.QUERY)
+    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<SlOpendoorApply> getInfo(@PathVariable("id") Long id)
-    {
+    public ResultData<SlOpendoorApply> getInfo(@PathVariable("id") Long id) {
         return ResultData.success(slOpendoorApplyService.selectSlOpendoorApplyById(id));
     }
 
@@ -135,11 +129,10 @@ public class SlOpendoorApplyController extends BaseController
      * 新增申请开门
      */
     @ApiOperation(value = "新增申请开门")
-    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ PerFun.ADD)
+    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY + PerFun.ADD)
     @Log(title = "申请开门", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody SlOpendoorApply slOpendoorApply)
-    {
+    public ResultData add(@RequestBody SlOpendoorApply slOpendoorApply) {
         /*user_id 申请人id
         user_id2 人员2 id
         subject_id 实验室id
@@ -156,8 +149,7 @@ public class SlOpendoorApplyController extends BaseController
     @ApiOperation(value = "新增申请开门")
     @Log(title = "申请开门", businessType = BusinessType.INSERT)
     @PostMapping("/addStudent")
-    public ResultData addStudent(@RequestBody SlOpendoorApply slOpendoorApply)
-    {
+    public ResultData addStudent(@RequestBody SlOpendoorApply slOpendoorApply) {
         return ResultData.result(slOpendoorApplyService.insertSlOpendoorApply(slOpendoorApply));
     }
 
@@ -166,23 +158,21 @@ public class SlOpendoorApplyController extends BaseController
      * 修改申请开门
      */
     @ApiOperation(value = "修改申请开门")
-    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ PerFun.EDIT)
+    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY + PerFun.EDIT)
     @Log(title = "申请开门", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody SlOpendoorApply slOpendoorApply)
-    {
-        return  ResultData.result(slOpendoorApplyService.updateSlOpendoorApply(slOpendoorApply));
+    public ResultData edit(@RequestBody SlOpendoorApply slOpendoorApply) {
+        return ResultData.result(slOpendoorApplyService.updateSlOpendoorApply(slOpendoorApply));
     }
 
     /**
      * 删除申请开门
      */
     @ApiOperation(value = "删除申请开门")
-    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY+ PerFun.REMOVE)
+    @PreAuthorize(hasPermi = PerPrefix.SMARTLOCK_OPENDOORAPPLY + PerFun.REMOVE)
     @Log(title = "申请开门", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(slOpendoorApplyService.deleteSlOpendoorApplyByIds(ids));
     }
 
@@ -193,8 +183,7 @@ public class SlOpendoorApplyController extends BaseController
      */
     @ApiOperation(value = "重新授权")
     @GetMapping("/auth/{id}")
-    public AjaxResult againAuth(@PathVariable Long id)
-    {
+    public AjaxResult againAuth(@PathVariable Long id) {
         return AjaxResult.success(slOpendoorApplyService.againAuth(id));
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlSubjectRelationController.java

@@ -153,9 +153,9 @@ public class SlSubjectRelationController extends BaseController {
     @GetMapping("/listLockRoom")
     @ApiOperation(value = "查询实验室关联列表")
     public TableDataInfo<SlRoom> listLockRoom(SlRoom slRoom) {
-        List<SlRoom> list = smartlockUtil.getRoom( slRoom);
+        List<SlRoom> list = smartlockUtil.getRoom(slRoom);
 
-        /*List<SlRoom> list = new ArrayList<>();
+        /* List<SlRoom> list = new ArrayList<>();
         slRoom.setRoomname("房间1");
         slRoom.setRoomcode2("MS001");
         slRoom.setRoomlocation("1-1-110");
@@ -167,7 +167,7 @@ public class SlSubjectRelationController extends BaseController {
         slRoom1.setRoomcode2("MS002");
         slRoom1.setRoomlocation("1-1-112");
         slRoom1.setRoomid(330);
-        list.add(slRoom1);*/
+        list.add(slRoom1); */
         return getDataTable(list);
     }
 
@@ -184,9 +184,9 @@ public class SlSubjectRelationController extends BaseController {
         List<SlSubjectRelationVo> listrelation = slSubjectRelationService.selectSlSubjectRelationList(subjectRelation);
 
         List<SlLockOnline> onlineList = new ArrayList<>();
-        for (SlSubjectRelation rl:listrelation) {
+        for (SlSubjectRelation rl : listrelation) {
             SlLockOnline lockOnline = smartlockUtil.getRoomDetails(rl.getLockRoomId());
-            if(lockOnline!=null){
+            if (lockOnline != null) {
                 onlineList.add(lockOnline);
             }
         }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SlUserRelationController.java

@@ -29,7 +29,7 @@ import java.util.List;
  */
 
 @RestController
-@Api(tags = "门锁相关信息查询")
+@Api(tags = "用户关联")
 @RequestMapping("/smartlock/userRelation")
 public class SlUserRelationController extends BaseController
 {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/controller/SmartlockController.java

@@ -45,15 +45,14 @@ public class SmartlockController extends BaseController {
      */
     @GetMapping("/detalis")
     @ApiOperation(value = "查询实验室门锁信息")
-    public TableDataInfo<SlLockOnline> list(Long subjectId)
-    {
+    public TableDataInfo<SlLockOnline> list(Long subjectId) {
         List<SlLockOnline> lockOnlineslist = new ArrayList<>();
 
         //查询实验室绑定的门锁集合
         SlSubjectRelationVo subjectRelation = new SlSubjectRelationVo();
         subjectRelation.setSubjectId(subjectId);
         List<SlSubjectRelationVo> list = slSubjectRelationService.selectSlSubjectRelationList(subjectRelation);
-        for (SlSubjectRelationVo sub: list ) {
+        for (SlSubjectRelationVo sub : list) {
             //查询门锁状态
             SlLockOnline lockOnline = smartlockUtil.getRoomDetails(sub.getLockRoomId());
             lockOnlineslist.add(lockOnline);
@@ -62,8 +61,7 @@ public class SmartlockController extends BaseController {
     }
 
     @GetMapping("/test")
-    public ResultData<Long> test()
-    {
+    public ResultData<Long> test() {
         R<SysUser> r = remoteUserService.getUserInfoByUserId(1L, SecurityConstants.INNER);
         logger.info(r.getData().toString());
         logger.info(smartlockUtil.SERVICE_URL);

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

@@ -30,8 +30,7 @@ import java.util.*;
  */
 @Slf4j
 @Service
-public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
-{
+public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService {
 
     @Autowired
     private TokenService tokenService;
@@ -62,8 +61,7 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      * @return 申请审核
      */
     @Override
-    public SlApplyApproval selectSlApplyApprovalById(Long id)
-    {
+    public SlApplyApproval selectSlApplyApprovalById(Long id) {
         return slApplyApprovalMapper.selectSlApplyApprovalById(id);
     }
 
@@ -74,14 +72,13 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      * @return 申请审核
      */
     @Override
-    public List<SlApplyApproval> selectSlApplyApprovalList(SlApplyApproval slApplyApproval)
-    {
+    public List<SlApplyApproval> selectSlApplyApprovalList(SlApplyApproval slApplyApproval) {
         return slApplyApprovalMapper.selectSlApplyApprovalList(slApplyApproval);
     }
 
     @Override
-    public List<SlApplyApproval> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+    public List<SlApplyApproval> getListByIds(List<Long> ids) {
+        if (ids.isEmpty()) {
             new ArrayList<>();
         }
         return slApplyApprovalMapper.getListByIds(ids);
@@ -95,9 +92,8 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertSlApplyApproval(SlApplyApproval slApplyApproval)
-    {
-        int flg=0;
+    public int insertSlApplyApproval(SlApplyApproval slApplyApproval) {
+        int flg = 0;
         try {
             SysUser sysUser = tokenService.getLoginUser().getSysUser();
             //部门id
@@ -114,55 +110,55 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
             //查询申请记录
             SlOpendoorApply opendoorApply = slOpendoorApplyMapper.selectSlOpendoorApplyById(slApplyApproval.getApplyId());
 
-            if(opendoorApply.getApplyStatus()==3){
+            if (opendoorApply.getApplyStatus() == 3) {
                 throw new ServiceException("该记录已驳回，无需审核！");
             }
-            if(opendoorApply.getApplyNumber()==2){
+            if (opendoorApply.getApplyNumber() == 2) {
                 throw new ServiceException("该记录已有两次审核，无需再次审核！");
             }
             //通过
-            if(slApplyApproval.getApprovaStatus()==1){
-                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber()+1);
+            if (slApplyApproval.getApprovaStatus() == 1) {
+                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber() + 1);
                 //审核通过，下发密码(第二次，审核通过的情况下)
-                if(opendoorApply.getApplyNumber()==2){
+                if (opendoorApply.getApplyNumber() == 2) {
                     //判断是否同一个人连续审核
                     SlApplyApproval approval = new SlApplyApproval();
                     approval.setApplyId(slApplyApproval.getApplyId());
                     approval.setApprovaId(sysUser.getUserId());
                     List<SlApplyApproval> applyVoList = slApplyApprovalMapper.selectSlApplyApprovalList(approval);
-                    if(applyVoList.size()>0){
+                    if (applyVoList.size() > 0) {
                         throw new ServiceException("您已审核过该条申请，无需重复审核！");
                     }
                     //审核通过，刷新审核状态
                     opendoorApply.setApplyStatus(2L);
                     //审核通过后，添加人员并且授权、短信发送
-                    String str =  authPower(opendoorApply.getId());
-                    if(!"ok".equals(str)){
-                        log.info("人员授权以及短信发送结果："+str);
+                    String str = authPower(opendoorApply.getId());
+                    if (!"ok".equals(str)) {
+                        log.info("人员授权以及短信发送结果：" + str);
                         throw new ServiceException(str);
                     }
                 }
-            }else if(slApplyApproval.getApprovaStatus()==2){
+            } else if (slApplyApproval.getApprovaStatus() == 2) {
                 //驳回
-                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber()+1);
+                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber() + 1);
                 //修改申请表状态
                 opendoorApply.setApplyStatus(3L);
 
                 //申请人1短信发送通知
-               R r1= remoteStockService.sendSydSms("【实验室安全系统】"+opendoorApply.getSubjectName()+"-门禁远程授权申请已拒绝，请联系实验室管理人员。",3,opendoorApply.getId(),opendoorApply.getPhonenumber());
-               log.info("开门申请拒绝，人员1短信通知结果："+r1);
+                R r1 = remoteStockService.sendSydSms("【实验室安全系统】" + opendoorApply.getSubjectName() + "-门禁远程授权申请已拒绝，请联系实验室管理人员。", 3, opendoorApply.getId(), opendoorApply.getPhonenumber());
+                log.info("开门申请拒绝，人员1短信通知结果：" + r1);
                 //申请人2短信发送通知
-               R r2= remoteStockService.sendSydSms("【实验室安全系统】"+opendoorApply.getSubjectName()+"-门禁远程授权申请已拒绝，请联系实验室管理人员。",3,opendoorApply.getId(),opendoorApply.getPhonenumber2());
-                log.info("开门申请拒绝，人员2短信通知结果："+r2);
+                R r2 = remoteStockService.sendSydSms("【实验室安全系统】" + opendoorApply.getSubjectName() + "-门禁远程授权申请已拒绝，请联系实验室管理人员。", 3, opendoorApply.getId(), opendoorApply.getPhonenumber2());
+                log.info("开门申请拒绝，人员2短信通知结果：" + r2);
             }
             //申请表操作
             opendoorApply.setApprovalTime(new Date());
             opendoorApply.setApprovalUser(sysUser.getNickName());
 
             slOpendoorApplyMapper.updateSlOpendoorApply(opendoorApply);
-            flg= slApplyApprovalMapper.insertSlApplyApproval(slApplyApproval);
-        }catch (Exception e){
-            log.info("申请审核异常"+e);
+            flg = slApplyApprovalMapper.insertSlApplyApproval(slApplyApproval);
+        } catch (Exception e) {
+            log.info("申请审核异常" + e);
         }
         return flg;
     }
@@ -175,8 +171,7 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateSlApplyApproval(SlApplyApproval slApplyApproval)
-    {
+    public int updateSlApplyApproval(SlApplyApproval slApplyApproval) {
         return slApplyApprovalMapper.updateSlApplyApproval(slApplyApproval);
     }
 
@@ -188,8 +183,7 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteSlApplyApprovalByIds(Long[] ids)
-    {
+    public int deleteSlApplyApprovalByIds(Long[] ids) {
         return slApplyApprovalMapper.deleteSlApplyApprovalByIds(ids);
     }
 
@@ -201,8 +195,7 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteSlApplyApprovalById(Long id)
-    {
+    public int deleteSlApplyApprovalById(Long id) {
         return slApplyApprovalMapper.deleteSlApplyApprovalById(id);
     }
 
@@ -215,70 +208,70 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String,Object> sysMsgApprova(String phone, String content, Long lockApplyId) {
-        Map<String,Object> map = new HashMap<>();
+    public Map<String, Object> sysMsgApprova(String phone, String content, Long lockApplyId) {
+        Map<String, Object> map = new HashMap<>();
         try {
             //审核状态 1通过 2驳回
-            Long approvalStatus=1L ;
-            SysUser sysUser =  remoteUserService.getUserByPhone(phone).getData();
-            if(sysUser==null){
-                map.put("msg","未查询到相关人信息");
-                map.put("status","error");
+            Long approvalStatus = 1L;
+            SysUser sysUser = remoteUserService.getUserByPhone(phone).getData();
+            if (sysUser == null) {
+                map.put("msg", "未查询到相关人信息");
+                map.put("status", "error");
                 return map;
             }
 
             //查询申请记录
             SlOpendoorApply opendoorApply = slOpendoorApplyMapper.selectSlOpendoorApplyById(lockApplyId);
 
-            if(opendoorApply.getApplyStatus()==3){
-                map.put("msg","该记录已驳回，无需审核！");
-                map.put("status","error");
+            if (opendoorApply.getApplyStatus() == 3) {
+                map.put("msg", "该记录已驳回，无需审核！");
+                map.put("status", "error");
                 return map;
             }
-            if(opendoorApply.getApplyNumber()==2){
-                map.put("msg","该记录已有两次审核，无需再次审核！");
-                map.put("status","error");
+            if (opendoorApply.getApplyNumber() == 2) {
+                map.put("msg", "该记录已有两次审核，无需再次审核！");
+                map.put("status", "error");
                 return map;
             }
             //通过
-            if( "1".equals(content)){
-                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber()+1);
+            if ("1".equals(content)) {
+                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber() + 1);
                 //审核通过，下发密码(第二次，审核通过的情况下)
-                if(opendoorApply.getApplyNumber()==2){
+                if (opendoorApply.getApplyNumber() == 2) {
                     //判断是否同一个人连续审核
                     SlApplyApproval approval = new SlApplyApproval();
                     approval.setApplyId(lockApplyId);
                     approval.setApprovaId(sysUser.getUserId());
                     List<SlApplyApproval> applyVoList = slApplyApprovalMapper.selectSlApplyApprovalList(approval);
-                    if(applyVoList.size()>0){
-                        map.put("msg","您已审核过该条申请，无需重复审核！");
-                        map.put("status","error");
+                    if (applyVoList.size() > 0) {
+                        map.put("msg", "您已审核过该条申请，无需重复审核！");
+                        map.put("status", "error");
                         return map;
                     }
                     //审核通过，刷新审核状态
                     opendoorApply.setApplyStatus(2L);
 
                     //审核通过后，添加人员并且授权、短信发送
-                    String str =  authPower(opendoorApply.getId());
-                    if(!"ok".equals(str)){
-                        map.put("msg",str);
-                        map.put("status","error");
+                    String str = authPower(opendoorApply.getId());
+                    if (!"ok".equals(str)) {
+                        map.put("msg", str);
+                        map.put("status", "error");
                         return map;
                     }
                 }
-            }else if( "0".equals(content)){
-                approvalStatus=2L;
+            } else if ("0".equals(content)) {
+                approvalStatus = 2L;
                 //驳回
-                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber()+1);
+                opendoorApply.setApplyNumber(opendoorApply.getApplyNumber() + 1);
                 //修改申请表状态
                 opendoorApply.setApplyStatus(3L);
 
                 //申请人1短信发送通知
-                R r1= remoteStockService.sendSydSms("【实验室安全系统】"+opendoorApply.getSubjectName()+"-门禁远程授权申请已拒绝，请联系实验室管理人员。",3,opendoorApply.getId(),opendoorApply.getPhonenumber());
-                log.info("短信开门申请拒绝，人员1短信通知结果："+r1);
+                R r1 = remoteStockService.sendSydSms("【实验室安全系统】" + opendoorApply.getSubjectName() + "-门禁远程授权申请已拒绝，请联系实验室管理人员。", 3, opendoorApply.getId(), opendoorApply.getPhonenumber());
+                log.info("短信开门申请拒绝，人员1短信通知结果：" + r1);
                 //申请人2短信发送通知
-                R r2= remoteStockService.sendSydSms("【实验室安全系统】"+opendoorApply.getSubjectName()+"-门禁远程授权申请已拒绝，请联系实验室管理人员。",3,opendoorApply.getId(),opendoorApply.getPhonenumber2());
-                log.info("短信开门申请拒绝，人员2短信通知结果："+r2);
+                R r2 = remoteStockService.sendSydSms("【实验室安全系统】" + opendoorApply.getSubjectName() + "-门禁远程授权申请已拒绝，请联系实验室管理人员。", 3, opendoorApply.getId(), opendoorApply.getPhonenumber2());
+                log.info("短信开门申请拒绝，人员2短信通知结果：" + r2);
             }
             //申请表操作
             opendoorApply.setApprovalTime(new Date());
@@ -295,14 +288,14 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
             approval.setApprovaStatus(approvalStatus);
             approval.setCretaTime(new Date());
             slApplyApprovalMapper.insertSlApplyApproval(approval);
-        }catch (Exception e){
-            log.info("短信审核处理异常："+e);
-            map.put("msg",e);
-            map.put("status","error");
+        } catch (Exception e) {
+            log.info("短信审核处理异常：" + e);
+            map.put("msg", e);
+            map.put("status", "error");
             return map;
         }
-        map.put("msg","成功");
-        map.put("status","ok");
+        map.put("msg", "成功");
+        map.put("status", "ok");
         return map;
     }
 
@@ -313,97 +306,96 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
     public String authPower(Long applyId) throws Exception {
         log.info("========开始门锁授权===========");
         //人员1 授权结果
-        Boolean auths1=false;
+        Boolean auths1 = false;
         //人员2授权结果
-        Boolean auths2=false;
+        Boolean auths2 = false;
         //返回值
-        String strMsg="ok";
+        String strMsg = "ok";
         try {
             //查询申请记录
             SlOpendoorApply opendoorApply = slOpendoorApplyMapper.selectSlOpendoorApplyById(applyId);
 
             SlSubjectRelationVo subjectRelation = new SlSubjectRelationVo();
             subjectRelation.setSubjectId(opendoorApply.getSubjectId());
-            List<SlSubjectRelationVo>  listsubRla = slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
-            if(listsubRla.size()!=2){
-                strMsg="该实验室暂未绑定双锁！";
+            List<SlSubjectRelationVo> listsubRla = slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
+            if (listsubRla.size() != 2) {
+                strMsg = "该实验室暂未绑定双锁！";
             }
 
-            Map<String,Object> detalisMap = new HashMap<>();
+            Map<String, Object> detalisMap = new HashMap<>();
             SlUser user = new SlUser();
             //学号、工号
             user.setPersoncode(opendoorApply.getUserCode());
             //姓名
             user.setPersonname(opendoorApply.getUserName());
             //性别 （0=女，1=男）
-            user.setPersonsex(opendoorApply.getUserSex()==null?1+"":0+"");
+            user.setPersonsex(opendoorApply.getUserSex() == null ? 1 + "" : 0 + "");
             //人员类别（1=学生，2=教职工，3=临时人员）
             user.setPersontype("1");
             //电话
             user.setPersonmobile(opendoorApply.getPhonenumber());
             log.info("=======人员1授权开始========");
-            Map<String,Object> map1= smartlockUtil.addUser(user,listsubRla.get(0).getLockRoomId());
+            Map<String, Object> map1 = smartlockUtil.addUser(user, listsubRla.get(0).getLockRoomId());
 
-            if(!smartlockUtil.RESULT_MSG.equals(map1.get("resultMsg").toString())){
-                log.info("人员："+opendoorApply.getUserName()+"，授权失败，原因："+map1.get("resultMsg")+"，请联系管理员");
-                strMsg="人员："+opendoorApply.getUserName()+"，授权失败，原因："+map1.get("resultMsg")+"，请联系管理员";
+            if (!smartlockUtil.RESULT_MSG.equals(map1.get("resultMsg").toString())) {
+                log.info("人员：" + opendoorApply.getUserName() + "，授权失败，原因：" + map1.get("resultMsg") + "，请联系管理员");
+                strMsg = "人员：" + opendoorApply.getUserName() + "，授权失败，原因：" + map1.get("resultMsg") + "，请联系管理员";
                 return strMsg;
-            }else {
+            } else {
                 log.info("=======人员1授权成功========");
-                auths1=true;
+                auths1 = true;
             }
 
 
             //人员1 备注详情
-            detalisMap.put("人员1",opendoorApply.getUserName());
-            detalisMap.put("锁编1号",listsubRla.get(0).getLockCode());
-            detalisMap.put("人员1密码",map1.get("password"));
+            detalisMap.put("人员1", opendoorApply.getUserName());
+            detalisMap.put("锁编1号", listsubRla.get(0).getLockCode());
+            detalisMap.put("人员1密码", map1.get("password"));
 
             //学号、工号
             user.setPersoncode(opendoorApply.getUserCode2());
             //姓名
             user.setPersonname(opendoorApply.getUserName2());
             //性别 （0=女，1=男）
-            user.setPersonsex(opendoorApply.getUserSex2()==null?1+"":0+"");
+            user.setPersonsex(opendoorApply.getUserSex2() == null ? 1 + "" : 0 + "");
             //人员类别（1=学生，2=教职工，3=临时人员）
             user.setPersontype("1");
             //电话
             user.setPersonmobile(opendoorApply.getPhonenumber2());
 
             log.info("=======人员2授权开始========");
-            Map<String,Object> map2= smartlockUtil.addUser(user,listsubRla.get(1).getLockRoomId());
+            Map<String, Object> map2 = smartlockUtil.addUser(user, listsubRla.get(1).getLockRoomId());
 
             //人员2 备注详情
-            detalisMap.put("人员2",opendoorApply.getUserName());
-            detalisMap.put("锁编2号",listsubRla.get(1).getLockCode());
-            detalisMap.put("人员2密码",map2.get("password"));
-            if(!smartlockUtil.RESULT_MSG.equals(map2.get("resultMsg").toString())){
-                log.info("人员2："+opendoorApply.getUserName()+"，授权失败，原因："+map2.get("resultMsg")+"，请联系管理员");
-                strMsg="人员："+opendoorApply.getUserName()+"，授权失败，原因："+map2.get("resultMsg")+"，请联系管理员";
+            detalisMap.put("人员2", opendoorApply.getUserName());
+            detalisMap.put("锁编2号", listsubRla.get(1).getLockCode());
+            detalisMap.put("人员2密码", map2.get("password"));
+            if (!smartlockUtil.RESULT_MSG.equals(map2.get("resultMsg").toString())) {
+                log.info("人员2：" + opendoorApply.getUserName() + "，授权失败，原因：" + map2.get("resultMsg") + "，请联系管理员");
+                strMsg = "人员：" + opendoorApply.getUserName() + "，授权失败，原因：" + map2.get("resultMsg") + "，请联系管理员";
                 return strMsg;
-            }else {
+            } else {
                 log.info("=======人员2授权成功========");
-                auths2=true;
+                auths2 = true;
             }
 
 
-
-            log.info("=======授权结束========人员1授权结果:"+auths1+" ,人员2授权结果:"+auths2);
+            log.info("=======授权结束========人员1授权结果:" + auths1 + " ,人员2授权结果:" + auths2);
             //人员入住办理成功,发送短信提示
-            if(auths1 && auths2){
+            if (auths1 && auths2) {
                 log.info("=============双人授权成功，下发短信================");
-                R p1 = remoteStockService.sendSydSms("【实验室安全系统】授权码："+map1.get("password")+"（"+smartlockUtil.AUTHS_LENGTH+"小时内有效），"+opendoorApply.getSubjectName()+"-门禁远程授权申请已通过，请勿泄露给他人。",3,applyId,new String[] {opendoorApply.getPhonenumber()});
-                log.info("人员1短信发送结果："+p1.getData());
+                R p1 = remoteStockService.sendSydSms("【实验室安全系统】授权码：" + map1.get("password") + "（" + smartlockUtil.AUTHS_LENGTH + "小时内有效），" + opendoorApply.getSubjectName() + "-门禁远程授权申请已通过，请勿泄露给他人。", 3, applyId, new String[]{opendoorApply.getPhonenumber()});
+                log.info("人员1短信发送结果：" + p1.getData());
 
-                R p2 = remoteStockService.sendSydSms("【实验室安全系统】授权码："+map1.get("password")+"（"+smartlockUtil.AUTHS_LENGTH+"小时内有效），"+opendoorApply.getSubjectName()+"-门禁远程授权申请已通过，请勿泄露给他人。",3,applyId,new String[] {opendoorApply.getPhonenumber2()});
-                log.info("人员2短信发送结果："+p2.getData());
+                R p2 = remoteStockService.sendSydSms("【实验室安全系统】授权码：" + map1.get("password") + "（" + smartlockUtil.AUTHS_LENGTH + "小时内有效），" + opendoorApply.getSubjectName() + "-门禁远程授权申请已通过，请勿泄露给他人。", 3, applyId, new String[]{opendoorApply.getPhonenumber2()});
+                log.info("人员2短信发送结果：" + p2.getData());
             }
 
             opendoorApply.setIllustrate(detalisMap.toString());
             slOpendoorApplyMapper.updateSlOpendoorApply(opendoorApply);
 
-        }catch (Exception e){
-            log.info("=======人员授权失败========"+e);
+        } catch (Exception e) {
+            log.info("=======人员授权失败========" + e);
         }
         return strMsg;
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlOpendoorApplyServiceImpl.java

@@ -138,16 +138,16 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
             //短信发送成功 数据入库
             slOpendoorApplyMapper.insertSlOpendoorApply(slOpendoorApply);
 
-            String msg =sendMsgToSafeUser(slOpendoorApply.getId());
-            if(!"ok".equals(msg)){
+            String msg = sendMsgToSafeUser(slOpendoorApply.getId());
+            if (!"ok".equals(msg)) {
                 //授权失败删除申请数据
                 slOpendoorApplyMapper.deleteSlOpendoorApplyById(slOpendoorApply.getId());
-                log.info("操作失败："+msg);
+                log.info("操作失败：" + msg);
                 return 0;
             }
-            log.info("短信通知结果："+msg);
+            log.info("短信通知结果：" + msg);
         } catch (Exception e) {
-            log.info("授权失败："+e);
+            log.info("授权失败：" + e);
         }
         return 1;
     }
@@ -196,18 +196,19 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
      */
     @Override
     public String againAuth(Long id) {
-        String str="";
+        String str = "";
         try {
-            str =  authPowerNew(id);
-        }catch (Exception e) {
+            str = authPowerNew(id);
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("重新授权失败："+e);
+            log.error("重新授权失败：" + e);
         }
         return str;
     }
 
     /**
      * 发送短信给相关门锁负责人
+     *
      * @param applyId
      * @return
      * @throws Exception
@@ -215,19 +216,19 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
     public String sendMsgToSafeUser(Long applyId) throws Exception {
         log.info("========开始发送短信===========");
         //返回值
-        String strMsg="ok";
+        String strMsg = "ok";
         Map<String, Object> map = new HashMap<>();
         try {
             //查询申请记录
             SlOpendoorApply opendoorApply = slOpendoorApplyMapper.selectSlOpendoorApplyById(applyId);
-            Map<String,Object> detalisMap = new HashMap<>();
+            Map<String, Object> detalisMap = new HashMap<>();
 
             //检查是否绑定双锁
             SlSubjectRelationVo relationVo = new SlSubjectRelationVo();
             relationVo.setSubjectId(opendoorApply.getSubjectId());
             List<SlSubjectRelationVo> relist = slSubjectRelationMapper.selectSlSubjectRelationList(relationVo);
-            if(relist.size()<2){
-                strMsg="该实验室暂未关联双门锁。";
+            if (relist.size() < 2) {
+                strMsg = "该实验室暂未关联双门锁。";
                 log.info("该实验室暂未关联双门锁。");
                 return strMsg;
             }
@@ -238,18 +239,18 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
             rv.setSubjectId(opendoorApply.getSubjectId());
             relist = slSubjectRelationMapper.selectSlSubjectRelationList(rv);
 
-            if(relist.size()==0){
-                strMsg="未查询到安全负责人关联的实验室信息。";
+            if (relist.size() == 0) {
+                strMsg = "未查询到安全负责人关联的实验室信息。";
                 return strMsg;
             }
 
             //获取token
             String token = smartlockUtil.getToken();
-            log.info("安全负责人电话："+relist.get(0).getSafeUserPhone());
+            log.info("安全负责人电话：" + relist.get(0).getSafeUserPhone());
 
             //查询用户是否存在授权
             String authis = smartlockUtil.checkUserAuthExis(relist.get(0).getSafeUserPhone(), token);
-            log.info("权限id："+authis);
+            log.info("权限id：" + authis);
 
             if (StringUtils.isNotEmpty(authis)) {
                 /*//修改授权
@@ -258,47 +259,47 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
                 strMsg = map.get("resultMsg").toString();*/
 
                 //删除用户授权
-                map = smartlockUtil.deleteAuths(token, relist.get(0).getLockRoomId(), Integer.valueOf(authis) );
-                log.info("删除用户授权结果："+map.get("resultMsg"));
-                if("ok".equals(map.get("resultMsg"))){
-                    strMsg="删除授权失败，"+map.get("resultMsg");
+                map = smartlockUtil.deleteAuths(token, relist.get(0).getLockRoomId(), Integer.valueOf(authis));
+                log.info("删除用户授权结果：" + map.get("resultMsg"));
+                if ("ok".equals(map.get("resultMsg"))) {
+                    strMsg = "删除授权失败，" + map.get("resultMsg");
                     return strMsg;
                 }
 
                 Thread.sleep(8000);//等待8秒，等待门锁指令发送完毕
 
                 //重新添加授权
-                map = smartlockUtil.addUserAuths(token,  relist.get(0).getSafeUserPhone(), relist.get(0).getLockRoomId());
-                log.info("重新添加授权结果："+map.get("resultMsg"));
-                if("ok".equals(map.get("resultMsg"))){
-                    strMsg="添加授权失败，"+map.get("resultMsg");
+                map = smartlockUtil.addUserAuths(token, relist.get(0).getSafeUserPhone(), relist.get(0).getLockRoomId());
+                log.info("重新添加授权结果：" + map.get("resultMsg"));
+                if ("ok".equals(map.get("resultMsg"))) {
+                    strMsg = "添加授权失败，" + map.get("resultMsg");
                     return strMsg;
                 }
 
 
                 log.info("=============下发短信================");
                 //人员1 备注详情
-                detalisMap.put("人员",opendoorApply.getUserName());
-                detalisMap.put("锁编号",relist.get(0).getLockCode());
-                detalisMap.put("人员密码",map.get("password"));
+                detalisMap.put("人员", opendoorApply.getUserName());
+                detalisMap.put("锁编号", relist.get(0).getLockCode());
+                detalisMap.put("人员密码", map.get("password"));
 
-                R r1= remoteStockService.sendSydSms(
+                R r1 = remoteStockService.sendSydSms(
                         "【实验室安全系统】" + opendoorApply.getUserName() + "申请" +
                                 opendoorApply.getSubjectName() +
-                                "-门禁远程授权，手机号："+opendoorApply.getPhonenumber()+"，授权码："+map.get("password")+
-                                "（"+ smartlockUtil.AUTHS_LENGTH+"小时内有效），请勿泄露给他人。",
+                                "-门禁远程授权，手机号：" + opendoorApply.getPhonenumber() + "，授权码：" + map.get("password") +
+                                "（" + smartlockUtil.AUTHS_LENGTH + "小时内有效），请勿泄露给他人。",
                         3, opendoorApply.getId(), relist.get(0).getSafeUserPhone());
-                log.info("人员1短信发送结果："+r1.getData());
+                log.info("人员1短信发送结果：" + r1.getData());
 
                 //修改申请数据
                 opendoorApply.setIllustrate(detalisMap.toString());
                 slOpendoorApplyMapper.updateSlOpendoorApply(opendoorApply);
-            }else{
-                strMsg="用户暂无授权。";
+            } else {
+                strMsg = "用户暂无授权。";
             }
 
-        }catch (Exception e){
-            log.info("=======人员授权失败========"+e);
+        } catch (Exception e) {
+            log.info("=======人员授权失败========" + e);
         }
         return strMsg;
     }
@@ -310,78 +311,78 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
     public String authPowerNew(Long applyId) throws Exception {
         log.info("========开始门锁授权===========");
         //人员1 授权结果
-        Boolean auths1=false;
+        Boolean auths1 = false;
         //返回值
-        String strMsg="ok";
+        String strMsg = "ok";
         try {
             //查询申请记录
             SlOpendoorApply opendoorApply = slOpendoorApplyMapper.selectSlOpendoorApplyById(applyId);
 
             SlSubjectRelationVo subjectRelation = new SlSubjectRelationVo();
             subjectRelation.setSubjectId(opendoorApply.getSubjectId());
-            List<SlSubjectRelationVo>  listsubRla = slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
-            if(listsubRla.size()!=2){
-                strMsg="该实验室暂未绑定双锁！";
+            List<SlSubjectRelationVo> listsubRla = slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
+            if (listsubRla.size() != 2) {
+                strMsg = "该实验室暂未绑定双锁！";
             }
 
-            Map<String,Object> detalisMap = new HashMap<>();
+            Map<String, Object> detalisMap = new HashMap<>();
             SlUser user = new SlUser();
             //学号、工号
             user.setPersoncode(opendoorApply.getUserCode());
             //姓名
             user.setPersonname(opendoorApply.getUserName());
             //性别 （0=女，1=男）
-            user.setPersonsex(opendoorApply.getUserSex()==null?1+"":0+"");
+            user.setPersonsex(opendoorApply.getUserSex() == null ? 1 + "" : 0 + "");
             //人员类别（1=学生，2=教职工，3=临时人员）
             user.setPersontype("1");
             //电话
             user.setPersonmobile(opendoorApply.getPhonenumber());
             log.info("=======人员1授权开始========");
-            Map<String,Object> map1= smartlockUtil.addUser(user,listsubRla.get(0).getLockRoomId());
+            Map<String, Object> map1 = smartlockUtil.addUser(user, listsubRla.get(0).getLockRoomId());
 
-            if(!smartlockUtil.RESULT_MSG.equals(map1.get("resultMsg").toString())){
-                log.info("人员："+opendoorApply.getUserName()+"，授权失败，原因："+map1.get("resultMsg")+"，请联系管理员");
-                strMsg="人员："+opendoorApply.getUserName()+"，授权失败，原因："+map1.get("resultMsg")+"，请联系管理员";
+            if (!smartlockUtil.RESULT_MSG.equals(map1.get("resultMsg").toString())) {
+                log.info("人员：" + opendoorApply.getUserName() + "，授权失败，原因：" + map1.get("resultMsg") + "，请联系管理员");
+                strMsg = "人员：" + opendoorApply.getUserName() + "，授权失败，原因：" + map1.get("resultMsg") + "，请联系管理员";
                 return strMsg;
-            }else {
+            } else {
                 log.info("=======人员1授权成功========");
-                auths1=true;
+                auths1 = true;
             }
 
-            log.info("=======授权结束========人员授权结果:"+auths1);
+            log.info("=======授权结束========人员授权结果:" + auths1);
             //人员入住办理成功,发送短信提示
-            if(auths1){
+            if (auths1) {
                 SlSubjectRelationVo relationVo = new SlSubjectRelationVo();
                 relationVo.setSubjectId(opendoorApply.getSubjectId());
                 List<SlSubjectRelationVo> relist = slSubjectRelationMapper.selectSlSubjectRelationList(relationVo);
-                if(relist.size()<2){
+                if (relist.size() < 2) {
                     log.info("该实验室暂未关联双门锁。");
-                    throw  new ServiceException("该实验室暂未关联双门锁。");
+                    throw new ServiceException("该实验室暂未关联双门锁。");
                 }
 
-                for (SlSubjectRelationVo rvo:relist) {
-                    if(opendoorApply.getSafeUserId().equals(String.valueOf(rvo.getSubjectId())) ){
+                for (SlSubjectRelationVo rvo : relist) {
+                    if (opendoorApply.getSafeUserId().equals(String.valueOf(rvo.getSubjectId()))) {
                         log.info("=============授权成功，下发短信================");
                         //人员1 备注详情
-                        detalisMap.put("人员",opendoorApply.getUserName());
-                        detalisMap.put("锁编号",rvo.getLockCode());
-                        detalisMap.put("人员密码",map1.get("password"));
+                        detalisMap.put("人员", opendoorApply.getUserName());
+                        detalisMap.put("锁编号", rvo.getLockCode());
+                        detalisMap.put("人员密码", map1.get("password"));
 
-                        R r1= remoteStockService.sendSydSms(
+                        R r1 = remoteStockService.sendSydSms(
                                 "【实验室安全系统】" + opendoorApply.getUserName() + "申请" +
                                         opendoorApply.getSubjectName() +
-                                        "-门禁远程授权，手机号："+opendoorApply.getPhonenumber()+"，授权码："+map1.get("password")+
-                                        "（"+ smartlockUtil.AUTHS_LENGTH+"小时内有效），请勿泄露给他人。",
+                                        "-门禁远程授权，手机号：" + opendoorApply.getPhonenumber() + "，授权码：" + map1.get("password") +
+                                        "（" + smartlockUtil.AUTHS_LENGTH + "小时内有效），请勿泄露给他人。",
                                 3, opendoorApply.getId(), rvo.getSafeUserPhone());
-                        log.info("人员1短信发送结果："+r1);
+                        log.info("人员1短信发送结果：" + r1);
                     }
                 }
             }
             opendoorApply.setIllustrate(detalisMap.toString());
             slOpendoorApplyMapper.updateSlOpendoorApply(opendoorApply);
 
-        }catch (Exception e){
-            log.info("=======人员授权失败========"+e);
+        } catch (Exception e) {
+            log.info("=======人员授权失败========" + e);
         }
         return strMsg;
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlSubjectRelationServiceImpl.java

@@ -25,8 +25,7 @@ import java.util.List;
  * @date 2022-09-03
  */
 @Service
-public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
-{
+public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService {
     @Autowired
     private SlSubjectRelationMapper slSubjectRelationMapper;
 
@@ -40,8 +39,7 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
      * @return 实验室关联
      */
     @Override
-    public SlSubjectRelation selectSlSubjectRelationById(Long id)
-    {
+    public SlSubjectRelation selectSlSubjectRelationById(Long id) {
         return slSubjectRelationMapper.selectSlSubjectRelationById(id);
     }
 
@@ -52,14 +50,13 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
      * @return 实验室关联
      */
     @Override
-    public List<SlSubjectRelationVo> selectSlSubjectRelationList(SlSubjectRelationVo slSubjectRelation)
-    {
+    public List<SlSubjectRelationVo> selectSlSubjectRelationList(SlSubjectRelationVo slSubjectRelation) {
         return slSubjectRelationMapper.selectSlSubjectRelationList(slSubjectRelation);
     }
 
     @Override
-    public List<SlSubjectRelation> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+    public List<SlSubjectRelation> getListByIds(List<Long> ids) {
+        if (ids.isEmpty()) {
             new ArrayList<>();
         }
         return slSubjectRelationMapper.getListByIds(ids);
@@ -73,29 +70,28 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertSlSubjectRelation(SlSubjectRelationVo vo)
-    {
+    public int insertSlSubjectRelation(SlSubjectRelationVo vo) {
         List<SlSubjectRelation> list = vo.getSlSubjectList();
-        if(list==null || list.size()==0){
+        if (list == null || list.size() == 0) {
             throw new ServiceException("没有要关联的数据！");
         }
         System.out.println(SecurityUtils.getUsername());
         //校验本次提交是否存在已绑定情况
         SlSubjectRelationVo subjectRelation = new SlSubjectRelationVo();
-        for (SlSubjectRelation sl:list ) {
-            if(StringUtils.isEmpty(sl.getLockCode())){
-                throw new ServiceException("房间: "+sl.getRoomName()+",位置: "+sl.getRoomLocation()+"未绑定门锁。");
+        for (SlSubjectRelation sl : list) {
+            if (StringUtils.isEmpty(sl.getLockCode())) {
+                throw new ServiceException("房间: " + sl.getRoomName() + ",位置: " + sl.getRoomLocation() + "未绑定门锁。");
             }
             subjectRelation.setLockRoomId(sl.getLockRoomId());
-            List<SlSubjectRelationVo> sellist=  slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
-            if(sellist.size()>0){
-                throw new ServiceException("房间: "+sl.getRoomName()+",位置: "+sl.getRoomLocation()+"已被绑定。");
+            List<SlSubjectRelationVo> sellist = slSubjectRelationMapper.selectSlSubjectRelationList(subjectRelation);
+            if (sellist.size() > 0) {
+                throw new ServiceException("房间: " + sl.getRoomName() + ",位置: " + sl.getRoomLocation() + "已被绑定。");
             }
         }
 
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         //关系绑定
-        for (SlSubjectRelation slsub:list ) {
+        for (SlSubjectRelation slsub : list) {
             slsub.setDeptId(sysUser.getDept().getDeptId());
             slsub.setDeptName(sysUser.getDept().getDeptName());
             slsub.setUserId(sysUser.getUserId());
@@ -114,8 +110,7 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateSlSubjectRelation(SlSubjectRelation slSubjectRelation)
-    {
+    public int updateSlSubjectRelation(SlSubjectRelation slSubjectRelation) {
         return slSubjectRelationMapper.updateSlSubjectRelation(slSubjectRelation);
     }
 
@@ -127,8 +122,7 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteSlSubjectRelationByIds(Long[] ids)
-    {
+    public int deleteSlSubjectRelationByIds(Long[] ids) {
         return slSubjectRelationMapper.deleteSlSubjectRelationByIds(ids);
     }
 
@@ -140,8 +134,7 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteSlSubjectRelationById(Long id)
-    {
+    public int deleteSlSubjectRelationById(Long id) {
         return slSubjectRelationMapper.deleteSlSubjectRelationById(id);
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlUserRelationServiceImpl.java

@@ -17,8 +17,7 @@ import java.util.List;
  * @date 2022-09-02
  */
 @Service
-public class SlUserRelationServiceImpl implements ISlUserRelationService
-{
+public class SlUserRelationServiceImpl implements ISlUserRelationService {
     @Autowired
     private SlUserRelationMapper slUserRelationMapper;
 
@@ -29,8 +28,7 @@ public class SlUserRelationServiceImpl implements ISlUserRelationService
      * @return 人员关联
      */
     @Override
-    public SlUserRelation selectSlUserRelationById(Long id)
-    {
+    public SlUserRelation selectSlUserRelationById(Long id) {
         return slUserRelationMapper.selectSlUserRelationById(id);
     }
 
@@ -41,14 +39,13 @@ public class SlUserRelationServiceImpl implements ISlUserRelationService
      * @return 人员关联
      */
     @Override
-    public List<SlUserRelation> selectSlUserRelationList(SlUserRelation slUserRelation)
-    {
+    public List<SlUserRelation> selectSlUserRelationList(SlUserRelation slUserRelation) {
         return slUserRelationMapper.selectSlUserRelationList(slUserRelation);
     }
 
     @Override
-    public List<SlUserRelation> getListByIds(List<Long> ids){
-        if (ids.isEmpty()){
+    public List<SlUserRelation> getListByIds(List<Long> ids) {
+        if (ids.isEmpty()) {
             new ArrayList<>();
         }
         return slUserRelationMapper.getListByIds(ids);
@@ -62,8 +59,7 @@ public class SlUserRelationServiceImpl implements ISlUserRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertSlUserRelation(SlUserRelation slUserRelation)
-    {
+    public int insertSlUserRelation(SlUserRelation slUserRelation) {
         return slUserRelationMapper.insertSlUserRelation(slUserRelation);
     }
 
@@ -75,8 +71,7 @@ public class SlUserRelationServiceImpl implements ISlUserRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateSlUserRelation(SlUserRelation slUserRelation)
-    {
+    public int updateSlUserRelation(SlUserRelation slUserRelation) {
         return slUserRelationMapper.updateSlUserRelation(slUserRelation);
     }
 
@@ -88,8 +83,7 @@ public class SlUserRelationServiceImpl implements ISlUserRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteSlUserRelationByIds(Long[] ids)
-    {
+    public int deleteSlUserRelationByIds(Long[] ids) {
         return slUserRelationMapper.deleteSlUserRelationByIds(ids);
     }
 
@@ -101,8 +95,7 @@ public class SlUserRelationServiceImpl implements ISlUserRelationService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteSlUserRelationById(Long id)
-    {
+    public int deleteSlUserRelationById(Long id) {
         return slUserRelationMapper.deleteSlUserRelationById(id);
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/utils/SmartlockUtil.java

@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -125,7 +126,7 @@ public class SmartlockUtil {
      * @param
      * @return
      */
-    public  List<SlRoom> getRoom(SlRoom room) {
+    public List<SlRoom> getRoom(SlRoom room) {
         SlBuild slBuild = null;
         String token = getToken();
         List<SlRoom> listRoom = new ArrayList<>();
@@ -223,7 +224,7 @@ public class SmartlockUtil {
             String lockCode = JSON.parseObject(JSON.parseObject(str).get("result").toString()).get("roomcode2").toString();
             lockOnline.setOnLine(roomnetquality);
             lockOnline.setLockCode(lockCode);
-            lockOnline.setOnLineStatus("在线".equals(roomnetquality)?1:0);
+            lockOnline.setOnLineStatus("在线".equals(roomnetquality) ? 1 : 0);
             // System.out.println("房间详情，门锁状态 roomnetquality: " + roomnetquality + " lockCode: " + lockCode);
         } catch (Exception e) {
             logger.error("获取房间详情失败2：" + e);
@@ -349,11 +350,11 @@ public class SmartlockUtil {
                 if (StringUtils.isNotEmpty(authis)) {
                     //修改授权
                     map = updateAuths(token, roomId, Integer.valueOf(authis));
-                    resultMsg= map.get("resultMsg").toString();
+                    resultMsg = map.get("resultMsg").toString();
                 } else {
                     //添加授权
                     map = addUserAuths(token, user.getPersoncode(), roomId);
-                    resultMsg= map.get("resultMsg").toString();
+                    resultMsg = map.get("resultMsg").toString();
                 }
             }
             //操作结果
@@ -375,7 +376,7 @@ public class SmartlockUtil {
     public Map<String, Object> deleteAuths(String token, String roomid, Integer authid) {
         Map<String, Object> map = new HashMap<>();
         try {
-            String url2 = SERVICE_URL + "/lockauth/operate/5/deleteauths?token=" + token + "&roomid="+roomid ;
+            String url2 = SERVICE_URL + "/lockauth/operate/5/deleteauths?token=" + token + "&roomid=" + roomid;
             List<SlupdateAuths> list = new ArrayList<>();
             SlupdateAuths slupdateAuths = new SlupdateAuths();
             slupdateAuths.setAuthid(authid);//权限id
@@ -386,8 +387,8 @@ public class SmartlockUtil {
             HttpResponse response2 = request2.execute();
             String resultMsg = JSON.parseObject(response2.body()).get("resultMsg").toString();
             map.put("resultMsg", resultMsg);
-            logger.info("删除用户授权结果："+response2.body());
-        }catch (Exception e) {
+            logger.info("删除用户授权结果：" + response2.body());
+        } catch (Exception e) {
             logger.error("删除用户授权失败" + e);
         }
         return map;
@@ -408,20 +409,20 @@ public class SmartlockUtil {
             slupdateAuths.setRctype(3);
             list.add(slupdateAuths);
             //授权开始日期
-            String empsdate =sdf.format(new Date());
+            String empsdate = sdf.format(new Date());
             //授权结束日期
             String empedate = sdf.format(getTime(AUTHS_LENGTH));
 
             String pw = getRandom(6);
             String url2 = SERVICE_URL + "/lockauth/operate/7/updateauths?token=" + token + "&roomid=" + roomId + "&password=" + pw
-                    +"&empsdate="+empsdate+"&empedate="+empedate;
+                    + "&empsdate=" + empsdate + "&empedate=" + empedate;
             HttpRequest request2 = SmartlockUtil.httpSendPost(url2, JSONObject.toJSONString(list));
             HttpResponse response2 = request2.execute();
             String resultMsg = JSON.parseObject(response2.body()).get("resultMsg").toString();
-            logger.info("用户申请修改："+response2.body());
+            logger.info("用户申请修改：" + response2.body());
 
             map.put("password", pw);
-            logger.info("用户密码："+pw);
+            logger.info("用户密码：" + pw);
             map.put("resultMsg", resultMsg);
         } catch (Exception e) {
             logger.error("修改用户授权失败" + e);
@@ -578,7 +579,7 @@ public class SmartlockUtil {
      * @param personcode
      * @return
      */
-    public  String checkUserAuthExis(String personcode, String token) {
+    public String checkUserAuthExis(String personcode, String token) {
         String authid = null;
         //查询用户授权信息
         //String token =  SmartlockUtil.getToken();

zd-modules/zd-algorithm/src/main/resources/mapper/smartlock/SlApplyApprovalMapper.xml

@@ -66,7 +66,8 @@
         where id = #{id}
     </select>
 
-    <insert id="insertSlApplyApproval" parameterType="com.zd.algorithm.api.smartlock.entity.SlApplyApproval" useGeneratedKeys="true"
+    <insert id="insertSlApplyApproval" parameterType="com.zd.algorithm.api.smartlock.entity.SlApplyApproval"
+            useGeneratedKeys="true"
             keyProperty="id">
         insert into sl_apply_approval
         <trim prefix="(" suffix=")" suffixOverrides=",">

zd-modules/zd-algorithm/src/main/resources/mapper/smartlock/SlOpendoorApplyMapper.xml

@@ -89,11 +89,13 @@
                t.approval_user,
                t.approval_time,
                t.creat_time,
-               (select GROUP_CONCAT(safe_user_name) from sl_subject_relation r where r.subject_id= t.subject_id ) authName,
+               (select GROUP_CONCAT(safe_user_name)
+                from sl_subject_relation r
+                where r.subject_id = t.subject_id)     authName,
                date_add(t.creat_time, interval 1 hour) loseTime
         from sl_opendoor_apply as t
-        LEFT JOIN   sys_dept d on   t.dept_id=d.dept_id
-        LEFT JOIN sys_user u on  t.user_id=u.user_id
+                 LEFT JOIN sys_dept d on t.dept_id = d.dept_id
+                 LEFT JOIN sys_user u on t.user_id = u.user_id
     </sql>
     <select id="selectSlOpendoorApplyList" parameterType="com.zd.algorithm.api.smartlock.entity.vo.SlOpendoorApplyVo"
             resultMap="SlOpendoorApplyResult">
@@ -120,9 +122,9 @@
             <if test="position != null  and position != ''">and t.position = #{position}</if>
             <if test="college != null  and college != ''">and t.college = #{college}</if>
             <if test="applyStatus != null ">
-                <if test="applyStatus == 1 ">and t.creat_time &gt; now() </if>
+                <if test="applyStatus == 1 ">and t.creat_time &gt; now()</if>
 
-                <if test="applyStatus == 2 ">and t.creat_time &lt; now() </if>
+                <if test="applyStatus == 2 ">and t.creat_time &lt; now()</if>
             </if>
             <if test="applyNumber != null ">and t.apply_number = #{applyNumber}</if>
             <if test="illustrate != null ">and t.illustrate = #{illustrate}</if>
@@ -136,8 +138,12 @@
                 t.subject_name like concat('%', #{searchValue}, '%')
                 )
             </if>
-            <if test="startTime != null "> and date_format(t.creat_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
-            <if test="endTime != null "> and date_format(t.creat_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
+            <if test="startTime != null ">and date_format(t.creat_time,'%Y-%m-%d') &gt;=
+                date_format(#{startTime},'%Y-%m-%d')
+            </if>
+            <if test="endTime != null ">and date_format(t.creat_time,'%Y-%m-%d') &lt;=
+                date_format(#{endTime},'%Y-%m-%d')
+            </if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -158,7 +164,8 @@
         where id = #{id}
     </select>
 
-    <insert id="insertSlOpendoorApply" parameterType="com.zd.algorithm.api.smartlock.entity.SlOpendoorApply" useGeneratedKeys="true"
+    <insert id="insertSlOpendoorApply" parameterType="com.zd.algorithm.api.smartlock.entity.SlOpendoorApply"
+            useGeneratedKeys="true"
             keyProperty="id">
         insert into sl_opendoor_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">