信息牌接口对接调整 2023-03-31

zd-api/zd-system-api/src/main/java/com/zd/system/api/vo/SysLogoConfigVO.java

@@ -57,6 +57,79 @@ public class SysLogoConfigVO extends BaseEntity
     @Excel(name = "首页banner")
     @ApiModelProperty(value = "首页banner")
     private String homepageBanner;
+
+    /** 用户身份，11是教职工，22是学生 */
+    @Excel(name = "用户身份，11是教职工，22是学生")
+    @ApiModelProperty(value = "用户身份，11是教职工，22是学生")
+    private String userType;
+
+    @ApiModelProperty(value = "智能锁配置1是有，0是无")
+    private Integer smartLock;
+
+    @ApiModelProperty(value = "气瓶标签配置 1是有，0是无")
+    private Integer airBottle;
+
+    @ApiModelProperty(value = "返回时间")
+    private Integer returnTime;
+
+    @ApiModelProperty(value = "注销时间")
+    private Integer logoutTime;
+
+    @ApiModelProperty(value = "是否启用信息牌 0不启用 1启用")
+    private Integer isStart;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public Integer getSmartLock() {
+        return smartLock;
+    }
+
+    public void setSmartLock(Integer smartLock) {
+        this.smartLock = smartLock;
+    }
+
+    public Integer getAirBottle() {
+        return airBottle;
+    }
+
+    public void setAirBottle(Integer airBottle) {
+        this.airBottle = airBottle;
+    }
+
+    public Integer getReturnTime() {
+        return returnTime;
+    }
+
+    public void setReturnTime(Integer returnTime) {
+        this.returnTime = returnTime;
+    }
+
+    public Integer getLogoutTime() {
+        return logoutTime;
+    }
+
+    public void setLogoutTime(Integer logoutTime) {
+        this.logoutTime = logoutTime;
+    }
+
+    public Integer getIsStart() {
+        return isStart;
+    }
+
+    public void setIsStart(Integer isStart) {
+        this.isStart = isStart;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

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

@@ -66,7 +66,6 @@ public class LabBoardApi {
         }
         map.put("subjectName", resultData.getData());
         map.put("currentTime", DateUtils.parseDateToStr("YYYY_MM_DD HH:MM:SS",new Date()));
-        map.put("messageList", "实验室发生火情，请注意");
         return ResultData.success(map);
     }
 
@@ -254,13 +253,21 @@ public class LabBoardApi {
     @GetMapping(value = "/getSubjectIdByNum/{num}")
     public ResultData getSubjectIdByNum(@PathVariable("num") String num) {
         ResultData<String> resultData=remoteDutyService.querySubInfoByNumber(num);
+        R<SysLogoConfigVO> sysLogo = remoteUserService.getConfigLogo();
         if(null==resultData || resultData.getCode()!=200){
             return ResultData.fail("获取实验室编号失败！");
         }
-
+        if (sysLogo == null || sysLogo.getCode() != 200) {
+            return ResultData.fail(500, "获取logo失败！");
+        }
+        Map<String,Object> map=new HashMap<String,Object>();
         if(StringUtils.isNull(resultData.getData())){
             return ResultData.fail("获取实验室编号失败！");
         }
+        map.put("labId",resultData.getData());
+        map.put("logoutTime",sysLogo.getData().getLogoutTime());
+        map.put("returnTime",sysLogo.getData().getReturnTime());
+        map.put("isStart",sysLogo.getData().getIsStart());
         return ResultData.success(resultData.getData());
     }