【ADD】检测表汇总接口

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java

@@ -0,0 +1,93 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.enums.JcebTypeEnum;
+import com.railway.business.catenary.service.IBusJcebGjsfxService;
+import com.railway.business.catenary.service.IBusJcebJddzService;
+import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
+import com.railway.business.catenary.service.IBusJcebLbjghjlService;
+import com.railway.business.catenary.service.IBusJcebQmjcjlService;
+import com.railway.business.catenary.service.IBusJcebXsjcjlService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhangcaifeng
+ */
+@Api(value = "rest/catenary/bus/jceb/xsjcjl", tags = "检测表 - 汇总接口")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jceb/view")
+public class BusJcebController extends BaseController {
+
+  private final IBusJcebXsjcjlService xsjcjlService;
+  private final IBusJcebQmjcjlService qmjcjlService;
+  private final IBusJcebLbjghjlService lbjghjlService;
+  private final IBusJcebJyzqsjlService jyzqsjlService;
+  private final IBusJcebJddzService jddzService;
+  private final IBusJcebGjsfxService gjsfxService;
+
+  public BusJcebController(
+      IBusJcebXsjcjlService xsjcjlService,
+      IBusJcebQmjcjlService qmjcjlService,
+      IBusJcebLbjghjlService lbjghjlService,
+      IBusJcebJyzqsjlService jyzqsjlService,
+      IBusJcebJddzService jddzService,
+      IBusJcebGjsfxService gjsfxService) {
+    this.xsjcjlService = xsjcjlService;
+    this.qmjcjlService = qmjcjlService;
+    this.lbjghjlService = lbjghjlService;
+    this.jyzqsjlService = jyzqsjlService;
+    this.jddzService = jddzService;
+    this.gjsfxService = gjsfxService;
+  }
+
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "listByType")
+  public TableDataInfo listByType(JcebQueryVo query) {
+    startPage();
+    JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
+    List<JcebRecordVo> list = null;
+    switch (jcebTypeEnum){
+      case Jddz:
+        list = jddzService.getList(query);
+        break;
+      case Gjsfx:
+        list = gjsfxService.getList(query);
+        break;
+      case Qmjcjl:
+        list = qmjcjlService.getList(query);
+        break;
+      case Xsjcjl:
+        list = xsjcjlService.getList(query);
+        break;
+      case Jyzqsjl:
+        list = jyzqsjlService.getList(query);
+        break;
+      case Lbjghjl:
+        list = lbjghjlService.getList(query);
+        break;
+      default:
+        break;
+    }
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "listAll")
+  public TableDataInfo listAll(JcebQueryVo query) {
+    startPage();
+    List<JcebRecordVo> list = qmjcjlService.getList(query);
+    return getDataTable(list);
+  }
+
+}

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

@@ -0,0 +1,64 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 检测表-关节式分相 
+ * @author zhaomn
+ */
+@Data
+@ApiModel("检测表 -  ")
+@EqualsAndHashCode(callSuper = true)
+public class BusJceb extends BaseEntity{
+
+    @ApiModelProperty(value = "主键", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "所属部门")
+    private String deptName;
+
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
+
+    @ApiModelProperty(value = "线别")
+    private String lineName;
+
+    @ApiModelProperty(value = "站/区间名称")
+    private String stationName;
+
+    @ApiModelProperty(value = "站/区间ID")
+    private String stationId;
+
+    @ApiModelProperty(value = "行别")
+    @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+    private String xingbie;
+
+    @ApiModelProperty(value = "检查日期")
+    private Date operationDate;
+
+    @ApiModelProperty(value = "检测人")
+    @Length(min = 1, max = 255, message = "【检测人】长度必须介于 {min} 和 {max} 之间")
+    private String operator;
+
+    @ApiModelProperty(value = "备注")
+    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
+    private String remark;
+
+    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
+    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
+    private String submitState;
+
+    @ApiModelProperty(value = "del_flag")
+    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    private String delFlag;
+
+}

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

@@ -1,9 +1,7 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -14,23 +12,11 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @ApiModel("检测表-关节式分相 ")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcebGjsfx extends BaseEntity{
+public class BusJcebGjsfx extends BusJceb{
 
     @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "站/区间ID")
-    private String stationId;
-
     @ApiModelProperty(value = "支柱号起点")
     @Length(min = 1, max = 50, message = "【支柱号起点】长度必须介于 {min} 和 {max} 之间")
     private String pillarStart;
@@ -39,9 +25,6 @@ public class BusJcebGjsfx extends BaseEntity{
     @Length(min = 1, max = 50, message = "【支柱号结束】长度必须介于 {min} 和 {max} 之间")
     private String pillarEnd;
 
-    @ApiModelProperty(value = "检查日期")
-    private Date operationDate;
-
     @ApiModelProperty(value = "承力索/接触线两锚段接触悬挂间水平距离（mm）-转换柱1")
     @Length(min = 1, max = 50, message = "【承力索/接触线两锚段接触悬挂间水平距离（mm）-转换柱1】长度必须介于 {min} 和 {max} 之间")
     private String lmdjcspjlZhz1;
@@ -94,31 +77,4 @@ public class BusJcebGjsfx extends BaseEntity{
     @Length(min = 1, max = 255, message = "【下锚支接触线垂直投影与钢轨交叉处抬高（mm）】长度必须介于 {min} 和 {max} 之间")
     private String xmzjcxcztyyggjcctg;
 
-    @ApiModelProperty(value = "检测人")
-    @Length(min = 1, max = 255, message = "【检测人】长度必须介于 {min} 和 {max} 之间")
-    private String operator;
-
-    @ApiModelProperty(value = "备注")
-    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    private String remark;
-
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
-
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
 }

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

@@ -1,9 +1,7 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -14,36 +12,12 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @ApiModel("检测表-接地电阻")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcebJddz extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
-
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "线别ID")
-    private String lineId;
-
-    @ApiModelProperty(value = "线别")
-    private String lineName;
-
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "站/区间ID")
-    private String stationId;
+public class BusJcebJddz extends BusJceb{
 
     @ApiModelProperty(value = "锚段号")
     @Length(min = 1, max = 20, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
     private String mdh;
 
-    @ApiModelProperty(value = "测量日期")
-    private Date operationDate;
-
     @ApiModelProperty(value = "支柱(或悬挂点号)")
     @Length(min = 1, max = 20, message = "【支柱(或悬挂点号)】长度必须介于 {min} 和 {max} 之间")
     private String pillarCode;
@@ -62,34 +36,7 @@ public class BusJcebJddz extends BaseEntity{
     @Length(min = 1, max = 1, message = "【是否合格】长度必须介于 {min} 和 {max} 之间")
     private String sfhg;
 
-    @ApiModelProperty(value = "测试人")
-    @Length(min = 1, max = 20, message = "【测试人】长度必须介于 {min} 和 {max} 之间")
-    private String operator;
-
-    @ApiModelProperty(value = "备注")
-    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    private String remark;
-
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
-
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 100, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 100, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
 }

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

@@ -1,9 +1,7 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -14,41 +12,16 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @ApiModel("检测表-绝缘子清扫记录")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcebJyzqsjl extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
+public class BusJcebJyzqsjl extends BusJceb{
 
     @ApiModelProperty(value = "绝缘部件名称")
     @Length(min = 1, max = 100, message = "【绝缘部件名称】长度必须介于 {min} 和 {max} 之间")
     private String jybjmc;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "线路id")
-    private Long lineId;
-
-    @ApiModelProperty(value = "线别")
-    private String lineName;
-
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "站/区间ID")
-    private String stationId;
-
     @ApiModelProperty(value = "周期")
     @Length(min = 1, max = 10, message = "【周期】长度必须介于 {min} 和 {max} 之间")
     private String zq;
 
-    @ApiModelProperty(value = "行别")
-    @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String xingbie;
-
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
     private String pillarCode;
@@ -56,34 +29,4 @@ public class BusJcebJyzqsjl extends BaseEntity{
     @ApiModelProperty(value = "数量")
     private Integer sl;
 
-    @ApiModelProperty(value = "日期")
-    private Date operationDate;
-
-    @ApiModelProperty(value = "清扫人员")
-    @Length(min = 1, max = 50, message = "【清扫人员】长度必须介于 {min} 和 {max} 之间")
-    private String operator;
-
-    @ApiModelProperty(value = "备注")
-    @Length(min = 1, max = 255, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    private String remark;
-
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
-
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
 }

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

@@ -1,6 +1,5 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,22 +12,7 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @ApiModel("检测表-零部件更换记录")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcebLbjghjl extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
-
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "站/区间ID")
-    private String stationId;
+public class BusJcebLbjghjl extends BusJceb{
 
     @ApiModelProperty(value = "地点")
     @Length(min = 1, max = 20, message = "【地点】长度必须介于 {min} 和 {max} 之间")
@@ -66,20 +50,4 @@ public class BusJcebLbjghjl extends BaseEntity{
     @Length(min = 1, max = 10, message = "【更换时间】长度必须介于 {min} 和 {max} 之间")
     private String ghsj;
 
-    @ApiModelProperty(value = "操作人")
-    @Length(min = 1, max = 20, message = "【操作人】长度必须介于 {min} 和 {max} 之间")
-    private String operator;
-
-    @ApiModelProperty(value = "备注")
-    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    private String remark;
-
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
-
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
 }

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

@@ -1,6 +1,5 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,22 +12,7 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @ApiModel("检测表-全面检查记录")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcebQmjcjl extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
-
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "站/区间ID")
-    private String stationId;
+public class BusJcebQmjcjl extends BusJceb{
 
     @ApiModelProperty(value = "支柱号（或悬挂点）")
     @Length(min = 1, max = 100, message = "【支柱号（或悬挂点）】长度必须介于 {min} 和 {max} 之间")
@@ -70,10 +54,6 @@ public class BusJcebQmjcjl extends BaseEntity{
     @Length(min = 1, max = 20, message = "【设备状态】长度必须介于 {min} 和 {max} 之间")
     private String sbzt;
 
-    @ApiModelProperty(value = "操作人")
-    @Length(min = 1, max = 20, message = "【操作人】长度必须介于 {min} 和 {max} 之间")
-    private String operator;
-
     @ApiModelProperty(value = "工作领导人")
     @Length(min = 1, max = 20, message = "【工作领导人】长度必须介于 {min} 和 {max} 之间")
     private String gzldr;
@@ -82,20 +62,4 @@ public class BusJcebQmjcjl extends BaseEntity{
     @Length(min = 1, max = 20, message = "【验收人】长度必须介于 {min} 和 {max} 之间")
     private String confirmUser;
 
-    @ApiModelProperty(value = "日期")
-    @Length(min = 1, max = 10, message = "【日期】长度必须介于 {min} 和 {max} 之间")
-    private String operationDate;
-
-    @ApiModelProperty(value = "备注")
-    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    private String remark;
-
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
-
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
 }

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

@@ -1,6 +1,5 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -14,25 +13,7 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @ApiModel("检测表-巡视检查记录")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcebXsjcjl extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
-
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
-
-    @ApiModelProperty(value = "站/区间ID")
-    private String stationId;
-
-    @ApiModelProperty(value = "巡视检查日期")
-    private Date checkDate;
+public class BusJcebXsjcjl extends BusJceb{
 
     @ApiModelProperty(value = "巡视检查方式")
     private Integer xsjcfs;
@@ -52,10 +33,6 @@ public class BusJcebXsjcjl extends BaseEntity{
     @ApiModelProperty(value = "要求完成时间")
     private Date yqwcsj;
 
-    @ApiModelProperty(value = "巡视检查人")
-    @Length(min = 1, max = 30, message = "【巡视检查人】长度必须介于 {min} 和 {max} 之间")
-    private String checkUser;
-
     @ApiModelProperty(value = "处理措施 0紧固 1更换")
     @Length(min = 1, max = 1, message = "【处理措施 0紧固 1更换】长度必须介于 {min} 和 {max} 之间")
     private String clcs;
@@ -70,35 +47,12 @@ public class BusJcebXsjcjl extends BaseEntity{
 
     @ApiModelProperty(value = "处理缺陷操作者")
     @Length(min = 1, max = 30, message = "【处理缺陷操作者】长度必须介于 {min} 和 {max} 之间")
-    private String operator;
+    private String clqxczz;
 
     @ApiModelProperty(value = "处理日期")
-    private Date operationDate;
-
-    @ApiModelProperty(value = "备注")
-    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    private String remark;
-
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
-
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 100, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 100, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
+    private Date clrq;
 
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
 }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryVo.java

@@ -0,0 +1,30 @@
+package com.railway.business.catenary.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 检测表查询参数
+ * @author zhaomn
+ */
+@Data
+public class JcebQueryVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "检测表类型")
+    private String jcebType;
+
+    @ApiModelProperty(value = "车间id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "区间站场id")
+    private Long stationId;
+
+    @ApiModelProperty(value = "支柱号")
+    private String pillarCode;
+
+    @ApiModelProperty(value = "记录人/操作人")
+    private String operator;
+}

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebRecordVo.java

@@ -0,0 +1,31 @@
+package com.railway.business.catenary.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 检测表查询参数
+ * @author zhaomn
+ */
+@Data
+public class JcebRecordVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "所属部门")
+    private String deptName;
+
+    @ApiModelProperty(value = "站/区间名称")
+    private String stationName;
+
+    @ApiModelProperty(value = "检测表类型")
+    private String jcebType;
+
+    @ApiModelProperty(value = "记录人/操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "记录日期/操作日期")
+    private Date operationDate;
+}

railway-business/src/main/java/com/railway/business/catenary/enums/TestTableStatusEnum.java → railway-business/src/main/java/com/railway/business/catenary/enums/JcebStatusEnum.java

@@ -5,7 +5,7 @@ package com.railway.business.catenary.enums;
  *
  * @author railway
  */
-public enum TestTableStatusEnum {
+public enum JcebStatusEnum {
   /** 检查表状态 */
   UNREPORTED("0", "未提交"),
   REPORTED("1", "已提交"),
@@ -16,7 +16,7 @@ public enum TestTableStatusEnum {
   private final String code;
   private final String info;
 
-  TestTableStatusEnum(String code, String info) {
+  JcebStatusEnum(String code, String info) {
     this.code = code;
     this.info = info;
   }

railway-business/src/main/java/com/railway/business/catenary/enums/JcebTypeEnum.java

@@ -0,0 +1,42 @@
+package com.railway.business.catenary.enums;
+
+/**
+ * 检测表类型
+ *
+ * @author railway
+ */
+public enum JcebTypeEnum {
+  /** 检测表类型 */
+  Gjsfx("gjsfx", "关节式分相"),
+  Jddz("jddz", "接地电阻"),
+  Jyzqsjl("jyzqsjl", "绝缘子清扫记录"),
+  Lbjghjl("lbjghjl", "零部件更换记录"),
+  Qmjcjl("qmjcjl", "全面检查记录"),
+  Xsjcjl("xsjcjl", "巡视检查记录"),
+  ;
+
+  private final String code;
+  private final String type;
+
+  JcebTypeEnum(String code, String type) {
+    this.code = code;
+    this.type = type;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public static JcebTypeEnum ofValue(String code) {
+    for (JcebTypeEnum investor : JcebTypeEnum.values()) {
+      if (investor.getCode().equals(code)) {
+        return investor;
+      }
+    }
+    return Jddz;
+  }
+}

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebGjsfxMapper.java

@@ -7,37 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 检测表-关节式分相 
-* @author whh
-* @date 2021/10/19
-*/
+ * 检测表-关节式分相
+ *
+ * @author whh
+ * @date 2021/10/19
+ */
 @Mapper
 @Repository
-public interface BusJcebGjsfxMapper {
-
-    /**
-    * 新增
-    */
-    int insert(BusJcebGjsfx busJcebGjsfx);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebGjsfx busJcebGjsfx);
-
-    /**
-    * 获取单个
-    */
-    BusJcebGjsfx getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusJcebGjsfx> getList(BusJcebGjsfx busJcebGjsfx);
+public interface BusJcebGjsfxMapper extends BusJcebMapper<BusJcebGjsfx> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebJddzMapper.java

@@ -7,37 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-*  del_flag char(1) default
-* @author zcf
-* @date 2021/10/24
-*/
+ * del_flag char(1) default
+ *
+ * @author zcf
+ * @date 2021/10/24
+ */
 @Mapper
 @Repository
-public interface BusJcebJddzMapper {
-
-    /**
-    * 新增
-    */
-    int insert(BusJcebJddz busJcebJddz);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebJddz busJcebJddz);
-
-    /**
-    * 获取单个
-    */
-    BusJcebJddz getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusJcebJddz> getList(BusJcebJddz busJcebJddz);
+public interface BusJcebJddzMapper extends BusJcebMapper<BusJcebJddz> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebJyzqsjlMapper.java

@@ -7,37 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 检测表-绝缘子清扫记录
-* @author author
-* @date 2021/10/21
-*/
+ * 检测表-绝缘子清扫记录
+ *
+ * @author author
+ * @date 2021/10/21
+ */
 @Mapper
 @Repository
-public interface BusJcebJyzqsjlMapper {
-
-    /**
-    * 新增
-    */
-    int insert(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebJyzqsjl getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusJcebJyzqsjl> getList(BusJcebJyzqsjl busJcebJyzqsjl);
+public interface BusJcebJyzqsjlMapper extends BusJcebMapper<BusJcebJyzqsjl> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebLbjghjlMapper.java

@@ -7,37 +7,14 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 检测表-零部件更换记录
-* @author author
-* @date 2021/10/19
-*/
+ * 检测表-零部件更换记录
+ *
+ * @author author
+ * @date 2021/10/19
+ */
 @Mapper
 @Repository
-public interface BusJcebLbjghjlMapper {
+public interface BusJcebLbjghjlMapper extends BusJcebMapper<BusJcebLbjghjl> {
 
-    /**
-    * 新增
-    */
-    int insert(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebLbjghjl getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusJcebLbjghjl> getList(BusJcebLbjghjl busJcebLbjghjl);
 
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebMapper.java

@@ -0,0 +1,50 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusJceb;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author zhaomn
+ */
+@Mapper
+@Repository
+public interface BusJcebMapper<T extends BusJceb> {
+
+  /**
+   * 删除
+   */
+  int delete(@Param("id") String id);
+
+  /**
+   * 更新状态
+   *
+   * @return 提交结果
+   */
+  int update(T t);
+
+  /**
+   * 查询列表
+   */
+  Page<JcebRecordVo> getList(JcebQueryVo query);
+
+  /**
+   * 新增
+   */
+  int insert(T t);
+
+  /**
+   * 获取单个
+   */
+  T getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<T> getList(T t);
+
+}

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebQmjcjlMapper.java

@@ -7,37 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 检测表-全面检查记录
-* @author author
-* @date 2021/10/19
-*/
+ * 检测表-全面检查记录
+ *
+ * @author author
+ * @date 2021/10/19
+ */
 @Mapper
 @Repository
-public interface BusJcebQmjcjlMapper {
-
-    /**
-    * 新增
-    */
-    int insert(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebQmjcjl getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusJcebQmjcjl> getList(BusJcebQmjcjl busJcebQmjcjl);
+public interface BusJcebQmjcjlMapper extends BusJcebMapper<BusJcebQmjcjl> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebXsjcjlMapper.java

@@ -7,37 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-*  del_flag char(1) default
-* @author zcf
-* @date 2021/10/24
-*/
+ * del_flag char(1) default
+ *
+ * @author zcf
+ * @date 2021/10/24
+ */
 @Mapper
 @Repository
-public interface BusJcebXsjcjlMapper {
-
-    /**
-    * 新增
-    */
-    int insert(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebXsjcjl getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusJcebXsjcjl> getList(BusJcebXsjcjl busJcebXsjcjl);
+public interface BusJcebXsjcjlMapper extends BusJcebMapper<BusJcebXsjcjl> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebGjsfxService.java

@@ -1,59 +1,11 @@
 package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusJcebGjsfx;
-import java.util.List;
 /**
 * 检测表-关节式分相 
 * @author whh
 * @date 2021/10/19
 */
-public interface IBusJcebGjsfxService{
-
-    /**
-    * 新增
-    */
-    int create(BusJcebGjsfx busJcebGjsfx);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebGjsfx busJcebGjsfx);
-
-    /**
-    * 获取单个
-    */
-    BusJcebGjsfx getInfo(String id);
-
-    /**
-    * 查询列表
-    */
-    List<BusJcebGjsfx> getList(BusJcebGjsfx busJcebGjsfx);
-
-
-    /**
-     * 提交
-     * @param busJcebGjsfx
-     * @return 提交结果
-     */
-    int submit(BusJcebGjsfx busJcebGjsfx);
-
-    /**
-     * 退回
-     * @param busJcebGjsfx
-     * @return 退回结果
-     */
-    int reject(BusJcebGjsfx busJcebGjsfx);
-
-    /**
-     * 确认
-     * @param busJcebGjsfx
-     * @return 确认结果
-     */
-    int confirm(BusJcebGjsfx busJcebGjsfx);
+public interface IBusJcebGjsfxService extends IBusJcebService<BusJcebGjsfx>{
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebJddzService.java

@@ -1,54 +1,11 @@
 package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusJcebJddz;
-import java.util.List;
-/**
-* @author zcf
-* @date 2021/10/24
-*/
-public interface IBusJcebJddzService{
-
-    /**
-    * 新增
-    */
-    int create(BusJcebJddz busJcebJddz);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebJddz busJcebJddz);
-
-    /**
-    * 获取单个
-    */
-    BusJcebJddz getInfo(String id);
 
-    /**
-    * 查询列表
-    */
-    List<BusJcebJddz> getList(BusJcebJddz busJcebJddz);
-
-    /**
-     * 提交
-     * @return 提交结果
-     */
-    int submit(BusJcebJddz busJcebJddz);
-
-    /**
-     * 退回
-     * @return 退回结果
-     */
-    int reject(BusJcebJddz busJcebJddz);
-
-    /**
-     * 确认
-     * @return 确认结果
-     */
-    int confirm(BusJcebJddz busJcebJddz);
+/**
+ * @author zcf
+ * @date 2021/10/24
+ */
+public interface IBusJcebJddzService extends IBusJcebService<BusJcebJddz> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebJyzqsjlService.java

@@ -1,60 +1,13 @@
 package com.railway.business.catenary.service;
 
-import com.railway.business.catenary.domain.BusJcebGjsfx;
 import com.railway.business.catenary.domain.BusJcebJyzqsjl;
-import java.util.List;
-/**
-* 检测表-绝缘子清扫记录
-* @author author
-* @date 2021/10/21
-*/
-public interface IBusJcebJyzqsjlService{
-
-    /**
-    * 新增
-    */
-    int create(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebJyzqsjl getInfo(String id);
-
-    /**
-    * 查询列表
-    */
-    List<BusJcebJyzqsjl> getList(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-     * 提交
-     * @param busJcebJyzqsjl
-     * @return 提交结果
-     */
-    int submit(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-     * 退回
-     * @param busJcebJyzqsjl
-     * @return 退回结果
-     */
-    int reject(BusJcebJyzqsjl busJcebJyzqsjl);
-
-    /**
-     * 确认
-     * @param busJcebJyzqsjl
-     * @return 确认结果
-     */
-    int confirm(BusJcebJyzqsjl busJcebJyzqsjl);
 
+/**
+ * 检测表-绝缘子清扫记录
+ *
+ * @author author
+ * @date 2021/10/21
+ */
+public interface IBusJcebJyzqsjlService extends IBusJcebService<BusJcebJyzqsjl> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebLbjghjlService.java

@@ -2,58 +2,12 @@ package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusJcebLbjghjl;
 
-import java.util.List;
 /**
-* 检测表-零部件更换记录
-* @author author
-* @date 2021/10/19
-*/
-public interface IBusJcebLbjghjlService {
-
-    /**
-    * 新增
-    */
-    int create(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebLbjghjl getInfo(String id);
-
-    /**
-    * 查询列表
-    */
-    List<BusJcebLbjghjl> getList(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-     * 提交
-     * @param busJcebLbjghjl
-     * @return 提交结果
-     */
-    int submit(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-     * 退回
-     * @param busJcebLbjghjl
-     * @return 退回结果
-     */
-    int reject(BusJcebLbjghjl busJcebLbjghjl);
-
-    /**
-     * 确认
-     * @param busJcebLbjghjl
-     * @return 确认结果
-     */
-    int confirm(BusJcebLbjghjl busJcebLbjghjl);
+ * 检测表-零部件更换记录
+ *
+ * @author author
+ * @date 2021/10/19
+ */
+public interface IBusJcebLbjghjlService extends IBusJcebService<BusJcebLbjghjl> {
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebQmjcjlService.java

@@ -2,57 +2,12 @@ package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusJcebQmjcjl;
 
-import java.util.List;
 /**
-* 检测表-全面检查记录
-* @author author
-* @date 2021/10/19
-*/
-public interface IBusJcebQmjcjlService {
+ * 检测表-全面检查记录
+ *
+ * @author author
+ * @date 2021/10/19
+ */
+public interface IBusJcebQmjcjlService extends IBusJcebService<BusJcebQmjcjl> {
 
-    /**
-    * 新增
-    */
-    int create(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebQmjcjl getInfo(String id);
-
-    /**
-    * 查询列表
-    */
-    List<BusJcebQmjcjl> getList(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-     * 提交
-     * @param busJcebQmjcjl
-     * @return 提交结果
-     */
-    int submit(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-     * 退回
-     * @param busJcebQmjcjl
-     * @return 退回结果
-     */
-    int reject(BusJcebQmjcjl busJcebQmjcjl);
-
-    /**
-     * 确认
-     * @param busJcebQmjcjl
-     * @return 确认结果
-     */
-    int confirm(BusJcebQmjcjl busJcebQmjcjl);
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebService.java

@@ -0,0 +1,60 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJceb;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import java.util.List;
+
+/**
+* @author zhaomn
+*/
+public interface IBusJcebService<T extends BusJceb> {
+
+    /**
+     * 新增
+     */
+    int create(T t);
+
+    /**
+     * 更新
+     */
+    int update(T t);
+
+    /**
+    * 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * 查询列表
+    */
+    List<JcebRecordVo> getList(JcebQueryVo query);
+
+    /**
+     * 获取单个
+     */
+    T getInfo(String id);
+
+    /**
+     * 查询列表
+     */
+    List<T> getList(T t);
+
+    /**
+     * 提交
+     * @return 提交结果
+     */
+    int submit(T t);
+
+    /**
+     * 退回
+     * @return 退回结果
+     */
+    int reject(T t);
+
+    /**
+     * 确认
+     * @return 确认结果
+     */
+    int confirm(T t);
+}

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebXsjcjlService.java

@@ -2,53 +2,10 @@ package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusJcebXsjcjl;
 
-import java.util.List;
 /**
-* @author zcf
-* @date 2021/10/24
-*/
-public interface IBusJcebXsjcjlService{
+ * @author zcf
+ * @date 2021/10/24
+ */
+public interface IBusJcebXsjcjlService extends IBusJcebService<BusJcebXsjcjl> {
 
-    /**
-    * 新增
-    */
-    int create(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-    * 获取单个
-    */
-    BusJcebXsjcjl getInfo(String id);
-
-    /**
-    * 查询列表
-    */
-    List<BusJcebXsjcjl> getList(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-     * 提交
-     * @return 提交结果
-     */
-    int submit(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-     * 退回
-     * @return 退回结果
-     */
-    int reject(BusJcebXsjcjl busJcebXsjcjl);
-
-    /**
-     * 确认
-     * @return 确认结果
-     */
-    int confirm(BusJcebXsjcjl busJcebXsjcjl);
 }

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

@@ -2,7 +2,7 @@ package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcbBlq;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+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.utils.SecurityUtils;
@@ -10,128 +10,130 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 /**
-* 检查表-避雷器
-* @author wuhonghao
-* @date 2021/10/17
-*/
+ * 检查表-避雷器
+ *
+ * @author wuhonghao
+ * @date 2021/10/17
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcbBlqServiceImpl implements IBusJcbBlqService{
-
-	private final BusJcbBlqMapper busJcbBlqMapper;
-
-	public BusJcbBlqServiceImpl(BusJcbBlqMapper busJcbBlqMapper) {
-		this.busJcbBlqMapper = busJcbBlqMapper;
-	}
-
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcbBlq busJcbBlq) {
-	    busJcbBlq.setCreateTime(new Date());
-        busJcbBlq.setCreateBy(SecurityUtils.getUsername());
-		return busJcbBlqMapper.insert(busJcbBlq);
-	}
-
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcbBlqMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
-
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcbBlq busJcbBlq) {
-		busJcbBlq.setUpdateTime(new Date());
-    	busJcbBlq.setUpdateBy(SecurityUtils.getUsername());
-		return busJcbBlqMapper.update(busJcbBlq);
-	}
-
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcbBlq getInfo(String id) {
-		return busJcbBlqMapper.getInfo(id);
-	}
-
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcbBlq> getList(BusJcbBlq busJcbBlq) {
-		return busJcbBlqMapper.getList(busJcbBlq);
-	}
-
-	/**
-	 * 获取上次检测值
-	 */
-	@Override
-	public BusJcbFdfxjyq getLastOne(BusJcbBlq busJcbBlq) {
-		return busJcbBlqMapper.getLastOne(busJcbBlq);
-	}
-
-	/**
-	 * 提交
-	 * @param busJcbBlq
-	 * @return 提交结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcbBlq busJcbBlq) {
-		if(busJcbBlq.getId()!=null){
-			busJcbBlq.setUpdateTime(new Date());
-			busJcbBlq.setUpdateBy(SecurityUtils.getUsername());
-			busJcbBlq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-			return busJcbBlqMapper.update(busJcbBlq);
-		}else{
-			busJcbBlq.setCreateTime(new Date());
-			busJcbBlq.setCreateBy(SecurityUtils.getUsername());
-			busJcbBlq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-			return busJcbBlqMapper.insert(busJcbBlq);
-		}
-
-	}
-
-	/**
-	 * 退回
-	 * @param busJcbBlq
-	 * @return 退回结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcbBlq busJcbBlq) {
-		busJcbBlq.setUpdateTime(new Date());
-		busJcbBlq.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcbBlqMapper.update(busJcbBlq);
-	}
-
-	/**
-	 * 确认
-	 * @param busJcbBlq
-	 * @return 确认结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcbBlq busJcbBlq) {
-		busJcbBlq.setUpdateTime(new Date());
-		busJcbBlq.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcbBlqMapper.update(busJcbBlq);
-	}
+public class BusJcbBlqServiceImpl implements IBusJcbBlqService {
+
+  private final BusJcbBlqMapper busJcbBlqMapper;
+
+  public BusJcbBlqServiceImpl(BusJcbBlqMapper busJcbBlqMapper) {
+    this.busJcbBlqMapper = busJcbBlqMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcbBlq busJcbBlq) {
+    busJcbBlq.setCreateTime(new Date());
+    busJcbBlq.setCreateBy(SecurityUtils.getUsername());
+    return busJcbBlqMapper.insert(busJcbBlq);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcbBlqMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcbBlq busJcbBlq) {
+    busJcbBlq.setUpdateTime(new Date());
+    busJcbBlq.setUpdateBy(SecurityUtils.getUsername());
+    return busJcbBlqMapper.update(busJcbBlq);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcbBlq getInfo(String id) {
+    return busJcbBlqMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcbBlq> getList(BusJcbBlq busJcbBlq) {
+    return busJcbBlqMapper.getList(busJcbBlq);
+  }
+
+  /**
+   * 获取上次检测值
+   */
+  @Override
+  public BusJcbFdfxjyq getLastOne(BusJcbBlq busJcbBlq) {
+    return busJcbBlqMapper.getLastOne(busJcbBlq);
+  }
+
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int submit(BusJcbBlq busJcbBlq) {
+    if (busJcbBlq.getId() != null) {
+      busJcbBlq.setUpdateTime(new Date());
+      busJcbBlq.setUpdateBy(SecurityUtils.getUsername());
+      busJcbBlq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      return busJcbBlqMapper.update(busJcbBlq);
+    } else {
+      busJcbBlq.setCreateTime(new Date());
+      busJcbBlq.setCreateBy(SecurityUtils.getUsername());
+      busJcbBlq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      return busJcbBlqMapper.insert(busJcbBlq);
+    }
+
+  }
+
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int reject(BusJcbBlq busJcbBlq) {
+    busJcbBlq.setUpdateTime(new Date());
+    busJcbBlq.setSubmitState(JcebStatusEnum.RETURNED.getCode());
+    return busJcbBlqMapper.update(busJcbBlq);
+  }
+
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int confirm(BusJcbBlq busJcbBlq) {
+    busJcbBlq.setUpdateTime(new Date());
+    busJcbBlq.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+    return busJcbBlqMapper.update(busJcbBlq);
+  }
 
 
 }

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

@@ -1,7 +1,7 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcbDmcgyq;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+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.utils.SecurityUtils;
@@ -10,117 +10,119 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+
 /**
-* 检查表-地面磁感应器
-* @author zcf
-* @date 2021/10/13
-*/
+ * 检查表-地面磁感应器
+ *
+ * @author zcf
+ * @date 2021/10/13
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService{
+public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService {
 
-	private final BusJcbDmcgyqMapper busJcbDmcgyqMapper;
+  private final BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 
-	public BusJcbDmcgyqServiceImpl(
-			BusJcbDmcgyqMapper busJcbDmcgyqMapper) {
-		this.busJcbDmcgyqMapper = busJcbDmcgyqMapper;
-	}
+  public BusJcbDmcgyqServiceImpl(
+      BusJcbDmcgyqMapper busJcbDmcgyqMapper) {
+    this.busJcbDmcgyqMapper = busJcbDmcgyqMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcbDmcgyq busJcbDmcgyq) {
-		busJcbDmcgyq.setUserId(SecurityUtils.getUserId());
-		busJcbDmcgyq.setCreateTime(new Date());
-		busJcbDmcgyq.setCreateBy(SecurityUtils.getUsername());
-		return busJcbDmcgyqMapper.insert(busJcbDmcgyq);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcbDmcgyq busJcbDmcgyq) {
+    busJcbDmcgyq.setUserId(SecurityUtils.getUserId());
+    busJcbDmcgyq.setCreateTime(new Date());
+    busJcbDmcgyq.setCreateBy(SecurityUtils.getUsername());
+    return busJcbDmcgyqMapper.insert(busJcbDmcgyq);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcbDmcgyqMapper.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 = busJcbDmcgyqMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcbDmcgyq busJcbDmcgyq) {
-		busJcbDmcgyq.setUpdateTime(new Date());
-		busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
-		return busJcbDmcgyqMapper.update(busJcbDmcgyq);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcbDmcgyq busJcbDmcgyq) {
+    busJcbDmcgyq.setUpdateTime(new Date());
+    busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
+    return busJcbDmcgyqMapper.update(busJcbDmcgyq);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcbDmcgyq getInfo(String id) {
-		return busJcbDmcgyqMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcbDmcgyq getInfo(String id) {
+    return busJcbDmcgyqMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcbDmcgyq> getList(BusJcbDmcgyq busJcbDmcgyq) {
-		return busJcbDmcgyqMapper.getList(busJcbDmcgyq);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcbDmcgyq> getList(BusJcbDmcgyq busJcbDmcgyq) {
+    return busJcbDmcgyqMapper.getList(busJcbDmcgyq);
+  }
 
-	/**
-	 * 获取上次检查记录
-	 */
-	@Override
-	public BusJcbDmcgyq getLastRecord() {
-		return busJcbDmcgyqMapper.getLastRecord(SecurityUtils.getUserId());
-	}
+  /**
+   * 获取上次检查记录
+   */
+  @Override
+  public BusJcbDmcgyq getLastRecord() {
+    return busJcbDmcgyqMapper.getLastRecord(SecurityUtils.getUserId());
+  }
 
-	/**
-	 * 提交
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcbDmcgyq busJcbDmcgyq) {
-		busJcbDmcgyq.setUpdateTime(new Date());
-		busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
-		busJcbDmcgyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcbDmcgyqMapper.update(busJcbDmcgyq);
-	}
+  /**
+   * 提交
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int submit(BusJcbDmcgyq busJcbDmcgyq) {
+    busJcbDmcgyq.setUpdateTime(new Date());
+    busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
+    busJcbDmcgyq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+    return busJcbDmcgyqMapper.update(busJcbDmcgyq);
+  }
 
-	/**
-	 * 退回
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcbDmcgyq busJcbDmcgyq) {
-		busJcbDmcgyq.setUpdateTime(new Date());
-		busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
-		busJcbDmcgyq.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcbDmcgyqMapper.update(busJcbDmcgyq);
-	}
+  /**
+   * 退回
+   */
+  @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);
+  }
 
-	/**
-	 * 确认
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcbDmcgyq busJcbDmcgyq) {
-		busJcbDmcgyq.setUpdateTime(new Date());
-		busJcbDmcgyq.setUpdateBy(SecurityUtils.getUsername());
-		busJcbDmcgyq.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcbDmcgyqMapper.update(busJcbDmcgyq);
-	}
+  /**
+   * 确认
+   */
+  @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);
+  }
 
 }

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

@@ -1,6 +1,6 @@
 package com.railway.business.catenary.service.impl;
 
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+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;
@@ -10,127 +10,129 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+
 /**
-* dxf分选绝缘器检查表 
-* @author wuhonghao
-* @date 2021/10/14
-*/
+ * dxf分选绝缘器检查表
+ *
+ * @author wuhonghao
+ * @date 2021/10/14
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService{
+public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService {
 
-	private final BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
+  private final BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 
-	public BusJcbFdfxjyqServiceImpl(
-			BusJcbFdfxjyqMapper busJcbFdfxjyqMapper) {
-		this.busJcbFdfxjyqMapper = busJcbFdfxjyqMapper;
-	}
+  public BusJcbFdfxjyqServiceImpl(
+      BusJcbFdfxjyqMapper busJcbFdfxjyqMapper) {
+    this.busJcbFdfxjyqMapper = busJcbFdfxjyqMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcbFdfxjyq busJcbFdfxjyq) {
-		busJcbFdfxjyq.setCreateTime(new Date());
-		busJcbFdfxjyq.setCreateBy(SecurityUtils.getUsername());
-		return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcbFdfxjyq busJcbFdfxjyq) {
+    busJcbFdfxjyq.setCreateTime(new Date());
+    busJcbFdfxjyq.setCreateBy(SecurityUtils.getUsername());
+    return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcbFdfxjyqMapper.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 = busJcbFdfxjyqMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcbFdfxjyq busJcbFdfxjyq) {
-		busJcbFdfxjyq.setUpdateTime(new Date());
-		busJcbFdfxjyq.setUpdateBy(SecurityUtils.getUsername());
-		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcbFdfxjyq busJcbFdfxjyq) {
+    busJcbFdfxjyq.setUpdateTime(new Date());
+    busJcbFdfxjyq.setUpdateBy(SecurityUtils.getUsername());
+    return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcbFdfxjyq getInfo(String id) {
-		return busJcbFdfxjyqMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcbFdfxjyq getInfo(String id) {
+    return busJcbFdfxjyqMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcbFdfxjyq> getList(BusJcbFdfxjyq busJcbFdfxjyq) {
-		return busJcbFdfxjyqMapper.getList(busJcbFdfxjyq);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcbFdfxjyq> getList(BusJcbFdfxjyq busJcbFdfxjyq) {
+    return busJcbFdfxjyqMapper.getList(busJcbFdfxjyq);
+  }
 
-	/**
-	 * 获取上次检测值
-	 */
-	@Override
-	public BusJcbFdfxjyq getLastOne(BusJcbFdfxjyq busJcbFdfxjyq) {
-		return busJcbFdfxjyqMapper.getLastOne(busJcbFdfxjyq);
-	}
+  /**
+   * 获取上次检测值
+   */
+  @Override
+  public BusJcbFdfxjyq getLastOne(BusJcbFdfxjyq busJcbFdfxjyq) {
+    return busJcbFdfxjyqMapper.getLastOne(busJcbFdfxjyq);
+  }
 
-	/**
-	 * 提交
-	 * @param busJcbFdfxjyq
-	 * @return 提交结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcbFdfxjyq busJcbFdfxjyq) {
-		if(busJcbFdfxjyq.getId()!=null){
-			busJcbFdfxjyq.setUpdateTime(new Date());
-			busJcbFdfxjyq.setUpdateBy(SecurityUtils.getUsername());
-			busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-			return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
-		}else{
-			busJcbFdfxjyq.setCreateTime(new Date());
-			busJcbFdfxjyq.setCreateBy(SecurityUtils.getUsername());
-			busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-			return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
-		}
-	}
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int submit(BusJcbFdfxjyq busJcbFdfxjyq) {
+    if (busJcbFdfxjyq.getId() != null) {
+      busJcbFdfxjyq.setUpdateTime(new Date());
+      busJcbFdfxjyq.setUpdateBy(SecurityUtils.getUsername());
+      busJcbFdfxjyq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+    } else {
+      busJcbFdfxjyq.setCreateTime(new Date());
+      busJcbFdfxjyq.setCreateBy(SecurityUtils.getUsername());
+      busJcbFdfxjyq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
+    }
+  }
 
-	/**
-	 * 退回
-	 * @param busJcbFdfxjyq
-	 * @return 退回结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcbFdfxjyq busJcbFdfxjyq) {
-		busJcbFdfxjyq.setUpdateTime(new Date());
-		busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
-	}
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int reject(BusJcbFdfxjyq busJcbFdfxjyq) {
+    busJcbFdfxjyq.setUpdateTime(new Date());
+    busJcbFdfxjyq.setSubmitState(JcebStatusEnum.RETURNED.getCode());
+    return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+  }
 
-	/**
-	 * 确认
-	 * @param busJcbFdfxjyq
-	 * @return 确认结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcbFdfxjyq busJcbFdfxjyq) {
-		busJcbFdfxjyq.setUpdateTime(new Date());
-		busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
-	}
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int confirm(BusJcbFdfxjyq busJcbFdfxjyq) {
+    busJcbFdfxjyq.setUpdateTime(new Date());
+    busJcbFdfxjyq.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+    return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+  }
 
 }

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

@@ -2,7 +2,7 @@ package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcbGlkg;
 import com.railway.common.enums.DelFlagEnum;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbGlkgMapper;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
 import com.railway.common.utils.SecurityUtils;
@@ -37,7 +37,7 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 		busJcbGlkg.setUpdateTime(new Date());
 		busJcbGlkg.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
 		if (StringUtils.isBlank(busJcbGlkg.getSubmitState())) {
-			busJcbGlkg.setSubmitState(TestTableStatusEnum.UNREPORTED.getCode());
+			busJcbGlkg.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
 		}
 
 		return busJcbGlkgMapper.insert(busJcbGlkg);
@@ -52,7 +52,7 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcbGlkg busJcbGlkg) {
 		busJcbGlkg.setUpdateTime(new Date());
-		busJcbGlkg.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		busJcbGlkg.setSubmitState(JcebStatusEnum.REPORTED.getCode());
 		return busJcbGlkgMapper.update(busJcbGlkg);
 	}
 
@@ -65,7 +65,7 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcbGlkg busJcbGlkg) {
 		busJcbGlkg.setUpdateTime(new Date());
-		busJcbGlkg.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+		busJcbGlkg.setSubmitState(JcebStatusEnum.RETURNED.getCode());
 		return busJcbGlkgMapper.update(busJcbGlkg);
 	}
 
@@ -78,7 +78,7 @@ public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
 	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcbGlkg busJcbGlkg) {
 		busJcbGlkg.setUpdateTime(new Date());
-		busJcbGlkg.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+		busJcbGlkg.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
 		return busJcbGlkgMapper.update(busJcbGlkg);
 	}
 

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

@@ -1,7 +1,7 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcbJcxc;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+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.utils.SecurityUtils;
@@ -94,7 +94,7 @@ public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService{
 	public int submit(BusJcbJcxc busJcbJcxc) {
 		busJcbJcxc.setUpdateTime(new Date());
 		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbJcxc.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		busJcbJcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
 		return busJcbJcxcMapper.update(busJcbJcxc);
 	}
 
@@ -106,7 +106,7 @@ public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService{
 	public int reject(BusJcbJcxc busJcbJcxc) {
 		busJcbJcxc.setUpdateTime(new Date());
 		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbJcxc.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+		busJcbJcxc.setSubmitState(JcebStatusEnum.RETURNED.getCode());
 		return busJcbJcxcMapper.update(busJcbJcxc);
 	}
 
@@ -118,7 +118,7 @@ public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService{
 	public int confirm(BusJcbJcxc busJcbJcxc) {
 		busJcbJcxc.setUpdateTime(new Date());
 		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbJcxc.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+		busJcbJcxc.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
 		return busJcbJcxcMapper.update(busJcbJcxc);
 	}
 	

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

@@ -1,6 +1,6 @@
 package com.railway.business.catenary.service.impl;
 
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+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;
@@ -93,7 +93,7 @@ public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService{
 	public int submit(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());
 		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbWjcxc.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		busJcbWjcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
 		return busJcbWjcxcMapper.update(busJcbWjcxc);
 	}
 
@@ -105,7 +105,7 @@ public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService{
 	public int reject(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());
 		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbWjcxc.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+		busJcbWjcxc.setSubmitState(JcebStatusEnum.RETURNED.getCode());
 		return busJcbWjcxcMapper.update(busJcbWjcxc);
 	}
 
@@ -117,7 +117,7 @@ public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService{
 	public int confirm(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());
 		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		busJcbWjcxc.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+		busJcbWjcxc.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
 		return busJcbWjcxcMapper.update(busJcbWjcxc);
 	}
 }

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

@@ -1,14 +1,14 @@
 package com.railway.business.catenary.service.impl;
 
-import com.railway.business.catenary.enums.TestTableStatusEnum;
-import com.railway.business.catenary.mapper.BusJcebGjsfxMapper;
 import com.railway.business.catenary.domain.BusJcebGjsfx;
+import com.railway.business.catenary.mapper.BusJcebGjsfxMapper;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
-import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import com.railway.common.utils.StringUtils;
 import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 检测表-关节式分相 
 * @author whh
@@ -16,11 +16,13 @@ import java.util.Date;
 */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebGjsfxServiceImpl implements IBusJcebGjsfxService{
+public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
+		implements IBusJcebGjsfxService{
 
 	private final BusJcebGjsfxMapper busJcebGjsfxMapper;
 
 	public BusJcebGjsfxServiceImpl(BusJcebGjsfxMapper busJcebGjsfxMapper) {
+		super(busJcebGjsfxMapper);
 		this.busJcebGjsfxMapper = busJcebGjsfxMapper;
 	}
 
@@ -78,44 +80,38 @@ public class BusJcebGjsfxServiceImpl implements IBusJcebGjsfxService{
 
 	/**
 	 * 提交
-	 * @param busJcebGjsfx
+	 *
 	 * @return 提交结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcebGjsfx busJcebGjsfx) {
-		busJcebGjsfx.setUpdateTime(new Date());
-		busJcebGjsfx.setUpdateBy(SecurityUtils.getUsername());
-		busJcebGjsfx.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcebGjsfxMapper.update(busJcebGjsfx);
+		setSubmit(busJcebGjsfx);
+		if(StringUtils.isEmpty(busJcebGjsfx.getId())){
+			return create(busJcebGjsfx);
+		} else {
+			return update(busJcebGjsfx);
+		}
 	}
 
 	/**
 	 * 退回
-	 * @param busJcebGjsfx
+	 *
 	 * @return 退回结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcebGjsfx busJcebGjsfx) {
-		busJcebGjsfx.setUpdateTime(new Date());
-		busJcebGjsfx.setUpdateBy(SecurityUtils.getUsername());
-		busJcebGjsfx.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcebGjsfxMapper.update(busJcebGjsfx);
+		setReject(busJcebGjsfx);
+		return update(busJcebGjsfx);
 	}
 
 	/**
 	 * 确认
-	 * @param busJcebGjsfx
-	 * @return 提交结果
+	 *
+	 * @return 确认结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcebGjsfx busJcebGjsfx) {
-		busJcebGjsfx.setUpdateTime(new Date());
-		busJcebGjsfx.setUpdateBy(SecurityUtils.getUsername());
-		busJcebGjsfx.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcebGjsfxMapper.update(busJcebGjsfx);
+		setConfirm(busJcebGjsfx);
+		return update(busJcebGjsfx);
 	}
-
 }

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

@@ -1,15 +1,14 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcebJddz;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebJddzMapper;
 import com.railway.business.catenary.service.IBusJcebJddzService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import com.railway.common.utils.StringUtils;
 import java.util.Date;
 import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author zcf
@@ -17,11 +16,13 @@ import java.util.List;
  */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebJddzServiceImpl implements IBusJcebJddzService {
+public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
+    implements IBusJcebJddzService {
 
   private final BusJcebJddzMapper busJcebJddzMapper;
 
   public BusJcebJddzServiceImpl(BusJcebJddzMapper busJcebJddzMapper) {
+    super(busJcebJddzMapper);
     this.busJcebJddzMapper = busJcebJddzMapper;
   }
 
@@ -80,38 +81,38 @@ public class BusJcebJddzServiceImpl implements IBusJcebJddzService {
 
   /**
    * 提交
+   *
+   * @return 提交结果
    */
   @Override
-  @Transactional(rollbackFor = Exception.class)
   public int submit(BusJcebJddz busJcebJddz) {
-    busJcebJddz.setUpdateTime(new Date());
-    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-    busJcebJddz.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-    return busJcebJddzMapper.update(busJcebJddz);
+    setSubmit(busJcebJddz);
+    if(StringUtils.isEmpty(busJcebJddz.getId())){
+      return create(busJcebJddz);
+    } else {
+      return update(busJcebJddz);
+    }
   }
 
   /**
    * 退回
+   *
+   * @return 退回结果
    */
   @Override
-  @Transactional(rollbackFor = Exception.class)
   public int reject(BusJcebJddz busJcebJddz) {
-    busJcebJddz.setUpdateTime(new Date());
-    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-    busJcebJddz.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-    return busJcebJddzMapper.update(busJcebJddz);
+    setReject(busJcebJddz);
+    return update(busJcebJddz);
   }
 
   /**
    * 确认
+   *
+   * @return 确认结果
    */
   @Override
-  @Transactional(rollbackFor = Exception.class)
   public int confirm(BusJcebJddz busJcebJddz) {
-    busJcebJddz.setUpdateTime(new Date());
-    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-    busJcebJddz.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-    return busJcebJddzMapper.update(busJcebJddz);
+    setConfirm(busJcebJddz);
+    return update(busJcebJddz);
   }
-
 }

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

@@ -1,14 +1,14 @@
 package com.railway.business.catenary.service.impl;
 
-import com.railway.business.catenary.enums.TestTableStatusEnum;
-import com.railway.business.catenary.mapper.BusJcebJyzqsjlMapper;
 import com.railway.business.catenary.domain.BusJcebJyzqsjl;
+import com.railway.business.catenary.mapper.BusJcebJyzqsjlMapper;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
-import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import com.railway.common.utils.StringUtils;
 import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 检测表-绝缘子清扫记录
 * @author author
@@ -16,11 +16,13 @@ import java.util.Date;
 */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebJyzqsjlServiceImpl implements IBusJcebJyzqsjlService{
+public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl>
+		implements IBusJcebJyzqsjlService{
 
 	private final BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 
 	public BusJcebJyzqsjlServiceImpl(BusJcebJyzqsjlMapper busJcebJyzqsjlMapper) {
+		super(busJcebJyzqsjlMapper);
 		this.busJcebJyzqsjlMapper = busJcebJyzqsjlMapper;
 	}
 
@@ -78,43 +80,38 @@ public class BusJcebJyzqsjlServiceImpl implements IBusJcebJyzqsjlService{
 
 	/**
 	 * 提交
-	 * @param busJcebJyzqsjl
+	 *
 	 * @return 提交结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcebJyzqsjl busJcebJyzqsjl) {
-		busJcebJyzqsjl.setUpdateTime(new Date());
-		busJcebJyzqsjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebJyzqsjl.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcebJyzqsjlMapper.update(busJcebJyzqsjl);
+		setSubmit(busJcebJyzqsjl);
+		if(StringUtils.isEmpty(busJcebJyzqsjl.getId())){
+			return create(busJcebJyzqsjl);
+		} else {
+			return update(busJcebJyzqsjl);
+		}
 	}
 
 	/**
 	 * 退回
-	 * @param busJcebJyzqsjl
+	 *
 	 * @return 退回结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcebJyzqsjl busJcebJyzqsjl) {
-		busJcebJyzqsjl.setUpdateTime(new Date());
-		busJcebJyzqsjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebJyzqsjl.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcebJyzqsjlMapper.update(busJcebJyzqsjl);
+		setReject(busJcebJyzqsjl);
+		return update(busJcebJyzqsjl);
 	}
 
 	/**
 	 * 确认
-	 * @param busJcebJyzqsjl
+	 *
 	 * @return 确认结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcebJyzqsjl busJcebJyzqsjl) {
-		busJcebJyzqsjl.setUpdateTime(new Date());
-		busJcebJyzqsjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebJyzqsjl.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcebJyzqsjlMapper.update(busJcebJyzqsjl);
+		setConfirm(busJcebJyzqsjl);
+		return update(busJcebJyzqsjl);
 	}
 }

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

@@ -1,17 +1,16 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcebLbjghjl;
-import com.railway.common.enums.DelFlagEnum;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebLbjghjlMapper;
 import com.railway.business.catenary.service.IBusJcebLbjghjlService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
 /**
 * 检测表-零部件更换记录
 * @author author
@@ -19,11 +18,13 @@ import java.util.List;
 */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebLbjghjlServiceImpl implements IBusJcebLbjghjlService {
+public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl>
+		implements IBusJcebLbjghjlService {
 
 	private final BusJcebLbjghjlMapper busJcebLbjghjlMapper;
 
 	public BusJcebLbjghjlServiceImpl(BusJcebLbjghjlMapper busJcebLbjghjlMapper) {
+		super(busJcebLbjghjlMapper);
 		this.busJcebLbjghjlMapper = busJcebLbjghjlMapper;
 	}
 
@@ -37,7 +38,7 @@ public class BusJcebLbjghjlServiceImpl implements IBusJcebLbjghjlService {
         busJcebLbjghjl.setCreateBy(SecurityUtils.getUsername());
 		busJcebLbjghjl.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
 		if (StringUtils.isBlank(busJcebLbjghjl.getSubmitState())) {
-			busJcebLbjghjl.setSubmitState(TestTableStatusEnum.UNREPORTED.getCode());
+			busJcebLbjghjl.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
 		}
 		return busJcebLbjghjlMapper.insert(busJcebLbjghjl);
 	}
@@ -83,30 +84,40 @@ public class BusJcebLbjghjlServiceImpl implements IBusJcebLbjghjlService {
 		return busJcebLbjghjlMapper.getList(busJcebLbjghjl);
 	}
 
+	/**
+	 * 提交
+	 *
+	 * @return 提交结果
+	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcebLbjghjl busJcebLbjghjl) {
-		busJcebLbjghjl.setUpdateTime(new Date());
-		busJcebLbjghjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebLbjghjl.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcebLbjghjlMapper.update(busJcebLbjghjl);
+		setSubmit(busJcebLbjghjl);
+		if(StringUtils.isEmpty(busJcebLbjghjl.getId())){
+			return create(busJcebLbjghjl);
+		} else {
+			return update(busJcebLbjghjl);
+		}
 	}
 
+	/**
+	 * 退回
+	 *
+	 * @return 退回结果
+	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcebLbjghjl busJcebLbjghjl) {
-		busJcebLbjghjl.setUpdateTime(new Date());
-		busJcebLbjghjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebLbjghjl.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcebLbjghjlMapper.update(busJcebLbjghjl);
+		setReject(busJcebLbjghjl);
+		return update(busJcebLbjghjl);
 	}
 
+	/**
+	 * 确认
+	 *
+	 * @return 确认结果
+	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcebLbjghjl busJcebLbjghjl) {
-		busJcebLbjghjl.setUpdateTime(new Date());
-		busJcebLbjghjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebLbjghjl.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcebLbjghjlMapper.update(busJcebLbjghjl);
+		setConfirm(busJcebLbjghjl);
+		return update(busJcebLbjghjl);
 	}
 }

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

@@ -1,17 +1,16 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcebQmjcjl;
-import com.railway.common.enums.DelFlagEnum;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebQmjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebQmjcjlService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import com.railway.common.utils.StringUtils;
 import java.util.Date;
 import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 检测表-全面检查记录
 * @author author
@@ -19,11 +18,13 @@ import java.util.List;
 */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebQmjcjlServiceImpl implements IBusJcebQmjcjlService {
+public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
+		implements IBusJcebQmjcjlService {
 
 	private final BusJcebQmjcjlMapper busJcebQmjcjlMapper;
 
 	public BusJcebQmjcjlServiceImpl(BusJcebQmjcjlMapper busJcebQmjcjlMapper) {
+		super(busJcebQmjcjlMapper);
 		this.busJcebQmjcjlMapper = busJcebQmjcjlMapper;
 	}
 
@@ -37,7 +38,7 @@ public class BusJcebQmjcjlServiceImpl implements IBusJcebQmjcjlService {
         busJcebQmjcjl.setCreateBy(SecurityUtils.getUsername());
 		busJcebQmjcjl.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
 		if (StringUtils.isBlank(busJcebQmjcjl.getSubmitState())) {
-			busJcebQmjcjl.setSubmitState(TestTableStatusEnum.UNREPORTED.getCode());
+			busJcebQmjcjl.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
 		}
 		return busJcebQmjcjlMapper.insert(busJcebQmjcjl);
 	}
@@ -85,43 +86,38 @@ public class BusJcebQmjcjlServiceImpl implements IBusJcebQmjcjlService {
 
 	/**
 	 * 提交
-	 * @param busJcebQmjcjl
+	 *
 	 * @return 提交结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcebQmjcjl busJcebQmjcjl) {
-		busJcebQmjcjl.setUpdateTime(new Date());
-		busJcebQmjcjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebQmjcjl.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcebQmjcjlMapper.update(busJcebQmjcjl);
+		setSubmit(busJcebQmjcjl);
+		if(StringUtils.isEmpty(busJcebQmjcjl.getId())){
+			return create(busJcebQmjcjl);
+		} else {
+			return update(busJcebQmjcjl);
+		}
 	}
 
 	/**
 	 * 退回
-	 * @param busJcebQmjcjl
+	 *
 	 * @return 退回结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcebQmjcjl busJcebQmjcjl) {
-		busJcebQmjcjl.setUpdateTime(new Date());
-		busJcebQmjcjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebQmjcjl.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcebQmjcjlMapper.update(busJcebQmjcjl);
+		setReject(busJcebQmjcjl);
+		return update(busJcebQmjcjl);
 	}
 
 	/**
 	 * 确认
-	 * @param busJcebQmjcjl
+	 *
 	 * @return 确认结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcebQmjcjl busJcebQmjcjl) {
-		busJcebQmjcjl.setUpdateTime(new Date());
-		busJcebQmjcjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebQmjcjl.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcebQmjcjlMapper.update(busJcebQmjcjl);
+		setConfirm(busJcebQmjcjl);
+		return update(busJcebQmjcjl);
 	}
 }

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

@@ -0,0 +1,72 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.domain.BusJceb;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+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.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+* @author zcf
+* @date 2021/10/24
+*/
+@Service
+@Transactional(readOnly = true)
+public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebService<T> {
+
+	private final BusJcebMapper<T> busJcebMapper;
+
+	public BusJcebServiceImpl(BusJcebMapper<T> busJcebMapper) {
+		this.busJcebMapper = busJcebMapper;
+	}
+
+	/**
+	* 删除
+	*/
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busJcebMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
+	}
+
+	/**
+	 * 查询列表
+	 */
+	@Override
+	public List<JcebRecordVo> getList(JcebQueryVo query) {
+		return busJcebMapper.getList(query);
+	}
+
+	/**
+	 * 提交
+	 */
+	protected void setSubmit(BusJceb jceb) {
+		jceb.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+	}
+
+	/**
+	 * 退回
+	 */
+	protected void setReject(BusJceb jceb) {
+		jceb.setSubmitState(JcebStatusEnum.RETURNED.getCode());
+	}
+
+	/**
+	 * 确认
+	 */
+	protected void setConfirm(BusJceb jceb) {
+		jceb.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+	}
+
+}

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

@@ -1,119 +1,118 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusJcebXsjcjl;
-import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebXsjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebXsjcjlService;
 import com.railway.common.utils.SecurityUtils;
+import com.railway.common.utils.StringUtils;
+import java.util.Date;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
 /**
-* @author zcf
-* @date 2021/10/24
-*/
+ * @author zcf
+ * @date 2021/10/24
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebXsjcjlServiceImpl implements IBusJcebXsjcjlService{
+public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
+    implements IBusJcebXsjcjlService {
 
-	private final BusJcebXsjcjlMapper busJcebXsjcjlMapper;
+  private final BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 
-	public BusJcebXsjcjlServiceImpl(BusJcebXsjcjlMapper busJcebXsjcjlMapper) {
-		this.busJcebXsjcjlMapper = busJcebXsjcjlMapper;
-	}
+  public BusJcebXsjcjlServiceImpl(BusJcebXsjcjlMapper busJcebXsjcjlMapper) {
+    super(busJcebXsjcjlMapper);
+    this.busJcebXsjcjlMapper = busJcebXsjcjlMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcebXsjcjl busJcebXsjcjl) {
-		busJcebXsjcjl.setUserId(SecurityUtils.getUserId());
-	    busJcebXsjcjl.setCreateTime(new Date());
-        busJcebXsjcjl.setCreateBy(SecurityUtils.getUsername());
-		return busJcebXsjcjlMapper.insert(busJcebXsjcjl);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcebXsjcjl busJcebXsjcjl) {
+    busJcebXsjcjl.setUserId(SecurityUtils.getUserId());
+    busJcebXsjcjl.setCreateTime(new Date());
+    busJcebXsjcjl.setCreateBy(SecurityUtils.getUsername());
+    return busJcebXsjcjlMapper.insert(busJcebXsjcjl);
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcebXsjcjlMapper.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 = busJcebXsjcjlMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcebXsjcjl busJcebXsjcjl) {
-		busJcebXsjcjl.setUpdateTime(new Date());
-    	busJcebXsjcjl.setUpdateBy(SecurityUtils.getUsername());
-		return busJcebXsjcjlMapper.update(busJcebXsjcjl);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcebXsjcjl busJcebXsjcjl) {
+    busJcebXsjcjl.setUpdateTime(new Date());
+    busJcebXsjcjl.setUpdateBy(SecurityUtils.getUsername());
+    return busJcebXsjcjlMapper.update(busJcebXsjcjl);
+  }
 
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusJcebXsjcjl getInfo(String id) {
-		return busJcebXsjcjlMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcebXsjcjl getInfo(String id) {
+    return busJcebXsjcjlMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusJcebXsjcjl> getList(BusJcebXsjcjl busJcebXsjcjl) {
-		return busJcebXsjcjlMapper.getList(busJcebXsjcjl);
-	}
-	
-	/**
-	 * 提交
-	 * @return 提交结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcebXsjcjl busJcebXsjcjl) {
-		busJcebXsjcjl.setUpdateTime(new Date());
-		busJcebXsjcjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebXsjcjl.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcebXsjcjlMapper.update(busJcebXsjcjl);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcebXsjcjl> getList(BusJcebXsjcjl busJcebXsjcjl) {
+    return busJcebXsjcjlMapper.getList(busJcebXsjcjl);
+  }
 
-	/**
-	 * 退回
-	 * @return 退回结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcebXsjcjl busJcebXsjcjl) {
-		busJcebXsjcjl.setUpdateTime(new Date());
-		busJcebXsjcjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebXsjcjl.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcebXsjcjlMapper.update(busJcebXsjcjl);
-	}
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  public int submit(BusJcebXsjcjl busJcebXsjcjl) {
+    setSubmit(busJcebXsjcjl);
+    if(StringUtils.isEmpty(busJcebXsjcjl.getId())){
+      return create(busJcebXsjcjl);
+    } else {
+      return update(busJcebXsjcjl);
+    }
+  }
 
-	/**
-	 * 确认
-	 * @return 确认结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcebXsjcjl busJcebXsjcjl) {
-		busJcebXsjcjl.setUpdateTime(new Date());
-		busJcebXsjcjl.setUpdateBy(SecurityUtils.getUsername());
-		busJcebXsjcjl.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcebXsjcjlMapper.update(busJcebXsjcjl);
-	}
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  public int reject(BusJcebXsjcjl busJcebXsjcjl) {
+    setReject(busJcebXsjcjl);
+    return update(busJcebXsjcjl);
+  }
 
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  public int confirm(BusJcebXsjcjl busJcebXsjcjl) {
+    setConfirm(busJcebXsjcjl);
+    return update(busJcebXsjcjl);
+  }
 }

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -7,18 +7,18 @@
     <result column="id" property="id"/>
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
-    <result column="check_date" property="checkDate"/>
+    <result column="operation_date" property="operationDate"/>
     <result column="xsjcfs" property="xsjcfs"/>
     <result column="qxdd" property="qxdd"/>
     <result column="qxnr" property="qxnr"/>
     <result column="qxdj" property="qxdj"/>
     <result column="yqwcsj" property="yqwcsj"/>
-    <result column="check_user" property="checkUser"/>
+    <result column="operator" property="operator"/>
     <result column="clcs" property="clcs"/>
     <result column="cljg" property="cljg"/>
     <result column="clqxldr" property="clqxldr"/>
-    <result column="operator" property="operator"/>
-    <result column="operation_date" property="operationDate"/>
+    <result column="clqxczz" property="clqxczz"/>
+    <result column="clrq" property="clrq"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="create_by" property="createBy"/>
@@ -33,18 +33,18 @@
     t.id,
     v.station_name as station_name,
     t.station_id,
-    t.check_date,
+    t.operation_date,
     t.xsjcfs,
     t.qxdd,
     t.qxnr,
     t.qxdj,
     t.yqwcsj,
-    t.check_user,
+    t.operator,
     t.clcs,
     t.cljg,
     t.clqxldr,
-    t.operator,
-    t.operation_date,
+    t.clqxczz,
+    t.clrq,
     t.remark,
     t.submit_state,
     t.create_by,
@@ -61,8 +61,8 @@
       <if test='null != stationId'>
         station_id,
       </if>
-      <if test='null != checkDate'>
-        check_date,
+      <if test='null != operationDate'>
+        operation_date,
       </if>
       <if test='null != xsjcfs'>
         xsjcfs,
@@ -79,8 +79,8 @@
       <if test='null != yqwcsj'>
         yqwcsj,
       </if>
-      <if test='null != checkUser'>
-        check_user,
+      <if test='null != operator'>
+        operator,
       </if>
       <if test='null != clcs'>
         clcs,
@@ -91,11 +91,11 @@
       <if test='null != clqxldr'>
         clqxldr,
       </if>
-      <if test='null != operator'>
-        operator,
+      <if test='null != clqxczz'>
+        clqxczz,
       </if>
-      <if test='null != operationDate'>
-        operation_date,
+      <if test='null != clrq'>
+        clrq,
       </if>
       <if test='null != remark'>
         remark,
@@ -126,8 +126,8 @@
       <if test='null != stationId'>
         #{stationId},
       </if>
-      <if test='null != checkDate'>
-        #{checkDate},
+      <if test='null != operationDate'>
+        #{operationDate},
       </if>
       <if test='null != xsjcfs'>
         #{xsjcfs},
@@ -144,8 +144,8 @@
       <if test='null != yqwcsj'>
         #{yqwcsj},
       </if>
-      <if test='null != checkUser'>
-        #{checkUser},
+      <if test='null != operator'>
+        #{operator},
       </if>
       <if test='null != clcs'>
         #{clcs},
@@ -156,11 +156,11 @@
       <if test='null != clqxldr'>
         #{clqxldr},
       </if>
-      <if test='null != operator'>
-        #{operator},
+      <if test='null != clqxczz'>
+        #{clqxczz},
       </if>
-      <if test='null != operationDate'>
-        #{operationDate},
+      <if test='null != clrq'>
+        #{clrq},
       </if>
       <if test='null != remark'>
         #{remark},
@@ -199,18 +199,18 @@
     UPDATE bus_jceb_xsjcjl
     <set>
       <if test='null != stationId'>station_id = #{stationId},</if>
-      <if test='null != checkDate'>check_date = #{checkDate},</if>
+      <if test='null != operationDate'>operation_date = #{operationDate},</if>
       <if test='null != xsjcfs'>xsjcfs = #{xsjcfs},</if>
       <if test='null != qxdd'>qxdd = #{qxdd},</if>
       <if test='null != qxnr'>qxnr = #{qxnr},</if>
       <if test='null != qxdj'>qxdj = #{qxdj},</if>
       <if test='null != yqwcsj'>yqwcsj = #{yqwcsj},</if>
-      <if test='null != checkUser'>check_user = #{checkUser},</if>
+      <if test='null != operator'>operator = #{operator},</if>
       <if test='null != clcs'>clcs = #{clcs},</if>
       <if test='null != cljg'>cljg = #{cljg},</if>
       <if test='null != clqxldr'>clqxldr = #{clqxldr},</if>
-      <if test='null != operator'>operator = #{operator},</if>
-      <if test='null != operationDate'>operation_date = #{operationDate},</if>
+      <if test='null != clqxczz'>clqxczz = #{clqxczz},</if>
+      <if test='null != clrq'>clrq = #{clrq},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != createBy'>create_by = #{createBy},</if>
@@ -242,8 +242,8 @@
       <if test="stationId!=null and stationId!=''">
         and t.station_id=#{stationId}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
-        and t.check_date=#{checkDate}
+      <if test="operationDate!=null and operationDate!=''">
+        and t.operation_date=#{operationDate}
       </if>
       <if test="xsjcfs!=null and xsjcfs!=''">
         and t.xsjcfs=#{xsjcfs}
@@ -260,8 +260,8 @@
       <if test="yqwcsj!=null and yqwcsj!=''">
         and t.yqwcsj=#{yqwcsj}
       </if>
-      <if test="checkUser!=null and checkUser!=''">
-        and t.check_user=#{checkUser}
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
       </if>
       <if test="clcs!=null and clcs!=''">
         and t.clcs=#{clcs}
@@ -272,11 +272,11 @@
       <if test="clqxldr!=null and clqxldr!=''">
         and t.clqxldr=#{clqxldr}
       </if>
-      <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+      <if test="clqxczz!=null and clqxczz!=''">
+        and t.clqxczz=#{clqxczz}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
-        and t.operation_date=#{operationDate}
+      <if test="clrq!=null and clrq!=''">
+        and t.clrq=#{clrq}
       </if>
       <if test="remark!=null and remark!=''">
         and t.remark=#{remark}