Merge remote-tracking branch 'origin/master'

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/RfidTagMapper.java

@@ -15,10 +15,10 @@ public interface RfidTagMapper extends BaseMapper<RfidTag> {
 
     /***
      * 根据标签码查询
-     * @param tagCode
+     * @param authCode
      * @return
      */
-    RfidTag getRfidByTagCode(String tagCode);
+    RfidTag getRfidByTagCode(String authCode);
 
     /***
      * 修改标签

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/RfidTagService.java

@@ -22,10 +22,10 @@ public interface RfidTagService extends IService<RfidTag> {
 
     /***
      * 根据标签码查询
-     * @param tagCode
+     * @param authCode
      * @return
      */
-    RfidTag getRfidByTagCode(String tagCode);
+    RfidTag getRfidByTagCode(String authCode);
 
     /***
      * 修改标签

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageServiceImpl.java

@@ -63,14 +63,16 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
         bsVo.setElectronicTag(bottleStorage.getElectronicTag());
         List<BottleStorageVo> list =  bottleStorageMapper.getListVo(bsVo);
         if(list.size()>0){
-            throw  new ServiceException("该标签码已存在！");
+            throw  new ServiceException("该识别码已存在！");
         }
 
         //查询标签码
         RfidTag rfidTag = rfidTagService.getRfidByTagCode(bottleStorage.getElectronicTag());
         if(rfidTag==null){
-            throw  new ServiceException("未查询到相关标签码！");
+            throw  new ServiceException("未查询到相关识别码！");
         }
+
+        //刷新识别码状态
         RfidTag rfid = new RfidTag();
         rfid.setIsBind((short) 1);
         rfid.setId(rfidTag.getId());

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/RfidTagServiceImpl.java

@@ -72,13 +72,13 @@ public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> impl
     }
 
     /***
-     * 根据标签码查询
-     * @param tagCode
+     * 根据识别码查询
+     * @param authCode
      * @return
      */
     @Override
-    public RfidTag getRfidByTagCode(String tagCode) {
-        return rfidTagMapper.getRfidByTagCode(tagCode);
+    public RfidTag getRfidByTagCode(String authCode) {
+        return rfidTagMapper.getRfidByTagCode(authCode);
     }
 
     /***

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/RfidTagMapper.xml

@@ -21,10 +21,10 @@
         tag_code, is_bind
     </sql>
 
-    <!-- 根据标签码查询-->
+    <!-- 根据识别码查询-->
     <select id="getRfidByTagCode" parameterType="java.lang.String"
             resultType="com.zd.bottle.domain.RfidTag">
-         select * from ab_rfid_tag where tag_code=#{tagCode}
+         select * from ab_rfid_tag where auth_code=#{authCode}
     </select>
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanAbnormalGroupVO.java

@@ -44,7 +44,10 @@ public class LabRiskPlanAbnormalGroupVO extends LabRiskPlanAbnormalGroup {
     @ApiModelProperty(value = "预案id")
     private Long riskPlanId;
 
-   private List<LabHardware> hardwareList;
+    @ApiModelProperty(value = "是否有疏散线路")
+    private Boolean whetherRoute;
+
+    private List<LabHardware> hardwareList;
 
     public String getSubjectName() {
         return subjectName;
@@ -125,4 +128,12 @@ public class LabRiskPlanAbnormalGroupVO extends LabRiskPlanAbnormalGroup {
     public void setRiskPlanId(Long riskPlanId) {
         this.riskPlanId = riskPlanId;
     }
+
+    public Boolean getWhetherRoute() {
+        return whetherRoute;
+    }
+
+    public void setWhetherRoute(Boolean whetherRoute) {
+        this.whetherRoute = whetherRoute;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalGroupServiceImpl.java

@@ -13,6 +13,7 @@ import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalGroupVO;
 import com.zd.laboratory.mapper.LabHardwareMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalGroupMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalLogMapper;
+import com.zd.laboratory.service.ILabExitLineService;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalGroupService;
 import com.zd.system.api.laboratory.domain.SensorFunctionStatus;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,9 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
     @Autowired
     private LabRiskPlanAbnormalLogMapper labRiskPlanAbnormalLogMapper;
 
+    @Autowired
+    private ILabExitLineService labExitLineService;
+
 
     @Override
 //    @DataScope(deptAlias = "t")
@@ -73,6 +77,15 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
             labHardware.setType(HardwareTypeEnum.SWITCH);
             List<LabHardware> hardwareList = labHardwareMapper.selectLabHardwareListBySubject(labHardware);
             a.setHardwareList(hardwareList);
+
+            //todo 这里查看预案下是不是有疏散线路，返回true和false
+            try{
+                labExitLineService.getRoute(a.getSubjectId(),0);
+                a.setWhetherRoute(true);
+            }catch (Exception e){
+                a.setWhetherRoute(false);
+            }
+
         });
         return groupList;
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationSiteServiceImpl.java

@@ -18,12 +18,12 @@ import com.zd.laboratory.service.ILabViolationSiteService;
 
 /**
  * 违规-违���项设置Service业务层处理
- * 
+ *
  * @author zd
  * @date 2021-12-13
  */
 @Service
-public class LabViolationSiteServiceImpl implements ILabViolationSiteService 
+public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 {
     @Autowired
     private LabViolationSiteMapper labViolationSiteMapper;
@@ -36,7 +36,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 
     /**
      * 查询违规-违���项设置
-     * 
+     *
      * @param id 违规-违���项设置主键
      * @return 违规-违���项设置
      */
@@ -48,7 +48,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 
     /**
      * 查询违规-违���项设置列表
-     * 
+     *
      * @param labViolationSite 违规-违���项设置
      * @return 违规-违���项设置
      */
@@ -60,7 +60,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 
     /**
      * 新增违规-违���项设置
-     * 
+     *
      * @param obj 违规-违���项设置
      * @return 结果
      */
@@ -70,14 +70,19 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
          Map map =  obj;
         int row = 0;
          if (map.get("violationType")!=null) {
-            List<Map<String, String>> siteList = (List<Map<String, String>>) map.get("violationType");
+//            List<Map<String, String>> siteList = (List<Map<String, String>>) map.get("violationType");
              labViolationSiteMapper.deleteLabViolationSiteAll();
-            siteList.forEach(s->{
-                LabViolationSite site = new LabViolationSite();
-                site.setViolationVal(s.get("violationVal"));
-                site.setRemake(obj.get("remake").toString());
-                labViolationSiteMapper.insertLabViolationSite(site);
-            });
+             //todo 需求变动，取消了原来的violationType字段类型参数
+//            siteList.forEach(s->{
+//                LabViolationSite site = new LabViolationSite();
+//                site.setViolationVal(s.get("violationVal"));
+//                site.setRemake(obj.get("remake").toString());
+//                labViolationSiteMapper.insertLabViolationSite(site);
+//            });
+             LabViolationSite site = new LabViolationSite();
+             site.setViolationVal("负面清单次数");
+             site.setRemake(obj.get("remake").toString());
+             labViolationSiteMapper.insertLabViolationSite(site);
              row = 1;
          }
          if (map.get("violationMeth")!=null){
@@ -96,7 +101,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 
     /**
      * 修改违规-违���项设置
-     * 
+     *
      * @param labViolationSite 违规-违���项设置
      * @return 结果
      */
@@ -108,7 +113,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 
     /**
      * 批量删除违规-违���项设置
-     * 
+     *
      * @param ids 需要删除的违规-违���项设置主键
      * @return 结果
      */
@@ -120,7 +125,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
 
     /**
      * 删除违规-违���项设置信息
-     * 
+     *
      * @param id 违规-违���项设置主键
      * @return 结果
      */

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

@@ -134,4 +134,16 @@ public class SlApplyApprovalController extends BaseController
         return AjaxResult.success(map);
     }
 
+    /***
+     * 重新授权
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "重新授权")
+    @GetMapping("/auth/{id}")
+    public AjaxResult againAuth(@PathVariable Long id)
+    {
+        return AjaxResult.success(slApplyApprovalService.againAuth(id));
+    }
+
 }

zd-modules/zd-smartlock/src/main/java/com/zd/smartlock/service/ISlApplyApprovalService.java

@@ -77,4 +77,11 @@ public interface ISlApplyApprovalService
      * @return
      */
     Map<String,Object> sysMsgApprova(String phone, String content, Long lockApplyId);
+
+    /***
+     * 门锁申请重新授权
+     * @param id
+     * @return
+     */
+    String againAuth(Long id);
 }

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

@@ -303,6 +303,23 @@ public class SlApplyApprovalServiceImpl implements ISlApplyApprovalService
     }
 
     /***
+     * 门锁申请重新授权
+     * @param id
+     * @return
+     */
+    @Override
+    public String againAuth(Long id) {
+        String str="";
+        try {
+            str =  authPower(id);
+        }catch (Exception e) {
+            e.printStackTrace();
+            log.error("重新授权失败："+e);
+        }
+        return str;
+    }
+
+    /***
      * 审批通过后人员密码授权处理
      * @param applyId 申请id
      */