소스 검색

【CHG】完善隔离开关检查表。

hao 4 년 전
부모
커밋
523139a105

+ 2 - 1
railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbGlkg.java

@@ -253,7 +253,8 @@ public class BusJcbGlkg extends BaseEntity{
     private String sbztDesc;
 
     @ApiModelProperty(value = "检查人")
-    private Long jcr;
+    @Length(min = 1, max = 100, message = "【检查人】长度必须介于 {min} 和 {max} 之间")
+    private String jcr;
 
     @ApiModelProperty(value = "存在问题")
     @Length(min = 1, max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")

+ 29 - 0
railway-business/src/main/java/com/railway/business/catenary/enums/DelFlagEnum.java

@@ -0,0 +1,29 @@
+package com.railway.business.catenary.enums;
+
+/**
+ * 删除状态
+ *
+ * @author railway
+ */
+public enum DelFlagEnum {
+
+    NOT_DELETE("0", "否"),
+    DELETED("1", "是"),
+    ;
+
+    private final String code;
+    private final String info;
+
+    DelFlagEnum(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

+ 20 - 3
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -1,13 +1,17 @@
 package com.railway.business.catenary.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.railway.business.catenary.mapper.BusJcbGlkgMapper;
 import com.railway.business.catenary.domain.BusJcbGlkg;
+import com.railway.business.catenary.enums.DelFlagEnum;
+import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.mapper.BusJcbGlkgMapper;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
+import com.railway.common.utils.SecurityUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 import java.util.List;
 /**
 * 隔离开关检查表
@@ -25,6 +29,16 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcbGlkg busJcbGlkg) {
+		Long userID = SecurityUtils.getUserId();
+		busJcbGlkg.setCreateTime(new Date());
+		busJcbGlkg.setCreateBy(String.valueOf(userID));
+		busJcbGlkg.setUpdateTime(new Date());
+		busJcbGlkg.setUpdateBy(String.valueOf(userID));
+		busJcbGlkg.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+		if (StringUtils.isBlank(busJcbGlkg.getSubmitState())) {
+			busJcbGlkg.setSubmitState(TestTableStatusEnum.UNREPORTED.getCode());
+		}
+
 		return busJcbGlkgMapper.insert(busJcbGlkg);
 	}
 
@@ -46,6 +60,9 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcbGlkg busJcbGlkg) {
+		Long userID = SecurityUtils.getUserId();
+		busJcbGlkg.setUpdateTime(new Date());
+		busJcbGlkg.setUpdateBy(String.valueOf(userID));
 		return busJcbGlkgMapper.update(busJcbGlkg);
 	}