遗漏合并

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

@@ -15,12 +15,14 @@ import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.api.entity.FunctionStatus;
 import com.zd.laboratory.api.vo.HardwareCVO;
 import com.zd.laboratory.domain.LabHardware;
+import com.zd.laboratory.domain.XxpCardInfo;
 import com.zd.laboratory.domain.vo.HxpSmartTerminalByExcel;
 import com.zd.laboratory.domain.vo.LabHardwareVO;
 import com.zd.laboratory.domain.vo.LabSensorVO;
 import com.zd.laboratory.service.ILabHardwareService;
 import com.zd.laboratory.service.ILabSensorService;
 import com.zd.laboratory.service.ILabSubjectService;
+import com.zd.laboratory.service.IXxpCardInfoService;
 import com.zd.laboratory.service.impl.LabSubjectManagerService;
 import com.zd.laboratory.socket.command.Symbol;
 import com.zd.model.constant.HttpStatus;
@@ -75,6 +77,8 @@ public class LabHardwareController extends BaseController {
     RedisService redisService;
     @Resource
     private RemoteRfidService rfidService;
+    @Autowired
+    private IXxpCardInfoService xxpCardInfoService;
 
     /**
      * 查询硬件统计
@@ -274,15 +278,25 @@ public class LabHardwareController extends BaseController {
         ytjVo.setIds(ids);
         List<LabHardware> listkzsb=labHardwareService.selectNewLabHardwareByTypes(ytjVo);
 
+        ytjVo.setType(HardwareTypeEnum.HK_DOOR);
+        ytjVo.setIds(null);
+        List<LabHardwareVO> listHK = labHardwareService.selectLabHardwareList(ytjVo);
+
         //实验室详情
         //LabSubject labSubject =labSubjectService.selectLabSubjectById(subjectId);
 
+        XxpCardInfo xxpCardInfo = new XxpCardInfo();
+        xxpCardInfo.setSubjectId(subjectId);
+        List<XxpCardInfo>  listXxp =xxpCardInfoService.selectXxpCardInfoList(xxpCardInfo);
+
         map.put("listYtj",listYtj);//一体机
         //map.put("listDykg",listDykg);//控制设备-电源开关
         //map.put("listZntf",listZntf);//控制设备-智能通风
         map.put("listSpjk",listSpjk); //摄像头
         map.put("listCgq",listCgq); //传感器
         map.put("listkzsb",listkzsb); //控制设备
+        map.put("listHK",listHK);
+        map.put("listXxp",listXxp);//电子信息牌
         //map.put("labSubject",labSubject); //实验室详情
         return AjaxResult.success(map);
 

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

@@ -842,6 +842,7 @@ public class LabSecurityApplyController extends BaseController
         List<LabSecurityApply> list = labSecurityApplyService.selectValidApply(securityApply);
         return ResultData.success(list);
     }
+
     /**
      * 电子信息牌获取准入人员的指纹信息列表
      * @param labId

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

@@ -54,7 +54,8 @@ public class LabXxpClassifyDetailedController extends BaseController
     /**
      * 查询安全信息类目详情列表
      */
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.LIST)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询安全信息类目详情列表")
     public TableDataInfo<XxpClassifyDetailVO> list(XxpClassifyDetailVO classifyDetailed)
@@ -69,7 +70,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 导出安全信息类目详情列表
      */
     @ApiOperation(value = "导出安全信息类目详情列表")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EXPORT)
+   // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EXPORT)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.EXPORT)
     @Log(title = "安全信息类目详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, XxpClassifyDetailVO classifyDetailed) throws IOException
@@ -83,7 +85,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 获取安全信息类目详情详细信息
      */
     @ApiOperation(value = "获取安全信息类目详情详细信息")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.QUERY)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.QUERY)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.QUERY)
     @GetMapping(value = "/{id}")
     public ResultData<XxpClassifyDetail> getInfo(@PathVariable("id") Long id)
     {
@@ -95,7 +98,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 新增安全信息类目详情
      */
     @ApiOperation(value = "新增安全信息类目详情")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.ADD)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.ADD)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.ADD)
     @Log(title = "安全信息类目详情", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData add(@RequestBody XxpClassifyDetail classifyDetailed)
@@ -109,7 +113,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 修改安全信息类目详情
      */
     @ApiOperation(value = "修改安全信息类目详情")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EDIT)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EDIT)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.EDIT)
     @Log(title = "安全信息类目详情", businessType = BusinessType.UPDATE)
     @PutMapping
     public ResultData edit(@RequestBody XxpClassifyDetail classifyDetailed)
@@ -121,7 +126,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 删除安全信息类目详情
      */
     @ApiOperation(value = "删除安全信息类目详情")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.REMOVE)
     @Log(title = "安全信息类目详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public ResultData remove(@PathVariable Long[] ids)
@@ -135,7 +141,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * @return
      */
     @ApiOperation(value = "根据id删除安全信息类目详情关联关系")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+   // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.REMOVE)
     @Log(title = "安全信息类目详情", businessType = BusinessType.DELETE)
     @PostMapping("/{id}")
     public ResultData remove(@PathVariable Long id)