Merge remote-tracking branch 'origin/master'

# Conflicts:
#	railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusFdfxjyqController.java
#	railway-business/src/main/java/com/railway/business/catenary/domain/BusFdfxjyq.java
#	railway-business/src/main/java/com/railway/business/catenary/mapper/BusFdfxjyqMapper.java
#	railway-business/src/main/java/com/railway/business/catenary/service/IBusFdfxjyqService.java
#	railway-business/src/main/java/com/railway/business/catenary/service/impl/BusFdfxjyqServiceImpl.java
#	railway-business/src/main/resources/mapper/business/BusFdfxjyqMapper.xml

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

@@ -26,15 +26,15 @@ public class BusFdfxjyqController extends BaseController {
     private IBusFdfxjyqService busFdfxjyqService;
 
     @ApiOperation(value = "新增")
-    @PutMapping("/add")
+    @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody BusFdfxjyq busFdfxjyq) {
         return toAjax(busFdfxjyqService.create(busFdfxjyq));
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("/id")
-    public AjaxResult delete(@RequestParam String id) {
-        return toAjax(busFdfxjyqService.delete(id));
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busFdfxjyqService.delete(ids));
     }
 
     @ApiOperation(value = "更新")
@@ -44,7 +44,7 @@ public class BusFdfxjyqController extends BaseController {
     }
 
     @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/id"})
+    @GetMapping(value = {"/", "/{id}"})
     public AjaxResult getInfo(String id) {
         BusFdfxjyq info = busFdfxjyqService.getInfo(id);
         AjaxResult ajax = AjaxResult.success();
@@ -53,8 +53,8 @@ public class BusFdfxjyqController extends BaseController {
     }
 
     @ApiOperation(value = "列表")
-    @PostMapping(value = "list")
-    public TableDataInfo getList(@RequestBody BusFdfxjyq busFdfxjyq) {
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusFdfxjyq busFdfxjyq) {
         startPage();
         List<BusFdfxjyq> list = busFdfxjyqService.getList(busFdfxjyq);
         return getDataTable(list);

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

@@ -8,6 +8,7 @@ import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +35,7 @@ public class BusFjxgmdController extends BaseController {
     }
 
     @ApiOperation(value = "通过支柱信息获取对锚列表", notes = "通过支柱信息获取对锚列表", response = AjaxResult.class)
-    @PostMapping("/getListByZz")
+    @GetMapping("/getListByZz")
     public TableDataInfo getList(BusFjxgmdVo busFjxgmdVo) {
         startPage();
         List<BusFjxgmdVo> list = busFjxgmdService.getListByZz(busFjxgmdVo);

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

@@ -0,0 +1,63 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.WebDataBinder;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import javax.validation.Valid;
+import java.util.List;
+
+import javax.validation.Valid;
+
+@Api(value = "rest/catenary/bus/jcb/fdfxjyq", tags = "dxf分段绝缘器检查表")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jcb/fdfxjyq")
+public class BusJcbFdfxjyqController extends BaseController {
+    @Autowired
+    private IBusJcbFdfxjyqService busJcbFdfxjyqService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public AjaxResult add(@Validated @RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+        return toAjax(busJcbFdfxjyqService.create(busJcbFdfxjyq));
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busJcbFdfxjyqService.delete(ids));
+    }
+
+    @ApiOperation(value = "更新")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody @Valid BusJcbFdfxjyq busJcbFdfxjyq) {
+        return toAjax(busJcbFdfxjyqService.update(busJcbFdfxjyq));
+    }
+
+    @ApiOperation(value = "单个")
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(String id) {
+        BusJcbFdfxjyq info = busJcbFdfxjyqService.getInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "列表")
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusJcbFdfxjyq busJcbFdfxjyq) {
+        startPage();
+        List<BusJcbFdfxjyq> list = busJcbFdfxjyqService.getList(busJcbFdfxjyq);
+        return getDataTable(list);
+    }
+
+}

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

@@ -26,15 +26,15 @@ public class BusZzdzxxController extends BaseController {
     private IBusZzdzxxService busZzdzxxService;
 
     @ApiOperation(value = "新增")
-    @PutMapping("/add")
+    @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody BusZzdzxx busZzdzxx) {
         return toAjax(busZzdzxxService.create(busZzdzxx));
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("/id")
-    public AjaxResult delete(@RequestParam String id) {
-        return toAjax(busZzdzxxService.delete(id));
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@PathVariable String[] ids) {
+        return toAjax(busZzdzxxService.delete(ids));
     }
 
     @ApiOperation(value = "更新")
@@ -44,7 +44,7 @@ public class BusZzdzxxController extends BaseController {
     }
 
     @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/id"})
+    @GetMapping(value = {"/", "/{id}"})
     public AjaxResult getInfo(String id) {
         BusZzdzxx info = busZzdzxxService.getInfo(id);
         AjaxResult ajax = AjaxResult.success();
@@ -53,8 +53,8 @@ public class BusZzdzxxController extends BaseController {
     }
 
     @ApiOperation(value = "列表")
-    @PostMapping(value = "list")
-    public TableDataInfo getList(@RequestBody BusZzdzxx busZzdzxx) {
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusZzdzxx busZzdzxx) {
         startPage();
         List<BusZzdzxx> list = busZzdzxxService.getList(busZzdzxx);
         return getDataTable(list);

railway-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@ spring:
       # 主库数据源
       master:
         url: jdbc:mysql://db.iamsee.com:3306/railway?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
+        username: railway
         password: '$jgkj001'
       # 从库数据源
       slave:

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

@@ -10,11 +10,11 @@ import java.util.Date;
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotNull;
 /**
- * = 分段分相绝缘器
- * @author wuhonghao 2021-10-12
+ * 分段分相绝缘器
+ * @author wuhonghao 2021-10-13
  */
 @Data
-@ApiModel("= 分段分相绝缘器")
+@ApiModel("分段分相绝缘器")
 @EqualsAndHashCode(callSuper = true)
 public class BusFdfxjyq extends BaseEntity{
 
@@ -23,212 +23,185 @@ public class BusFdfxjyq extends BaseEntity{
 
     @ApiModelProperty(value = "段别")
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【段别】不能为空")
     private String db;
 
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【所属部门】不能为空")
     private String bm;
 
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【线别】不能为空")
     private String xb;
 
     @ApiModelProperty(value = "站/区间")
     @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【站/区间】不能为空")
     private String qj;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【行别】不能为空")
     private String hb;
 
     @ApiModelProperty(value = "支柱号范围")
     @Length(min = 1, max = 50, message = "【支柱号范围】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱号范围】不能为空")
     private String zzhfw;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【股道】不能为空")
     private String gd;
 
     @ApiModelProperty(value = "管辖模式")
     @Length(min = 1, max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【管辖模式】不能为空")
     private String gxms;
 
     @ApiModelProperty(value = "公里标")
     @Length(min = 1, max = 50, message = "【公里标】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【公里标】不能为空")
     private String glb;
 
     @ApiModelProperty(value = "道岔号")
     @Length(min = 1, max = 50, message = "【道岔号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【道岔号】不能为空")
     private String cdh;
 
     @ApiModelProperty(value = "类型")
     @Length(min = 1, max = 20, message = "【类型】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【类型】不能为空")
     private String lx;
 
     @ApiModelProperty(value = "备注")
     @Length(min = 1, max = 300, message = "【备注】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【备注】不能为空")
     private String bz;
 
     @ApiModelProperty(value = "绝缘器编号")
     @Length(min = 1, max = 50, message = "【绝缘器编号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【绝缘器编号】不能为空")
     private String jyqbh;
 
     @ApiModelProperty(value = "绝缘器型号")
     @Length(min = 1, max = 50, message = "【绝缘器型号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【绝缘器型号】不能为空")
     private String jyqxh;
 
     @ApiModelProperty(value = "生产厂家")
     @Length(min = 1, max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【生产厂家】不能为空")
     private String sccj;
 
     @ApiModelProperty(value = "出厂日期")
-    @NotNull(message = "【出厂日期】不能为空")
     private Date ccrq;
 
     @ApiModelProperty(value = "投运日期")
-    @NotNull(message = "【投运日期】不能为空")
     private Date tyrq;
 
     @ApiModelProperty(value = "使用寿命（年）")
     @Length(min = 1, max = 10, message = "【使用寿命（年）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【使用寿命（年）】不能为空")
     private String sysm;
 
     @ApiModelProperty(value = "承力索绝缘子-类型")
     @Length(min = 1, max = 100, message = "【承力索绝缘子-类型】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【承力索绝缘子-类型】不能为空")
     private String clsjyzlx;
 
     @ApiModelProperty(value = "承力索终锚线夹状态")
     @Length(min = 1, max = 20, message = "【承力索终锚线夹状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【承力索终锚线夹状态】不能为空")
     private String clsjyzzt;
 
     @ApiModelProperty(value = "分段主绝缘状态")
     @Length(min = 1, max = 20, message = "【分段主绝缘状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【分段主绝缘状态】不能为空")
     private String fdzjyzt;
 
     @ApiModelProperty(value = "绝缘滑道(辅助滑道)")
     @Length(min = 1, max = 20, message = "【绝缘滑道(辅助滑道)】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【绝缘滑道(辅助滑道)】不能为空")
     private String jyhdzt;
 
     @ApiModelProperty(value = "金属滑道磨损状态")
     @Length(min = 1, max = 20, message = "【金属滑道磨损状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【金属滑道磨损状态】不能为空")
     private String jshdmszt;
 
     @ApiModelProperty(value = "空气间隙-实测值")
     @Length(min = 1, max = 10, message = "【空气间隙-实测值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【空气间隙-实测值】不能为空")
     private String kqjxScz;
 
     @ApiModelProperty(value = "空气间隙-标准值\r\n")
     @Length(min = 1, max = 10, message = "【空气间隙-标准值\r\n】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【空气间隙-标准值\r\n】不能为空")
     private String kqjxBzz;
 
     @ApiModelProperty(value = "消弧棒状态")
     @Length(min = 1, max = 20, message = "【消弧棒状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【消弧棒状态】不能为空")
     private String xgbzt;
 
     @ApiModelProperty(value = "悬吊装置状态")
     @Length(min = 1, max = 20, message = "【悬吊装置状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【悬吊装置状态】不能为空")
     private String xdzzzt;
 
     @ApiModelProperty(value = "与线路中心线的偏移（mm）-实测值")
     @Length(min = 1, max = 10, message = "【与线路中心线的偏移（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【与线路中心线的偏移（mm）-实测值】不能为空")
     private String yxlzxxpyScz;
 
     @ApiModelProperty(value = "与线路中心线的偏移（mm）-标准值")
     @Length(min = 1, max = 10, message = "【与线路中心线的偏移（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【与线路中心线的偏移（mm）-标准值】不能为空")
     private String yxlzxxpyBzz;
 
     @ApiModelProperty(value = "与轨面连线是否平行")
     @Length(min = 1, max = 10, message = "【与轨面连线是否平行】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【与轨面连线是否平行】不能为空")
     private String ygmlxsfpx;
 
     @ApiModelProperty(value = "负弛度(mm)")
     @Length(min = 1, max = 10, message = "【负弛度(mm)】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【负弛度(mm)】不能为空")
     private String fcdScz;
 
     @ApiModelProperty(value = "负弛度(mm)")
     @Length(min = 1, max = 10, message = "【负弛度(mm)】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【负弛度(mm)】不能为空")
     private String fcdBzz;
 
     @ApiModelProperty(value = "接头及各连接部位状态")
     @Length(min = 1, max = 20, message = "【接头及各连接部位状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接头及各连接部位状态】不能为空")
     private String jtjgljbwzt;
 
     @ApiModelProperty(value = "接触线夹处导线磨耗情况")
     @Length(min = 1, max = 20, message = "【接触线夹处导线磨耗情况】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接触线夹处导线磨耗情况】不能为空")
     private String jcxjcdxmhqk;
 
     @ApiModelProperty(value = "接触线接头线夹螺栓、螺母（力矩55 n·m）")
     @Length(min = 1, max = 10, message = "【接触线接头线夹螺栓、螺母（力矩55 n·m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接触线接头线夹螺栓、螺母（力矩55 n·m）】不能为空")
     private String jcxjtxjlslm;
 
     @ApiModelProperty(value = "过渡是否平滑")
     @Length(min = 1, max = 10, message = "【过渡是否平滑】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【过渡是否平滑】不能为空")
     private String gdsfph;
 
     @ApiModelProperty(value = "其它")
     @Length(min = 1, max = 255, message = "【其它】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【其它】不能为空")
     private String qt;
 
     @ApiModelProperty(value = "附件")
     @Length(min = 1, max = 255, message = "【附件】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【附件】不能为空")
     private String fj;
 
     @ApiModelProperty(value = "数量")
     @Length(min = 1, max = 10, message = "【数量】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【数量】不能为空")
     private String sl;
 
     @ApiModelProperty(value = "单位")
     @Length(min = 1, max = 10, message = "【单位】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【单位】不能为空")
     private String dw;
 
     @ApiModelProperty(value = "分段安装位置")
     @Length(min = 1, max = 100, message = "【分段安装位置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【分段安装位置】不能为空")
     private String fdazwz;
 
     @ApiModelProperty(value = "数据编号")
     @Length(min = 1, max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【数据编号】不能为空")
     private String sjbh;
 
+    @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;
+
     public BusFdfxjyq() {
     }
 

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

@@ -33,7 +33,7 @@ public class BusFjxgmd extends BaseEntity {
     /**
      * 所属部门
      */
-    private String ssbm;
+    private String bm;
 
     /**
      * 线别

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

@@ -0,0 +1,164 @@
+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;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+/**
+ * dxf分段绝缘器检查表
+ * @author wuhonghao 2021-10-13
+ */
+@Data
+@ApiModel("dxf分段绝缘器检查表")
+@EqualsAndHashCode(callSuper = true)
+public class BusJcbFdfxjyq extends BaseEntity{
+
+    @ApiModelProperty(value = "主键", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "绝缘器主键")
+    private Long fdfxjyqId;
+
+    @ApiModelProperty(value = "温度")
+    @Length(min = 1, max = 10, message = "【温度】长度必须介于 {min} 和 {max} 之间")
+    private String wd;
+
+    @ApiModelProperty(value = "检查日期")
+    private Date jcrq;
+
+    @ApiModelProperty(value = "图片路径")
+    @Length(min = 1, max = 255, message = "【图片路径】长度必须介于 {min} 和 {max} 之间")
+    private String picUrl;
+
+    @ApiModelProperty(value = "a点值")
+    private BigDecimal pointA;
+
+    @ApiModelProperty(value = "b点值")
+    private BigDecimal pointB;
+
+    @ApiModelProperty(value = "c点值")
+    private BigDecimal pointC;
+
+    @ApiModelProperty(value = "d点值")
+    private BigDecimal pointD;
+
+    @ApiModelProperty(value = "e点值")
+    private BigDecimal pointE;
+
+    @ApiModelProperty(value = "f点值")
+    private BigDecimal pointF;
+
+    @ApiModelProperty(value = "g点值")
+    private BigDecimal pointG;
+
+    @ApiModelProperty(value = "h点值")
+    private BigDecimal pointH;
+
+    @ApiModelProperty(value = "分段负驰度")
+    private BigDecimal fcd;
+
+    @ApiModelProperty(value = "分段地面平顺度（任意两点间导高差最大值）")
+    @Length(min = 1, max = 255, message = "【分段地面平顺度（任意两点间导高差最大值）】长度必须介于 {min} 和 {max} 之间")
+    private String fddmpsd;
+
+    @ApiModelProperty(value = "分段绝缘器主绝缘状态")
+    @Length(min = 1, max = 1, message = "【分段绝缘器主绝缘状态】长度必须介于 {min} 和 {max} 之间")
+    private String jybjFdjyqzjyzt;
+
+    @ApiModelProperty(value = "分段绝缘器主绝缘状态(故障描述)")
+    @Length(min = 1, max = 255, message = "【分段绝缘器主绝缘状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String jybjFdjyqzjyztDesc;
+
+    @ApiModelProperty(value = "承力索绝缘子状态")
+    @Length(min = 1, max = 1, message = "【承力索绝缘子状态】长度必须介于 {min} 和 {max} 之间")
+    private String jybjClsjyzzt;
+
+    @ApiModelProperty(value = "承力索绝缘子状态(故障描述)")
+    @Length(min = 1, max = 255, message = "【承力索绝缘子状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String jybjClsjyzztDesc;
+
+    @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹")
+    @Length(min = 1, max = 1, message = "【各螺栓无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztLs;
+
+    @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹(故障描述)")
+    @Length(min = 1, max = 255, message = "【各螺栓无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztLsDesc;
+
+    @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹")
+    @Length(min = 1, max = 1, message = "【斜吊线无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztXdx;
+
+    @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹(故障描述)")
+    @Length(min = 1, max = 255, message = "【斜吊线无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztXdxDesc;
+
+    @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹")
+    @Length(min = 1, max = 1, message = "【平衡支架无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztPhzj;
+
+    @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹(故障描述)")
+    @Length(min = 1, max = 255, message = "【平衡支架无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztPhzjDesc;
+
+    @ApiModelProperty(value = "接触线接头处过渡平滑")
+    @Length(min = 1, max = 1, message = "【接触线接头处过渡平滑】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztJcxjt;
+
+    @ApiModelProperty(value = "接触线接头处过渡平滑(故障描述)")
+    @Length(min = 1, max = 255, message = "【接触线接头处过渡平滑(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztJcxjtDesc;
+
+    @ApiModelProperty(value = "消弧角无裂纹、烧伤")
+    @Length(min = 1, max = 1, message = "【消弧角无裂纹、烧伤】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztXhj;
+
+    @ApiModelProperty(value = "消弧角无裂纹、烧伤(故障描述)")
+    @Length(min = 1, max = 255, message = "【消弧角无裂纹、烧伤(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztXhjDesc;
+
+    @ApiModelProperty(value = "设备状态")
+    @Length(min = 1, max = 1, message = "【设备状态】长度必须介于 {min} 和 {max} 之间")
+    private String sbzt;
+
+    @ApiModelProperty(value = "设备状态(故障描述)")
+    @Length(min = 1, max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String sbztDesc;
+
+    @ApiModelProperty(value = "检查人")
+    private Long jcr;
+
+    @ApiModelProperty(value = "存在问题")
+    @Length(min = 1, max = 1000, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    private String czwt;
+
+    @ApiModelProperty(value = "创建者")
+    @Length(min = 1, max = 64, message = "【创建者】长度必须介于 {min} 和 {max} 之间")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新者")
+    @Length(min = 1, max = 64, message = "【更新者】长度必须介于 {min} 和 {max} 之间")
+    private String updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "保存状态，1-保存 ，2-提交")
+    @Length(min = 1, max = 1, message = "【保存状态，1-保存 ，2-提交】长度必须介于 {min} 和 {max} 之间")
+    private String saveFlag;
+
+    @ApiModelProperty(value = "del_flag")
+    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    private String delFlag;
+
+    public BusJcbFdfxjyq() {
+    }
+
+}

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

@@ -10,11 +10,11 @@ import java.util.Date;
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotNull;
 /**
- * 支柱吊柱信息 row_format =
- * @author wuhonghao 2021-10-12
+ * 支柱吊柱信息
+ * @author wuhonghao 2021-10-13
  */
 @Data
-@ApiModel("支柱吊柱信息 row_format =")
+@ApiModel("支柱吊柱信息")
 @EqualsAndHashCode(callSuper = true)
 public class BusZzdzxx extends BaseEntity{
 
@@ -23,359 +23,287 @@ public class BusZzdzxx extends BaseEntity{
 
     @ApiModelProperty(value = "段别")
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【段别】不能为空")
     private String db;
 
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【所属部门】不能为空")
     private String bm;
 
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【线别】不能为空")
     private String xb;
 
     @ApiModelProperty(value = "站/区间")
     @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【站/区间】不能为空")
     private String qj;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【行别】不能为空")
     private String hb;
 
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱号】不能为空")
     private String zzh;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【股道】不能为空")
     private String gd;
 
     @ApiModelProperty(value = "管辖模式")
     @Length(min = 1, max = 20, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【管辖模式】不能为空")
     private String gxms;
 
     @ApiModelProperty(value = "基本单元代码")
     @Length(min = 1, max = 100, message = "【基本单元代码】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【基本单元代码】不能为空")
     private String jbdydm;
 
     @ApiModelProperty(value = "隧道")
     @Length(min = 1, max = 50, message = "【隧道】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【隧道】不能为空")
     private String sd;
 
     @ApiModelProperty(value = "公里标（m）")
     @Length(min = 1, max = 20, message = "【公里标（m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【公里标（m）】不能为空")
     private String glb;
 
     @ApiModelProperty(value = "接触悬挂锚段号")
     @Length(min = 1, max = 100, message = "【接触悬挂锚段号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接触悬挂锚段号】不能为空")
     private String jcxgmdh;
 
     @ApiModelProperty(value = "接触悬挂安装图号")
     @Length(min = 1, max = 200, message = "【接触悬挂安装图号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【接触悬挂安装图号】不能为空")
     private String jcxgazth;
 
     @ApiModelProperty(value = "附加悬挂安装图号")
     @Length(min = 1, max = 200, message = "【附加悬挂安装图号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【附加悬挂安装图号】不能为空")
     private String fjxgazth;
 
     @ApiModelProperty(value = "支柱类型")
     @Length(min = 1, max = 50, message = "【支柱类型】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱类型】不能为空")
     private String zzlx;
 
     @ApiModelProperty(value = "支柱型号")
     @Length(min = 1, max = 100, message = "【支柱型号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱型号】不能为空")
     private String zzxh;
 
     @ApiModelProperty(value = "支柱用途")
     @Length(min = 1, max = 100, message = "【支柱用途】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱用途】不能为空")
     private String zzyt;
 
     @ApiModelProperty(value = "材质")
     @Length(min = 1, max = 100, message = "【材质】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【材质】不能为空")
     private String cz;
 
     @ApiModelProperty(value = "直线/曲外/曲内")
     @Length(min = 1, max = 50, message = "【直线/曲外/曲内】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【直线/曲外/曲内】不能为空")
     private String zxqwqn;
 
     @ApiModelProperty(value = "跨距（m）")
     @Length(min = 1, max = 50, message = "【跨距（m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【跨距（m）】不能为空")
     private String kj;
 
     @ApiModelProperty(value = "曲线半径（m）")
     @Length(min = 1, max = 50, message = "【曲线半径（m）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【曲线半径（m）】不能为空")
     private String qxbj;
 
     @ApiModelProperty(value = "导高")
     @Length(min = 1, max = 50, message = "【导高】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【导高】不能为空")
     private String dg;
 
     @ApiModelProperty(value = "拉出值")
     @Length(min = 1, max = 50, message = "【拉出值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【拉出值】不能为空")
     private String lcz;
 
     @ApiModelProperty(value = "轨面标高（mm）-实测值（支柱侧轨面红线高度）")
     @Length(min = 1, max = 50, message = "【轨面标高（mm）-实测值（支柱侧轨面红线高度）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【轨面标高（mm）-实测值（支柱侧轨面红线高度）】不能为空")
     private String gmbgScz;
 
     @ApiModelProperty(value = "轨面标高（mm）-标准值（红横线位置）")
     @Length(min = 1, max = 50, message = "【轨面标高（mm）-标准值（红横线位置）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【轨面标高（mm）-标准值（红横线位置）】不能为空")
     private String gmbgBzz;
 
     @ApiModelProperty(value = "侧面限界（mm）-实测值")
     @Length(min = 1, max = 50, message = "【侧面限界（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【侧面限界（mm）-实测值】不能为空")
     private String cmxjScz;
 
     @ApiModelProperty(value = "侧面限界（mm）-标准值")
     @Length(min = 1, max = 50, message = "【侧面限界（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【侧面限界（mm）-标准值】不能为空")
     private String cmxjBzz;
 
     @ApiModelProperty(value = "外轨超高（mm）-实测值")
     @Length(min = 1, max = 50, message = "【外轨超高（mm）-实测值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【外轨超高（mm）-实测值】不能为空")
     private String wgcgScz;
 
     @ApiModelProperty(value = "外轨超高（mm）-标准值")
     @Length(min = 1, max = 50, message = "【外轨超高（mm）-标准值】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【外轨超高（mm）-标准值】不能为空")
     private String wgcgBzz;
 
     @ApiModelProperty(value = "支柱状态")
     @Length(min = 1, max = 50, message = "【支柱状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱状态】不能为空")
     private String zzzt;
 
     @ApiModelProperty(value = "生产厂家")
     @Length(min = 1, max = 200, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【生产厂家】不能为空")
     private String sccj;
 
     @ApiModelProperty(value = "投运日期")
-    @NotNull(message = "【投运日期】不能为空")
     private Date tyrq;
 
     @ApiModelProperty(value = "出厂日期")
-    @NotNull(message = "【出厂日期】不能为空")
     private Date ccrq;
 
     @ApiModelProperty(value = "设计寿命（年）")
     @Length(min = 1, max = 10, message = "【设计寿命（年）】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【设计寿命（年）】不能为空")
     private String sjsm;
 
     @ApiModelProperty(value = "支柱基础状态")
     @Length(min = 1, max = 50, message = "【支柱基础状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【支柱基础状态】不能为空")
     private String zzjczt;
 
     @ApiModelProperty(value = "基础类型")
     @Length(min = 1, max = 50, message = "【基础类型】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【基础类型】不能为空")
     private String jclx;
 
     @ApiModelProperty(value = "地线状态")
     @Length(min = 1, max = 50, message = "【地线状态】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【地线状态】不能为空")
     private String dxzt;
 
     @ApiModelProperty(value = "检修周期")
     @Length(min = 1, max = 10, message = "【检修周期】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【检修周期】不能为空")
     private String jxzq;
 
     @ApiModelProperty(value = "af、pw线绝缘子、肩架及对锚是否满足要求")
     @Length(min = 1, max = 10, message = "【af、pw线绝缘子、肩架及对锚是否满足要求】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【af、pw线绝缘子、肩架及对锚是否满足要求】不能为空")
     private String sfSfpwjjdm;
 
     @ApiModelProperty(value = "是否有补偿装置")
     @Length(min = 1, max = 10, message = "【是否有补偿装置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有补偿装置】不能为空")
     private String sfBczz;
 
     @ApiModelProperty(value = "是否有分段绝缘器")
     @Length(min = 1, max = 10, message = "【是否有分段绝缘器】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有分段绝缘器】不能为空")
     private String sfFdjyq;
 
     @ApiModelProperty(value = "是否有分相绝缘器")
     @Length(min = 1, max = 10, message = "【是否有分相绝缘器】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有分相绝缘器】不能为空")
     private String sfFxjyq;
 
     @ApiModelProperty(value = "是否处于交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于交叉线岔】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于交叉线岔】不能为空")
     private String sfJcxc;
 
     @ApiModelProperty(value = "是否处于两线无交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于两线无交叉线岔】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于两线无交叉线岔】不能为空")
     private String sfLxwjcxc;
 
     @ApiModelProperty(value = "是否处于三线无交叉线岔")
     @Length(min = 1, max = 10, message = "【是否处于三线无交叉线岔】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于三线无交叉线岔】不能为空")
     private String sfSxwjcxc;
 
     @ApiModelProperty(value = "是否处于锚段关节式分相")
     @Length(min = 1, max = 10, message = "【是否处于锚段关节式分相】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否处于锚段关节式分相】不能为空")
     private String sfMdgjzfx;
 
     @ApiModelProperty(value = "是否有硬横跨")
     @Length(min = 1, max = 10, message = "【是否有硬横跨】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有硬横跨】不能为空")
     private String sfHkd;
 
     @ApiModelProperty(value = "是否有电连接")
     @Length(min = 1, max = 10, message = "【是否有电连接】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有电连接】不能为空")
     private String sfDlj;
 
     @ApiModelProperty(value = "是否有隔离开关")
     @Length(min = 1, max = 10, message = "【是否有隔离开关】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有隔离开关】不能为空")
     private String sfGlkg;
 
     @ApiModelProperty(value = "是否有避雷器")
     @Length(min = 1, max = 10, message = "【是否有避雷器】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有避雷器】不能为空")
     private String sfBlq;
 
     @ApiModelProperty(value = "是否有地磁感应装置")
     @Length(min = 1, max = 10, message = "【是否有地磁感应装置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有地磁感应装置】不能为空")
     private String sfDcgyzz;
 
     @ApiModelProperty(value = "是否有行车标志牌")
     @Length(min = 1, max = 10, message = "【是否有行车标志牌】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有行车标志牌】不能为空")
     private String sfXcbzp;
 
     @ApiModelProperty(value = "是否有接地装置")
     @Length(min = 1, max = 10, message = "【是否有接地装置】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有接地装置】不能为空")
     private String sfJdzz;
 
     @ApiModelProperty(value = "是否有吸上线")
     @Length(min = 1, max = 10, message = "【是否有吸上线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有吸上线】不能为空")
     private String sfXsx;
 
     @ApiModelProperty(value = "是否有回流线")
     @Length(min = 1, max = 10, message = "【是否有回流线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有回流线】不能为空")
     private String sfHlx;
 
     @ApiModelProperty(value = "是否有gw线")
     @Length(min = 1, max = 10, message = "【是否有gw线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有gw线】不能为空")
     private String sfGwx;
 
     @ApiModelProperty(value = "是否有供电线")
     @Length(min = 1, max = 10, message = "【是否有供电线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有供电线】不能为空")
     private String sfGdx;
 
     @ApiModelProperty(value = "是否有pw线")
     @Length(min = 1, max = 10, message = "【是否有pw线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有pw线】不能为空")
     private String sfPwx;
 
     @ApiModelProperty(value = "是否有af线")
     @Length(min = 1, max = 10, message = "【是否有af线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有af线】不能为空")
     private String sfSfx;
 
     @ApiModelProperty(value = "是否有加强线")
     @Length(min = 1, max = 10, message = "【是否有加强线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有加强线】不能为空")
     private String sfJqx;
 
     @ApiModelProperty(value = "是否有避雷线")
     @Length(min = 1, max = 10, message = "【是否有避雷线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有避雷线】不能为空")
     private String sfBlx;
 
     @ApiModelProperty(value = "是否有拉线")
     @Length(min = 1, max = 10, message = "【是否有拉线】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有拉线】不能为空")
     private String sfLx;
 
     @ApiModelProperty(value = "是否有中锚")
     @Length(min = 1, max = 10, message = "【是否有中锚】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【是否有中锚】不能为空")
     private String sfZm;
 
     @ApiModelProperty(value = "其它")
     @Length(min = 1, max = 255, message = "【其它】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【其它】不能为空")
     private String qt;
 
     @ApiModelProperty(value = "附件")
     @Length(min = 1, max = 255, message = "【附件】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【附件】不能为空")
     private String fj;
 
     @ApiModelProperty(value = "数量")
     @Length(min = 1, max = 10, message = "【数量】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【数量】不能为空")
     private String sl;
 
     @ApiModelProperty(value = "单位")
     @Length(min = 1, max = 100, message = "【单位】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【单位】不能为空")
     private String dw;
 
     @ApiModelProperty(value = "数据编号")
     @Length(min = 1, max = 255, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【数据编号】不能为空")
     private String sjbh;
 
     @ApiModelProperty(value = "del_flag")
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【del_flag】不能为空")
     private String delFlag;
 
     @ApiModelProperty(value = "create_by")
     @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【create_by】不能为空")
     private String createBy;
 
     @ApiModelProperty(value = "update_by")
     @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    @NotNull(message = "【update_by】不能为空")
     private String updateBy;
 
     @ApiModelProperty(value = "update_time")
-    @NotNull(message = "【update_time】不能为空")
     private Date updateTime;
 
     public BusZzdzxx() {

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

@@ -28,7 +28,7 @@ public class BusFjxgmdVo {
      * 所属部门
      */
     @ApiModelProperty(value = "所属部门")
-    private String ssbm;
+    private String bm;
 
     /**
      * 线别

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

@@ -0,0 +1,31 @@
+package com.railway.business.catenary.enums;
+
+/**
+ * 检查表状态
+ *
+ * @author railway
+ */
+public enum TestTableStatusEnum {
+  /** 检查表状态 */
+  UNREPORTED("0", "未提交"),
+  REPORTED("1", "已提交"),
+  RETURNED("2", "已退回"),
+  COMPLETED("9", "已确认"),
+  ;
+
+  private final String code;
+  private final String info;
+
+  TestTableStatusEnum(String code, String info) {
+    this.code = code;
+    this.info = info;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public String getInfo() {
+    return info;
+  }
+}

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

@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* = 分段分相绝缘器
+* 分段分相绝缘器
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 @Mapper
 @Repository

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

@@ -0,0 +1,43 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+* dxf分段绝缘器检查表
+* @author wuhonghao
+* @date 2021/10/13
+*/
+@Mapper
+@Repository
+public interface BusJcbFdfxjyqMapper {
+
+    /**
+    * @Description: 新增
+    */
+    int insert(BusJcbFdfxjyq busJcbFdfxjyq);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(@Param("id") String id);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbFdfxjyq busJcbFdfxjyq);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbFdfxjyq getInfo(@Param("id") String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    Page<BusJcbFdfxjyq> getList(BusJcbFdfxjyq busJcbFdfxjyq);
+
+}

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

@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 支柱吊柱信息 row_format =
+* 支柱吊柱信息
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 @Mapper
 @Repository

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

@@ -3,9 +3,9 @@ package com.railway.business.catenary.service;
 import com.railway.business.catenary.domain.BusFdfxjyq;
 import java.util.List;
 /**
-* = 分段分相绝缘器
+* 分段分相绝缘器
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 public interface IBusFdfxjyqService{
 
@@ -17,7 +17,7 @@ public interface IBusFdfxjyqService{
     /**
     * @Description: 删除
     */
-    int delete(String ids);
+    int delete(String[] ids);
 
     /**
     * @Description: 更新

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

@@ -0,0 +1,37 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import java.util.List;
+/**
+* dxf分段绝缘器检查表
+* @author wuhonghao
+* @date 2021/10/13
+*/
+public interface IBusJcbFdfxjyqService{
+
+    /**
+    * @Description: 新增
+    */
+    int create(BusJcbFdfxjyq busJcbFdfxjyq);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbFdfxjyq busJcbFdfxjyq);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbFdfxjyq getInfo(String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    List<BusJcbFdfxjyq> getList(BusJcbFdfxjyq busJcbFdfxjyq);
+
+}

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

@@ -3,9 +3,9 @@ package com.railway.business.catenary.service;
 import com.railway.business.catenary.domain.BusZzdzxx;
 import java.util.List;
 /**
-* 支柱吊柱信息 row_format =
+* 支柱吊柱信息
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 public interface IBusZzdzxxService{
 
@@ -17,7 +17,7 @@ public interface IBusZzdzxxService{
     /**
     * @Description: 删除
     */
-    int delete(String ids);
+    int delete(String[] ids);
 
     /**
     * @Description: 更新

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

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 /**
-* = 分段分相绝缘器
+* 分段分相绝缘器
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 @Service
 @Transactional(readOnly = true)
@@ -32,8 +32,13 @@ private BusFdfxjyqMapper busFdfxjyqMapper;
 	* @Description: 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public int delete(String id) {
-		return	busFdfxjyqMapper.delete(id);
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busFdfxjyqMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
 	}
 
 	/**

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

@@ -0,0 +1,65 @@
+package com.railway.business.catenary.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper;
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+/**
+* dxf分段绝缘器检查表
+* @author wuhonghao
+* @date 2021/10/13
+*/
+@Service
+@Transactional(readOnly = true)
+public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService{
+@Autowired
+private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
+
+	/**
+	* @Description: 新增
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int create(BusJcbFdfxjyq busJcbFdfxjyq) {
+		return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
+	}
+
+	/**
+	* @Description: 删除
+	*/
+	@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;
+	}
+
+	/**
+	* @Description: 更新
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int update(BusJcbFdfxjyq busJcbFdfxjyq) {
+		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+	}
+
+	/**
+	* @Description: 获取单个
+	*/
+	public BusJcbFdfxjyq getInfo(String id) {
+		return busJcbFdfxjyqMapper.getInfo(id);
+	}
+
+	/**
+	* @Description: 查询列表
+	*/
+	public List<BusJcbFdfxjyq> getList(BusJcbFdfxjyq busJcbFdfxjyq) {
+		return busJcbFdfxjyqMapper.getList(busJcbFdfxjyq);
+	}
+}

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

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 /**
-* 支柱吊柱信息 row_format =
+* 支柱吊柱信息
 * @author wuhonghao
-* @date 2021/10/12
+* @date 2021/10/13
 */
 @Service
 @Transactional(readOnly = true)
@@ -32,8 +32,13 @@ private BusZzdzxxMapper busZzdzxxMapper;
 	* @Description: 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public int delete(String id) {
-		return	busZzdzxxMapper.delete(id);
+	public int delete(String[] ids) {
+		int r =0;
+		for (int i=0; i< ids.length;i++){
+			int j= busZzdzxxMapper.delete(ids[i]);
+			r = r + j;
+		}
+		return r;
 	}
 
 	/**

railway-business/src/main/resources/mapper/business/BusFdfxjyqMapper.xml

@@ -47,6 +47,11 @@
                 <result column="dw" property="dw"/>
                 <result column="fdazwz" property="fdazwz"/>
                 <result column="sjbh" property="sjbh"/>
+                <result column="del_flag" property="delFlag"/>
+                <result column="create_by" property="createBy"/>
+                <result column="create_time" property="createTime"/>
+                <result column="update_by" property="updateBy"/>
+                <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -92,7 +97,12 @@
                 sl,
                 dw,
                 fdazwz,
-                sjbh
+                sjbh,
+                del_flag,
+                create_by,
+                create_time,
+                update_by,
+                update_time
     </sql>
 
     <insert id="insert" parameterType="com.railway.business.catenary.domain.BusFdfxjyq">
@@ -101,7 +111,6 @@
         </selectKey>
         INSERT INTO bus_fdfxjyq
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    id,
                     <if test ='null != db'>
                     db,
                     </if>
@@ -226,11 +235,25 @@
                     fdazwz,
                     </if>
                     <if test ='null != sjbh'>
-                    sjbh
+                    sjbh,
+                    </if>
+                    <if test ='null != delFlag'>
+                    del_flag,
+                    </if>
+                    <if test ='null != createBy'>
+                    create_by,
+                    </if>
+                    <if test ='null != createTime'>
+                    create_time,
+                    </if>
+                    <if test ='null != updateBy'>
+                    update_by,
+                    </if>
+                    <if test ='null != updateTime'>
+                    update_time
                     </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    #{id},
                     <if test ='null != db'>
                     #{db},
                     </if>
@@ -355,7 +378,22 @@
                     #{fdazwz},
                     </if>
                     <if test ='null != sjbh'>
-                    #{sjbh}
+                    #{sjbh},
+                    </if>
+                    <if test ='null != delFlag'>
+                    #{delFlag},
+                    </if>
+                    <if test ='null != createBy'>
+                    #{createBy},
+                    </if>
+                    <if test ='null != createTime'>
+                    #{createTime},
+                    </if>
+                    <if test ='null != updateBy'>
+                    #{updateBy},
+                    </if>
+                    <if test ='null != updateTime'>
+                    #{updateTime}
                     </if>
         </trim>
     </insert>
@@ -410,7 +448,12 @@
                     <if test ='null != sl'>sl = #{sl},</if>
                     <if test ='null != dw'>dw = #{dw},</if>
                     <if test ='null != fdazwz'>fdazwz = #{fdazwz},</if>
-                    <if test ='null != sjbh'>sjbh = #{sjbh}</if>
+                    <if test ='null != sjbh'>sjbh = #{sjbh},</if>
+                    <if test ='null != delFlag'>del_flag = #{delFlag},</if>
+                    <if test ='null != createBy'>create_by = #{createBy},</if>
+                    <if test ='null != createTime'>create_time = #{createTime},</if>
+                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
+                    <if test ='null != updateTime'>update_time = #{updateTime}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -420,7 +463,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM bus_fdfxjyq
-        WHERE id = #{id}
+        WHERE del_flag='0' and id = #{id}
 
     </select>
 
@@ -429,6 +472,7 @@
         <include refid="Base_Column_List"/>
         FROM bus_fdfxjyq
         <where>
+            del_flag='0'
                 <if test="db!=null and db!=''">
                     and db=#{db}
                 </if>
@@ -555,6 +599,21 @@
                 <if test="sjbh!=null and sjbh!=''">
                     and sjbh=#{sjbh}
                 </if>
+                <if test="delFlag!=null and delFlag!=''">
+                    and del_flag=#{delFlag}
+                </if>
+                <if test="createBy!=null and createBy!=''">
+                    and create_by=#{createBy}
+                </if>
+                <if test="createTime!=null and createTime!=''">
+                    and create_time=#{createTime}
+                </if>
+                <if test="updateBy!=null and updateBy!=''">
+                    and update_by=#{updateBy}
+                </if>
+                <if test="updateTime!=null and updateTime!=''">
+                    and update_time=#{updateTime}
+                </if>
         </where>
     </select>
 

railway-business/src/main/resources/mapper/business/BusFjxgmdMapper.xml

@@ -14,7 +14,7 @@
         SELECT DISTINCT
             dm.qsgh as zzh,
             dm.qsglb,
-            dm.ssbm,
+            dm.bm,
             dm.xb,
             dm.qj,
             dm.hb
@@ -34,8 +34,8 @@
                     <if test="query.zzh != null and query.zzh != ''">
                         AND zz.zzh = #{query.zzh}
                     </if>
-                    <if test="query.ssbm != null and query.ssbm != ''">
-                        AND zz.bm = #{query.ssbm}
+                    <if test="query.bm != null and query.bm != ''">
+                        AND zz.bm = #{query.bm}
                     </if>
                     <if test="query.xb != null and query.xb != ''">
                         AND zz.xb = #{query.xb}

railway-business/src/main/resources/mapper/business/BusJcbFdfxjyqMapper.xml

@@ -0,0 +1,512 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper">
+
+    <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcbFdfxjyq">
+                <result column="id" property="id"/>
+                <result column="fdfxjyq_id" property="fdfxjyqId"/>
+                <result column="wd" property="wd"/>
+                <result column="jcrq" property="jcrq"/>
+                <result column="pic_url" property="picUrl"/>
+                <result column="point_a" property="pointA"/>
+                <result column="point_b" property="pointB"/>
+                <result column="point_c" property="pointC"/>
+                <result column="point_d" property="pointD"/>
+                <result column="point_e" property="pointE"/>
+                <result column="point_f" property="pointF"/>
+                <result column="point_g" property="pointG"/>
+                <result column="point_h" property="pointH"/>
+                <result column="fcd" property="fcd"/>
+                <result column="fddmpsd" property="fddmpsd"/>
+                <result column="jybj_fdjyqzjyzt" property="jybjFdjyqzjyzt"/>
+                <result column="jybj_fdjyqzjyzt_desc" property="jybjFdjyqzjyztDesc"/>
+                <result column="jybj_clsjyzzt" property="jybjClsjyzzt"/>
+                <result column="jybj_clsjyzzt_desc" property="jybjClsjyzztDesc"/>
+                <result column="lbjzt_ls" property="lbjztLs"/>
+                <result column="lbjzt_ls_desc" property="lbjztLsDesc"/>
+                <result column="lbjzt_xdx" property="lbjztXdx"/>
+                <result column="lbjzt_xdx_desc" property="lbjztXdxDesc"/>
+                <result column="lbjzt_phzj" property="lbjztPhzj"/>
+                <result column="lbjzt_phzj_desc" property="lbjztPhzjDesc"/>
+                <result column="lbjzt_jcxjt" property="lbjztJcxjt"/>
+                <result column="lbjzt_jcxjt_desc" property="lbjztJcxjtDesc"/>
+                <result column="lbjzt_xhj" property="lbjztXhj"/>
+                <result column="lbjzt_xhj_desc" property="lbjztXhjDesc"/>
+                <result column="sbzt" property="sbzt"/>
+                <result column="sbzt_desc" property="sbztDesc"/>
+                <result column="jcr" property="jcr"/>
+                <result column="czwt" property="czwt"/>
+                <result column="create_by" property="createBy"/>
+                <result column="create_time" property="createTime"/>
+                <result column="update_by" property="updateBy"/>
+                <result column="update_time" property="updateTime"/>
+                <result column="save_flag" property="saveFlag"/>
+                <result column="del_flag" property="delFlag"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                fdfxjyq_id,
+                wd,
+                jcrq,
+                pic_url,
+                point_a,
+                point_b,
+                point_c,
+                point_d,
+                point_e,
+                point_f,
+                point_g,
+                point_h,
+                fcd,
+                fddmpsd,
+                jybj_fdjyqzjyzt,
+                jybj_fdjyqzjyzt_desc,
+                jybj_clsjyzzt,
+                jybj_clsjyzzt_desc,
+                lbjzt_ls,
+                lbjzt_ls_desc,
+                lbjzt_xdx,
+                lbjzt_xdx_desc,
+                lbjzt_phzj,
+                lbjzt_phzj_desc,
+                lbjzt_jcxjt,
+                lbjzt_jcxjt_desc,
+                lbjzt_xhj,
+                lbjzt_xhj_desc,
+                sbzt,
+                sbzt_desc,
+                jcr,
+                czwt,
+                create_by,
+                create_time,
+                update_by,
+                update_time,
+                save_flag,
+                del_flag
+    </sql>
+
+    <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbFdfxjyq">
+        <selectKey keyProperty="id" order="BEFORE" resultType="String">
+            select replace(uuid(), '-', '') from dual
+        </selectKey>
+        INSERT INTO bus_jcb_fdfxjyq
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test ='null != fdfxjyqId'>
+                    fdfxjyq_id,
+                    </if>
+                    <if test ='null != wd'>
+                    wd,
+                    </if>
+                    <if test ='null != jcrq'>
+                    jcrq,
+                    </if>
+                    <if test ='null != picUrl'>
+                    pic_url,
+                    </if>
+                    <if test ='null != pointA'>
+                    point_a,
+                    </if>
+                    <if test ='null != pointB'>
+                    point_b,
+                    </if>
+                    <if test ='null != pointC'>
+                    point_c,
+                    </if>
+                    <if test ='null != pointD'>
+                    point_d,
+                    </if>
+                    <if test ='null != pointE'>
+                    point_e,
+                    </if>
+                    <if test ='null != pointF'>
+                    point_f,
+                    </if>
+                    <if test ='null != pointG'>
+                    point_g,
+                    </if>
+                    <if test ='null != pointH'>
+                    point_h,
+                    </if>
+                    <if test ='null != fcd'>
+                    fcd,
+                    </if>
+                    <if test ='null != fddmpsd'>
+                    fddmpsd,
+                    </if>
+                    <if test ='null != jybjFdjyqzjyzt'>
+                    jybj_fdjyqzjyzt,
+                    </if>
+                    <if test ='null != jybjFdjyqzjyztDesc'>
+                    jybj_fdjyqzjyzt_desc,
+                    </if>
+                    <if test ='null != jybjClsjyzzt'>
+                    jybj_clsjyzzt,
+                    </if>
+                    <if test ='null != jybjClsjyzztDesc'>
+                    jybj_clsjyzzt_desc,
+                    </if>
+                    <if test ='null != lbjztLs'>
+                    lbjzt_ls,
+                    </if>
+                    <if test ='null != lbjztLsDesc'>
+                    lbjzt_ls_desc,
+                    </if>
+                    <if test ='null != lbjztXdx'>
+                    lbjzt_xdx,
+                    </if>
+                    <if test ='null != lbjztXdxDesc'>
+                    lbjzt_xdx_desc,
+                    </if>
+                    <if test ='null != lbjztPhzj'>
+                    lbjzt_phzj,
+                    </if>
+                    <if test ='null != lbjztPhzjDesc'>
+                    lbjzt_phzj_desc,
+                    </if>
+                    <if test ='null != lbjztJcxjt'>
+                    lbjzt_jcxjt,
+                    </if>
+                    <if test ='null != lbjztJcxjtDesc'>
+                    lbjzt_jcxjt_desc,
+                    </if>
+                    <if test ='null != lbjztXhj'>
+                    lbjzt_xhj,
+                    </if>
+                    <if test ='null != lbjztXhjDesc'>
+                    lbjzt_xhj_desc,
+                    </if>
+                    <if test ='null != sbzt'>
+                    sbzt,
+                    </if>
+                    <if test ='null != sbztDesc'>
+                    sbzt_desc,
+                    </if>
+                    <if test ='null != jcr'>
+                    jcr,
+                    </if>
+                    <if test ='null != czwt'>
+                    czwt,
+                    </if>
+                    <if test ='null != createBy'>
+                    create_by,
+                    </if>
+                    <if test ='null != createTime'>
+                    create_time,
+                    </if>
+                    <if test ='null != updateBy'>
+                    update_by,
+                    </if>
+                    <if test ='null != updateTime'>
+                    update_time,
+                    </if>
+                    <if test ='null != saveFlag'>
+                    save_flag,
+                    </if>
+                    <if test ='null != delFlag'>
+                    del_flag
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test ='null != fdfxjyqId'>
+                    #{fdfxjyqId},
+                    </if>
+                    <if test ='null != wd'>
+                    #{wd},
+                    </if>
+                    <if test ='null != jcrq'>
+                    #{jcrq},
+                    </if>
+                    <if test ='null != picUrl'>
+                    #{picUrl},
+                    </if>
+                    <if test ='null != pointA'>
+                    #{pointA},
+                    </if>
+                    <if test ='null != pointB'>
+                    #{pointB},
+                    </if>
+                    <if test ='null != pointC'>
+                    #{pointC},
+                    </if>
+                    <if test ='null != pointD'>
+                    #{pointD},
+                    </if>
+                    <if test ='null != pointE'>
+                    #{pointE},
+                    </if>
+                    <if test ='null != pointF'>
+                    #{pointF},
+                    </if>
+                    <if test ='null != pointG'>
+                    #{pointG},
+                    </if>
+                    <if test ='null != pointH'>
+                    #{pointH},
+                    </if>
+                    <if test ='null != fcd'>
+                    #{fcd},
+                    </if>
+                    <if test ='null != fddmpsd'>
+                    #{fddmpsd},
+                    </if>
+                    <if test ='null != jybjFdjyqzjyzt'>
+                    #{jybjFdjyqzjyzt},
+                    </if>
+                    <if test ='null != jybjFdjyqzjyztDesc'>
+                    #{jybjFdjyqzjyztDesc},
+                    </if>
+                    <if test ='null != jybjClsjyzzt'>
+                    #{jybjClsjyzzt},
+                    </if>
+                    <if test ='null != jybjClsjyzztDesc'>
+                    #{jybjClsjyzztDesc},
+                    </if>
+                    <if test ='null != lbjztLs'>
+                    #{lbjztLs},
+                    </if>
+                    <if test ='null != lbjztLsDesc'>
+                    #{lbjztLsDesc},
+                    </if>
+                    <if test ='null != lbjztXdx'>
+                    #{lbjztXdx},
+                    </if>
+                    <if test ='null != lbjztXdxDesc'>
+                    #{lbjztXdxDesc},
+                    </if>
+                    <if test ='null != lbjztPhzj'>
+                    #{lbjztPhzj},
+                    </if>
+                    <if test ='null != lbjztPhzjDesc'>
+                    #{lbjztPhzjDesc},
+                    </if>
+                    <if test ='null != lbjztJcxjt'>
+                    #{lbjztJcxjt},
+                    </if>
+                    <if test ='null != lbjztJcxjtDesc'>
+                    #{lbjztJcxjtDesc},
+                    </if>
+                    <if test ='null != lbjztXhj'>
+                    #{lbjztXhj},
+                    </if>
+                    <if test ='null != lbjztXhjDesc'>
+                    #{lbjztXhjDesc},
+                    </if>
+                    <if test ='null != sbzt'>
+                    #{sbzt},
+                    </if>
+                    <if test ='null != sbztDesc'>
+                    #{sbztDesc},
+                    </if>
+                    <if test ='null != jcr'>
+                    #{jcr},
+                    </if>
+                    <if test ='null != czwt'>
+                    #{czwt},
+                    </if>
+                    <if test ='null != createBy'>
+                    #{createBy},
+                    </if>
+                    <if test ='null != createTime'>
+                    #{createTime},
+                    </if>
+                    <if test ='null != updateBy'>
+                    #{updateBy},
+                    </if>
+                    <if test ='null != updateTime'>
+                    #{updateTime},
+                    </if>
+                    <if test ='null != saveFlag'>
+                    #{saveFlag},
+                    </if>
+                    <if test ='null != delFlag'>
+                    #{delFlag}
+                    </if>
+        </trim>
+    </insert>
+
+    <delete id="delete">
+        UPDATE bus_jcb_fdfxjyq
+        set del_flag='1'
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbFdfxjyq">
+        UPDATE bus_jcb_fdfxjyq
+        <set>
+                    <if test ='null != fdfxjyqId'>fdfxjyq_id = #{fdfxjyqId},</if>
+                    <if test ='null != wd'>wd = #{wd},</if>
+                    <if test ='null != jcrq'>jcrq = #{jcrq},</if>
+                    <if test ='null != picUrl'>pic_url = #{picUrl},</if>
+                    <if test ='null != pointA'>point_a = #{pointA},</if>
+                    <if test ='null != pointB'>point_b = #{pointB},</if>
+                    <if test ='null != pointC'>point_c = #{pointC},</if>
+                    <if test ='null != pointD'>point_d = #{pointD},</if>
+                    <if test ='null != pointE'>point_e = #{pointE},</if>
+                    <if test ='null != pointF'>point_f = #{pointF},</if>
+                    <if test ='null != pointG'>point_g = #{pointG},</if>
+                    <if test ='null != pointH'>point_h = #{pointH},</if>
+                    <if test ='null != fcd'>fcd = #{fcd},</if>
+                    <if test ='null != fddmpsd'>fddmpsd = #{fddmpsd},</if>
+                    <if test ='null != jybjFdjyqzjyzt'>jybj_fdjyqzjyzt = #{jybjFdjyqzjyzt},</if>
+                    <if test ='null != jybjFdjyqzjyztDesc'>jybj_fdjyqzjyzt_desc = #{jybjFdjyqzjyztDesc},</if>
+                    <if test ='null != jybjClsjyzzt'>jybj_clsjyzzt = #{jybjClsjyzzt},</if>
+                    <if test ='null != jybjClsjyzztDesc'>jybj_clsjyzzt_desc = #{jybjClsjyzztDesc},</if>
+                    <if test ='null != lbjztLs'>lbjzt_ls = #{lbjztLs},</if>
+                    <if test ='null != lbjztLsDesc'>lbjzt_ls_desc = #{lbjztLsDesc},</if>
+                    <if test ='null != lbjztXdx'>lbjzt_xdx = #{lbjztXdx},</if>
+                    <if test ='null != lbjztXdxDesc'>lbjzt_xdx_desc = #{lbjztXdxDesc},</if>
+                    <if test ='null != lbjztPhzj'>lbjzt_phzj = #{lbjztPhzj},</if>
+                    <if test ='null != lbjztPhzjDesc'>lbjzt_phzj_desc = #{lbjztPhzjDesc},</if>
+                    <if test ='null != lbjztJcxjt'>lbjzt_jcxjt = #{lbjztJcxjt},</if>
+                    <if test ='null != lbjztJcxjtDesc'>lbjzt_jcxjt_desc = #{lbjztJcxjtDesc},</if>
+                    <if test ='null != lbjztXhj'>lbjzt_xhj = #{lbjztXhj},</if>
+                    <if test ='null != lbjztXhjDesc'>lbjzt_xhj_desc = #{lbjztXhjDesc},</if>
+                    <if test ='null != sbzt'>sbzt = #{sbzt},</if>
+                    <if test ='null != sbztDesc'>sbzt_desc = #{sbztDesc},</if>
+                    <if test ='null != jcr'>jcr = #{jcr},</if>
+                    <if test ='null != czwt'>czwt = #{czwt},</if>
+                    <if test ='null != createBy'>create_by = #{createBy},</if>
+                    <if test ='null != createTime'>create_time = #{createTime},</if>
+                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
+                    <if test ='null != updateTime'>update_time = #{updateTime},</if>
+                    <if test ='null != saveFlag'>save_flag = #{saveFlag},</if>
+                    <if test ='null != delFlag'>del_flag = #{delFlag}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+    <select id="getInfo" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_fdfxjyq
+        WHERE del_flag='0' and id = #{id}
+
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_fdfxjyq
+        <where>
+            del_flag='0'
+                <if test="fdfxjyqId!=null and fdfxjyqId!=''">
+                    and fdfxjyq_id=#{fdfxjyqId}
+                </if>
+                <if test="wd!=null and wd!=''">
+                    and wd=#{wd}
+                </if>
+                <if test="jcrq!=null and jcrq!=''">
+                    and jcrq=#{jcrq}
+                </if>
+                <if test="picUrl!=null and picUrl!=''">
+                    and pic_url=#{picUrl}
+                </if>
+                <if test="pointA!=null and pointA!=''">
+                    and point_a=#{pointA}
+                </if>
+                <if test="pointB!=null and pointB!=''">
+                    and point_b=#{pointB}
+                </if>
+                <if test="pointC!=null and pointC!=''">
+                    and point_c=#{pointC}
+                </if>
+                <if test="pointD!=null and pointD!=''">
+                    and point_d=#{pointD}
+                </if>
+                <if test="pointE!=null and pointE!=''">
+                    and point_e=#{pointE}
+                </if>
+                <if test="pointF!=null and pointF!=''">
+                    and point_f=#{pointF}
+                </if>
+                <if test="pointG!=null and pointG!=''">
+                    and point_g=#{pointG}
+                </if>
+                <if test="pointH!=null and pointH!=''">
+                    and point_h=#{pointH}
+                </if>
+                <if test="fcd!=null and fcd!=''">
+                    and fcd=#{fcd}
+                </if>
+                <if test="fddmpsd!=null and fddmpsd!=''">
+                    and fddmpsd=#{fddmpsd}
+                </if>
+                <if test="jybjFdjyqzjyzt!=null and jybjFdjyqzjyzt!=''">
+                    and jybj_fdjyqzjyzt=#{jybjFdjyqzjyzt}
+                </if>
+                <if test="jybjFdjyqzjyztDesc!=null and jybjFdjyqzjyztDesc!=''">
+                    and jybj_fdjyqzjyzt_desc=#{jybjFdjyqzjyztDesc}
+                </if>
+                <if test="jybjClsjyzzt!=null and jybjClsjyzzt!=''">
+                    and jybj_clsjyzzt=#{jybjClsjyzzt}
+                </if>
+                <if test="jybjClsjyzztDesc!=null and jybjClsjyzztDesc!=''">
+                    and jybj_clsjyzzt_desc=#{jybjClsjyzztDesc}
+                </if>
+                <if test="lbjztLs!=null and lbjztLs!=''">
+                    and lbjzt_ls=#{lbjztLs}
+                </if>
+                <if test="lbjztLsDesc!=null and lbjztLsDesc!=''">
+                    and lbjzt_ls_desc=#{lbjztLsDesc}
+                </if>
+                <if test="lbjztXdx!=null and lbjztXdx!=''">
+                    and lbjzt_xdx=#{lbjztXdx}
+                </if>
+                <if test="lbjztXdxDesc!=null and lbjztXdxDesc!=''">
+                    and lbjzt_xdx_desc=#{lbjztXdxDesc}
+                </if>
+                <if test="lbjztPhzj!=null and lbjztPhzj!=''">
+                    and lbjzt_phzj=#{lbjztPhzj}
+                </if>
+                <if test="lbjztPhzjDesc!=null and lbjztPhzjDesc!=''">
+                    and lbjzt_phzj_desc=#{lbjztPhzjDesc}
+                </if>
+                <if test="lbjztJcxjt!=null and lbjztJcxjt!=''">
+                    and lbjzt_jcxjt=#{lbjztJcxjt}
+                </if>
+                <if test="lbjztJcxjtDesc!=null and lbjztJcxjtDesc!=''">
+                    and lbjzt_jcxjt_desc=#{lbjztJcxjtDesc}
+                </if>
+                <if test="lbjztXhj!=null and lbjztXhj!=''">
+                    and lbjzt_xhj=#{lbjztXhj}
+                </if>
+                <if test="lbjztXhjDesc!=null and lbjztXhjDesc!=''">
+                    and lbjzt_xhj_desc=#{lbjztXhjDesc}
+                </if>
+                <if test="sbzt!=null and sbzt!=''">
+                    and sbzt=#{sbzt}
+                </if>
+                <if test="sbztDesc!=null and sbztDesc!=''">
+                    and sbzt_desc=#{sbztDesc}
+                </if>
+                <if test="jcr!=null and jcr!=''">
+                    and jcr=#{jcr}
+                </if>
+                <if test="czwt!=null and czwt!=''">
+                    and czwt=#{czwt}
+                </if>
+                <if test="createBy!=null and createBy!=''">
+                    and create_by=#{createBy}
+                </if>
+                <if test="createTime!=null and createTime!=''">
+                    and create_time=#{createTime}
+                </if>
+                <if test="updateBy!=null and updateBy!=''">
+                    and update_by=#{updateBy}
+                </if>
+                <if test="updateTime!=null and updateTime!=''">
+                    and update_time=#{updateTime}
+                </if>
+                <if test="saveFlag!=null and saveFlag!=''">
+                    and save_flag=#{saveFlag}
+                </if>
+                <if test="delFlag!=null and delFlag!=''">
+                    and del_flag=#{delFlag}
+                </if>
+        </where>
+    </select>
+
+</mapper>

railway-business/src/main/resources/mapper/business/BusZzdzxxMapper.xml

@@ -163,7 +163,6 @@
         </selectKey>
         INSERT INTO bus_zzdzxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    id,
                     <if test ='null != db'>
                     db,
                     </if>
@@ -385,7 +384,6 @@
                     </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    #{id},
                     <if test ='null != db'>
                     #{db},
                     </if>
@@ -610,7 +608,7 @@
 
     <delete id="delete">
         UPDATE bus_zzdzxx
-        set is_del='1'
+        set del_flag='1'
         WHERE id = #{id}
     </delete>
 
@@ -699,7 +697,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM bus_zzdzxx
-        WHERE id = #{id}
+        WHERE del_flag='0' and id = #{id}
 
     </select>
 
@@ -708,6 +706,7 @@
         <include refid="Base_Column_List"/>
         FROM bus_zzdzxx
         <where>
+            del_flag='0'
                 <if test="db!=null and db!=''">
                     and db=#{db}
                 </if>

railway-common/src/main/java/com/railway/common/core/domain/AjaxResult.java

@@ -34,7 +34,7 @@ public class AjaxResult extends HashMap<String, Object> {
     /**
      * 成功
      */
-    SUCCESS(0),
+    SUCCESS(200),
     /**
      * 警告
      */

railway-common/src/main/java/com/railway/common/core/page/TableSupport.java

@@ -1,6 +1,5 @@
 package com.railway.common.core.page;
 
-import com.railway.common.constant.Constants;
 import com.railway.common.utils.ServletUtils;
 
 /**

railway-generator/src/main/resources/templates/code-generator/railway/back/controller.ftl

@@ -26,15 +26,15 @@ public class ${classInfo.className}Controller extends BaseController {
     private I${classInfo.className}Service ${classInfo.className?uncap_first}Service;
 
     @ApiOperation(value = "新增")
-    @PutMapping("/add")
+    @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody ${classInfo.className} ${classInfo.className?uncap_first}) {
         return toAjax(${classInfo.className?uncap_first}Service.create(${classInfo.className?uncap_first}));
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("/${primaryKeyCame}")
-    public AjaxResult delete(@RequestParam String ${primaryKeyCame}) {
-        return toAjax(${classInfo.className?uncap_first}Service.delete(${primaryKeyCame}));
+    @DeleteMapping("/{${primaryKeyCame}s}")
+    public AjaxResult delete(@RequestParam String[] ${primaryKeyCame}s) {
+        return toAjax(${classInfo.className?uncap_first}Service.delete(${primaryKeyCame}s));
     }
 
     @ApiOperation(value = "更新")
@@ -44,7 +44,7 @@ public class ${classInfo.className}Controller extends BaseController {
     }
 
     @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/${primaryKeyCame}"})
+    @GetMapping(value = {"/", "/{${primaryKeyCame}}"})
     public AjaxResult getInfo(String ${primaryKeyCame}) {
         ${classInfo.className} info = ${classInfo.className?uncap_first}Service.getInfo(${primaryKeyCame});
         AjaxResult ajax = AjaxResult.success();
@@ -53,8 +53,8 @@ public class ${classInfo.className}Controller extends BaseController {
     }
 
     @ApiOperation(value = "列表")
-    @PostMapping(value = "list")
-    public TableDataInfo getList(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first}) {
+    @GetMapping(value = "list")
+    public TableDataInfo getList(${classInfo.className} ${classInfo.className?uncap_first}) {
         startPage();
         List<${classInfo.className}> list = ${classInfo.className?uncap_first}Service.getList(${classInfo.className?uncap_first});
         return getDataTable(list);

railway-generator/src/main/resources/templates/code-generator/railway/back/entity.ftl

@@ -42,7 +42,7 @@ public class ${classInfo.className} extends BaseEntity{
     @Length(min = 1, max = ${fieldItem.fieldLength}, message = "【${fieldItem.fieldComment}】长度必须介于 {min} 和 {max} 之间")
     </#if>
 <#--    <#if fieldItem.fieldClass=='Date' >-->
-    @NotNull(message = "【${fieldItem.fieldComment}】不能为空")
+<#--@NotNull(message = "【${fieldItem.fieldComment}】不能为空")-->
 <#--    </#if>-->
     private ${fieldItem.fieldClass} ${fieldItem.fieldName};
 

railway-generator/src/main/resources/templates/code-generator/railway/back/mybatis.ftl

@@ -28,7 +28,7 @@
         INSERT INTO ${classInfo.tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
-                    ${primaryKey},
+                   <#-- ${primaryKey},-->
                 <#list classInfo.fieldList as fieldItem >
                     ${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
                     ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
@@ -38,7 +38,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
-                    ${r"#{"}${primaryKeyCame}${r"}"},
+                    <#--${r"#{"}${primaryKeyCame}${r"}"},-->
                 <#list classInfo.fieldList as fieldItem >
                     ${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
                     ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
@@ -71,7 +71,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM ${classInfo.tableName}
-        WHERE ${primaryKey} = ${r"#{"}${primaryKeyCame}${r"}"}
+        WHERE del_flag='0' and ${primaryKey} = ${r"#{"}${primaryKeyCame}${r"}"}
 
     </select>
 
@@ -81,6 +81,7 @@
         FROM ${classInfo.tableName}
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
         <where>
+            del_flag='0'
             <#list classInfo.fieldList as fieldItem >
                 <if test="${fieldItem.fieldName}!=null and ${fieldItem.fieldName}!=''">
                     and ${fieldItem.columnName}=${r"#{"}${fieldItem.fieldName}${r"}"}

railway-generator/src/main/resources/templates/code-generator/railway/back/service.ftl

@@ -17,7 +17,7 @@ public interface I${classInfo.className}Service{
     /**
     * @Description: 删除
     */
-    int delete(String ${primaryKeyCame}s);
+    int delete(String[] ${primaryKeyCame}s);
 
     /**
     * @Description: 更新

railway-generator/src/main/resources/templates/code-generator/railway/back/serviceImpl.ftl

@@ -32,8 +32,13 @@ private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper;
 	* @Description: 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public int delete(String ${primaryKeyCame}) {
-		return	${classInfo.className?uncap_first}Mapper.delete(${primaryKeyCame});
+	public int delete(String[] ${primaryKeyCame}s) {
+		int r =0;
+		for (String ${primaryKeyCame} : ${primaryKeyCame}s) {
+			int j= ${classInfo.className?uncap_first}Mapper.delete(${primaryKeyCame});
+			r = r + j;
+		}
+		return	r;
 	}
 
 	/**

railway-generator/src/main/resources/templates/index.ftl

@@ -132,14 +132,14 @@
                 <span class="input-group-text">项目路径</span>
             </div>
             <input type="text" class="form-control" id="projectPath" name="projectPath"
-                   placeholder="/Users/guozhanbing/IdeaProjects/grsg/grsg-demo">
+                   placeholder="D:\workspace\railway">
         </div>
         <div class="input-group mb-3">
             <div class="input-group-prepend">
                 <span class="input-group-text">包名路径</span>
             </div>
             <input type="text" class="form-control" id="packageName" name="packageName"
-                   placeholder="com.sgcc.grsg.demo">
+                   placeholder="com.railway.business.catenary">
         </div>
         <div class="input-group mb-3">
             <div class="input-group-prepend">