Преглед на файлове

上传避雷器检查表相关功能

wuhonghao преди 4 години
родител
ревизия
4dd2d64b42
променени са 18 файла, в които са добавени 2533 реда и са изтрити 3 реда
  1. 63 0
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusBlqController.java
  2. 1 1
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusFdfxjyqController.java
  3. 133 0
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbBlqController.java
  4. 5 2
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java
  5. 311 0
      railway-business/src/main/java/com/railway/business/catenary/domain/BusBlq.java
  6. 163 0
      railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbBlq.java
  7. 14 0
      railway-business/src/main/java/com/railway/business/catenary/domain/BusZzdzxx.java
  8. 43 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusBlqMapper.java
  9. 49 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbBlqMapper.java
  10. 37 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusBlqService.java
  11. 65 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java
  12. 70 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusBlqServiceImpl.java
  13. 123 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java
  14. 4 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java
  15. 932 0
      railway-business/src/main/resources/mapper/business/BusBlqMapper.xml
  16. 519 0
      railway-business/src/main/resources/mapper/business/BusJcbBlqMapper.xml
  17. BIN
      railway-business/src/main/resources/word/template/DXF分段绝缘器手册.docx
  18. 1 0
      railway-generator/src/main/resources/templates/code-generator/railway/back/serviceImpl.ftl

+ 63 - 0
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusBlqController.java

@@ -0,0 +1,63 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.BusBlq;
+import com.railway.business.catenary.service.IBusBlqService;
+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/blq", tags = "基础管理-避雷器")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/blq")
+public class BusBlqController extends BaseController {
+    @Autowired
+    private IBusBlqService busBlqService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public AjaxResult add(@Validated @RequestBody BusBlq busBlq) {
+        return toAjax(busBlqService.create(busBlq));
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busBlqService.delete(ids));
+    }
+
+    @ApiOperation(value = "更新")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody @Valid BusBlq busBlq) {
+        return toAjax(busBlqService.update(busBlq));
+    }
+
+    @ApiOperation(value = "单个")
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(String id) {
+        BusBlq info = busBlqService.getInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "列表")
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusBlq busBlq) {
+        startPage();
+        List<BusBlq> list = busBlqService.getList(busBlq);
+        return getDataTable(list);
+    }
+
+}

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

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(value = "rest/catenary/bus/fdfxjyq", tags = "分段分相绝缘器")
+@Api(value = "rest/catenary/bus/fdfxjyq", tags = "基础管理-分段分相绝缘器")
 @RestController
 @Validated
 @RequestMapping(value = "business/catenary/bus/fdfxjyq")

+ 133 - 0
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbBlqController.java

@@ -0,0 +1,133 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.service.IBusJcbBlqService;
+import com.railway.common.utils.poi.WordUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+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.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+@Api(value = "rest/catenary/bus/jcb/blq", tags = "检查表-避雷器")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jcb/blq")
+public class BusJcbBlqController extends BaseController {
+    @Autowired
+    private IBusJcbBlqService busJcbBlqService;
+
+    @Value("${file.path}")
+    public String filePath;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public AjaxResult add(@Validated @RequestBody BusJcbBlq busJcbBlq) {
+        return toAjax(busJcbBlqService.create(busJcbBlq));
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busJcbBlqService.delete(ids));
+    }
+
+    @ApiOperation(value = "更新")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody @Valid BusJcbBlq busJcbBlq) {
+        return toAjax(busJcbBlqService.update(busJcbBlq));
+    }
+
+    @ApiOperation(value = "单个")
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(String id) {
+        BusJcbBlq info = busJcbBlqService.getInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "列表")
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusJcbBlq busJcbBlq) {
+        startPage();
+        List<BusJcbBlq> list = busJcbBlqService.getList(busJcbBlq);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "获取上次检测值")
+    @GetMapping(value = "getLastOne")
+    public AjaxResult getLastOne(BusJcbBlq busJcbBlq) {
+        BusJcbFdfxjyq info = busJcbBlqService.getLastOne(busJcbBlq);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "提交")
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody BusJcbBlq busJcbBlq) {
+        busJcbBlq.setUpdateBy(getUsername());
+        return toAjax(busJcbBlqService.submit(busJcbBlq));
+    }
+
+    @ApiOperation(value = "退回")
+    @PutMapping("/reject")
+    public AjaxResult reject(@RequestBody BusJcbBlq busJcbBlq) {
+        busJcbBlq.setUpdateBy(getUsername());
+        return toAjax(busJcbBlqService.reject(busJcbBlq));
+    }
+
+    @ApiOperation(value = "确认")
+    @PutMapping("/confirm")
+    public AjaxResult confirm(@RequestBody BusJcbBlq busJcbBlq) {
+        busJcbBlq.setUpdateBy(getUsername());
+        return toAjax(busJcbBlqService.confirm(busJcbBlq));
+    }
+
+    @ApiOperation(value = "导出")
+    @PutMapping("/export")
+    public void export(@RequestParam String id, HttpServletResponse response) {
+        WordUtils wordUtil=new WordUtils();
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("${fdh}", "测试分段号");
+        params.put("${qj}", "测试区间");
+        params.put("${wd}", "85");
+        try{
+
+            Map<String,Object> header = new HashMap<String, Object>();
+            header.put("width", 450);
+            header.put("height", 110);
+            header.put("type", "jpg");
+            header.put("content", WordUtils.inputStream2ByteArray(new FileInputStream(filePath+"/fdjyq-20211016.png"), true));
+            params.put("${header}",header);
+            //InputStream inputStream = this.getClass().getResourceAsStream("/word/template/DXF分段绝缘器手册.docx");
+            InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("word/template/DXF分段绝缘器手册.docx");
+            String fileName= URLEncoder.encode("测试文档.docx", "UTF-8");    //生成word文件的文件名
+            wordUtil.getWord(inputStream,params,null,fileName,response);
+
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+}

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

@@ -116,22 +116,25 @@ public class BusJcbFdfxjyqController extends BaseController {
     @ApiOperation(value = "导出")
     @PutMapping("/export")
     public void export(@RequestParam String id, HttpServletResponse response) {
+        //获取基础数据
+        BusJcbFdfxjyq info = busJcbFdfxjyqService.getInfo(id);
         WordUtils wordUtil=new WordUtils();
+        //填充变量
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("${fdh}", "测试分段号");
         params.put("${qj}", "测试区间");
         params.put("${wd}", "85");
         try{
-
+            //填充图片信息
             Map<String,Object> header = new HashMap<String, Object>();
             header.put("width", 450);
             header.put("height", 110);
             header.put("type", "jpg");
             header.put("content", WordUtils.inputStream2ByteArray(new FileInputStream(filePath+"/fdjyq-20211016.png"), true));
             params.put("${header}",header);
-            //InputStream inputStream = this.getClass().getResourceAsStream("/word/template/DXF分段绝缘器手册.docx");
             InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("word/template/DXF分段绝缘器手册.docx");
             String fileName= URLEncoder.encode("测试文档.docx", "UTF-8");    //生成word文件的文件名
+            //调用生成导出方法
             wordUtil.getWord(inputStream,params,null,fileName,response);
 
         }catch(Exception e){

+ 311 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusBlq.java

@@ -0,0 +1,311 @@
+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.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+/**
+ * 基础数据-避雷器
+ * @author wuhonghao 2021-10-17
+ */
+@Data
+@ApiModel("基础数据-避雷器")
+@EqualsAndHashCode(callSuper = true)
+public class BusBlq extends BaseEntity{
+
+    @ApiModelProperty(value = "主键", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "段别")
+    @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
+    private String db;
+
+    @ApiModelProperty(value = "所属部门")
+    @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
+    private String bm;
+
+    @ApiModelProperty(value = "线别")
+    @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
+    private String xb;
+
+    @ApiModelProperty(value = "站/区间")
+    @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
+    private String qj;
+
+    @ApiModelProperty(value = "行别")
+    @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+    private String hb;
+
+    @ApiModelProperty(value = "支柱号")
+    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String zzh;
+
+    @ApiModelProperty(value = "公里标")
+    @Length(min = 1, max = 50, message = "【公里标】长度必须介于 {min} 和 {max} 之间")
+    private String glb;
+
+    @ApiModelProperty(value = "股道")
+    @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
+    private String gd;
+
+    @ApiModelProperty(value = "管辖模式")
+    @Length(min = 1, max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
+    private String gxms;
+
+    @ApiModelProperty(value = "电压等级")
+    @Length(min = 1, max = 50, message = "【电压等级】长度必须介于 {min} 和 {max} 之间")
+    private String dydj;
+
+    @ApiModelProperty(value = "备注")
+    @Length(min = 1, max = 255, message = "【备注】长度必须介于 {min} 和 {max} 之间")
+    private String bz;
+
+    @ApiModelProperty(value = "生产厂家")
+    @Length(min = 1, max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
+    private String sccj;
+
+    @ApiModelProperty(value = "投运日期")
+    private Date tyrq;
+
+    @ApiModelProperty(value = "避雷器类型")
+    @Length(min = 1, max = 100, message = "【避雷器类型】长度必须介于 {min} 和 {max} 之间")
+    private String blqlx;
+
+    @ApiModelProperty(value = "避雷器型号")
+    @Length(min = 1, max = 100, message = "【避雷器型号】长度必须介于 {min} 和 {max} 之间")
+    private String blqxh;
+
+    @ApiModelProperty(value = "运行编号")
+    @Length(min = 1, max = 50, message = "【运行编号】长度必须介于 {min} 和 {max} 之间")
+    private String yzbh;
+
+    @ApiModelProperty(value = "锚段号")
+    @Length(min = 1, max = 100, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
+    private String mdh;
+
+    @ApiModelProperty(value = "脱离器投运日期")
+    private Date tlqtyrq;
+
+    @ApiModelProperty(value = "脱离器状态")
+    @Length(min = 1, max = 20, message = "【脱离器状态】长度必须介于 {min} 和 {max} 之间")
+    private String tlqzt;
+
+    @ApiModelProperty(value = "设备线夹状态")
+    @Length(min = 1, max = 20, message = "【设备线夹状态】长度必须介于 {min} 和 {max} 之间")
+    private String sbxjzt;
+
+    @ApiModelProperty(value = "预防性试验日期")
+    private Date yfxsyrq;
+
+    @ApiModelProperty(value = "引线距接地体最小距离(mm) -t线(1)")
+    @Length(min = 1, max = 20, message = "【引线距接地体最小距离(mm) -t线(1)】长度必须介于 {min} 和 {max} 之间")
+    private String yxjjdtzxjlT1;
+
+    @ApiModelProperty(value = "引线距接地体最小距离(mm) -t线(2)")
+    @Length(min = 1, max = 20, message = "【引线距接地体最小距离(mm) -t线(2)】长度必须介于 {min} 和 {max} 之间")
+    private String yxjjdtzxjlT2;
+
+    @ApiModelProperty(value = "引线距接地体最小距离(mm) -f线(1)")
+    @Length(min = 1, max = 20, message = "【引线距接地体最小距离(mm) -f线(1)】长度必须介于 {min} 和 {max} 之间")
+    private String yxjjdtzxjlF1;
+
+    @ApiModelProperty(value = "引线距接地体最小距离(mm) -f线(2)")
+    @Length(min = 1, max = 20, message = "【引线距接地体最小距离(mm) -f线(2)】长度必须介于 {min} 和 {max} 之间")
+    private String yxjjdtzxjlF2;
+
+    @ApiModelProperty(value = "引线驰度")
+    @Length(min = 1, max = 20, message = "【引线驰度】长度必须介于 {min} 和 {max} 之间")
+    private String yxcd;
+
+    @ApiModelProperty(value = "绝缘子及套管状态")
+    @Length(min = 1, max = 20, message = "【绝缘子及套管状态】长度必须介于 {min} 和 {max} 之间")
+    private String jyzjgtzt;
+
+    @ApiModelProperty(value = "安全装置状态")
+    @Length(min = 1, max = 20, message = "【安全装置状态】长度必须介于 {min} 和 {max} 之间")
+    private String aqzzzt;
+
+    @ApiModelProperty(value = "泄露电流(ma) (1)")
+    @Length(min = 1, max = 20, message = "【泄露电流(ma) (1)】长度必须介于 {min} 和 {max} 之间")
+    private String xldl1;
+
+    @ApiModelProperty(value = "泄露电流(ma) (2)")
+    @Length(min = 1, max = 20, message = "【泄露电流(ma) (2)】长度必须介于 {min} 和 {max} 之间")
+    private String xldl2;
+
+    @ApiModelProperty(value = "计数器次数-t线")
+    @Length(min = 1, max = 20, message = "【计数器次数-t线】长度必须介于 {min} 和 {max} 之间")
+    private String jsqcsTx;
+
+    @ApiModelProperty(value = "计数器次数-f线")
+    @Length(min = 1, max = 20, message = "【计数器次数-f线】长度必须介于 {min} 和 {max} 之间")
+    private String jsqcsFx;
+
+    @ApiModelProperty(value = "接地极及火花间隙")
+    @Length(min = 1, max = 20, message = "【接地极及火花间隙】长度必须介于 {min} 和 {max} 之间")
+    private String jdjjhhjx;
+
+    @ApiModelProperty(value = "避雷器托架_连接螺栓")
+    @Length(min = 1, max = 20, message = "【避雷器托架_连接螺栓】长度必须介于 {min} 和 {max} 之间")
+    private String blqtjLjls;
+
+    @ApiModelProperty(value = "避雷器托架_螺母")
+    @Length(min = 1, max = 20, message = "【避雷器托架_螺母】长度必须介于 {min} 和 {max} 之间")
+    private String blqtjLm;
+
+    @ApiModelProperty(value = "t线避雷器_避雷器本体")
+    @Length(min = 1, max = 20, message = "【t线避雷器_避雷器本体】长度必须介于 {min} 和 {max} 之间")
+    private String txblqBlqbt;
+
+    @ApiModelProperty(value = "t线避雷器_避雷器底部法兰连接螺栓、螺母*4")
+    @Length(min = 1, max = 20, message = "【t线避雷器_避雷器底部法兰连接螺栓、螺母*4】长度必须介于 {min} 和 {max} 之间")
+    private String txblqBlqdbfllm;
+
+    @ApiModelProperty(value = "t线避雷器_连接计数器绝缘软导线本体")
+    @Length(min = 1, max = 20, message = "【t线避雷器_连接计数器绝缘软导线本体】长度必须介于 {min} 和 {max} 之间")
+    private String txblqLjjsqjyrdtbt;
+
+    @ApiModelProperty(value = "t线避雷器_避雷器计数器本体")
+    @Length(min = 1, max = 20, message = "【t线避雷器_避雷器计数器本体】长度必须介于 {min} 和 {max} 之间")
+    private String txblqBlqjsqbt;
+
+    @ApiModelProperty(value = "t线避雷器_脱离器本体及镀锌铜线")
+    @Length(min = 1, max = 20, message = "【t线避雷器_脱离器本体及镀锌铜线】长度必须介于 {min} 和 {max} 之间")
+    private String txblqTlqbt;
+
+    @ApiModelProperty(value = "t线避雷器_支柱绝缘子本体")
+    @Length(min = 1, max = 20, message = "【t线避雷器_支柱绝缘子本体】长度必须介于 {min} 和 {max} 之间")
+    private String txblqZzjyzbt;
+
+    @ApiModelProperty(value = "t线避雷器_法兰螺栓、螺母")
+    @Length(min = 1, max = 20, message = "【t线避雷器_法兰螺栓、螺母】长度必须介于 {min} 和 {max} 之间")
+    private String txblqFalslm;
+
+    @ApiModelProperty(value = "t线避雷器_盖板螺栓、螺母")
+    @Length(min = 1, max = 20, message = "【t线避雷器_盖板螺栓、螺母】长度必须介于 {min} 和 {max} 之间")
+    private String txblqGblslm;
+
+    @ApiModelProperty(value = "t线避雷器_避雷器引线")
+    @Length(min = 1, max = 20, message = "【t线避雷器_避雷器引线】长度必须介于 {min} 和 {max} 之间")
+    private String txblqBlqyx;
+
+    @ApiModelProperty(value = "t线避雷器_引线与接触网连接线夹")
+    @Length(min = 1, max = 20, message = "【t线避雷器_引线与接触网连接线夹】长度必须介于 {min} 和 {max} 之间")
+    private String txblqYxyjcwljxj;
+
+    @ApiModelProperty(value = "f线避雷器_避雷器本体")
+    @Length(min = 1, max = 20, message = "【f线避雷器_避雷器本体】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqBlqbt;
+
+    @ApiModelProperty(value = "f线避雷器_避雷器底部法兰连接螺栓、螺母*4")
+    @Length(min = 1, max = 20, message = "【f线避雷器_避雷器底部法兰连接螺栓、螺母*4】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqBlqdbfllm;
+
+    @ApiModelProperty(value = "f线避雷器_连接计数器绝缘软导线本体")
+    @Length(min = 1, max = 20, message = "【f线避雷器_连接计数器绝缘软导线本体】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqLjjsqjyrdtbt;
+
+    @ApiModelProperty(value = "f线避雷器_避雷器计数器本体")
+    @Length(min = 1, max = 20, message = "【f线避雷器_避雷器计数器本体】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqBlqjsqbt;
+
+    @ApiModelProperty(value = "f线避雷器_脱离器本体及镀锌铜线")
+    @Length(min = 1, max = 20, message = "【f线避雷器_脱离器本体及镀锌铜线】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqTlqbt;
+
+    @ApiModelProperty(value = "f线避雷器_支柱绝缘子本体")
+    @Length(min = 1, max = 20, message = "【f线避雷器_支柱绝缘子本体】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqZzjyzbt;
+
+    @ApiModelProperty(value = "f线避雷器_法兰螺栓、螺母")
+    @Length(min = 1, max = 20, message = "【f线避雷器_法兰螺栓、螺母】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqFalslm;
+
+    @ApiModelProperty(value = "f线避雷器_盖板螺栓*4")
+    @Length(min = 1, max = 20, message = "【f线避雷器_盖板螺栓*4】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqGbls;
+
+    @ApiModelProperty(value = "f线避雷器_盖板螺母*8")
+    @Length(min = 1, max = 20, message = "【f线避雷器_盖板螺母*8】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqGblm;
+
+    @ApiModelProperty(value = "f线避雷器_避雷器引线")
+    @Length(min = 1, max = 20, message = "【f线避雷器_避雷器引线】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqBlqyx;
+
+    @ApiModelProperty(value = "f线避雷器_引线与f线连接并沟线夹及螺栓")
+    @Length(min = 1, max = 20, message = "【f线避雷器_引线与f线连接并沟线夹及螺栓】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqYxyjcwljxj;
+
+    @ApiModelProperty(value = "f线避雷器_引线绑线")
+    @Length(min = 1, max = 20, message = "【f线避雷器_引线绑线】长度必须介于 {min} 和 {max} 之间")
+    private String fxblqYxbx;
+
+    @ApiModelProperty(value = "计数器与综合接地连接部件_铝接线端子")
+    @Length(min = 1, max = 20, message = "【计数器与综合接地连接部件_铝接线端子】长度必须介于 {min} 和 {max} 之间")
+    private String jsqyzhljdljbjLlxdz;
+
+    @ApiModelProperty(value = "计数器与综合接地连接部件_电连接线(铝绞线)本体 ")
+    @Length(min = 1, max = 20, message = "【计数器与综合接地连接部件_电连接线(铝绞线)本体】长度必须介于 {min} 和 {max} 之间")
+    private String jsqyzhljdljbjDljxbt;
+
+    @ApiModelProperty(value = "计数器与保护线连接部件_铜接线端子及连接螺栓、螺母m12")
+    @Length(min = 1, max = 20, message = "【计数器与保护线连接部件_铜接线端子及连接螺栓、螺母m12】长度必须介于 {min} 和 {max} 之间")
+    private String jsqybhxljbjTjxdzjlhlslm;
+
+    @ApiModelProperty(value = "计数器与保护线连接部件_低压铜芯电缆本体")
+    @Length(min = 1, max = 20, message = "【计数器与保护线连接部件_低压铜芯电缆本体】长度必须介于 {min} 和 {max} 之间")
+    private String jsqybhxljbjDytxdlbt;
+
+    @ApiModelProperty(value = "避雷线接地引下线")
+    @Length(min = 1, max = 20, message = "【避雷线接地引下线】长度必须介于 {min} 和 {max} 之间")
+    private String blxjdyxx;
+
+    @ApiModelProperty(value = "接地电阻值-接地电阻值(欧)")
+    @Length(min = 1, max = 20, message = "【接地电阻值-接地电阻值(欧)】长度必须介于 {min} 和 {max} 之间")
+    private String jddzz;
+
+    @ApiModelProperty(value = "其它")
+    @Length(min = 1, max = 255, message = "【其它】长度必须介于 {min} 和 {max} 之间")
+    private String qt;
+
+    @ApiModelProperty(value = "附件")
+    @Length(min = 1, max = 255, message = "【附件】长度必须介于 {min} 和 {max} 之间")
+    private String fj;
+
+    @ApiModelProperty(value = "数量")
+    @Length(min = 1, max = 10, message = "【数量】长度必须介于 {min} 和 {max} 之间")
+    private String sl;
+
+    @ApiModelProperty(value = "单位")
+    @Length(min = 1, max = 20, message = "【单位】长度必须介于 {min} 和 {max} 之间")
+    private String dw;
+
+    @ApiModelProperty(value = "数据编号")
+    @Length(min = 1, max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+    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 BusBlq() {
+    }
+
+}

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

@@ -0,0 +1,163 @@
+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.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+/**
+ * 检查表-避雷器
+ * @author wuhonghao 2021-10-17
+ */
+@Data
+@ApiModel("检查表-避雷器")
+@EqualsAndHashCode(callSuper = true)
+public class BusJcbBlq extends BaseEntity{
+
+    @ApiModelProperty(value = "主键", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "避雷器主键")
+    private Long blqId;
+
+    @ApiModelProperty(value = "区间")
+    @Length(min = 1, max = 100, message = "【区间】长度必须介于 {min} 和 {max} 之间")
+    private String qj;
+
+    @ApiModelProperty(value = "区间id")
+    @Length(min = 1, max = 50, message = "【区间id】长度必须介于 {min} 和 {max} 之间")
+    private String deptId;
+
+    @ApiModelProperty(value = "支柱号")
+    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String zzh;
+
+    @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 = "避雷器托架安装水平")
+    @Length(min = 1, max = 1, message = "【避雷器托架安装水平】长度必须介于 {min} 和 {max} 之间")
+    private String tjwzBlqtjazsp;
+
+    @ApiModelProperty(value = "避雷器托架安装水平(故障描述)")
+    @Length(min = 1, max = 225, message = "【避雷器托架安装水平(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String tjwzBlqtjazspDesc;
+
+    @ApiModelProperty(value = "无锈蚀")
+    @Length(min = 1, max = 1, message = "【无锈蚀】长度必须介于 {min} 和 {max} 之间")
+    private String tjwzWxs;
+
+    @ApiModelProperty(value = "无锈蚀(故障描述)")
+    @Length(min = 1, max = 225, message = "【无锈蚀(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String tjwzWxsDesc;
+
+    @ApiModelProperty(value = "各部螺栓连接紧固")
+    @Length(min = 1, max = 1, message = "【各部螺栓连接紧固】长度必须介于 {min} 和 {max} 之间")
+    private String tjwzGblsljjg;
+
+    @ApiModelProperty(value = "各部螺栓连接紧固(故障描述)")
+    @Length(min = 1, max = 225, message = "【各部螺栓连接紧固(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String tjwzGblsljjgDesc;
+
+    @ApiModelProperty(value = "避雷器及支持绝缘子呈竖直状态")
+    @Length(min = 1, max = 1, message = "【避雷器及支持绝缘子呈竖直状态】长度必须介于 {min} 和 {max} 之间")
+    private String blqjyzBlqjzcjyzcszzt;
+
+    @ApiModelProperty(value = "避雷器及支持绝缘子呈竖直状态(故障描述)")
+    @Length(min = 1, max = 255, message = "【避雷器及支持绝缘子呈竖直状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String blqjyzBlqjzcjyzcszztDesc;
+
+    @ApiModelProperty(value = "表面清洁,安装牢固")
+    @Length(min = 1, max = 1, message = "【表面清洁,安装牢固】长度必须介于 {min} 和 {max} 之间")
+    private String blqjyzBmqjazlg;
+
+    @ApiModelProperty(value = "表面清洁,安装牢固(故障描述)")
+    @Length(min = 1, max = 255, message = "【表面清洁,安装牢固(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String blqjyzBmqjazlgDesc;
+
+    @ApiModelProperty(value = "无裂纹、破损及放电痕迹")
+    @Length(min = 1, max = 1, message = "【无裂纹、破损及放电痕迹】长度必须介于 {min} 和 {max} 之间")
+    private String blqjyzWlhpsjfdhj;
+
+    @ApiModelProperty(value = "无裂纹、破损及放电痕迹(故障描述)")
+    @Length(min = 1, max = 255, message = "【无裂纹、破损及放电痕迹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String blqjyzWlhpsjfdhjDesc;
+
+    @ApiModelProperty(value = "避雷器引线无烧伤、断股")
+    @Length(min = 1, max = 1, message = "【避雷器引线无烧伤、断股】长度必须介于 {min} 和 {max} 之间")
+    private String blqyxBlqyxwssdg;
+
+    @ApiModelProperty(value = "避雷器引线无烧伤、断股(故障描述)")
+    @Length(min = 1, max = 1, message = "【避雷器引线无烧伤、断股(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String blqyxBlqyxwssdgDesc;
+
+    @ApiModelProperty(value = "高压侧引线对接地体的动态最小距离\r\n")
+    @Length(min = 1, max = 20, message = "【高压侧引线对接地体的动态最小距离\r\n】长度必须介于 {min} 和 {max} 之间")
+    private String blqyxGycyxdjdtdtzxjl;
+
+    @ApiModelProperty(value = "状态良好,无破损、裂纹")
+    @Length(min = 1, max = 1, message = "【状态良好,无破损、裂纹】长度必须介于 {min} 和 {max} 之间")
+    private String tlqZtlhwpslh;
+
+    @ApiModelProperty(value = "状态良好,无破损、裂纹(故障描述)")
+    @Length(min = 1, max = 1, message = "【状态良好,无破损、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    private String tlqZtlhwpslhDesc;
+
+    @ApiModelProperty(value = "计数器-动作计数")
+    @Length(min = 1, max = 20, message = "【计数器-动作计数】长度必须介于 {min} 和 {max} 之间")
+    private String jsqDzjs;
+
+    @ApiModelProperty(value = "避雷器接地状态-接地电阻")
+    @Length(min = 1, max = 20, message = "【避雷器接地状态-接地电阻】长度必须介于 {min} 和 {max} 之间")
+    private String blqjdztJddz;
+
+    @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 = "提交状态 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;
+
+    public BusJcbBlq() {
+    }
+
+}

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

@@ -21,6 +21,18 @@ public class BusZzdzxx extends BaseEntity{
     @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
+    @ApiModelProperty(value = "区间ID")
+    @Length(min = 1, max = 20, message = "【区间ID】长度必须介于 {min} 和 {max} 之间")
+    private String stationId;
+
+    @ApiModelProperty(value = "车间ID")
+    @Length(min = 1, max = 20, message = "【车间ID】长度必须介于 {min} 和 {max} 之间")
+    private String deptId;
+
+    @ApiModelProperty(value = "线别ID")
+    @Length(min = 1, max = 20, message = "【线别ID】长度必须介于 {min} 和 {max} 之间")
+    private String lineId;
+
     @ApiModelProperty(value = "段别")
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
     private String db;
@@ -306,6 +318,8 @@ public class BusZzdzxx extends BaseEntity{
     @ApiModelProperty(value = "update_time")
     private Date updateTime;
 
+
+
     public BusZzdzxx() {
     }
 

+ 43 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusBlqMapper.java

@@ -0,0 +1,43 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusBlq;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+* 基础数据-避雷器
+* @author wuhonghao
+* @date 2021/10/17
+*/
+@Mapper
+@Repository
+public interface BusBlqMapper {
+
+    /**
+    * @Description: 新增
+    */
+    int insert(BusBlq busBlq);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(@Param("id") String id);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusBlq busBlq);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusBlq getInfo(@Param("id") String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    Page<BusBlq> getList(BusBlq busBlq);
+
+}

+ 49 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbBlqMapper.java

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

+ 37 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusBlqService.java

@@ -0,0 +1,37 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusBlq;
+import java.util.List;
+/**
+* 基础数据-避雷器
+* @author wuhonghao
+* @date 2021/10/17
+*/
+public interface IBusBlqService{
+
+    /**
+    * @Description: 新增
+    */
+    int create(BusBlq busBlq);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusBlq busBlq);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusBlq getInfo(String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    List<BusBlq> getList(BusBlq busBlq);
+
+}

+ 65 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java

@@ -0,0 +1,65 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+
+import java.util.List;
+/**
+* 检查表-避雷器
+* @author wuhonghao
+* @date 2021/10/17
+*/
+public interface IBusJcbBlqService{
+
+    /**
+    * @Description: 新增
+    */
+    int create(BusJcbBlq busJcbBlq);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbBlq busJcbBlq);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbBlq getInfo(String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    List<BusJcbBlq> getList(BusJcbBlq busJcbBlq);
+
+    /**
+     * @Description: 获取上次检测值
+     */
+    BusJcbFdfxjyq getLastOne(BusJcbBlq busJcbBlq);
+
+    /**
+     * 提交
+     * @param busJcbBlq
+     * @return
+     */
+    int submit(BusJcbBlq busJcbBlq);
+
+    /**
+     * 退回
+     * @param busJcbBlq
+     * @return
+     */
+    int reject(BusJcbBlq busJcbBlq);
+
+    /**
+     * 确认
+     * @param busJcbBlq
+     * @return
+     */
+    int confirm(BusJcbBlq busJcbBlq);
+
+}

+ 70 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusBlqServiceImpl.java

@@ -0,0 +1,70 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.mapper.BusBlqMapper;
+import com.railway.business.catenary.domain.BusBlq;
+import com.railway.business.catenary.service.IBusBlqService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.railway.common.utils.SecurityUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+/**
+* 基础数据-避雷器
+* @author wuhonghao
+* @date 2021/10/17
+*/
+@Service
+@Transactional(readOnly = true)
+public class BusBlqServiceImpl implements IBusBlqService{
+@Autowired
+private BusBlqMapper busBlqMapper;
+
+	/**
+	* @Description: 新增
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int create(BusBlq busBlq) {
+	    busBlq.setCreateTime(new Date());
+        busBlq.setCreateBy(SecurityUtils.getUsername());
+		return busBlqMapper.insert(busBlq);
+	}
+
+	/**
+	* @Description: 删除
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busBlqMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
+	}
+
+	/**
+	* @Description: 更新
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int update(BusBlq busBlq) {
+		busBlq.setUpdateTime(new Date());
+    	busBlq.setUpdateBy(SecurityUtils.getUsername());
+		return busBlqMapper.update(busBlq);
+	}
+
+	/**
+	* @Description: 获取单个
+	*/
+	public BusBlq getInfo(String id) {
+		return busBlqMapper.getInfo(id);
+	}
+
+	/**
+	* @Description: 查询列表
+	*/
+	public List<BusBlq> getList(BusBlq busBlq) {
+		return busBlqMapper.getList(busBlq);
+	}
+}

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

@@ -0,0 +1,123 @@
+package com.railway.business.catenary.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.mapper.BusJcbBlqMapper;
+import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.service.IBusJcbBlqService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.railway.common.utils.SecurityUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+/**
+* 检查表-避雷器
+* @author wuhonghao
+* @date 2021/10/17
+*/
+@Service
+@Transactional(readOnly = true)
+public class BusJcbBlqServiceImpl implements IBusJcbBlqService{
+@Autowired
+private BusJcbBlqMapper busJcbBlqMapper;
+
+	/**
+	* @Description: 新增
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int create(BusJcbBlq busJcbBlq) {
+	    busJcbBlq.setCreateTime(new Date());
+        busJcbBlq.setCreateBy(SecurityUtils.getUsername());
+		return busJcbBlqMapper.insert(busJcbBlq);
+	}
+
+	/**
+	* @Description: 删除
+	*/
+	@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;
+	}
+
+	/**
+	* @Description: 更新
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int update(BusJcbBlq busJcbBlq) {
+		busJcbBlq.setUpdateTime(new Date());
+    	busJcbBlq.setUpdateBy(SecurityUtils.getUsername());
+		return busJcbBlqMapper.update(busJcbBlq);
+	}
+
+	/**
+	* @Description: 获取单个
+	*/
+	public BusJcbBlq getInfo(String id) {
+		return busJcbBlqMapper.getInfo(id);
+	}
+
+	/**
+	* @Description: 查询列表
+	*/
+	public List<BusJcbBlq> getList(BusJcbBlq busJcbBlq) {
+		return busJcbBlqMapper.getList(busJcbBlq);
+	}
+
+	/**
+	 * @Description: 获取上次检测值
+	 */
+	@Override
+	public BusJcbFdfxjyq getLastOne(BusJcbBlq busJcbBlq) {
+		return busJcbBlqMapper.getLastOne(busJcbBlq);
+	}
+
+	/**
+	 * 提交
+	 * @param busJcbBlq
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int submit(BusJcbBlq busJcbBlq) {
+		busJcbBlq.setUpdateTime(new Date());
+		busJcbBlq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		return busJcbBlqMapper.update(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);
+	}
+
+
+}

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

@@ -72,6 +72,10 @@ private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 		return busJcbFdfxjyqMapper.getList(busJcbFdfxjyq);
 	}
 
+
+	/**
+	 * @Description: 获取上次检测值
+	 */
 	@Override
 	public BusJcbFdfxjyq getLastOne(BusJcbFdfxjyq busJcbFdfxjyq) {
 		return busJcbFdfxjyqMapper.getLastOne(busJcbFdfxjyq);

+ 932 - 0
railway-business/src/main/resources/mapper/business/BusBlqMapper.xml

@@ -0,0 +1,932 @@
+<?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.BusBlqMapper">
+
+    <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusBlq">
+                <result column="id" property="id"/>
+                <result column="db" property="db"/>
+                <result column="bm" property="bm"/>
+                <result column="xb" property="xb"/>
+                <result column="qj" property="qj"/>
+                <result column="hb" property="hb"/>
+                <result column="zzh" property="zzh"/>
+                <result column="glb" property="glb"/>
+                <result column="gd" property="gd"/>
+                <result column="gxms" property="gxms"/>
+                <result column="dydj" property="dydj"/>
+                <result column="bz" property="bz"/>
+                <result column="sccj" property="sccj"/>
+                <result column="tyrq" property="tyrq"/>
+                <result column="blqlx" property="blqlx"/>
+                <result column="blqxh" property="blqxh"/>
+                <result column="yzbh" property="yzbh"/>
+                <result column="mdh" property="mdh"/>
+                <result column="tlqtyrq" property="tlqtyrq"/>
+                <result column="tlqzt" property="tlqzt"/>
+                <result column="sbxjzt" property="sbxjzt"/>
+                <result column="yfxsyrq" property="yfxsyrq"/>
+                <result column="yxjjdtzxjl_t1" property="yxjjdtzxjlT1"/>
+                <result column="yxjjdtzxjl_t2" property="yxjjdtzxjlT2"/>
+                <result column="yxjjdtzxjl_f1" property="yxjjdtzxjlF1"/>
+                <result column="yxjjdtzxjl_f2" property="yxjjdtzxjlF2"/>
+                <result column="yxcd" property="yxcd"/>
+                <result column="jyzjgtzt" property="jyzjgtzt"/>
+                <result column="aqzzzt" property="aqzzzt"/>
+                <result column="xldl1" property="xldl1"/>
+                <result column="xldl2" property="xldl2"/>
+                <result column="jsqcs_tx" property="jsqcsTx"/>
+                <result column="jsqcs_fx" property="jsqcsFx"/>
+                <result column="jdjjhhjx" property="jdjjhhjx"/>
+                <result column="blqtj_ljls" property="blqtjLjls"/>
+                <result column="blqtj_lm" property="blqtjLm"/>
+                <result column="txblq_blqbt" property="txblqBlqbt"/>
+                <result column="txblq_blqdbfllm" property="txblqBlqdbfllm"/>
+                <result column="txblq_ljjsqjyrdtbt" property="txblqLjjsqjyrdtbt"/>
+                <result column="txblq_blqjsqbt" property="txblqBlqjsqbt"/>
+                <result column="txblq_tlqbt" property="txblqTlqbt"/>
+                <result column="txblq_zzjyzbt" property="txblqZzjyzbt"/>
+                <result column="txblq_falslm" property="txblqFalslm"/>
+                <result column="txblq_gblslm" property="txblqGblslm"/>
+                <result column="txblq_blqyx" property="txblqBlqyx"/>
+                <result column="txblq_yxyjcwljxj" property="txblqYxyjcwljxj"/>
+                <result column="fxblq_blqbt" property="fxblqBlqbt"/>
+                <result column="fxblq_blqdbfllm" property="fxblqBlqdbfllm"/>
+                <result column="fxblq_ljjsqjyrdtbt" property="fxblqLjjsqjyrdtbt"/>
+                <result column="fxblq_blqjsqbt" property="fxblqBlqjsqbt"/>
+                <result column="fxblq_tlqbt" property="fxblqTlqbt"/>
+                <result column="fxblq_zzjyzbt" property="fxblqZzjyzbt"/>
+                <result column="fxblq_falslm" property="fxblqFalslm"/>
+                <result column="fxblq_gbls" property="fxblqGbls"/>
+                <result column="fxblq_gblm" property="fxblqGblm"/>
+                <result column="fxblq_blqyx" property="fxblqBlqyx"/>
+                <result column="fxblq_yxyjcwljxj" property="fxblqYxyjcwljxj"/>
+                <result column="fxblq_yxbx" property="fxblqYxbx"/>
+                <result column="jsqyzhljdljbj_llxdz" property="jsqyzhljdljbjLlxdz"/>
+                <result column="jsqyzhljdljbj_dljxbt" property="jsqyzhljdljbjDljxbt"/>
+                <result column="jsqybhxljbj_tjxdzjlhlslm" property="jsqybhxljbjTjxdzjlhlslm"/>
+                <result column="jsqybhxljbj_dytxdlbt" property="jsqybhxljbjDytxdlbt"/>
+                <result column="blxjdyxx" property="blxjdyxx"/>
+                <result column="jddzz" property="jddzz"/>
+                <result column="qt" property="qt"/>
+                <result column="fj" property="fj"/>
+                <result column="sl" property="sl"/>
+                <result column="dw" property="dw"/>
+                <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">
+                id,
+                db,
+                bm,
+                xb,
+                qj,
+                hb,
+                zzh,
+                glb,
+                gd,
+                gxms,
+                dydj,
+                bz,
+                sccj,
+                tyrq,
+                blqlx,
+                blqxh,
+                yzbh,
+                mdh,
+                tlqtyrq,
+                tlqzt,
+                sbxjzt,
+                yfxsyrq,
+                yxjjdtzxjl_t1,
+                yxjjdtzxjl_t2,
+                yxjjdtzxjl_f1,
+                yxjjdtzxjl_f2,
+                yxcd,
+                jyzjgtzt,
+                aqzzzt,
+                xldl1,
+                xldl2,
+                jsqcs_tx,
+                jsqcs_fx,
+                jdjjhhjx,
+                blqtj_ljls,
+                blqtj_lm,
+                txblq_blqbt,
+                txblq_blqdbfllm,
+                txblq_ljjsqjyrdtbt,
+                txblq_blqjsqbt,
+                txblq_tlqbt,
+                txblq_zzjyzbt,
+                txblq_falslm,
+                txblq_gblslm,
+                txblq_blqyx,
+                txblq_yxyjcwljxj,
+                fxblq_blqbt,
+                fxblq_blqdbfllm,
+                fxblq_ljjsqjyrdtbt,
+                fxblq_blqjsqbt,
+                fxblq_tlqbt,
+                fxblq_zzjyzbt,
+                fxblq_falslm,
+                fxblq_gbls,
+                fxblq_gblm,
+                fxblq_blqyx,
+                fxblq_yxyjcwljxj,
+                fxblq_yxbx,
+                jsqyzhljdljbj_llxdz,
+                jsqyzhljdljbj_dljxbt,
+                jsqybhxljbj_tjxdzjlhlslm,
+                jsqybhxljbj_dytxdlbt,
+                blxjdyxx,
+                jddzz,
+                qt,
+                fj,
+                sl,
+                dw,
+                sjbh,
+                del_flag,
+                create_by,
+                create_time,
+                update_by,
+                update_time
+    </sql>
+
+    <insert id="insert" parameterType="com.railway.business.catenary.domain.BusBlq">
+        <selectKey keyProperty="id" order="BEFORE" resultType="String">
+            select replace(uuid(), '-', '') from dual
+        </selectKey>
+        INSERT INTO bus_blq
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test ='null != db'>
+                    db,
+                    </if>
+                    <if test ='null != bm'>
+                    bm,
+                    </if>
+                    <if test ='null != xb'>
+                    xb,
+                    </if>
+                    <if test ='null != qj'>
+                    qj,
+                    </if>
+                    <if test ='null != hb'>
+                    hb,
+                    </if>
+                    <if test ='null != zzh'>
+                    zzh,
+                    </if>
+                    <if test ='null != glb'>
+                    glb,
+                    </if>
+                    <if test ='null != gd'>
+                    gd,
+                    </if>
+                    <if test ='null != gxms'>
+                    gxms,
+                    </if>
+                    <if test ='null != dydj'>
+                    dydj,
+                    </if>
+                    <if test ='null != bz'>
+                    bz,
+                    </if>
+                    <if test ='null != sccj'>
+                    sccj,
+                    </if>
+                    <if test ='null != tyrq'>
+                    tyrq,
+                    </if>
+                    <if test ='null != blqlx'>
+                    blqlx,
+                    </if>
+                    <if test ='null != blqxh'>
+                    blqxh,
+                    </if>
+                    <if test ='null != yzbh'>
+                    yzbh,
+                    </if>
+                    <if test ='null != mdh'>
+                    mdh,
+                    </if>
+                    <if test ='null != tlqtyrq'>
+                    tlqtyrq,
+                    </if>
+                    <if test ='null != tlqzt'>
+                    tlqzt,
+                    </if>
+                    <if test ='null != sbxjzt'>
+                    sbxjzt,
+                    </if>
+                    <if test ='null != yfxsyrq'>
+                    yfxsyrq,
+                    </if>
+                    <if test ='null != yxjjdtzxjlT1'>
+                    yxjjdtzxjl_t1,
+                    </if>
+                    <if test ='null != yxjjdtzxjlT2'>
+                    yxjjdtzxjl_t2,
+                    </if>
+                    <if test ='null != yxjjdtzxjlF1'>
+                    yxjjdtzxjl_f1,
+                    </if>
+                    <if test ='null != yxjjdtzxjlF2'>
+                    yxjjdtzxjl_f2,
+                    </if>
+                    <if test ='null != yxcd'>
+                    yxcd,
+                    </if>
+                    <if test ='null != jyzjgtzt'>
+                    jyzjgtzt,
+                    </if>
+                    <if test ='null != aqzzzt'>
+                    aqzzzt,
+                    </if>
+                    <if test ='null != xldl1'>
+                    xldl1,
+                    </if>
+                    <if test ='null != xldl2'>
+                    xldl2,
+                    </if>
+                    <if test ='null != jsqcsTx'>
+                    jsqcs_tx,
+                    </if>
+                    <if test ='null != jsqcsFx'>
+                    jsqcs_fx,
+                    </if>
+                    <if test ='null != jdjjhhjx'>
+                    jdjjhhjx,
+                    </if>
+                    <if test ='null != blqtjLjls'>
+                    blqtj_ljls,
+                    </if>
+                    <if test ='null != blqtjLm'>
+                    blqtj_lm,
+                    </if>
+                    <if test ='null != txblqBlqbt'>
+                    txblq_blqbt,
+                    </if>
+                    <if test ='null != txblqBlqdbfllm'>
+                    txblq_blqdbfllm,
+                    </if>
+                    <if test ='null != txblqLjjsqjyrdtbt'>
+                    txblq_ljjsqjyrdtbt,
+                    </if>
+                    <if test ='null != txblqBlqjsqbt'>
+                    txblq_blqjsqbt,
+                    </if>
+                    <if test ='null != txblqTlqbt'>
+                    txblq_tlqbt,
+                    </if>
+                    <if test ='null != txblqZzjyzbt'>
+                    txblq_zzjyzbt,
+                    </if>
+                    <if test ='null != txblqFalslm'>
+                    txblq_falslm,
+                    </if>
+                    <if test ='null != txblqGblslm'>
+                    txblq_gblslm,
+                    </if>
+                    <if test ='null != txblqBlqyx'>
+                    txblq_blqyx,
+                    </if>
+                    <if test ='null != txblqYxyjcwljxj'>
+                    txblq_yxyjcwljxj,
+                    </if>
+                    <if test ='null != fxblqBlqbt'>
+                    fxblq_blqbt,
+                    </if>
+                    <if test ='null != fxblqBlqdbfllm'>
+                    fxblq_blqdbfllm,
+                    </if>
+                    <if test ='null != fxblqLjjsqjyrdtbt'>
+                    fxblq_ljjsqjyrdtbt,
+                    </if>
+                    <if test ='null != fxblqBlqjsqbt'>
+                    fxblq_blqjsqbt,
+                    </if>
+                    <if test ='null != fxblqTlqbt'>
+                    fxblq_tlqbt,
+                    </if>
+                    <if test ='null != fxblqZzjyzbt'>
+                    fxblq_zzjyzbt,
+                    </if>
+                    <if test ='null != fxblqFalslm'>
+                    fxblq_falslm,
+                    </if>
+                    <if test ='null != fxblqGbls'>
+                    fxblq_gbls,
+                    </if>
+                    <if test ='null != fxblqGblm'>
+                    fxblq_gblm,
+                    </if>
+                    <if test ='null != fxblqBlqyx'>
+                    fxblq_blqyx,
+                    </if>
+                    <if test ='null != fxblqYxyjcwljxj'>
+                    fxblq_yxyjcwljxj,
+                    </if>
+                    <if test ='null != fxblqYxbx'>
+                    fxblq_yxbx,
+                    </if>
+                    <if test ='null != jsqyzhljdljbjLlxdz'>
+                    jsqyzhljdljbj_llxdz,
+                    </if>
+                    <if test ='null != jsqyzhljdljbjDljxbt'>
+                    jsqyzhljdljbj_dljxbt,
+                    </if>
+                    <if test ='null != jsqybhxljbjTjxdzjlhlslm'>
+                    jsqybhxljbj_tjxdzjlhlslm,
+                    </if>
+                    <if test ='null != jsqybhxljbjDytxdlbt'>
+                    jsqybhxljbj_dytxdlbt,
+                    </if>
+                    <if test ='null != blxjdyxx'>
+                    blxjdyxx,
+                    </if>
+                    <if test ='null != jddzz'>
+                    jddzz,
+                    </if>
+                    <if test ='null != qt'>
+                    qt,
+                    </if>
+                    <if test ='null != fj'>
+                    fj,
+                    </if>
+                    <if test ='null != sl'>
+                    sl,
+                    </if>
+                    <if test ='null != dw'>
+                    dw,
+                    </if>
+                    <if test ='null != 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=",">
+                    <if test ='null != db'>
+                    #{db},
+                    </if>
+                    <if test ='null != bm'>
+                    #{bm},
+                    </if>
+                    <if test ='null != xb'>
+                    #{xb},
+                    </if>
+                    <if test ='null != qj'>
+                    #{qj},
+                    </if>
+                    <if test ='null != hb'>
+                    #{hb},
+                    </if>
+                    <if test ='null != zzh'>
+                    #{zzh},
+                    </if>
+                    <if test ='null != glb'>
+                    #{glb},
+                    </if>
+                    <if test ='null != gd'>
+                    #{gd},
+                    </if>
+                    <if test ='null != gxms'>
+                    #{gxms},
+                    </if>
+                    <if test ='null != dydj'>
+                    #{dydj},
+                    </if>
+                    <if test ='null != bz'>
+                    #{bz},
+                    </if>
+                    <if test ='null != sccj'>
+                    #{sccj},
+                    </if>
+                    <if test ='null != tyrq'>
+                    #{tyrq},
+                    </if>
+                    <if test ='null != blqlx'>
+                    #{blqlx},
+                    </if>
+                    <if test ='null != blqxh'>
+                    #{blqxh},
+                    </if>
+                    <if test ='null != yzbh'>
+                    #{yzbh},
+                    </if>
+                    <if test ='null != mdh'>
+                    #{mdh},
+                    </if>
+                    <if test ='null != tlqtyrq'>
+                    #{tlqtyrq},
+                    </if>
+                    <if test ='null != tlqzt'>
+                    #{tlqzt},
+                    </if>
+                    <if test ='null != sbxjzt'>
+                    #{sbxjzt},
+                    </if>
+                    <if test ='null != yfxsyrq'>
+                    #{yfxsyrq},
+                    </if>
+                    <if test ='null != yxjjdtzxjlT1'>
+                    #{yxjjdtzxjlT1},
+                    </if>
+                    <if test ='null != yxjjdtzxjlT2'>
+                    #{yxjjdtzxjlT2},
+                    </if>
+                    <if test ='null != yxjjdtzxjlF1'>
+                    #{yxjjdtzxjlF1},
+                    </if>
+                    <if test ='null != yxjjdtzxjlF2'>
+                    #{yxjjdtzxjlF2},
+                    </if>
+                    <if test ='null != yxcd'>
+                    #{yxcd},
+                    </if>
+                    <if test ='null != jyzjgtzt'>
+                    #{jyzjgtzt},
+                    </if>
+                    <if test ='null != aqzzzt'>
+                    #{aqzzzt},
+                    </if>
+                    <if test ='null != xldl1'>
+                    #{xldl1},
+                    </if>
+                    <if test ='null != xldl2'>
+                    #{xldl2},
+                    </if>
+                    <if test ='null != jsqcsTx'>
+                    #{jsqcsTx},
+                    </if>
+                    <if test ='null != jsqcsFx'>
+                    #{jsqcsFx},
+                    </if>
+                    <if test ='null != jdjjhhjx'>
+                    #{jdjjhhjx},
+                    </if>
+                    <if test ='null != blqtjLjls'>
+                    #{blqtjLjls},
+                    </if>
+                    <if test ='null != blqtjLm'>
+                    #{blqtjLm},
+                    </if>
+                    <if test ='null != txblqBlqbt'>
+                    #{txblqBlqbt},
+                    </if>
+                    <if test ='null != txblqBlqdbfllm'>
+                    #{txblqBlqdbfllm},
+                    </if>
+                    <if test ='null != txblqLjjsqjyrdtbt'>
+                    #{txblqLjjsqjyrdtbt},
+                    </if>
+                    <if test ='null != txblqBlqjsqbt'>
+                    #{txblqBlqjsqbt},
+                    </if>
+                    <if test ='null != txblqTlqbt'>
+                    #{txblqTlqbt},
+                    </if>
+                    <if test ='null != txblqZzjyzbt'>
+                    #{txblqZzjyzbt},
+                    </if>
+                    <if test ='null != txblqFalslm'>
+                    #{txblqFalslm},
+                    </if>
+                    <if test ='null != txblqGblslm'>
+                    #{txblqGblslm},
+                    </if>
+                    <if test ='null != txblqBlqyx'>
+                    #{txblqBlqyx},
+                    </if>
+                    <if test ='null != txblqYxyjcwljxj'>
+                    #{txblqYxyjcwljxj},
+                    </if>
+                    <if test ='null != fxblqBlqbt'>
+                    #{fxblqBlqbt},
+                    </if>
+                    <if test ='null != fxblqBlqdbfllm'>
+                    #{fxblqBlqdbfllm},
+                    </if>
+                    <if test ='null != fxblqLjjsqjyrdtbt'>
+                    #{fxblqLjjsqjyrdtbt},
+                    </if>
+                    <if test ='null != fxblqBlqjsqbt'>
+                    #{fxblqBlqjsqbt},
+                    </if>
+                    <if test ='null != fxblqTlqbt'>
+                    #{fxblqTlqbt},
+                    </if>
+                    <if test ='null != fxblqZzjyzbt'>
+                    #{fxblqZzjyzbt},
+                    </if>
+                    <if test ='null != fxblqFalslm'>
+                    #{fxblqFalslm},
+                    </if>
+                    <if test ='null != fxblqGbls'>
+                    #{fxblqGbls},
+                    </if>
+                    <if test ='null != fxblqGblm'>
+                    #{fxblqGblm},
+                    </if>
+                    <if test ='null != fxblqBlqyx'>
+                    #{fxblqBlqyx},
+                    </if>
+                    <if test ='null != fxblqYxyjcwljxj'>
+                    #{fxblqYxyjcwljxj},
+                    </if>
+                    <if test ='null != fxblqYxbx'>
+                    #{fxblqYxbx},
+                    </if>
+                    <if test ='null != jsqyzhljdljbjLlxdz'>
+                    #{jsqyzhljdljbjLlxdz},
+                    </if>
+                    <if test ='null != jsqyzhljdljbjDljxbt'>
+                    #{jsqyzhljdljbjDljxbt},
+                    </if>
+                    <if test ='null != jsqybhxljbjTjxdzjlhlslm'>
+                    #{jsqybhxljbjTjxdzjlhlslm},
+                    </if>
+                    <if test ='null != jsqybhxljbjDytxdlbt'>
+                    #{jsqybhxljbjDytxdlbt},
+                    </if>
+                    <if test ='null != blxjdyxx'>
+                    #{blxjdyxx},
+                    </if>
+                    <if test ='null != jddzz'>
+                    #{jddzz},
+                    </if>
+                    <if test ='null != qt'>
+                    #{qt},
+                    </if>
+                    <if test ='null != fj'>
+                    #{fj},
+                    </if>
+                    <if test ='null != sl'>
+                    #{sl},
+                    </if>
+                    <if test ='null != dw'>
+                    #{dw},
+                    </if>
+                    <if test ='null != 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>
+
+    <delete id="delete">
+        UPDATE bus_blq
+        set del_flag='1'
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.railway.business.catenary.domain.BusBlq">
+        UPDATE bus_blq
+        <set>
+                    <if test ='null != db'>db = #{db},</if>
+                    <if test ='null != bm'>bm = #{bm},</if>
+                    <if test ='null != xb'>xb = #{xb},</if>
+                    <if test ='null != qj'>qj = #{qj},</if>
+                    <if test ='null != hb'>hb = #{hb},</if>
+                    <if test ='null != zzh'>zzh = #{zzh},</if>
+                    <if test ='null != glb'>glb = #{glb},</if>
+                    <if test ='null != gd'>gd = #{gd},</if>
+                    <if test ='null != gxms'>gxms = #{gxms},</if>
+                    <if test ='null != dydj'>dydj = #{dydj},</if>
+                    <if test ='null != bz'>bz = #{bz},</if>
+                    <if test ='null != sccj'>sccj = #{sccj},</if>
+                    <if test ='null != tyrq'>tyrq = #{tyrq},</if>
+                    <if test ='null != blqlx'>blqlx = #{blqlx},</if>
+                    <if test ='null != blqxh'>blqxh = #{blqxh},</if>
+                    <if test ='null != yzbh'>yzbh = #{yzbh},</if>
+                    <if test ='null != mdh'>mdh = #{mdh},</if>
+                    <if test ='null != tlqtyrq'>tlqtyrq = #{tlqtyrq},</if>
+                    <if test ='null != tlqzt'>tlqzt = #{tlqzt},</if>
+                    <if test ='null != sbxjzt'>sbxjzt = #{sbxjzt},</if>
+                    <if test ='null != yfxsyrq'>yfxsyrq = #{yfxsyrq},</if>
+                    <if test ='null != yxjjdtzxjlT1'>yxjjdtzxjl_t1 = #{yxjjdtzxjlT1},</if>
+                    <if test ='null != yxjjdtzxjlT2'>yxjjdtzxjl_t2 = #{yxjjdtzxjlT2},</if>
+                    <if test ='null != yxjjdtzxjlF1'>yxjjdtzxjl_f1 = #{yxjjdtzxjlF1},</if>
+                    <if test ='null != yxjjdtzxjlF2'>yxjjdtzxjl_f2 = #{yxjjdtzxjlF2},</if>
+                    <if test ='null != yxcd'>yxcd = #{yxcd},</if>
+                    <if test ='null != jyzjgtzt'>jyzjgtzt = #{jyzjgtzt},</if>
+                    <if test ='null != aqzzzt'>aqzzzt = #{aqzzzt},</if>
+                    <if test ='null != xldl1'>xldl1 = #{xldl1},</if>
+                    <if test ='null != xldl2'>xldl2 = #{xldl2},</if>
+                    <if test ='null != jsqcsTx'>jsqcs_tx = #{jsqcsTx},</if>
+                    <if test ='null != jsqcsFx'>jsqcs_fx = #{jsqcsFx},</if>
+                    <if test ='null != jdjjhhjx'>jdjjhhjx = #{jdjjhhjx},</if>
+                    <if test ='null != blqtjLjls'>blqtj_ljls = #{blqtjLjls},</if>
+                    <if test ='null != blqtjLm'>blqtj_lm = #{blqtjLm},</if>
+                    <if test ='null != txblqBlqbt'>txblq_blqbt = #{txblqBlqbt},</if>
+                    <if test ='null != txblqBlqdbfllm'>txblq_blqdbfllm = #{txblqBlqdbfllm},</if>
+                    <if test ='null != txblqLjjsqjyrdtbt'>txblq_ljjsqjyrdtbt = #{txblqLjjsqjyrdtbt},</if>
+                    <if test ='null != txblqBlqjsqbt'>txblq_blqjsqbt = #{txblqBlqjsqbt},</if>
+                    <if test ='null != txblqTlqbt'>txblq_tlqbt = #{txblqTlqbt},</if>
+                    <if test ='null != txblqZzjyzbt'>txblq_zzjyzbt = #{txblqZzjyzbt},</if>
+                    <if test ='null != txblqFalslm'>txblq_falslm = #{txblqFalslm},</if>
+                    <if test ='null != txblqGblslm'>txblq_gblslm = #{txblqGblslm},</if>
+                    <if test ='null != txblqBlqyx'>txblq_blqyx = #{txblqBlqyx},</if>
+                    <if test ='null != txblqYxyjcwljxj'>txblq_yxyjcwljxj = #{txblqYxyjcwljxj},</if>
+                    <if test ='null != fxblqBlqbt'>fxblq_blqbt = #{fxblqBlqbt},</if>
+                    <if test ='null != fxblqBlqdbfllm'>fxblq_blqdbfllm = #{fxblqBlqdbfllm},</if>
+                    <if test ='null != fxblqLjjsqjyrdtbt'>fxblq_ljjsqjyrdtbt = #{fxblqLjjsqjyrdtbt},</if>
+                    <if test ='null != fxblqBlqjsqbt'>fxblq_blqjsqbt = #{fxblqBlqjsqbt},</if>
+                    <if test ='null != fxblqTlqbt'>fxblq_tlqbt = #{fxblqTlqbt},</if>
+                    <if test ='null != fxblqZzjyzbt'>fxblq_zzjyzbt = #{fxblqZzjyzbt},</if>
+                    <if test ='null != fxblqFalslm'>fxblq_falslm = #{fxblqFalslm},</if>
+                    <if test ='null != fxblqGbls'>fxblq_gbls = #{fxblqGbls},</if>
+                    <if test ='null != fxblqGblm'>fxblq_gblm = #{fxblqGblm},</if>
+                    <if test ='null != fxblqBlqyx'>fxblq_blqyx = #{fxblqBlqyx},</if>
+                    <if test ='null != fxblqYxyjcwljxj'>fxblq_yxyjcwljxj = #{fxblqYxyjcwljxj},</if>
+                    <if test ='null != fxblqYxbx'>fxblq_yxbx = #{fxblqYxbx},</if>
+                    <if test ='null != jsqyzhljdljbjLlxdz'>jsqyzhljdljbj_llxdz = #{jsqyzhljdljbjLlxdz},</if>
+                    <if test ='null != jsqyzhljdljbjDljxbt'>jsqyzhljdljbj_dljxbt = #{jsqyzhljdljbjDljxbt},</if>
+                    <if test ='null != jsqybhxljbjTjxdzjlhlslm'>jsqybhxljbj_tjxdzjlhlslm = #{jsqybhxljbjTjxdzjlhlslm},</if>
+                    <if test ='null != jsqybhxljbjDytxdlbt'>jsqybhxljbj_dytxdlbt = #{jsqybhxljbjDytxdlbt},</if>
+                    <if test ='null != blxjdyxx'>blxjdyxx = #{blxjdyxx},</if>
+                    <if test ='null != jddzz'>jddzz = #{jddzz},</if>
+                    <if test ='null != qt'>qt = #{qt},</if>
+                    <if test ='null != fj'>fj = #{fj},</if>
+                    <if test ='null != sl'>sl = #{sl},</if>
+                    <if test ='null != dw'>dw = #{dw},</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>
+
+
+    <select id="getInfo" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_blq
+        WHERE del_flag='0' and id = #{id}
+
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_blq
+        <where>
+            del_flag='0'
+                <if test="db!=null and db!=''">
+                    and db=#{db}
+                </if>
+                <if test="bm!=null and bm!=''">
+                    and bm=#{bm}
+                </if>
+                <if test="xb!=null and xb!=''">
+                    and xb=#{xb}
+                </if>
+                <if test="qj!=null and qj!=''">
+                    and qj=#{qj}
+                </if>
+                <if test="hb!=null and hb!=''">
+                    and hb=#{hb}
+                </if>
+                <if test="zzh!=null and zzh!=''">
+                    and zzh=#{zzh}
+                </if>
+                <if test="glb!=null and glb!=''">
+                    and glb=#{glb}
+                </if>
+                <if test="gd!=null and gd!=''">
+                    and gd=#{gd}
+                </if>
+                <if test="gxms!=null and gxms!=''">
+                    and gxms=#{gxms}
+                </if>
+                <if test="dydj!=null and dydj!=''">
+                    and dydj=#{dydj}
+                </if>
+                <if test="bz!=null and bz!=''">
+                    and bz=#{bz}
+                </if>
+                <if test="sccj!=null and sccj!=''">
+                    and sccj=#{sccj}
+                </if>
+                <if test="tyrq!=null and tyrq!=''">
+                    and tyrq=#{tyrq}
+                </if>
+                <if test="blqlx!=null and blqlx!=''">
+                    and blqlx=#{blqlx}
+                </if>
+                <if test="blqxh!=null and blqxh!=''">
+                    and blqxh=#{blqxh}
+                </if>
+                <if test="yzbh!=null and yzbh!=''">
+                    and yzbh=#{yzbh}
+                </if>
+                <if test="mdh!=null and mdh!=''">
+                    and mdh=#{mdh}
+                </if>
+                <if test="tlqtyrq!=null and tlqtyrq!=''">
+                    and tlqtyrq=#{tlqtyrq}
+                </if>
+                <if test="tlqzt!=null and tlqzt!=''">
+                    and tlqzt=#{tlqzt}
+                </if>
+                <if test="sbxjzt!=null and sbxjzt!=''">
+                    and sbxjzt=#{sbxjzt}
+                </if>
+                <if test="yfxsyrq!=null and yfxsyrq!=''">
+                    and yfxsyrq=#{yfxsyrq}
+                </if>
+                <if test="yxjjdtzxjlT1!=null and yxjjdtzxjlT1!=''">
+                    and yxjjdtzxjl_t1=#{yxjjdtzxjlT1}
+                </if>
+                <if test="yxjjdtzxjlT2!=null and yxjjdtzxjlT2!=''">
+                    and yxjjdtzxjl_t2=#{yxjjdtzxjlT2}
+                </if>
+                <if test="yxjjdtzxjlF1!=null and yxjjdtzxjlF1!=''">
+                    and yxjjdtzxjl_f1=#{yxjjdtzxjlF1}
+                </if>
+                <if test="yxjjdtzxjlF2!=null and yxjjdtzxjlF2!=''">
+                    and yxjjdtzxjl_f2=#{yxjjdtzxjlF2}
+                </if>
+                <if test="yxcd!=null and yxcd!=''">
+                    and yxcd=#{yxcd}
+                </if>
+                <if test="jyzjgtzt!=null and jyzjgtzt!=''">
+                    and jyzjgtzt=#{jyzjgtzt}
+                </if>
+                <if test="aqzzzt!=null and aqzzzt!=''">
+                    and aqzzzt=#{aqzzzt}
+                </if>
+                <if test="xldl1!=null and xldl1!=''">
+                    and xldl1=#{xldl1}
+                </if>
+                <if test="xldl2!=null and xldl2!=''">
+                    and xldl2=#{xldl2}
+                </if>
+                <if test="jsqcsTx!=null and jsqcsTx!=''">
+                    and jsqcs_tx=#{jsqcsTx}
+                </if>
+                <if test="jsqcsFx!=null and jsqcsFx!=''">
+                    and jsqcs_fx=#{jsqcsFx}
+                </if>
+                <if test="jdjjhhjx!=null and jdjjhhjx!=''">
+                    and jdjjhhjx=#{jdjjhhjx}
+                </if>
+                <if test="blqtjLjls!=null and blqtjLjls!=''">
+                    and blqtj_ljls=#{blqtjLjls}
+                </if>
+                <if test="blqtjLm!=null and blqtjLm!=''">
+                    and blqtj_lm=#{blqtjLm}
+                </if>
+                <if test="txblqBlqbt!=null and txblqBlqbt!=''">
+                    and txblq_blqbt=#{txblqBlqbt}
+                </if>
+                <if test="txblqBlqdbfllm!=null and txblqBlqdbfllm!=''">
+                    and txblq_blqdbfllm=#{txblqBlqdbfllm}
+                </if>
+                <if test="txblqLjjsqjyrdtbt!=null and txblqLjjsqjyrdtbt!=''">
+                    and txblq_ljjsqjyrdtbt=#{txblqLjjsqjyrdtbt}
+                </if>
+                <if test="txblqBlqjsqbt!=null and txblqBlqjsqbt!=''">
+                    and txblq_blqjsqbt=#{txblqBlqjsqbt}
+                </if>
+                <if test="txblqTlqbt!=null and txblqTlqbt!=''">
+                    and txblq_tlqbt=#{txblqTlqbt}
+                </if>
+                <if test="txblqZzjyzbt!=null and txblqZzjyzbt!=''">
+                    and txblq_zzjyzbt=#{txblqZzjyzbt}
+                </if>
+                <if test="txblqFalslm!=null and txblqFalslm!=''">
+                    and txblq_falslm=#{txblqFalslm}
+                </if>
+                <if test="txblqGblslm!=null and txblqGblslm!=''">
+                    and txblq_gblslm=#{txblqGblslm}
+                </if>
+                <if test="txblqBlqyx!=null and txblqBlqyx!=''">
+                    and txblq_blqyx=#{txblqBlqyx}
+                </if>
+                <if test="txblqYxyjcwljxj!=null and txblqYxyjcwljxj!=''">
+                    and txblq_yxyjcwljxj=#{txblqYxyjcwljxj}
+                </if>
+                <if test="fxblqBlqbt!=null and fxblqBlqbt!=''">
+                    and fxblq_blqbt=#{fxblqBlqbt}
+                </if>
+                <if test="fxblqBlqdbfllm!=null and fxblqBlqdbfllm!=''">
+                    and fxblq_blqdbfllm=#{fxblqBlqdbfllm}
+                </if>
+                <if test="fxblqLjjsqjyrdtbt!=null and fxblqLjjsqjyrdtbt!=''">
+                    and fxblq_ljjsqjyrdtbt=#{fxblqLjjsqjyrdtbt}
+                </if>
+                <if test="fxblqBlqjsqbt!=null and fxblqBlqjsqbt!=''">
+                    and fxblq_blqjsqbt=#{fxblqBlqjsqbt}
+                </if>
+                <if test="fxblqTlqbt!=null and fxblqTlqbt!=''">
+                    and fxblq_tlqbt=#{fxblqTlqbt}
+                </if>
+                <if test="fxblqZzjyzbt!=null and fxblqZzjyzbt!=''">
+                    and fxblq_zzjyzbt=#{fxblqZzjyzbt}
+                </if>
+                <if test="fxblqFalslm!=null and fxblqFalslm!=''">
+                    and fxblq_falslm=#{fxblqFalslm}
+                </if>
+                <if test="fxblqGbls!=null and fxblqGbls!=''">
+                    and fxblq_gbls=#{fxblqGbls}
+                </if>
+                <if test="fxblqGblm!=null and fxblqGblm!=''">
+                    and fxblq_gblm=#{fxblqGblm}
+                </if>
+                <if test="fxblqBlqyx!=null and fxblqBlqyx!=''">
+                    and fxblq_blqyx=#{fxblqBlqyx}
+                </if>
+                <if test="fxblqYxyjcwljxj!=null and fxblqYxyjcwljxj!=''">
+                    and fxblq_yxyjcwljxj=#{fxblqYxyjcwljxj}
+                </if>
+                <if test="fxblqYxbx!=null and fxblqYxbx!=''">
+                    and fxblq_yxbx=#{fxblqYxbx}
+                </if>
+                <if test="jsqyzhljdljbjLlxdz!=null and jsqyzhljdljbjLlxdz!=''">
+                    and jsqyzhljdljbj_llxdz=#{jsqyzhljdljbjLlxdz}
+                </if>
+                <if test="jsqyzhljdljbjDljxbt!=null and jsqyzhljdljbjDljxbt!=''">
+                    and jsqyzhljdljbj_dljxbt=#{jsqyzhljdljbjDljxbt}
+                </if>
+                <if test="jsqybhxljbjTjxdzjlhlslm!=null and jsqybhxljbjTjxdzjlhlslm!=''">
+                    and jsqybhxljbj_tjxdzjlhlslm=#{jsqybhxljbjTjxdzjlhlslm}
+                </if>
+                <if test="jsqybhxljbjDytxdlbt!=null and jsqybhxljbjDytxdlbt!=''">
+                    and jsqybhxljbj_dytxdlbt=#{jsqybhxljbjDytxdlbt}
+                </if>
+                <if test="blxjdyxx!=null and blxjdyxx!=''">
+                    and blxjdyxx=#{blxjdyxx}
+                </if>
+                <if test="jddzz!=null and jddzz!=''">
+                    and jddzz=#{jddzz}
+                </if>
+                <if test="qt!=null and qt!=''">
+                    and qt=#{qt}
+                </if>
+                <if test="fj!=null and fj!=''">
+                    and fj=#{fj}
+                </if>
+                <if test="sl!=null and sl!=''">
+                    and sl=#{sl}
+                </if>
+                <if test="dw!=null and dw!=''">
+                    and dw=#{dw}
+                </if>
+                <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>
+
+</mapper>

+ 519 - 0
railway-business/src/main/resources/mapper/business/BusJcbBlqMapper.xml

@@ -0,0 +1,519 @@
+<?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.BusJcbBlqMapper">
+
+    <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcbBlq">
+                <result column="id" property="id"/>
+                <result column="blq_id" property="blqId"/>
+                <result column="qj" property="qj"/>
+                <result column="dept_id" property="deptId"/>
+                <result column="zzh" property="zzh"/>
+                <result column="wd" property="wd"/>
+                <result column="jcrq" property="jcrq"/>
+                <result column="pic_url" property="picUrl"/>
+                <result column="tjwz_blqtjazsp" property="tjwzBlqtjazsp"/>
+                <result column="tjwz_blqtjazsp_desc" property="tjwzBlqtjazspDesc"/>
+                <result column="tjwz_wxs" property="tjwzWxs"/>
+                <result column="tjwz_wxs_desc" property="tjwzWxsDesc"/>
+                <result column="tjwz_gblsljjg" property="tjwzGblsljjg"/>
+                <result column="tjwz_gblsljjg_desc" property="tjwzGblsljjgDesc"/>
+                <result column="blqjyz_blqjzcjyzcszzt" property="blqjyzBlqjzcjyzcszzt"/>
+                <result column="blqjyz_blqjzcjyzcszzt_desc" property="blqjyzBlqjzcjyzcszztDesc"/>
+                <result column="blqjyz_bmqjazlg" property="blqjyzBmqjazlg"/>
+                <result column="blqjyz_bmqjazlg_desc" property="blqjyzBmqjazlgDesc"/>
+                <result column="blqjyz_wlhpsjfdhj" property="blqjyzWlhpsjfdhj"/>
+                <result column="blqjyz_wlhpsjfdhj_desc" property="blqjyzWlhpsjfdhjDesc"/>
+                <result column="blqyx_blqyxwssdg" property="blqyxBlqyxwssdg"/>
+                <result column="blqyx_blqyxwssdg_desc" property="blqyxBlqyxwssdgDesc"/>
+                <result column="blqyx_gycyxdjdtdtzxjl" property="blqyxGycyxdjdtdtzxjl"/>
+                <result column="tlq_ztlhwpslh" property="tlqZtlhwpslh"/>
+                <result column="tlq_ztlhwpslh_desc" property="tlqZtlhwpslhDesc"/>
+                <result column="jsq_dzjs" property="jsqDzjs"/>
+                <result column="blqjdzt_jddz" property="blqjdztJddz"/>
+                <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="submit_state" property="submitState"/>
+                <result column="del_flag" property="delFlag"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                blq_id,
+                qj,
+                dept_id,
+                zzh,
+                wd,
+                jcrq,
+                pic_url,
+                tjwz_blqtjazsp,
+                tjwz_blqtjazsp_desc,
+                tjwz_wxs,
+                tjwz_wxs_desc,
+                tjwz_gblsljjg,
+                tjwz_gblsljjg_desc,
+                blqjyz_blqjzcjyzcszzt,
+                blqjyz_blqjzcjyzcszzt_desc,
+                blqjyz_bmqjazlg,
+                blqjyz_bmqjazlg_desc,
+                blqjyz_wlhpsjfdhj,
+                blqjyz_wlhpsjfdhj_desc,
+                blqyx_blqyxwssdg,
+                blqyx_blqyxwssdg_desc,
+                blqyx_gycyxdjdtdtzxjl,
+                tlq_ztlhwpslh,
+                tlq_ztlhwpslh_desc,
+                jsq_dzjs,
+                blqjdzt_jddz,
+                sbzt,
+                sbzt_desc,
+                jcr,
+                czwt,
+                create_by,
+                create_time,
+                update_by,
+                update_time,
+                submit_state,
+                del_flag
+    </sql>
+
+    <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbBlq">
+        <selectKey keyProperty="id" order="BEFORE" resultType="String">
+            select replace(uuid(), '-', '') from dual
+        </selectKey>
+        INSERT INTO bus_jcb_blq
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test ='null != blqId'>
+                    blq_id,
+                    </if>
+                    <if test ='null != qj'>
+                    qj,
+                    </if>
+                    <if test ='null != deptId'>
+                    dept_id,
+                    </if>
+                    <if test ='null != zzh'>
+                    zzh,
+                    </if>
+                    <if test ='null != wd'>
+                    wd,
+                    </if>
+                    <if test ='null != jcrq'>
+                    jcrq,
+                    </if>
+                    <if test ='null != picUrl'>
+                    pic_url,
+                    </if>
+                    <if test ='null != tjwzBlqtjazsp'>
+                    tjwz_blqtjazsp,
+                    </if>
+                    <if test ='null != tjwzBlqtjazspDesc'>
+                    tjwz_blqtjazsp_desc,
+                    </if>
+                    <if test ='null != tjwzWxs'>
+                    tjwz_wxs,
+                    </if>
+                    <if test ='null != tjwzWxsDesc'>
+                    tjwz_wxs_desc,
+                    </if>
+                    <if test ='null != tjwzGblsljjg'>
+                    tjwz_gblsljjg,
+                    </if>
+                    <if test ='null != tjwzGblsljjgDesc'>
+                    tjwz_gblsljjg_desc,
+                    </if>
+                    <if test ='null != blqjyzBlqjzcjyzcszzt'>
+                    blqjyz_blqjzcjyzcszzt,
+                    </if>
+                    <if test ='null != blqjyzBlqjzcjyzcszztDesc'>
+                    blqjyz_blqjzcjyzcszzt_desc,
+                    </if>
+                    <if test ='null != blqjyzBmqjazlg'>
+                    blqjyz_bmqjazlg,
+                    </if>
+                    <if test ='null != blqjyzBmqjazlgDesc'>
+                    blqjyz_bmqjazlg_desc,
+                    </if>
+                    <if test ='null != blqjyzWlhpsjfdhj'>
+                    blqjyz_wlhpsjfdhj,
+                    </if>
+                    <if test ='null != blqjyzWlhpsjfdhjDesc'>
+                    blqjyz_wlhpsjfdhj_desc,
+                    </if>
+                    <if test ='null != blqyxBlqyxwssdg'>
+                    blqyx_blqyxwssdg,
+                    </if>
+                    <if test ='null != blqyxBlqyxwssdgDesc'>
+                    blqyx_blqyxwssdg_desc,
+                    </if>
+                    <if test ='null != blqyxGycyxdjdtdtzxjl'>
+                    blqyx_gycyxdjdtdtzxjl,
+                    </if>
+                    <if test ='null != tlqZtlhwpslh'>
+                    tlq_ztlhwpslh,
+                    </if>
+                    <if test ='null != tlqZtlhwpslhDesc'>
+                    tlq_ztlhwpslh_desc,
+                    </if>
+                    <if test ='null != jsqDzjs'>
+                    jsq_dzjs,
+                    </if>
+                    <if test ='null != blqjdztJddz'>
+                    blqjdzt_jddz,
+                    </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 != submitState'>
+                    submit_state,
+                    </if>
+                    <if test ='null != delFlag'>
+                    del_flag
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test ='null != blqId'>
+                    #{blqId},
+                    </if>
+                    <if test ='null != qj'>
+                    #{qj},
+                    </if>
+                    <if test ='null != deptId'>
+                    #{deptId},
+                    </if>
+                    <if test ='null != zzh'>
+                    #{zzh},
+                    </if>
+                    <if test ='null != wd'>
+                    #{wd},
+                    </if>
+                    <if test ='null != jcrq'>
+                    #{jcrq},
+                    </if>
+                    <if test ='null != picUrl'>
+                    #{picUrl},
+                    </if>
+                    <if test ='null != tjwzBlqtjazsp'>
+                    #{tjwzBlqtjazsp},
+                    </if>
+                    <if test ='null != tjwzBlqtjazspDesc'>
+                    #{tjwzBlqtjazspDesc},
+                    </if>
+                    <if test ='null != tjwzWxs'>
+                    #{tjwzWxs},
+                    </if>
+                    <if test ='null != tjwzWxsDesc'>
+                    #{tjwzWxsDesc},
+                    </if>
+                    <if test ='null != tjwzGblsljjg'>
+                    #{tjwzGblsljjg},
+                    </if>
+                    <if test ='null != tjwzGblsljjgDesc'>
+                    #{tjwzGblsljjgDesc},
+                    </if>
+                    <if test ='null != blqjyzBlqjzcjyzcszzt'>
+                    #{blqjyzBlqjzcjyzcszzt},
+                    </if>
+                    <if test ='null != blqjyzBlqjzcjyzcszztDesc'>
+                    #{blqjyzBlqjzcjyzcszztDesc},
+                    </if>
+                    <if test ='null != blqjyzBmqjazlg'>
+                    #{blqjyzBmqjazlg},
+                    </if>
+                    <if test ='null != blqjyzBmqjazlgDesc'>
+                    #{blqjyzBmqjazlgDesc},
+                    </if>
+                    <if test ='null != blqjyzWlhpsjfdhj'>
+                    #{blqjyzWlhpsjfdhj},
+                    </if>
+                    <if test ='null != blqjyzWlhpsjfdhjDesc'>
+                    #{blqjyzWlhpsjfdhjDesc},
+                    </if>
+                    <if test ='null != blqyxBlqyxwssdg'>
+                    #{blqyxBlqyxwssdg},
+                    </if>
+                    <if test ='null != blqyxBlqyxwssdgDesc'>
+                    #{blqyxBlqyxwssdgDesc},
+                    </if>
+                    <if test ='null != blqyxGycyxdjdtdtzxjl'>
+                    #{blqyxGycyxdjdtdtzxjl},
+                    </if>
+                    <if test ='null != tlqZtlhwpslh'>
+                    #{tlqZtlhwpslh},
+                    </if>
+                    <if test ='null != tlqZtlhwpslhDesc'>
+                    #{tlqZtlhwpslhDesc},
+                    </if>
+                    <if test ='null != jsqDzjs'>
+                    #{jsqDzjs},
+                    </if>
+                    <if test ='null != blqjdztJddz'>
+                    #{blqjdztJddz},
+                    </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 != submitState'>
+                    #{submitState},
+                    </if>
+                    <if test ='null != delFlag'>
+                    #{delFlag}
+                    </if>
+        </trim>
+    </insert>
+
+    <delete id="delete">
+        UPDATE bus_jcb_blq
+        set del_flag='1'
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbBlq">
+        UPDATE bus_jcb_blq
+        <set>
+                    <if test ='null != blqId'>blq_id = #{blqId},</if>
+                    <if test ='null != qj'>qj = #{qj},</if>
+                    <if test ='null != deptId'>dept_id = #{deptId},</if>
+                    <if test ='null != zzh'>zzh = #{zzh},</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 != tjwzBlqtjazsp'>tjwz_blqtjazsp = #{tjwzBlqtjazsp},</if>
+                    <if test ='null != tjwzBlqtjazspDesc'>tjwz_blqtjazsp_desc = #{tjwzBlqtjazspDesc},</if>
+                    <if test ='null != tjwzWxs'>tjwz_wxs = #{tjwzWxs},</if>
+                    <if test ='null != tjwzWxsDesc'>tjwz_wxs_desc = #{tjwzWxsDesc},</if>
+                    <if test ='null != tjwzGblsljjg'>tjwz_gblsljjg = #{tjwzGblsljjg},</if>
+                    <if test ='null != tjwzGblsljjgDesc'>tjwz_gblsljjg_desc = #{tjwzGblsljjgDesc},</if>
+                    <if test ='null != blqjyzBlqjzcjyzcszzt'>blqjyz_blqjzcjyzcszzt = #{blqjyzBlqjzcjyzcszzt},</if>
+                    <if test ='null != blqjyzBlqjzcjyzcszztDesc'>blqjyz_blqjzcjyzcszzt_desc = #{blqjyzBlqjzcjyzcszztDesc},</if>
+                    <if test ='null != blqjyzBmqjazlg'>blqjyz_bmqjazlg = #{blqjyzBmqjazlg},</if>
+                    <if test ='null != blqjyzBmqjazlgDesc'>blqjyz_bmqjazlg_desc = #{blqjyzBmqjazlgDesc},</if>
+                    <if test ='null != blqjyzWlhpsjfdhj'>blqjyz_wlhpsjfdhj = #{blqjyzWlhpsjfdhj},</if>
+                    <if test ='null != blqjyzWlhpsjfdhjDesc'>blqjyz_wlhpsjfdhj_desc = #{blqjyzWlhpsjfdhjDesc},</if>
+                    <if test ='null != blqyxBlqyxwssdg'>blqyx_blqyxwssdg = #{blqyxBlqyxwssdg},</if>
+                    <if test ='null != blqyxBlqyxwssdgDesc'>blqyx_blqyxwssdg_desc = #{blqyxBlqyxwssdgDesc},</if>
+                    <if test ='null != blqyxGycyxdjdtdtzxjl'>blqyx_gycyxdjdtdtzxjl = #{blqyxGycyxdjdtdtzxjl},</if>
+                    <if test ='null != tlqZtlhwpslh'>tlq_ztlhwpslh = #{tlqZtlhwpslh},</if>
+                    <if test ='null != tlqZtlhwpslhDesc'>tlq_ztlhwpslh_desc = #{tlqZtlhwpslhDesc},</if>
+                    <if test ='null != jsqDzjs'>jsq_dzjs = #{jsqDzjs},</if>
+                    <if test ='null != blqjdztJddz'>blqjdzt_jddz = #{blqjdztJddz},</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 != submitState'>submit_state = #{submitState},</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_blq
+        WHERE del_flag='0' and id = #{id}
+
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_blq
+        <where>
+            del_flag='0'
+                <if test="blqId!=null and blqId!=''">
+                    and blq_id=#{blqId}
+                </if>
+                <if test="qj!=null and qj!=''">
+                    and qj=#{qj}
+                </if>
+                <if test="deptId!=null and deptId!=''">
+                    and dept_id=#{deptId}
+                </if>
+                <if test="zzh!=null and zzh!=''">
+                    and zzh=#{zzh}
+                </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="tjwzBlqtjazsp!=null and tjwzBlqtjazsp!=''">
+                    and tjwz_blqtjazsp=#{tjwzBlqtjazsp}
+                </if>
+                <if test="tjwzBlqtjazspDesc!=null and tjwzBlqtjazspDesc!=''">
+                    and tjwz_blqtjazsp_desc=#{tjwzBlqtjazspDesc}
+                </if>
+                <if test="tjwzWxs!=null and tjwzWxs!=''">
+                    and tjwz_wxs=#{tjwzWxs}
+                </if>
+                <if test="tjwzWxsDesc!=null and tjwzWxsDesc!=''">
+                    and tjwz_wxs_desc=#{tjwzWxsDesc}
+                </if>
+                <if test="tjwzGblsljjg!=null and tjwzGblsljjg!=''">
+                    and tjwz_gblsljjg=#{tjwzGblsljjg}
+                </if>
+                <if test="tjwzGblsljjgDesc!=null and tjwzGblsljjgDesc!=''">
+                    and tjwz_gblsljjg_desc=#{tjwzGblsljjgDesc}
+                </if>
+                <if test="blqjyzBlqjzcjyzcszzt!=null and blqjyzBlqjzcjyzcszzt!=''">
+                    and blqjyz_blqjzcjyzcszzt=#{blqjyzBlqjzcjyzcszzt}
+                </if>
+                <if test="blqjyzBlqjzcjyzcszztDesc!=null and blqjyzBlqjzcjyzcszztDesc!=''">
+                    and blqjyz_blqjzcjyzcszzt_desc=#{blqjyzBlqjzcjyzcszztDesc}
+                </if>
+                <if test="blqjyzBmqjazlg!=null and blqjyzBmqjazlg!=''">
+                    and blqjyz_bmqjazlg=#{blqjyzBmqjazlg}
+                </if>
+                <if test="blqjyzBmqjazlgDesc!=null and blqjyzBmqjazlgDesc!=''">
+                    and blqjyz_bmqjazlg_desc=#{blqjyzBmqjazlgDesc}
+                </if>
+                <if test="blqjyzWlhpsjfdhj!=null and blqjyzWlhpsjfdhj!=''">
+                    and blqjyz_wlhpsjfdhj=#{blqjyzWlhpsjfdhj}
+                </if>
+                <if test="blqjyzWlhpsjfdhjDesc!=null and blqjyzWlhpsjfdhjDesc!=''">
+                    and blqjyz_wlhpsjfdhj_desc=#{blqjyzWlhpsjfdhjDesc}
+                </if>
+                <if test="blqyxBlqyxwssdg!=null and blqyxBlqyxwssdg!=''">
+                    and blqyx_blqyxwssdg=#{blqyxBlqyxwssdg}
+                </if>
+                <if test="blqyxBlqyxwssdgDesc!=null and blqyxBlqyxwssdgDesc!=''">
+                    and blqyx_blqyxwssdg_desc=#{blqyxBlqyxwssdgDesc}
+                </if>
+                <if test="blqyxGycyxdjdtdtzxjl!=null and blqyxGycyxdjdtdtzxjl!=''">
+                    and blqyx_gycyxdjdtdtzxjl=#{blqyxGycyxdjdtdtzxjl}
+                </if>
+                <if test="tlqZtlhwpslh!=null and tlqZtlhwpslh!=''">
+                    and tlq_ztlhwpslh=#{tlqZtlhwpslh}
+                </if>
+                <if test="tlqZtlhwpslhDesc!=null and tlqZtlhwpslhDesc!=''">
+                    and tlq_ztlhwpslh_desc=#{tlqZtlhwpslhDesc}
+                </if>
+                <if test="jsqDzjs!=null and jsqDzjs!=''">
+                    and jsq_dzjs=#{jsqDzjs}
+                </if>
+                <if test="blqjdztJddz!=null and blqjdztJddz!=''">
+                    and blqjdzt_jddz=#{blqjdztJddz}
+                </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="submitState!=null and submitState!=''">
+                    and submit_state=#{submitState}
+                </if>
+                <if test="delFlag!=null and delFlag!=''">
+                    and del_flag=#{delFlag}
+                </if>
+        </where>
+    </select>
+
+
+    <select id="getLastOne" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        bus_jcb_blq
+        WHERE
+        submit_state = '1'and del_flag = '0'
+        <if test="qj!=null and qj!=''">
+            and qj=#{qj}
+        </if>
+        <if test="qj!=null and qj!=''">
+            and qj=#{qj}
+        </if>
+        <if test="deptId!=null and deptId!=''">
+            and dept_id=#{deptId}
+        </if>
+        <if test="zzh!=null and zzh!=''">
+            and zzh=#{zzh}
+        </if>
+        <if test="fdh!=null and fdh!=''">
+            and fdh=#{fdh}
+        </if>
+        <if test="blqId!=null and blqId!=''">
+            and blq_id=#{blqId}
+        </if>
+        ORDER BY
+        update_time DESC
+        LIMIT 1
+    </select>
+
+</mapper>

BIN
railway-business/src/main/resources/word/template/DXF分段绝缘器手册.docx


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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
+import java.util.Date;
 /**
 * ${classInfo.classComment}
 * @author ${authorName}