问题修改 2023-04-10

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -113,6 +113,7 @@ public class LabBoardApi {
             }
             vo.setSafeUserVoList(safeUserList);
         }
+        vo.setSubjectName(String.valueOf(map.getOrDefault("subjectName", "")));
         vo.setInCheck((List<Map<String, String>>)map.get("checkIn"));
         vo.setOutCheck((List<String>)map.get("checkOut"));
         vo.setInspectInCheck((List<Map<String, String>>)map.get("inspectCheckIn"));

zd-modules/zd-base/src/main/java/com/zd/base/app/domain/board/LabXxpSubjectVo.java

@@ -34,6 +34,9 @@ public class LabXxpSubjectVo {
     @ApiModelProperty(value = "二维码地址")
     private String deptName;
 
+    @ApiModelProperty(value = "楼栋+房间号")
+    private String subjectName;
+
     @ApiModelProperty("进入检查项")
     private List<Map<String,String>> inCheck;
 
@@ -177,4 +180,12 @@ public class LabXxpSubjectVo {
     public void setOutCheck(List<String> outCheck) {
         this.outCheck = outCheck;
     }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/controller/OneMachineController.java

@@ -159,6 +159,11 @@ public class OneMachineController extends BaseController {
     @GetMapping("/{subId}/function/list")
     public ResultData<List<SensorFunctionStatus>> querySubFunctionList(@PathVariable("subId") Long subId) {
         List<SensorFunctionStatus> list = subjectManagerService.querySenseFunctionBySubId(subId);
+        for(SensorFunctionStatus sensorFunctionStatus:list){
+            if(null==sensorFunctionStatus.getDescribe()){
+                sensorFunctionStatus.setDescribe(sensorFunctionStatus.getFuncName());
+            }
+        }
         //todo 设备来了完善
         return ResultData.success(list);
     }

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

@@ -555,11 +555,19 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
     @Override
     public Map<String,Object> selectLabSubjectInfoId(Long id) {
         Map<String,Object> labMap=labSubjectMapper.selectXxpLabSubjectById(id);
+        labMap.put("subjectName","");
+        Object floorObj=labMap.get("floorName");
+        Object room=labMap.get("room");
+        if(null!=floorObj && null!=room){
+            labMap.put("subjectName",floorObj+"-"+room);
+        }
+        if(null==floorObj && null!=room){
+            labMap.put("subjectName",room);
+        }
         LabSubject labSubject=new LabSubject();
         labSubject.setQrCodeUrl(labMap.get("id") + "-" + Optional.ofNullable(labMap.get("room")).orElse(""));
         labMap.put("qrCode",labSubject.getQrCodeUrl());
         //进入检查
-        //设置
         String checkIn=String.valueOf(labMap.get("check_in"));
         String inspectCheckIn=String.valueOf(labMap.get("inspect_check_in"));
         if (StrUtil.isNotBlank(checkIn)) {

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

@@ -1221,6 +1221,7 @@
         select t.id,
                t.name,
                cf.classified_name                                                         levelName,
+               (SELECT  laf.name  FROM  lab_build_floor laf INNER JOIN `lab_build_floor_layout` lbfl ON laf.id=lbfl.floor_id WHERE lbfl.sub_id=t.id AND laf.type=2) as floorName,
                t.room,
                cf.classified_color                                                        filedColor,
                (SELECT ct.type_name FROM lab_safe_classtype ct WHERE ct.id = t.`type_id`) typeName,