【CHG】存在问题非必填；提交状态默认值；

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusDmcgyqServiceImpl.java

@@ -1,14 +1,13 @@
 package com.railway.business.baseinfo.service.impl;
 
-import com.railway.business.baseinfo.mapper.BusDmcgyqMapper;
 import com.railway.business.baseinfo.domain.BusDmcgyq;
+import com.railway.business.baseinfo.mapper.BusDmcgyqMapper;
 import com.railway.business.baseinfo.service.IBusDmcgyqService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 基础数据-地面磁感应器
 * @author zcf
@@ -31,7 +30,7 @@ public class BusDmcgyqServiceImpl implements IBusDmcgyqService{
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusDmcgyq busDmcgyq) {
 	    busDmcgyq.setCreateTime(new Date());
-        busDmcgyq.setCreateBy(SecurityUtils.getUsername());
+	    busDmcgyq.setCreateBy(SecurityUtils.getUsername());
 		return busDmcgyqMapper.insert(busDmcgyq);
 	}
 

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbBlq.java

@@ -49,7 +49,7 @@ public class BusJcbBlq extends BaseEntity{
     private String pillarCode;
 
     @ApiModelProperty(value = "温度")
-    @Length(min = 1, max = 10, message = "【温度】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 10, message = "【温度】长度必须介于 {min} 和 {max} 之间")
     private String temperature;
 
     @ApiModelProperty(value = "检查日期")
@@ -57,7 +57,7 @@ public class BusJcbBlq extends BaseEntity{
     private LocalDate checkDate;
 
     @ApiModelProperty(value = "图片路径")
-    @Length(min = 1, max = 255, message = "【图片路径】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 255, message = "【图片路径】长度必须介于 {min} 和 {max} 之间")
     private String picUrl;
 
     @ApiModelProperty(value = "避雷器托架安装水平")
@@ -129,7 +129,7 @@ public class BusJcbBlq extends BaseEntity{
     private String blqjdztJddz;
 
     @ApiModelProperty(value = "设备状态")
-    @Length(min = 1, max = 1, message = "【设备状态】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1, message = "【设备状态】长度必须介于 {min} 和 {max} 之间")
     private String sbzt;
 
     @ApiModelProperty(value = "设备状态(故障描述)")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbDmcgyq.java

@@ -134,7 +134,7 @@ public class BusJcbDmcgyq extends BaseEntity{
     private String confirmUser;
 
     @ApiModelProperty(value = "存在问题")
-    @Length(min = 1, max = 600, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
     private String czwt;
 
     @ApiModelProperty(value = "提交状态")

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

@@ -284,7 +284,7 @@ public class BusJcbGlkg extends BaseEntity{
     private String confirmUser;
 
     @ApiModelProperty(value = "存在问题")
-    @Length(min = 1, max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
     private String czwt;
 
     @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbJcxc.java

@@ -186,7 +186,7 @@ public class BusJcbJcxc extends BaseEntity{
     private String confirmUser;
 
     @ApiModelProperty(value = "存在问题")
-    @Length(min = 1, max = 600, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
     private String czwt;
 
     @ApiModelProperty(value = "提交状态")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbWjcxc.java

@@ -149,7 +149,7 @@ public class BusJcbWjcxc extends BaseEntity{
     private String confirmUser;
 
     @ApiModelProperty(value = "存在问题")
-    @Length(min = 1, max = 600, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
     private String czwt;
 
     @ApiModelProperty(value = "提交状态")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJceb.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -51,7 +51,7 @@ public class BusJceb extends BaseEntity{
 
     @ApiModelProperty(value = "检查日期")
     @JsonFormat(pattern="yyyy-MM-dd")
-    private Date operationDate;
+    private LocalDate operationDate;
 
     @ApiModelProperty(value = "检测人")
     @Length(min = 1, max = 255, message = "【检测人】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebJddz.java

@@ -23,7 +23,7 @@ public class BusJcebJddz extends BusJceb{
     private String pillarCode;
 
     @ApiModelProperty(value = "设备名称")
-    @Length(min = 1, max = 30, message = "【设备名称】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 30, message = "【设备名称】长度必须介于 {min} 和 {max} 之间")
     private String sbmc;
 
     @ApiModelProperty(value = "最大允许电阻")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebLbjghjl.java

@@ -19,15 +19,15 @@ public class BusJcebLbjghjl extends BusJceb{
     private String dd;
 
     @ApiModelProperty(value = "更换前名称")
-    @Length(min = 1, max = 20, message = "【更换前名称】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 20, message = "【更换前名称】长度必须介于 {min} 和 {max} 之间")
     private String ghqMc;
 
     @ApiModelProperty(value = "更换前规格型号")
-    @Length(min = 1, max = 20, message = "【更换前规格型号】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 20, message = "【更换前规格型号】长度必须介于 {min} 和 {max} 之间")
     private String ghqGgxh;
 
     @ApiModelProperty(value = "更换前生产厂家")
-    @Length(min = 1, max = 20, message = "【更换前生产厂家】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 20, message = "【更换前生产厂家】长度必须介于 {min} 和 {max} 之间")
     private String ghqSccj;
 
     @ApiModelProperty(value = "更换后名称")
@@ -35,11 +35,11 @@ public class BusJcebLbjghjl extends BusJceb{
     private String ghhMc;
 
     @ApiModelProperty(value = "更换后规格型号")
-    @Length(min = 1, max = 20, message = "【更换后规格型号】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 20, message = "【更换后规格型号】长度必须介于 {min} 和 {max} 之间")
     private String ghhGgxh;
 
     @ApiModelProperty(value = "更换后生产厂家")
-    @Length(min = 1, max = 20, message = "【更换后生产厂家】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 20, message = "【更换后生产厂家】长度必须介于 {min} 和 {max} 之间")
     private String ghhSccj;
 
     @ApiModelProperty(value = "更换原因")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJlgz.java

@@ -54,11 +54,11 @@ public class BusJlgz extends BaseEntity{
     private String yylxText;
 
     @ApiModelProperty(value = "记录日期")
-    @Length(min = 1, max = 100, message = "【记录日期】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 100, message = "【记录日期】长度必须介于 {min} 和 {max} 之间")
     private String operationDate;
 
     @ApiModelProperty(value = "故障描述")
-    @Length(min = 1, max = 1000, message = "【故障描述】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1000, message = "【故障描述】长度必须介于 {min} 和 {max} 之间")
     private String gzms;
 
     @ApiModelProperty(value = "del_flag")

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbBlqMapper;
 import com.railway.business.catenary.service.IBusJcbBlqService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import java.util.Date;
@@ -35,7 +36,12 @@ public class BusJcbBlqServiceImpl implements IBusJcbBlqService {
   @Transactional(rollbackFor = Exception.class)
   public int create(BusJcbBlq busJcbBlq) {
     busJcbBlq.setCreateTime(new Date());
+    busJcbBlq.setUpdateTime(new Date());
     busJcbBlq.setCreateBy(SecurityUtils.getUsername());
+    busJcbBlq.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+    if (StringUtils.isBlank(busJcbBlq.getSubmitState())) {
+      busJcbBlq.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+    }
     return busJcbBlqMapper.insert(busJcbBlq);
   }
 
@@ -112,9 +118,8 @@ public class BusJcbBlqServiceImpl implements IBusJcbBlqService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int reject(BusJcbBlq busJcbBlq) {
-    busJcbBlq.setUpdateTime(new Date());
     busJcbBlq.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-    return busJcbBlqMapper.update(busJcbBlq);
+    return update(busJcbBlq);
   }
 
   /**
@@ -125,10 +130,8 @@ public class BusJcbBlqServiceImpl implements IBusJcbBlqService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int confirm(BusJcbBlq busJcbBlq) {
-    busJcbBlq.setUpdateTime(new Date());
     busJcbBlq.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    return busJcbBlqMapper.update(busJcbBlq);
+    return update(busJcbBlq);
   }
 
-
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -4,6 +4,7 @@ import com.railway.business.catenary.domain.BusJcbDmcgyq;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbDmcgyqMapper;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
@@ -24,8 +25,7 @@ public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService {
 
   private final BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 
-  public BusJcbDmcgyqServiceImpl(
-      BusJcbDmcgyqMapper busJcbDmcgyqMapper) {
+  public BusJcbDmcgyqServiceImpl(BusJcbDmcgyqMapper busJcbDmcgyqMapper) {
     this.busJcbDmcgyqMapper = busJcbDmcgyqMapper;
   }
 
@@ -37,7 +37,12 @@ public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService {
   public int create(BusJcbDmcgyq busJcbDmcgyq) {
     busJcbDmcgyq.setUserId(SecurityUtils.getUserId());
     busJcbDmcgyq.setCreateTime(new Date());
+    busJcbDmcgyq.setUpdateTime(new Date());
     busJcbDmcgyq.setCreateBy(SecurityUtils.getUsername());
+    busJcbDmcgyq.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+    if (StringUtils.isBlank(busJcbDmcgyq.getSubmitState())) {
+      busJcbDmcgyq.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+    }
     return busJcbDmcgyqMapper.insert(busJcbDmcgyq);
   }
 
@@ -110,10 +115,8 @@ public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int reject(BusJcbDmcgyq busJcbDmcgyq) {
-    busJcbDmcgyq.setUpdateTime(new Date());
-    busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
     busJcbDmcgyq.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-    return busJcbDmcgyqMapper.update(busJcbDmcgyq);
+    return update(busJcbDmcgyq);
   }
 
   /**
@@ -122,10 +125,8 @@ public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int confirm(BusJcbDmcgyq busJcbDmcgyq) {
-    busJcbDmcgyq.setUpdateTime(new Date());
-    busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
     busJcbDmcgyq.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    return busJcbDmcgyqMapper.update(busJcbDmcgyq);
+    return update(busJcbDmcgyq);
   }
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java

@@ -4,6 +4,7 @@ import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -26,8 +27,7 @@ public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService {
 
   private final BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 
-  public BusJcbFdfxjyqServiceImpl(
-      BusJcbFdfxjyqMapper busJcbFdfxjyqMapper) {
+  public BusJcbFdfxjyqServiceImpl(BusJcbFdfxjyqMapper busJcbFdfxjyqMapper) {
     this.busJcbFdfxjyqMapper = busJcbFdfxjyqMapper;
   }
 
@@ -38,7 +38,12 @@ public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService {
   @Transactional(rollbackFor = Exception.class)
   public int create(BusJcbFdfxjyq busJcbFdfxjyq) {
     busJcbFdfxjyq.setCreateTime(new Date());
+    busJcbFdfxjyq.setUpdateTime(new Date());
     busJcbFdfxjyq.setCreateBy(SecurityUtils.getUsername());
+    busJcbFdfxjyq.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+    if (StringUtils.isBlank(busJcbFdfxjyq.getSubmitState())) {
+      busJcbFdfxjyq.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+    }
     return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
   }
 
@@ -116,9 +121,8 @@ public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int reject(BusJcbFdfxjyq busJcbFdfxjyq) {
-    busJcbFdfxjyq.setUpdateTime(new Date());
     busJcbFdfxjyq.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-    return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+    return update(busJcbFdfxjyq);
   }
 
   /**
@@ -129,9 +133,8 @@ public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int confirm(BusJcbFdfxjyq busJcbFdfxjyq) {
-    busJcbFdfxjyq.setUpdateTime(new Date());
     busJcbFdfxjyq.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+    return update(busJcbFdfxjyq);
   }
 
 }

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

@@ -39,13 +39,12 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 		if (StringUtils.isBlank(busJcbGlkg.getSubmitState())) {
 			busJcbGlkg.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
 		}
-
 		return busJcbGlkgMapper.insert(busJcbGlkg);
 	}
 
 	/**
 	 * 提交
-	 * @param busJcbGlkg
+	 * @param busJcbGlkg 数据对象
 	 * @return 提交结果
 	 */
 	@Override
@@ -61,28 +60,26 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 
 	/**
 	 * 退回
-	 * @param busJcbGlkg
+	 * @param busJcbGlkg 数据对象
 	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcbGlkg busJcbGlkg) {
-		busJcbGlkg.setUpdateTime(new Date());
 		busJcbGlkg.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-		return busJcbGlkgMapper.update(busJcbGlkg);
+		return update(busJcbGlkg);
 	}
 
 	/**
 	 * 确认
-	 * @param busJcbGlkg
+	 * @param busJcbGlkg 数据对象
 	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcbGlkg busJcbGlkg) {
-		busJcbGlkg.setUpdateTime(new Date());
 		busJcbGlkg.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-		return busJcbGlkgMapper.update(busJcbGlkg);
+		return update(busJcbGlkg);
 	}
 
 	/**
@@ -105,8 +102,8 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcbGlkg busJcbGlkg) {
-		Long userID = SecurityUtils.getUserId();
 		busJcbGlkg.setUpdateTime(new Date());
+		busJcbGlkg.setUpdateBy(SecurityUtils.getUsername());
 		return busJcbGlkgMapper.update(busJcbGlkg);
 	}
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java

@@ -4,6 +4,7 @@ import com.railway.business.catenary.domain.BusJcbJcxc;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbJcxcMapper;
 import com.railway.business.catenary.service.IBusJcbJcxcService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
@@ -11,118 +12,120 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+
 /**
-* 检查表-交叉线岔
-* @author zcf
-* @date 2021/10/18
-*/
+ * 检查表-交叉线岔
+ *
+ * @author zcf
+ * @date 2021/10/18
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService{
+public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService {
+
+  private final BusJcbJcxcMapper busJcbJcxcMapper;
 
-	private final BusJcbJcxcMapper busJcbJcxcMapper;
+  public BusJcbJcxcServiceImpl(BusJcbJcxcMapper busJcbJcxcMapper) {
+    this.busJcbJcxcMapper = busJcbJcxcMapper;
+  }
 
-	public BusJcbJcxcServiceImpl(BusJcbJcxcMapper busJcbJcxcMapper) {
-		this.busJcbJcxcMapper = busJcbJcxcMapper;
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcbJcxc busJcbJcxc) {
+    busJcbJcxc.setUserId(SecurityUtils.getUserId());
+    busJcbJcxc.setCreateTime(new Date());
+    busJcbJcxc.setCreateBy(SecurityUtils.getUsername());
+    busJcbJcxc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+    if (StringUtils.isBlank(busJcbJcxc.getSubmitState())) {
+      busJcbJcxc.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+    }
+    return busJcbJcxcMapper.insert(busJcbJcxc);
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcbJcxc busJcbJcxc) {
-		busJcbJcxc.setUserId(SecurityUtils.getUserId());
-	    busJcbJcxc.setCreateTime(new Date());
-        busJcbJcxc.setCreateBy(SecurityUtils.getUsername());
-		return busJcbJcxcMapper.insert(busJcbJcxc);
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcbJcxcMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcbJcxcMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcbJcxc busJcbJcxc) {
+    busJcbJcxc.setUpdateTime(new Date());
+    busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
+    return busJcbJcxcMapper.update(busJcbJcxc);
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcbJcxc busJcbJcxc) {
-		busJcbJcxc.setUpdateTime(new Date());
-    	busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
-		return busJcbJcxcMapper.update(busJcbJcxc);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcbJcxc getInfo(String id) {
+    return busJcbJcxcMapper.getInfo(id);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcbJcxc getInfo(String id) {
-		return busJcbJcxcMapper.getInfo(id);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcbJcxc> getList(BusJcbJcxc busJcbJcxc) {
+    return busJcbJcxcMapper.getList(busJcbJcxc);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcbJcxc> getList(BusJcbJcxc busJcbJcxc) {
-		return busJcbJcxcMapper.getList(busJcbJcxc);
-	}
+  /**
+   * 获取上次检查记录
+   */
+  @Override
+  public BusJcbJcxc getLastRecord() {
+    return busJcbJcxcMapper.getLastRecord(SecurityUtils.getUserId());
+  }
 
-	/**
-	 * 获取上次检查记录
-	 */
-	@Override
-	public BusJcbJcxc getLastRecord() {
-		return busJcbJcxcMapper.getLastRecord(SecurityUtils.getUserId());
-	}
+  /**
+   * 提交
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int submit(BusJcbJcxc busJcbJcxc) {
+    busJcbJcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+    if (StringUtils.isEmpty(busJcbJcxc.getId())) {
+      return create(busJcbJcxc);
+    } else {
+      return update(busJcbJcxc);
+    }
+  }
 
-	/**
-	 * 提交
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcbJcxc busJcbJcxc) {
-		busJcbJcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-		if(StringUtils.isEmpty(busJcbJcxc.getId())){
-			return create(busJcbJcxc);
-		}else {
-			return update(busJcbJcxc);
-		}
-	}
+  /**
+   * 退回
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int reject(BusJcbJcxc busJcbJcxc) {
+    busJcbJcxc.setSubmitState(JcebStatusEnum.RETURNED.getCode());
+    return update(busJcbJcxc);
+  }
 
-	/**
-	 * 退回
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcbJcxc busJcbJcxc) {
-		busJcbJcxc.setUpdateTime(new Date());
-		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbJcxc.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-		return busJcbJcxcMapper.update(busJcbJcxc);
-	}
+  /**
+   * 确认
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int confirm(BusJcbJcxc busJcbJcxc) {
+    busJcbJcxc.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+    return update(busJcbJcxc);
+  }
 
-	/**
-	 * 确认
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcbJcxc busJcbJcxc) {
-		busJcbJcxc.setUpdateTime(new Date());
-		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbJcxc.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-		return busJcbJcxcMapper.update(busJcbJcxc);
-	}
-	
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -4,123 +4,130 @@ import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbWjcxcMapper;
 import com.railway.business.catenary.domain.BusJcbWjcxc;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 import java.util.Date;
+
 /**
-* 检查表-无交叉线岔
-* @author zcf
-* @date 2021/10/19
-*/
+ * 检查表-无交叉线岔
+ *
+ * @author zcf
+ * @date 2021/10/19
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService{
+public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService {
 
-	private final BusJcbWjcxcMapper busJcbWjcxcMapper;
+  private final BusJcbWjcxcMapper busJcbWjcxcMapper;
 
-	public BusJcbWjcxcServiceImpl(BusJcbWjcxcMapper busJcbWjcxcMapper) {
-		this.busJcbWjcxcMapper = busJcbWjcxcMapper;
-	}
+  public BusJcbWjcxcServiceImpl(BusJcbWjcxcMapper busJcbWjcxcMapper) {
+    this.busJcbWjcxcMapper = busJcbWjcxcMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcbWjcxc busJcbWjcxc) {
-		busJcbWjcxc.setUserId(SecurityUtils.getUserId());
-	    busJcbWjcxc.setCreateTime(new Date());
-        busJcbWjcxc.setCreateBy(SecurityUtils.getUsername());
-		return busJcbWjcxcMapper.insert(busJcbWjcxc);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcbWjcxc busJcbWjcxc) {
+    busJcbWjcxc.setUserId(SecurityUtils.getUserId());
+    busJcbWjcxc.setCreateTime(new Date());
+    busJcbWjcxc.setCreateBy(SecurityUtils.getUsername());
+    busJcbWjcxc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+    if (StringUtils.isBlank(busJcbWjcxc.getSubmitState())) {
+      busJcbWjcxc.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+    }
+    return busJcbWjcxcMapper.insert(busJcbWjcxc);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcbWjcxcMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcbWjcxcMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcbWjcxc busJcbWjcxc) {
-		busJcbWjcxc.setUpdateTime(new Date());
-    	busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		return busJcbWjcxcMapper.update(busJcbWjcxc);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcbWjcxc busJcbWjcxc) {
+    busJcbWjcxc.setUpdateTime(new Date());
+    busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+    return busJcbWjcxcMapper.update(busJcbWjcxc);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcbWjcxc getInfo(String id) {
-		return busJcbWjcxcMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcbWjcxc getInfo(String id) {
+    return busJcbWjcxcMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcbWjcxc> getList(BusJcbWjcxc busJcbWjcxc) {
-		return busJcbWjcxcMapper.getList(busJcbWjcxc);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcbWjcxc> getList(BusJcbWjcxc busJcbWjcxc) {
+    return busJcbWjcxcMapper.getList(busJcbWjcxc);
+  }
 
-	/**
-	 * 获取上次检查记录
-	 */
-	@Override
-	public BusJcbWjcxc getLastRecord() {
-		return busJcbWjcxcMapper.getLastRecord(SecurityUtils.getUserId());
-	}
+  /**
+   * 获取上次检查记录
+   */
+  @Override
+  public BusJcbWjcxc getLastRecord() {
+    return busJcbWjcxcMapper.getLastRecord(SecurityUtils.getUserId());
+  }
 
-	/**
-	 * 提交
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcbWjcxc busJcbWjcxc) {
-		busJcbWjcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-		if(StringUtils.isEmpty(busJcbWjcxc.getId())){
-			return create(busJcbWjcxc);
-		}else {
-			return update(busJcbWjcxc);
-		}
-	}
+  /**
+   * 提交
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int submit(BusJcbWjcxc busJcbWjcxc) {
+    busJcbWjcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+    if (StringUtils.isEmpty(busJcbWjcxc.getId())) {
+      return create(busJcbWjcxc);
+    } else {
+      return update(busJcbWjcxc);
+    }
+  }
 
-	/**
-	 * 退回
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcbWjcxc busJcbWjcxc) {
-		busJcbWjcxc.setUpdateTime(new Date());
-		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbWjcxc.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-		return busJcbWjcxcMapper.update(busJcbWjcxc);
-	}
+  /**
+   * 退回
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int reject(BusJcbWjcxc busJcbWjcxc) {
+    busJcbWjcxc.setUpdateTime(new Date());
+    busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+    busJcbWjcxc.setSubmitState(JcebStatusEnum.RETURNED.getCode());
+    return busJcbWjcxcMapper.update(busJcbWjcxc);
+  }
 
-	/**
-	 * 确认
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcbWjcxc busJcbWjcxc) {
-		busJcbWjcxc.setUpdateTime(new Date());
-		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbWjcxc.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-		return busJcbWjcxcMapper.update(busJcbWjcxc);
-	}
+  /**
+   * 确认
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int confirm(BusJcbWjcxc busJcbWjcxc) {
+    busJcbWjcxc.setUpdateTime(new Date());
+    busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+    busJcbWjcxc.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+    return busJcbWjcxcMapper.update(busJcbWjcxc);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java

@@ -34,8 +34,7 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int create(BusJcebGjsfx busJcebGjsfx) {
-    busJcebGjsfx.setCreateTime(new Date());
-    busJcebGjsfx.setCreateBy(SecurityUtils.getUsername());
+    setCreate(busJcebGjsfx);
     return busJcebGjsfxMapper.insert(busJcebGjsfx);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJddzServiceImpl.java

@@ -32,9 +32,7 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int create(BusJcebJddz busJcebJddz) {
-    busJcebJddz.setCreateTime(new Date());
-    busJcebJddz.setCreateBy(SecurityUtils.getUsername());
-    busJcebJddz.setUserId(SecurityUtils.getUserId());
+    setCreate(busJcebJddz);
     return busJcebJddzMapper.insert(busJcebJddz);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java

@@ -9,109 +9,110 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 /**
-* 检测表-绝缘子清扫记录
-* @author author
-* @date 2021/10/21
-*/
+ * 检测表-绝缘子清扫记录
+ *
+ * @author author
+ * @date 2021/10/21
+ */
 @Service
 @Transactional(readOnly = true)
 public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl>
-		implements IBusJcebJyzqsjlService{
+    implements IBusJcebJyzqsjlService {
 
-	private final BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
+  private final BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 
-	public BusJcebJyzqsjlServiceImpl(BusJcebJyzqsjlMapper busJcebJyzqsjlMapper) {
-		super(busJcebJyzqsjlMapper);
-		this.busJcebJyzqsjlMapper = busJcebJyzqsjlMapper;
-	}
+  public BusJcebJyzqsjlServiceImpl(BusJcebJyzqsjlMapper busJcebJyzqsjlMapper) {
+    super(busJcebJyzqsjlMapper);
+    this.busJcebJyzqsjlMapper = busJcebJyzqsjlMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcebJyzqsjl busJcebJyzqsjl) {
-	    busJcebJyzqsjl.setCreateTime(new Date());
-        busJcebJyzqsjl.setCreateBy(SecurityUtils.getUsername());
-		return busJcebJyzqsjlMapper.insert(busJcebJyzqsjl);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcebJyzqsjl busJcebJyzqsjl) {
+    setCreate(busJcebJyzqsjl);
+    return busJcebJyzqsjlMapper.insert(busJcebJyzqsjl);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcebJyzqsjlMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcebJyzqsjlMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcebJyzqsjl busJcebJyzqsjl) {
-		busJcebJyzqsjl.setUpdateTime(new Date());
-    	busJcebJyzqsjl.setUpdateBy(SecurityUtils.getUsername());
-		return busJcebJyzqsjlMapper.update(busJcebJyzqsjl);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcebJyzqsjl busJcebJyzqsjl) {
+    busJcebJyzqsjl.setUpdateTime(new Date());
+    busJcebJyzqsjl.setUpdateBy(SecurityUtils.getUsername());
+    return busJcebJyzqsjlMapper.update(busJcebJyzqsjl);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcebJyzqsjl getInfo(String id) {
-		return busJcebJyzqsjlMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcebJyzqsjl getInfo(String id) {
+    return busJcebJyzqsjlMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcebJyzqsjl> getList(BusJcebJyzqsjl busJcebJyzqsjl) {
-		return busJcebJyzqsjlMapper.getList(busJcebJyzqsjl);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcebJyzqsjl> getList(BusJcebJyzqsjl busJcebJyzqsjl) {
+    return busJcebJyzqsjlMapper.getList(busJcebJyzqsjl);
+  }
 
-	/**
-	 * 提交
-	 *
-	 * @return 提交结果
-	 */
-	@Override
-	public int submit(BusJcebJyzqsjl busJcebJyzqsjl) {
-		setSubmit(busJcebJyzqsjl);
-		if(StringUtils.isEmpty(busJcebJyzqsjl.getId())){
-			return create(busJcebJyzqsjl);
-		} else {
-			return update(busJcebJyzqsjl);
-		}
-	}
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  public int submit(BusJcebJyzqsjl busJcebJyzqsjl) {
+    setSubmit(busJcebJyzqsjl);
+    if (StringUtils.isEmpty(busJcebJyzqsjl.getId())) {
+      return create(busJcebJyzqsjl);
+    } else {
+      return update(busJcebJyzqsjl);
+    }
+  }
 
-	/**
-	 * 退回
-	 *
-	 * @return 退回结果
-	 */
-	@Override
-	public int reject(BusJcebJyzqsjl busJcebJyzqsjl) {
-		setReject(busJcebJyzqsjl);
-		return update(busJcebJyzqsjl);
-	}
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  public int reject(BusJcebJyzqsjl busJcebJyzqsjl) {
+    setReject(busJcebJyzqsjl);
+    return update(busJcebJyzqsjl);
+  }
 
-	/**
-	 * 确认
-	 *
-	 * @return 确认结果
-	 */
-	@Override
-	public int confirm(BusJcebJyzqsjl busJcebJyzqsjl) {
-		setConfirm(busJcebJyzqsjl);
-		return update(busJcebJyzqsjl);
-	}
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  public int confirm(BusJcebJyzqsjl busJcebJyzqsjl) {
+    setConfirm(busJcebJyzqsjl);
+    return update(busJcebJyzqsjl);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java

@@ -11,113 +11,110 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 /**
-* 检测表-零部件更换记录
-* @author author
-* @date 2021/10/19
-*/
+ * 检测表-零部件更换记录
+ *
+ * @author author
+ * @date 2021/10/19
+ */
 @Service
 @Transactional(readOnly = true)
 public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl>
-		implements IBusJcebLbjghjlService {
+    implements IBusJcebLbjghjlService {
 
-	private final BusJcebLbjghjlMapper busJcebLbjghjlMapper;
+  private final BusJcebLbjghjlMapper busJcebLbjghjlMapper;
 
-	public BusJcebLbjghjlServiceImpl(BusJcebLbjghjlMapper busJcebLbjghjlMapper) {
-		super(busJcebLbjghjlMapper);
-		this.busJcebLbjghjlMapper = busJcebLbjghjlMapper;
-	}
+  public BusJcebLbjghjlServiceImpl(BusJcebLbjghjlMapper busJcebLbjghjlMapper) {
+    super(busJcebLbjghjlMapper);
+    this.busJcebLbjghjlMapper = busJcebLbjghjlMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcebLbjghjl busJcebLbjghjl) {
-	    busJcebLbjghjl.setCreateTime(new Date());
-        busJcebLbjghjl.setCreateBy(SecurityUtils.getUsername());
-		busJcebLbjghjl.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
-		if (StringUtils.isBlank(busJcebLbjghjl.getSubmitState())) {
-			busJcebLbjghjl.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
-		}
-		return busJcebLbjghjlMapper.insert(busJcebLbjghjl);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcebLbjghjl busJcebLbjghjl) {
+    setCreate(busJcebLbjghjl);
+    return busJcebLbjghjlMapper.insert(busJcebLbjghjl);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcebLbjghjlMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcebLbjghjlMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcebLbjghjl busJcebLbjghjl) {
-		busJcebLbjghjl.setUpdateTime(new Date());
-    	busJcebLbjghjl.setUpdateBy(SecurityUtils.getUsername());
-		return busJcebLbjghjlMapper.update(busJcebLbjghjl);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcebLbjghjl busJcebLbjghjl) {
+    busJcebLbjghjl.setUpdateTime(new Date());
+    busJcebLbjghjl.setUpdateBy(SecurityUtils.getUsername());
+    return busJcebLbjghjlMapper.update(busJcebLbjghjl);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcebLbjghjl getInfo(String id) {
-		return busJcebLbjghjlMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcebLbjghjl getInfo(String id) {
+    return busJcebLbjghjlMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcebLbjghjl> getList(BusJcebLbjghjl busJcebLbjghjl) {
-		return busJcebLbjghjlMapper.getList(busJcebLbjghjl);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcebLbjghjl> getList(BusJcebLbjghjl busJcebLbjghjl) {
+    return busJcebLbjghjlMapper.getList(busJcebLbjghjl);
+  }
 
-	/**
-	 * 提交
-	 *
-	 * @return 提交结果
-	 */
-	@Override
-	public int submit(BusJcebLbjghjl busJcebLbjghjl) {
-		setSubmit(busJcebLbjghjl);
-		if(StringUtils.isEmpty(busJcebLbjghjl.getId())){
-			return create(busJcebLbjghjl);
-		} else {
-			return update(busJcebLbjghjl);
-		}
-	}
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  public int submit(BusJcebLbjghjl busJcebLbjghjl) {
+    setSubmit(busJcebLbjghjl);
+    if (StringUtils.isEmpty(busJcebLbjghjl.getId())) {
+      return create(busJcebLbjghjl);
+    } else {
+      return update(busJcebLbjghjl);
+    }
+  }
 
-	/**
-	 * 退回
-	 *
-	 * @return 退回结果
-	 */
-	@Override
-	public int reject(BusJcebLbjghjl busJcebLbjghjl) {
-		setReject(busJcebLbjghjl);
-		return update(busJcebLbjghjl);
-	}
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  public int reject(BusJcebLbjghjl busJcebLbjghjl) {
+    setReject(busJcebLbjghjl);
+    return update(busJcebLbjghjl);
+  }
 
-	/**
-	 * 确认
-	 *
-	 * @return 确认结果
-	 */
-	@Override
-	public int confirm(BusJcebLbjghjl busJcebLbjghjl) {
-		setConfirm(busJcebLbjghjl);
-		return update(busJcebLbjghjl);
-	}
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  public int confirm(BusJcebLbjghjl busJcebLbjghjl) {
+    setConfirm(busJcebLbjghjl);
+    return update(busJcebLbjghjl);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java

@@ -11,113 +11,110 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 /**
-* 检测表-全面检查记录
-* @author author
-* @date 2021/10/19
-*/
+ * 检测表-全面检查记录
+ *
+ * @author author
+ * @date 2021/10/19
+ */
 @Service
 @Transactional(readOnly = true)
 public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
-		implements IBusJcebQmjcjlService {
+    implements IBusJcebQmjcjlService {
 
-	private final BusJcebQmjcjlMapper busJcebQmjcjlMapper;
+  private final BusJcebQmjcjlMapper busJcebQmjcjlMapper;
 
-	public BusJcebQmjcjlServiceImpl(BusJcebQmjcjlMapper busJcebQmjcjlMapper) {
-		super(busJcebQmjcjlMapper);
-		this.busJcebQmjcjlMapper = busJcebQmjcjlMapper;
-	}
+  public BusJcebQmjcjlServiceImpl(BusJcebQmjcjlMapper busJcebQmjcjlMapper) {
+    super(busJcebQmjcjlMapper);
+    this.busJcebQmjcjlMapper = busJcebQmjcjlMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcebQmjcjl busJcebQmjcjl) {
-	    busJcebQmjcjl.setCreateTime(new Date());
-        busJcebQmjcjl.setCreateBy(SecurityUtils.getUsername());
-		busJcebQmjcjl.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
-		if (StringUtils.isBlank(busJcebQmjcjl.getSubmitState())) {
-			busJcebQmjcjl.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
-		}
-		return busJcebQmjcjlMapper.insert(busJcebQmjcjl);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcebQmjcjl busJcebQmjcjl) {
+    setCreate(busJcebQmjcjl);
+    return busJcebQmjcjlMapper.insert(busJcebQmjcjl);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcebQmjcjlMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcebQmjcjlMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcebQmjcjl busJcebQmjcjl) {
-		busJcebQmjcjl.setUpdateTime(new Date());
-    	busJcebQmjcjl.setUpdateBy(SecurityUtils.getUsername());
-		return busJcebQmjcjlMapper.update(busJcebQmjcjl);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcebQmjcjl busJcebQmjcjl) {
+    busJcebQmjcjl.setUpdateTime(new Date());
+    busJcebQmjcjl.setUpdateBy(SecurityUtils.getUsername());
+    return busJcebQmjcjlMapper.update(busJcebQmjcjl);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcebQmjcjl getInfo(String id) {
-		return busJcebQmjcjlMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcebQmjcjl getInfo(String id) {
+    return busJcebQmjcjlMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcebQmjcjl> getList(BusJcebQmjcjl busJcebQmjcjl) {
-		return busJcebQmjcjlMapper.getList(busJcebQmjcjl);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcebQmjcjl> getList(BusJcebQmjcjl busJcebQmjcjl) {
+    return busJcebQmjcjlMapper.getList(busJcebQmjcjl);
+  }
 
-	/**
-	 * 提交
-	 *
-	 * @return 提交结果
-	 */
-	@Override
-	public int submit(BusJcebQmjcjl busJcebQmjcjl) {
-		setSubmit(busJcebQmjcjl);
-		if(StringUtils.isEmpty(busJcebQmjcjl.getId())){
-			return create(busJcebQmjcjl);
-		} else {
-			return update(busJcebQmjcjl);
-		}
-	}
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  public int submit(BusJcebQmjcjl busJcebQmjcjl) {
+    setSubmit(busJcebQmjcjl);
+    if (StringUtils.isEmpty(busJcebQmjcjl.getId())) {
+      return create(busJcebQmjcjl);
+    } else {
+      return update(busJcebQmjcjl);
+    }
+  }
 
-	/**
-	 * 退回
-	 *
-	 * @return 退回结果
-	 */
-	@Override
-	public int reject(BusJcebQmjcjl busJcebQmjcjl) {
-		setReject(busJcebQmjcjl);
-		return update(busJcebQmjcjl);
-	}
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  public int reject(BusJcebQmjcjl busJcebQmjcjl) {
+    setReject(busJcebQmjcjl);
+    return update(busJcebQmjcjl);
+  }
 
-	/**
-	 * 确认
-	 *
-	 * @return 确认结果
-	 */
-	@Override
-	public int confirm(BusJcebQmjcjl busJcebQmjcjl) {
-		setConfirm(busJcebQmjcjl);
-		return update(busJcebQmjcjl);
-	}
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  public int confirm(BusJcebQmjcjl busJcebQmjcjl) {
+    setConfirm(busJcebQmjcjl);
+    return update(busJcebQmjcjl);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -7,6 +7,10 @@ import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebMapper;
 import com.railway.business.catenary.service.IBusJcebService;
+import com.railway.common.enums.DelFlagEnum;
+import com.railway.common.utils.SecurityUtils;
+import com.railway.common.utils.StringUtils;
+import java.util.Date;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,6 +58,18 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 		return busJcebMapper.getCountByType(query);
 	}
 
+	/**
+	 * 提交
+	 */
+	protected void setCreate(BusJceb jceb) {
+		if (StringUtils.isBlank(jceb.getSubmitState())) {
+			jceb.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+		}
+		jceb.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+		jceb.setCreateTime(new Date());
+		jceb.setCreateBy(SecurityUtils.getUsername());
+	}
+
 	/**
 	 * 提交
 	 */

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java

@@ -33,8 +33,7 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
   @Transactional(rollbackFor = Exception.class)
   public int create(BusJcebXsjcjl busJcebXsjcjl) {
     busJcebXsjcjl.setUserId(SecurityUtils.getUserId());
-    busJcebXsjcjl.setCreateTime(new Date());
-    busJcebXsjcjl.setCreateBy(SecurityUtils.getUsername());
+    setCreate(busJcebXsjcjl);
     return busJcebXsjcjlMapper.insert(busJcebXsjcjl);
   }