小程序实验室详情没有二维码处理

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

@@ -88,6 +88,8 @@ public class LabSubMangerV2Controller extends BaseController {
         if(subDiyVOList.size()>0){
             //安全类目信息查询
             subDiyVOList.get(0).setClassifyList(subjectManagerService.getSubClassify(id));
+            //实验室二维码
+            subDiyVOList.get(0).getSafeInfo().setQrCodeUrl(subDiyVOList.get(0).getRoom()==null?"":id + "-" + subDiyVOList.get(0).getRoom());
         }
         return ResultData.success(subDiyVOList);
     }

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

@@ -7,6 +7,7 @@ import com.zd.laboratory.api.vo.ClassifyVO;
 import com.zd.laboratory.api.vo.HardwareCVO;
 import com.zd.laboratory.api.vo.LabSubClassVO;
 import com.zd.laboratory.domain.vo.LabSubjectVO;
+import com.zd.laboratory.interfaces.SysProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -31,6 +32,12 @@ public class SubDiyVO {
     private String name;
 
     /**
+     * 房间号
+     */
+    private String room;
+
+
+    /**
      * 实验室所属院系
      */
     private Long deptId;
@@ -319,6 +326,11 @@ public class SubDiyVO {
         @ApiModelProperty("二维码")
         private String qrCode;
 
+        @ApiModelProperty("二维码地址")
+        private String qrCodeUrl;
+
+        @ApiModelProperty("房间号")
+        private String room;
 
         @ApiModelProperty("实验室负责人名称")
         private String subAdminName;
@@ -440,5 +452,34 @@ public class SubDiyVO {
         public void setAdminNameAndPhone(String adminNameAndPhone) {
             this.adminNameAndPhone = adminNameAndPhone;
         }
+
+        public String getRoom() {
+            return room;
+        }
+
+        public void setRoom(String room) {
+            this.room = room;
+        }
+
+        public String getQrCodeUrl() {
+            return qrCodeUrl;
+        }
+
+        /**
+         * type = 5 实验室信息和安全检查二维码
+         *
+         * @param code = 实验室id + - + 实验室房间号
+         */
+        public void setQrCodeUrl(String code) {
+            this.qrCodeUrl = StrUtil.format(SysProperties.getLabInfoQrcode(), code, 5);
+        }
+    }
+
+    public String getRoom() {
+        return room;
+    }
+
+    public void setRoom(String room) {
+        this.room = room;
     }
 }

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

@@ -166,6 +166,7 @@ public class SubQueryManager {
             SubDiyVO subDiyVO = new SubDiyVO(a);
             subDiyVO.setDeptId(a.getDeptId());
             subDiyVO.setDeptName(a.getDeptName());
+            subDiyVO.setRoom(a.getRoom());
             if(subQueryConfig.getBaseInfo())
             {
                 //新的危险等级， 因为现在不能该前端了， 所以只能构造跟之前危险等级一样的数据