|
|
@@ -1,9 +1,14 @@
|
|
|
package com.persagy.fm.sop.model.dto;
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
-import com.baomidou.mybatisplus.extension.activerecord.Model;
|
|
|
+import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
-import java.io.Serializable;
|
|
|
+import com.baomidou.mybatisplus.extension.activerecord.Model;
|
|
|
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
|
|
|
+
|
|
|
+import javax.validation.constraints.NotEmpty;
|
|
|
+import javax.validation.constraints.NotNull;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
|
@@ -14,9 +19,6 @@ import java.io.Serializable;
|
|
|
* @since 2021-03-17
|
|
|
*/
|
|
|
public class SopEdit extends Model<SopEdit> {
|
|
|
-
|
|
|
- private static final long serialVersionUID=1L;
|
|
|
-
|
|
|
/**
|
|
|
* 主键
|
|
|
*/
|
|
|
@@ -25,115 +27,62 @@ public class SopEdit extends Model<SopEdit> {
|
|
|
|
|
|
private String sopId;
|
|
|
|
|
|
- /**
|
|
|
- * 通用sop的项目Id默认为"group_sop_id"
|
|
|
- */
|
|
|
private String projectId;
|
|
|
-
|
|
|
- /**
|
|
|
- * 项目类型：同一级建筑功能类型 ，字段使用原有的extend_field保存
|
|
|
- */
|
|
|
private String extendField;
|
|
|
-
|
|
|
- /**
|
|
|
- * 表示sop的发布者、更新者
|
|
|
- */
|
|
|
- private String operator;
|
|
|
-
|
|
|
- /**
|
|
|
- * 名称项目下唯一
|
|
|
- */
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private OperatorBean operator;
|
|
|
private String sopName;
|
|
|
-
|
|
|
- /**
|
|
|
- * 1-通用，2-项目专用
|
|
|
- */
|
|
|
private String sopType;
|
|
|
|
|
|
- /**
|
|
|
- * 0-否 1-是
|
|
|
- */
|
|
|
private String noObj;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<String> domains;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<String> orderType;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<ToolsBean> tools;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<FitObjsBean> fitObjs;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<String> equipModelIds;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<String> labels;
|
|
|
+ private String stepsVersion;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<SopStepsBean> steps;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<RelatedDataBean> relatedData;
|
|
|
|
|
|
/**
|
|
|
- * 数组[code，code]，
|
|
|
-子项：SE-强电，WE-弱电，AC-空调，WS-给排水，FF-消防，SP-安防
|
|
|
- */
|
|
|
- private String domains;
|
|
|
-
|
|
|
- /**
|
|
|
- * 数组[{"tool"：“……”,"from_step":true}]
|
|
|
+ * 1-已发布、2-已作废
|
|
|
*/
|
|
|
- private String tools;
|
|
|
-
|
|
|
- /**
|
|
|
- * 数组[code，code]，
|
|
|
-子项：1-保养、2-维修、3-巡检、4-运行、5-安防、
|
|
|
- */
|
|
|
- private String orderType;
|
|
|
-
|
|
|
- /**
|
|
|
- * [{
|
|
|
- "obj_id:"***", //对象id
|
|
|
- "obj_name:"对象名称1", //对象名称
|
|
|
- "obj_type":"equip", //对象类型,子项见后边
|
|
|
-}]
|
|
|
- */
|
|
|
- private String fitObjs;
|
|
|
-
|
|
|
- /**
|
|
|
- * [name,name]
|
|
|
- */
|
|
|
- private String equipModelIds;
|
|
|
-
|
|
|
- /**
|
|
|
- * 见 sop表
|
|
|
- */
|
|
|
- private String labels;
|
|
|
-
|
|
|
- /**
|
|
|
- * [{"name":"***'，“url”：“***”}，{}]
|
|
|
- */
|
|
|
- private String steps;
|
|
|
-
|
|
|
- /**
|
|
|
- * 0-草稿、1-已发布
|
|
|
- */
|
|
|
- private String relatedData;
|
|
|
+ private String sopStatus;
|
|
|
|
|
|
/**
|
|
|
- * 3-修订中
|
|
|
+ * 1-正常、2-待修订、3-修订中
|
|
|
*/
|
|
|
- private String sopStatus;
|
|
|
+ private String publishStatus;
|
|
|
|
|
|
/**
|
|
|
* id的数组[sop_id,sop_id]
|
|
|
+ *
|
|
|
*/
|
|
|
- private String publishStatus;
|
|
|
-
|
|
|
- private String refSopIds;
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
+ private List<String> refSopIds;
|
|
|
|
|
|
private String version;
|
|
|
|
|
|
private Integer versionCount;
|
|
|
|
|
|
- /**
|
|
|
- * 数组[“描述”,“描述”]
|
|
|
- */
|
|
|
private String versionExplain;
|
|
|
-
|
|
|
/**
|
|
|
- * yyyyMMddhhmmss
|
|
|
+ * 是否有效
|
|
|
*/
|
|
|
- private String createTime;
|
|
|
+ private Boolean valid;
|
|
|
|
|
|
- /**
|
|
|
- * yyyyMMddhhmmss
|
|
|
- */
|
|
|
private String updateTime;
|
|
|
|
|
|
- private Boolean valid;
|
|
|
-
|
|
|
+ private String createTime;
|
|
|
|
|
|
public String getSopEditId() {
|
|
|
return sopEditId;
|
|
|
@@ -143,6 +92,31 @@ public class SopEdit extends Model<SopEdit> {
|
|
|
this.sopEditId = sopEditId;
|
|
|
}
|
|
|
|
|
|
+ public String getCreateTime() {
|
|
|
+ return createTime;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setCreateTime(String createTime) {
|
|
|
+ this.createTime = createTime;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ public Boolean getValid() {
|
|
|
+ return valid;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setValid(Boolean valid) {
|
|
|
+ this.valid = valid;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getUpdateTime() {
|
|
|
+ return updateTime;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setUpdateTime(String updateTime) {
|
|
|
+ this.updateTime = updateTime;
|
|
|
+ }
|
|
|
+
|
|
|
public String getSopId() {
|
|
|
return sopId;
|
|
|
}
|
|
|
@@ -167,11 +141,11 @@ public class SopEdit extends Model<SopEdit> {
|
|
|
this.extendField = extendField;
|
|
|
}
|
|
|
|
|
|
- public String getOperator() {
|
|
|
+ public OperatorBean getOperator() {
|
|
|
return operator;
|
|
|
}
|
|
|
|
|
|
- public void setOperator(String operator) {
|
|
|
+ public void setOperator(OperatorBean operator) {
|
|
|
this.operator = operator;
|
|
|
}
|
|
|
|
|
|
@@ -199,67 +173,75 @@ public class SopEdit extends Model<SopEdit> {
|
|
|
this.noObj = noObj;
|
|
|
}
|
|
|
|
|
|
- public String getDomains() {
|
|
|
+ public List<String> getDomains() {
|
|
|
return domains;
|
|
|
}
|
|
|
|
|
|
- public void setDomains(String domains) {
|
|
|
+ public void setDomains(List<String> domains) {
|
|
|
this.domains = domains;
|
|
|
}
|
|
|
|
|
|
- public String getTools() {
|
|
|
- return tools;
|
|
|
+ public List<String> getOrderType() {
|
|
|
+ return orderType;
|
|
|
}
|
|
|
|
|
|
- public void setTools(String tools) {
|
|
|
- this.tools = tools;
|
|
|
+ public void setOrderType(List<String> orderType) {
|
|
|
+ this.orderType = orderType;
|
|
|
}
|
|
|
|
|
|
- public String getOrderType() {
|
|
|
- return orderType;
|
|
|
+ public List<ToolsBean> getTools() {
|
|
|
+ return tools;
|
|
|
}
|
|
|
|
|
|
- public void setOrderType(String orderType) {
|
|
|
- this.orderType = orderType;
|
|
|
+ public void setTools(List<ToolsBean> tools) {
|
|
|
+ this.tools = tools;
|
|
|
}
|
|
|
|
|
|
- public String getFitObjs() {
|
|
|
+ public List<FitObjsBean> getFitObjs() {
|
|
|
return fitObjs;
|
|
|
}
|
|
|
|
|
|
- public void setFitObjs(String fitObjs) {
|
|
|
+ public void setFitObjs(List<FitObjsBean> fitObjs) {
|
|
|
this.fitObjs = fitObjs;
|
|
|
}
|
|
|
|
|
|
- public String getEquipModelIds() {
|
|
|
+ public List<String> getEquipModelIds() {
|
|
|
return equipModelIds;
|
|
|
}
|
|
|
|
|
|
- public void setEquipModelIds(String equipModelIds) {
|
|
|
+ public void setEquipModelIds(List<String> equipModelIds) {
|
|
|
this.equipModelIds = equipModelIds;
|
|
|
}
|
|
|
|
|
|
- public String getLabels() {
|
|
|
+ public List<String> getLabels() {
|
|
|
return labels;
|
|
|
}
|
|
|
|
|
|
- public void setLabels(String labels) {
|
|
|
+ public void setLabels(List<String> labels) {
|
|
|
this.labels = labels;
|
|
|
}
|
|
|
|
|
|
- public String getSteps() {
|
|
|
+ public String getStepsVersion() {
|
|
|
+ return stepsVersion;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setStepsVersion(String stepsVersion) {
|
|
|
+ this.stepsVersion = stepsVersion;
|
|
|
+ }
|
|
|
+
|
|
|
+ public List<SopStepsBean> getSteps() {
|
|
|
return steps;
|
|
|
}
|
|
|
|
|
|
- public void setSteps(String steps) {
|
|
|
+ public void setSteps(List<SopStepsBean> steps) {
|
|
|
this.steps = steps;
|
|
|
}
|
|
|
|
|
|
- public String getRelatedData() {
|
|
|
+ public List<RelatedDataBean> getRelatedData() {
|
|
|
return relatedData;
|
|
|
}
|
|
|
|
|
|
- public void setRelatedData(String relatedData) {
|
|
|
+ public void setRelatedData(List<RelatedDataBean> relatedData) {
|
|
|
this.relatedData = relatedData;
|
|
|
}
|
|
|
|
|
|
@@ -279,11 +261,11 @@ public class SopEdit extends Model<SopEdit> {
|
|
|
this.publishStatus = publishStatus;
|
|
|
}
|
|
|
|
|
|
- public String getRefSopIds() {
|
|
|
+ public List<String> getRefSopIds() {
|
|
|
return refSopIds;
|
|
|
}
|
|
|
|
|
|
- public void setRefSopIds(String refSopIds) {
|
|
|
+ public void setRefSopIds(List<String> refSopIds) {
|
|
|
this.refSopIds = refSopIds;
|
|
|
}
|
|
|
|
|
|
@@ -311,63 +293,145 @@ public class SopEdit extends Model<SopEdit> {
|
|
|
this.versionExplain = versionExplain;
|
|
|
}
|
|
|
|
|
|
- public String getCreateTime() {
|
|
|
- return createTime;
|
|
|
- }
|
|
|
+ public static class OperatorBean {
|
|
|
+ /**
|
|
|
+ * id : ***
|
|
|
+ * name : 燕小六
|
|
|
+ */
|
|
|
+
|
|
|
+ private String id;
|
|
|
+ private String name;
|
|
|
+
|
|
|
+ public String getId() {
|
|
|
+ return id;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setId(String id) {
|
|
|
+ this.id = id;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getName() {
|
|
|
+ return name;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setName(String name) {
|
|
|
+ this.name = name;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ public static class ToolsBean {
|
|
|
+ /**
|
|
|
+ * tool : name
|
|
|
+ * from_step : true
|
|
|
+ */
|
|
|
+
|
|
|
+ private String tool;
|
|
|
+ private Boolean from_step;
|
|
|
+
|
|
|
+ public String getTool() {
|
|
|
+ return tool;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setTool(String tool) {
|
|
|
+ this.tool = tool;
|
|
|
+ }
|
|
|
|
|
|
- public void setCreateTime(String createTime) {
|
|
|
- this.createTime = createTime;
|
|
|
- }
|
|
|
+ public Boolean isFrom_step() {
|
|
|
+ return from_step;
|
|
|
+ }
|
|
|
|
|
|
- public String getUpdateTime() {
|
|
|
- return updateTime;
|
|
|
+ public void setFrom_step(Boolean from_step) {
|
|
|
+ this.from_step = from_step;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- public void setUpdateTime(String updateTime) {
|
|
|
- this.updateTime = updateTime;
|
|
|
- }
|
|
|
+ public static class FitObjsBean {
|
|
|
+ /**
|
|
|
+ * obj_id : ***
|
|
|
+ * obj_name : 对象名称1
|
|
|
+ * obj_code : XXX
|
|
|
+ * obj_type : system
|
|
|
+ * obj_source : content_obj
|
|
|
+ */
|
|
|
+ //"obj_id", "obj_name", "obj_type"
|
|
|
+ @NotEmpty
|
|
|
+ @NotNull
|
|
|
+ private String obj_id;
|
|
|
+ @NotEmpty
|
|
|
+ @NotNull
|
|
|
+ private String obj_name;
|
|
|
+ @NotEmpty
|
|
|
+ @NotNull
|
|
|
+ private String obj_type;
|
|
|
+ private String obj_source;
|
|
|
+ private String obj_code;
|
|
|
|
|
|
- public Boolean getValid() {
|
|
|
- return valid;
|
|
|
- }
|
|
|
+ public String getObj_id() {
|
|
|
+ return obj_id;
|
|
|
+ }
|
|
|
|
|
|
- public void setValid(Boolean valid) {
|
|
|
- this.valid = valid;
|
|
|
+ public void setObj_id(String obj_id) {
|
|
|
+ this.obj_id = obj_id;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getObj_name() {
|
|
|
+ return obj_name;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setObj_name(String obj_name) {
|
|
|
+ this.obj_name = obj_name;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getObj_code() {
|
|
|
+ return obj_code;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setObj_code(String obj_code) {
|
|
|
+ this.obj_code = obj_code;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getObj_type() {
|
|
|
+ return obj_type;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setObj_type(String obj_type) {
|
|
|
+ this.obj_type = obj_type;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getObj_source() {
|
|
|
+ return obj_source;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setObj_source(String obj_source) {
|
|
|
+ this.obj_source = obj_source;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- protected Serializable pkVal() {
|
|
|
- return this.sopEditId;
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public String toString() {
|
|
|
- return "SopEdit{" +
|
|
|
- "sopEditId=" + sopEditId +
|
|
|
- ", sopId=" + sopId +
|
|
|
- ", projectId=" + projectId +
|
|
|
- ", extendField=" + extendField +
|
|
|
- ", operator=" + operator +
|
|
|
- ", sopName=" + sopName +
|
|
|
- ", sopType=" + sopType +
|
|
|
- ", noObj=" + noObj +
|
|
|
- ", domains=" + domains +
|
|
|
- ", tools=" + tools +
|
|
|
- ", orderType=" + orderType +
|
|
|
- ", fitObjs=" + fitObjs +
|
|
|
- ", equipModelIds=" + equipModelIds +
|
|
|
- ", labels=" + labels +
|
|
|
- ", steps=" + steps +
|
|
|
- ", relatedData=" + relatedData +
|
|
|
- ", sopStatus=" + sopStatus +
|
|
|
- ", publishStatus=" + publishStatus +
|
|
|
- ", refSopIds=" + refSopIds +
|
|
|
- ", version=" + version +
|
|
|
- ", versionCount=" + versionCount +
|
|
|
- ", versionExplain=" + versionExplain +
|
|
|
- ", createTime=" + createTime +
|
|
|
- ", updateTime=" + updateTime +
|
|
|
- ", valid=" + valid +
|
|
|
- "}";
|
|
|
+ public static class RelatedDataBean {
|
|
|
+ /**
|
|
|
+ * name : ***
|
|
|
+ * url : ***
|
|
|
+ */
|
|
|
+
|
|
|
+ private String name;
|
|
|
+ private String url;
|
|
|
+
|
|
|
+ public String getName() {
|
|
|
+ return name;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setName(String name) {
|
|
|
+ this.name = name;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getUrl() {
|
|
|
+ return url;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setUrl(String url) {
|
|
|
+ this.url = url;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
