Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-algorithm/src/main/java/com/zd/alg/rfid/sdk/RfidClientImpl.java

@@ -455,7 +455,7 @@ public class RfidClientImpl implements IService {
             GClient client = clientMap.get(hardwareNum);
             synchronized (this) {
                 //设置开始报警、报警时长
-                return changeGpo(client, 1, 1);
+                return changeGpo(client, 1, 30);
             }
         }
         return false;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -239,8 +239,8 @@ public class LabRiskPlanController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.QUERY)
     @Log(title = "写入用户进入预案数据", businessType = BusinessType.OTHER)
     @GetMapping("/writerEnterRiskPlan")
-    public ResultData writerEnterRiskPlan(Long riskPlanId,Integer ifcheck) {
-        labRiskPlanService.writerEnterRiskPlan(riskPlanId,ifcheck);
+    public ResultData writerEnterRiskPlan(Long groupId,Integer ifcheck) {
+        labRiskPlanService.writerEnterRiskPlan(groupId,ifcheck);
         return ResultData.success();
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabRiskPlanAbnormalGroup.java

@@ -60,6 +60,13 @@ public class LabRiskPlanAbnormalGroup extends BaseEntity {
     @Excel(name = "组级状态，（1组开始，0是组关闭）")
     private Long status;
 
+    /**
+     * 是否查看预案 0否 1是
+     */
+    @ApiModelProperty(value = "是否查看预案 0否 1是")
+    @Excel(name = "是否查看预案 0否 1是")
+    private Integer ifCheck;
+
 
     public Long getId() {
         return id;
@@ -116,4 +123,12 @@ public class LabRiskPlanAbnormalGroup extends BaseEntity {
     public void setRiskPlanLevel(Integer riskPlanLevel) {
         this.riskPlanLevel = riskPlanLevel;
     }
+
+    public Integer getIfCheck() {
+        return ifCheck;
+    }
+
+    public void setIfCheck(Integer ifCheck) {
+        this.ifCheck = ifCheck;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/LabBuildFloorLayoutDTO.java

@@ -34,7 +34,7 @@ public class LabBuildFloorLayoutDTO {
      * 是否进入过预案
      */
     @ApiModelProperty(value = "是否进入过预案")
-    private Integer ifcheck;
+    private Integer ifCheck;
 
     /**
      * 预案发生时间

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabRiskPlanService.java

@@ -163,5 +163,5 @@ public interface ILabRiskPlanService  extends IService<LabRiskPlan> {
 
     Integer checkEnterRiskPlan(Long riskPlanId);
 
-    void writerEnterRiskPlan(Long riskPlanId,Integer ifcheck);
+    void writerEnterRiskPlan(Long groupId,Integer ifcheck);
 }

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

@@ -138,6 +138,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     @Autowired
     private ILabHardwareService labHardwareService;
 
+    @Autowired
+    private ILabBuildFloorLayoutService labBuildFloorLayoutService;
+
     private static final Logger log = LoggerFactory.getLogger(LabRiskPlanServiceImpl.class);
 
 
@@ -1051,7 +1054,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             labRiskPlanLevel.setRiskAttribute(riskAttribute);
 
             LabRiskPlan labRiskPlan = labRiskPlanMapper.selectLabRiskPlanByRiskPlanId(subFunction.getSubId());
-            labRiskPlanLevel.setFloorId(labRiskPlan.getFloorId());
+            LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
+            labBuildFloorLayout.setSubId(subFunction.getSubId());
+            List <LabBuildFloorLayoutVo> list = labBuildFloorLayoutService.selectLabBuildFloorLayoutList(labBuildFloorLayout);
+            labRiskPlanLevel.setFloorId(list.get(0).getFloorId());
             labRiskPlanLevel.setTopName(labRiskPlan.getTopName());
 
             log.error("触发预案2");
@@ -1296,14 +1302,13 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
                     }
                 }
-                R r = remoteCameraService.stopRecord("192.168.1.64");
-
 
                 //TODO 更新风险概要  recordVideo - 视频记录存放地址
                 String handlePerson = null;
                 String recordVideo = "";
                 labRiskPlanAbnormalDescService.updateLabRiskPlanAbnormalDesc(groupVo.getId(),handlePerson, recordVideo);
-
+                log.info("groupId = {}",groupList.get(0).getId());
+                writerEnterRiskPlan(groupList.get(0).getId(),2);
                 //结束前向前端发送mqtt预案触发提示
                 messageSendService.riskPlanTriggerNotice();
 
@@ -2233,11 +2238,11 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     }
 
     @Override
-    public void writerEnterRiskPlan(Long riskPlanId,Integer ifcheck) {
-        LabRiskPlan labRiskPlan = new LabRiskPlan();
-        labRiskPlan.setId(riskPlanId);
-        labRiskPlan.setIfCheck(ifcheck);
-        labRiskPlanMapper.updateById(labRiskPlan);
+    public void writerEnterRiskPlan(Long groupId,Integer ifcheck) {
+        LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
+        labRiskPlanAbnormalGroup.setId(groupId);
+        labRiskPlanAbnormalGroup.setIfCheck(ifcheck);
+        labRiskPlanAbnormalGroupMapper.updateLabRiskPlanAbnormalGroup(labRiskPlanAbnormalGroup);
     }
 
     public static boolean isListEqual(List l0, List l1) {

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalGroupMapper.xml

@@ -12,6 +12,7 @@
         <result property="riskAttribute" column="risk_attribute"/>
         <result property="riskPlanLevel" column="risk_plan_level"/>
         <result property="status" column="status"/>
+        <result property="ifCheck" column="if_check"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
@@ -118,6 +119,7 @@
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="ifCheck != null">if_check = #{ifCheck},</if>
         </trim>
         where id = #{id}
     </update>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalLogMapper.xml

@@ -429,17 +429,19 @@
     </delete>
     <select id="selectRiskPlanTriggerInfo" resultType="com.zd.laboratory.domain.dto.LabBuildFloorLayoutDTO">
         SELECT
-        lrpal.risk_plan_id,
-        lrpal.risk_plan_level_name,
-        lrpal.risk_plan_level,
-        lrpal.create_time riskPlanTriggerTime,
-        lrpal.risk_attribute ,
-        lrp.name,
-        lrp.if_check
-        FROM lab_risk_plan_abnormal_log  lrpal
-        LEFT JOIN lab_risk_plan lrp ON lrpal.risk_plan_id = lrp.id
+            lrpal.risk_plan_id,
+            lrpal.risk_plan_level_name,
+            lrpal.risk_plan_level,
+            lrpal.create_time riskPlanTriggerTime,
+            lrpal.risk_attribute,
+            lrp.NAME,
+            lrpag.if_check
+        FROM
+            lab_risk_plan_abnormal_group lrpag
+            LEFT JOIN lab_risk_plan_abnormal_log lrpal ON lrpag.id = lrpal.group_id
+            LEFT JOIN lab_risk_plan lrp ON lrpal.risk_plan_id = lrp.id
         WHERE lrpal.group_id = #{groupId}
-        and lrpal.risk_plan_id = #{riskPlanId}
+            and lrpal.risk_plan_id = #{riskPlanId}
         ORDER BY lrpal.id DESC
         LIMIT 1
     </select>