同步代码提交

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/dto/QuerySubListParam.java

@@ -0,0 +1,29 @@
+package com.zd.laboratory.api.dto;
+
+import com.zd.model.page.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description TODO
+ * @Author hzw
+ * @Date 2023/5/9 14:58
+ * @Version 2.0
+ */
+@Data
+public class QuerySubListParam extends PageQuery implements Serializable {
+
+    @ApiModelProperty("学院ids")
+    private Long[] deptIds;
+
+    @ApiModelProperty("学院id")
+    private Long deptId;
+
+    @ApiModelProperty("安全分类id")
+    private Long typeId;
+
+    @ApiModelProperty("级别id")
+    private Long level;
+}

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/vo/CollegeInfoVo.java

@@ -0,0 +1,26 @@
+package com.zd.laboratory.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 学院信息vo类
+ * @Author hzw
+ * @Date 2023/4/24 15:36
+ * @Version 2.0
+ */
+@Data
+@ApiModel("学院信息vo类")
+public class CollegeInfoVo {
+
+    @ApiModelProperty("学院id")
+    private Long deptId;
+
+    @ApiModelProperty("学院名称")
+    private String deptName;
+
+    @ApiModelProperty("学院下实验室数量")
+    private int subNum;
+
+}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/config/WarningProperties.java

@@ -0,0 +1,46 @@
+package com.zd.alg.forward.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+/***
+ * <p>WarningProperties</p>
+ *
+ * @author linft
+ * @date 6/16/2023
+ * @version 3.0
+ */
+@Configuration
+@RefreshScope
+@ConfigurationProperties("warning.algorithm")
+public class WarningProperties {
+
+    private Boolean enable;
+    private Integer code;
+    private String name;
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.zd.laboratory.domain;
+
+import com.zd.model.page.PageQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 查询实验室信息业务对象
+ * @Author hzw
+ * @Date 2023/4/24 13:54
+ * @Version 2.0
+ */
+@Data
+@ApiModel("查询实验室信息业务请求对象")
+public class SubejctInfoBo extends PageQuery {
+
+    @ApiModelProperty("查询实验室ids")
+    private Long[] subIds;
+
+    @ApiModelProperty("已选实验室ids")
+    private Long[] selectedSubIds;
+
+    @ApiModelProperty("安全分类")
+    private Long typeId;
+
+    @ApiModelProperty("级别")
+    private Long level;
+
+    @ApiModelProperty("学院")
+    private Long deptId;
+
+    @ApiModelProperty("过滤类型，1是过滤，2是不过滤")
+    private int filtType;
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/SubjectUploadTemplate.java

@@ -0,0 +1,49 @@
+package com.zd.laboratory.domain.vo;
+
+import com.zd.model.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 实验室上传模板
+ * @Author hzw
+ * @Date 2023/4/28 14:32
+ * @Version 2.0
+ */
+@Data
+@ApiModel("实验室上传模板")
+public class SubjectUploadTemplate {
+
+    @Excel(name = "实验室名称",sort = 1, isRequired=true)
+    @ApiModelProperty("实验室名称")
+    private String name;
+
+    @Excel(name = "学院",sort = 2, isRequired=true)
+    @ApiModelProperty(value = "学院")
+    private String deptName;
+
+    @Excel(name = "房间号",sort = 3, isRequired=true)
+    @ApiModelProperty(value = "房间号")
+    private String room;
+
+    @Excel(name = "楼栋",sort = 4, isRequired=true)
+    @ApiModelProperty(value = "楼栋")
+    private String buildName;
+
+    @Excel(name = "楼层",sort = 5, isRequired=true)
+    @ApiModelProperty(value = "楼层")
+    private String floorName;
+
+    @Excel(name = "安全分类",sort = 6, isRequired=true)
+    @ApiModelProperty(value = "安全分类")
+    private String typeName;
+
+    @Excel(name = "安全分级",sort = 7, isRequired=true)
+    @ApiModelProperty(value = "安全分级")
+    private String classifiedName;
+
+    @Excel(name = "实验室类型",sort = 8, isRequired=true)
+    @ApiModelProperty(value = "实验室类型")
+    private String moldName;
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/SubjectUploadTemplateFail.java

@@ -0,0 +1,21 @@
+package com.zd.laboratory.domain.vo;
+
+import com.zd.model.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 上传实验室失败数据模板
+ * @Author hzw
+ * @Date 2023/4/28 14:32
+ * @Version 2.0
+ */
+@Data
+@ApiModel("上传实验室失败数据模板")
+public class SubjectUploadTemplateFail extends SubjectUploadTemplate{
+
+    @ApiModelProperty("失败原因")
+    @Excel(name = "失败原因" ,type = Excel.Type.EXPORT)
+    private StringBuffer failCause = new StringBuffer();
+}