【CHG】修改导出实验结果

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

@@ -2,6 +2,7 @@ package com.railway.business.catenary.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
+import com.railway.common.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
@@ -94,4 +95,10 @@ public class BusJcab extends BaseEntity {
   @ApiModelProperty(value = "1-ASC 正序排序，0-DESC 倒序排序")
   private String isAsc;
 
+  protected void append(StringBuilder sb, String value) {
+    if (StringUtils.isEmpty(value)) {
+      return;
+    }
+    sb.append(value).append(";");
+  }
 }

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

@@ -1,164 +1,162 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
-import java.math.BigDecimal;
-
 /**
  * 检查表-避雷器
+ *
  * @author wuhonghao 2021-10-17
  */
 @Data
 @ApiModel("检查表-避雷器")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcbBlq extends BusJcab{
+public class BusJcbBlq extends BusJcab {
 
-    @ApiModelProperty(value = "避雷器主键")
-    private Long blqId;
+  @ApiModelProperty(value = "避雷器主键")
+  private Long blqId;
 
-    @ApiModelProperty(value = "支柱号")
-    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarCode;
+  @ApiModelProperty(value = "支柱号")
+  @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+  private String pillarCode;
 
-    @ApiModelProperty(value = "图片路径")
-    @Length(max = 255, message = "【图片路径】长度必须介于 {min} 和 {max} 之间")
-    private String picUrl;
+  @ApiModelProperty(value = "图片路径")
+  @Length(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 = 1, message = "【避雷器托架安装水平】长度必须介于 {min} 和 {max} 之间")
+  private String tjwzBlqtjazsp;
 
-    @ApiModelProperty(value = "避雷器托架安装水平(故障描述)")
-    @Length(max = 225, message = "【避雷器托架安装水平(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String tjwzBlqtjazspDesc;
+  @ApiModelProperty(value = "避雷器托架安装水平(故障描述)")
+  @Length(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 = 1, message = "【无锈蚀】长度必须介于 {min} 和 {max} 之间")
+  private String tjwzWxs;
 
-    @ApiModelProperty(value = "无锈蚀(故障描述)")
-    @Length(max = 225, message = "【无锈蚀(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String tjwzWxsDesc;
+  @ApiModelProperty(value = "无锈蚀(故障描述)")
+  @Length(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 = 1, message = "【各部螺栓连接紧固】长度必须介于 {min} 和 {max} 之间")
+  private String tjwzGblsljjg;
 
-    @ApiModelProperty(value = "各部螺栓连接紧固(故障描述)")
-    @Length(max = 225, message = "【各部螺栓连接紧固(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String tjwzGblsljjgDesc;
+  @ApiModelProperty(value = "各部螺栓连接紧固(故障描述)")
+  @Length(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 = 1, message = "【避雷器及支持绝缘子呈竖直状态】长度必须介于 {min} 和 {max} 之间")
+  private String blqjyzBlqjzcjyzcszzt;
 
-    @ApiModelProperty(value = "避雷器及支持绝缘子呈竖直状态(故障描述)")
-    @Length(max = 255, message = "【避雷器及支持绝缘子呈竖直状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String blqjyzBlqjzcjyzcszztDesc;
+  @ApiModelProperty(value = "避雷器及支持绝缘子呈竖直状态(故障描述)")
+  @Length(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 = 1, message = "【表面清洁，安装牢固,无裂纹、破损及放电痕迹】长度必须介于 {min} 和 {max} 之间")
+  private String blqjyzBmqjazlg;
 
-    @ApiModelProperty(value = "表面清洁，安装牢固,无裂纹、破损及放电痕迹(故障描述)")
-    @Length(max = 255, message = "【表面清洁，安装牢固,无裂纹、破损及放电痕迹(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String blqjyzBmqjazlgDesc;
+  @ApiModelProperty(value = "表面清洁，安装牢固,无裂纹、破损及放电痕迹(故障描述)")
+  @Length(max = 255, message = "【表面清洁，安装牢固,无裂纹、破损及放电痕迹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String blqjyzBmqjazlgDesc;
 
-    @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 blqyxBlqyxwssdg;
 
-    @ApiModelProperty(value = "避雷器引线无烧伤、断股(故障描述)")
-    @Length(max = 255, message = "【避雷器引线无烧伤、断股(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String blqyxBlqyxwssdgDesc;
+  @ApiModelProperty(value = "避雷器引线无烧伤、断股(故障描述)")
+  @Length(max = 255, message = "【避雷器引线无烧伤、断股(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String blqyxBlqyxwssdgDesc;
 
-    @ApiModelProperty(value = "高压侧引线对接地体的动态最小距离")
-    private BigDecimal blqyxGycyxdjdtdtzxjl;
+  @ApiModelProperty(value = "高压侧引线对接地体的动态最小距离")
+  private BigDecimal 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 tlqZtlhwpslh;
 
-    @ApiModelProperty(value = "状态良好，无破损、裂纹(故障描述)")
-    @Length(max = 255, message = "【状态良好，无破损、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String tlqZtlhwpslhDesc;
+  @ApiModelProperty(value = "状态良好，无破损、裂纹(故障描述)")
+  @Length(max = 255, 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 jsqDzjs;
 
-    @ApiModelProperty(value = "避雷器接地状态-接地电阻")
-    private BigDecimal blqjdztJddz;
+  @ApiModelProperty(value = "避雷器接地状态-接地电阻")
+  private BigDecimal blqjdztJddz;
 
-    @ApiModelProperty(value = "设备状态(故障描述)")
-    @Length(max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String sbztDesc;
+  @ApiModelProperty(value = "设备状态(故障描述)")
+  @Length(max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String sbztDesc;
 
-    @ApiModelProperty(value = "生产厂家")
-    private String sccj;
+  @ApiModelProperty(value = "生产厂家")
+  private String sccj;
 
-    public String getXb(){
-        return "检测";
-    }
+  public String getXb() {
+    return "检测";
+  }
 
-    public String getBtzt(){
-        if("1".equals(blqjyzBlqjzcjyzcszzt)&& "1".equals(blqjyzBmqjazlg)){
-            return "良好";
-        }else{
-            return "故障";
-        }
+  public String getBtzt() {
+    if ("1".equals(blqjyzBlqjzcjyzcszzt) && "1".equals(blqjyzBmqjazlg)) {
+      return "良好";
+    } else {
+      return "故障";
     }
+  }
 
-    public String getYx(){
-        if("1".equals(blqyxBlqyxwssdg)){
-            return "良好";
-        }else{
-            return "故障";
-        }
+  public String getYx() {
+    if ("1".equals(blqyxBlqyxwssdg)) {
+      return "良好";
+    } else {
+      return "故障";
     }
+  }
 
-    public String getJdx(){
-        if(blqjdztJddz!=null&&blqjdztJddz.compareTo(new BigDecimal("10"))==-1){
-            return "良好";
-        }else{
-            return "故障";
-        }
-    }
-
-
-    public String getTlq(){
-        if("1".equals(tlqZtlhwpslh)){
-            return "良好";
-        }else{
-            return "故障";
-        }
+  public String getJdx() {
+    if (blqjdztJddz != null && blqjdztJddz.compareTo(new BigDecimal("10")) == -1) {
+      return "良好";
+    } else {
+      return "故障";
     }
+  }
 
-    public String getFszzqt(){
-        if("1".equals(tjwzBlqtjazsp)&& "1".equals(tjwzWxs)&& "1".equals(tjwzGblsljjg)){
-            return "良好";
-        }else{
-            return "故障";
-        }
+  public String getTlq() {
+    if ("1".equals(tlqZtlhwpslh)) {
+      return "良好";
+    } else {
+      return "故障";
     }
+  }
 
-    public String getCzwtAll(){
-        StringBuffer sb = new StringBuffer();
-        if(!StringUtils.isEmpty(tjwzBlqtjazspDesc)){ sb.append(tjwzBlqtjazspDesc).append(";"); }
-        if(!StringUtils.isEmpty(tjwzWxsDesc)){ sb.append(tjwzWxsDesc).append(";"); }
-        if(!StringUtils.isEmpty(tjwzGblsljjgDesc)){ sb.append(tjwzGblsljjgDesc).append(";"); }
-        if(!StringUtils.isEmpty(blqjyzBlqjzcjyzcszztDesc)){ sb.append(blqjyzBlqjzcjyzcszztDesc).append(";"); }
-        if(!StringUtils.isEmpty(blqjyzBmqjazlgDesc)){ sb.append(blqjyzBmqjazlgDesc).append(";"); }
-        if(!StringUtils.isEmpty(blqyxBlqyxwssdgDesc)){ sb.append(blqyxBlqyxwssdgDesc).append(";"); }
-        if(!StringUtils.isEmpty(tlqZtlhwpslhDesc)){ sb.append(tlqZtlhwpslhDesc).append(";"); }
-        if(!StringUtils.isEmpty(sbztDesc)){ sb.append(sbztDesc).append(";"); }
-        if(!StringUtils.isEmpty(getCzwt())){ sb.append(getCzwt()).append(";"); }
-        return sb.toString();
+  public String getFszzqt() {
+    if ("1".equals(tjwzBlqtjazsp) && "1".equals(tjwzWxs) && "1".equals(tjwzGblsljjg)) {
+      return "良好";
+    } else {
+      return "故障";
     }
+  }
+
+  public String getCzwtAll() {
+    StringBuilder sb = new StringBuilder();
+    append(sb, tjwzBlqtjazspDesc);
+    append(sb, tjwzWxsDesc);
+    append(sb, tjwzGblsljjgDesc);
+    append(sb, blqjyzBlqjzcjyzcszztDesc);
+    append(sb, blqjyzBmqjazlgDesc);
+    append(sb, blqyxBlqyxwssdgDesc);
+    append(sb, tlqZtlhwpslhDesc);
+    append(sb, sbztDesc);
+    append(sb, getCzwt());
+    return sb.toString();
+  }
 
 }

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

@@ -5,100 +5,112 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+
 /**
  * 检查表-地面磁感应器
+ *
  * @author zcf 2021-10-13
  */
 @Data
 @ApiModel("检查表-地面磁感应器")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcbDmcgyq extends BusJcab{
-
-    @ApiModelProperty(value = "感应器id")
-    private Long gyqId;
-
-    @ApiModelProperty(value = "分相")
-    @Length(min = 1, max = 100, message = "【分相】长度必须介于 {min} 和 {max} 之间")
-    private String fenxiang;
-
-    @ApiModelProperty(value = "行别")
-    @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String xingbie;
-
-    @ApiModelProperty(value = "行别")
-    private String xingbieText;
-
-    @ApiModelProperty(value = "支柱号范围")
-    private Integer pillarArea;
-
-    @ApiModelProperty(value = "天气")
-    @Length(min = 1, max = 30, message = "【天气】长度必须介于 {min} 和 {max} 之间")
-    private String tianqi;
-
-    @ApiModelProperty(value = "地感器外观-是否安装牢固")
-    @Length(min = 1, max = 1, message = "【地感器外观-是否安装牢固】长度必须介于 {min} 和 {max} 之间")
-    private String dgqwgAzlg;
-
-    @ApiModelProperty(value = "地感器外观-是否完整无损")
-    @Length(min = 1, max = 1, message = "【地感器外观-是否完整无损】长度必须介于 {min} 和 {max} 之间")
-    private String dgqwgWzws;
-
-    @ApiModelProperty(value = "地感器外观-是否表面清洁")
-    @Length(min = 1, max = 1, message = "【地感器外观-是否表面清洁】长度必须介于 {min} 和 {max} 之间")
-    private String dgqwgBmqj;
-
-    @ApiModelProperty(value = "未安装牢固-故障描述")
-    @Length(min = 1, max = 100, message = "【未安装牢固-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String dgqwgAzlgGzms;
-
-    @ApiModelProperty(value = "未完整无损-故障描述")
-    @Length(min = 1, max = 100, message = "【未完整无损-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String dgqwgWzwsGzms;
-
-    @ApiModelProperty(value = "未表面清洁-故障描述")
-    @Length(min = 1, max = 100, message = "【未表面清洁-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String dgqwgBmqjGzms;
-
-    @ApiModelProperty(value = "标识牌外观-是否清晰")
-    @Length(min = 1, max = 1, message = "【标识牌外观-是否清晰】长度必须介于 {min} 和 {max} 之间")
-    private String bspwgBsqx;
-
-    @ApiModelProperty(value = "外观不清晰-故障描述")
-    @Length(min = 1, max = 100, message = "【外观不清晰-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String bspwgBsqxGzms;
-
-    @ApiModelProperty(value = "标识牌-是否安装牢固")
-    @Length(min = 1, max = 1, message = "【标识牌-是否安装牢固】长度必须介于 {min} 和 {max} 之间")
-    private String bspwgAzlg;
-
-    @ApiModelProperty(value = "未安装牢固-故障描述")
-    @Length(min = 1, max = 100, message = "【未安装牢固-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String bspwgAzlgGzms;
-
-    @ApiModelProperty(value = "地感器测量-g1")
-    private Integer dgqclG1;
-
-    @ApiModelProperty(value = "地感器测量-g2")
-    private Integer dgqclG2;
-
-    @ApiModelProperty(value = "地感器测量-g3")
-    private Integer dgqclG3;
-
-    @ApiModelProperty(value = "地感器测量-g4")
-    private Integer dgqclG4;
-
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    // 导出用
-    private String czlc;  // 里程
-
-    private String gyqNumber;  // 感应器编号
-
-    private String ctl; // 磁通量
-
-    private Integer scz; // 实测值
-
-    private String wsjbjsd; // 污损及部件松动
+public class BusJcbDmcgyq extends BusJcab {
+
+  @ApiModelProperty(value = "感应器id")
+  private Long gyqId;
+
+  @ApiModelProperty(value = "分相")
+  @Length(min = 1, max = 100, message = "【分相】长度必须介于 {min} 和 {max} 之间")
+  private String fenxiang;
+
+  @ApiModelProperty(value = "行别")
+  @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+  private String xingbie;
+
+  @ApiModelProperty(value = "行别")
+  private String xingbieText;
+
+  @ApiModelProperty(value = "支柱号范围")
+  private Integer pillarArea;
+
+  @ApiModelProperty(value = "天气")
+  @Length(min = 1, max = 30, message = "【天气】长度必须介于 {min} 和 {max} 之间")
+  private String tianqi;
+
+  @ApiModelProperty(value = "地感器外观-是否安装牢固")
+  @Length(min = 1, max = 1, message = "【地感器外观-是否安装牢固】长度必须介于 {min} 和 {max} 之间")
+  private String dgqwgAzlg;
+
+  @ApiModelProperty(value = "地感器外观-是否完整无损")
+  @Length(min = 1, max = 1, message = "【地感器外观-是否完整无损】长度必须介于 {min} 和 {max} 之间")
+  private String dgqwgWzws;
+
+  @ApiModelProperty(value = "地感器外观-是否表面清洁")
+  @Length(min = 1, max = 1, message = "【地感器外观-是否表面清洁】长度必须介于 {min} 和 {max} 之间")
+  private String dgqwgBmqj;
+
+  @ApiModelProperty(value = "未安装牢固-故障描述")
+  @Length(min = 1, max = 100, message = "【未安装牢固-故障描述】长度必须介于 {min} 和 {max} 之间")
+  private String dgqwgAzlgGzms;
+
+  @ApiModelProperty(value = "未完整无损-故障描述")
+  @Length(min = 1, max = 100, message = "【未完整无损-故障描述】长度必须介于 {min} 和 {max} 之间")
+  private String dgqwgWzwsGzms;
+
+  @ApiModelProperty(value = "未表面清洁-故障描述")
+  @Length(min = 1, max = 100, message = "【未表面清洁-故障描述】长度必须介于 {min} 和 {max} 之间")
+  private String dgqwgBmqjGzms;
+
+  @ApiModelProperty(value = "标识牌外观-是否清晰")
+  @Length(min = 1, max = 1, message = "【标识牌外观-是否清晰】长度必须介于 {min} 和 {max} 之间")
+  private String bspwgBsqx;
+
+  @ApiModelProperty(value = "外观不清晰-故障描述")
+  @Length(min = 1, max = 100, message = "【外观不清晰-故障描述】长度必须介于 {min} 和 {max} 之间")
+  private String bspwgBsqxGzms;
+
+  @ApiModelProperty(value = "标识牌-是否安装牢固")
+  @Length(min = 1, max = 1, message = "【标识牌-是否安装牢固】长度必须介于 {min} 和 {max} 之间")
+  private String bspwgAzlg;
+
+  @ApiModelProperty(value = "未安装牢固-故障描述")
+  @Length(min = 1, max = 100, message = "【未安装牢固-故障描述】长度必须介于 {min} 和 {max} 之间")
+  private String bspwgAzlgGzms;
+
+  @ApiModelProperty(value = "地感器测量-g1")
+  private Integer dgqclG1;
+
+  @ApiModelProperty(value = "地感器测量-g2")
+  private Integer dgqclG2;
+
+  @ApiModelProperty(value = "地感器测量-g3")
+  private Integer dgqclG3;
+
+  @ApiModelProperty(value = "地感器测量-g4")
+  private Integer dgqclG4;
+
+  @ApiModelProperty(value = "用户id")
+  private Long userId;
+
+  /**
+   * 导出用 - 里程
+   */
+  private String czlc;
+  /**
+   * 导出用 - 感应器编号
+   */
+  private String gyqNumber;
+  /**
+   * 导出用 - 磁通量
+   */
+  private String ctl;
+  /**
+   * 导出用 - 实测值
+   */
+  private Integer scz;
+  /**
+   * 导出用 - 污损及部件松动
+   */
+  private String wsjbjsd;
 
 }

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

@@ -1,201 +1,204 @@
 package com.railway.business.catenary.domain;
 
-import com.railway.common.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+
 /**
- * dxf分选绝缘器检查表 
+ * dxf分选绝缘器检查表
+ *
  * @author wuhonghao 2021-10-14
  */
 @Data
 @ApiModel("dxf分选绝缘器检查表 ")
 @EqualsAndHashCode(callSuper = true)
-public class BusJcbFdfxjyq extends BusJcab{
-
-    @ApiModelProperty(value = "绝缘器主键")
-    private Long fdfxjyqId;
-
-    @ApiModelProperty(value = "支柱号")
-    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarCode;
+public class BusJcbFdfxjyq extends BusJcab {
 
-    @ApiModelProperty(value = "分段号")
-    @Length(min = 1, max = 50, message = "【分段号】长度必须介于 {min} 和 {max} 之间")
-    private String fdh;
+  @ApiModelProperty(value = "绝缘器主键")
+  private Long fdfxjyqId;
 
-    @ApiModelProperty(value = "图片路径")
-    @Length(message = "【图片路径】长度必须介于 {min} 和 {max} 之间")
-    private String picUrl;
+  @ApiModelProperty(value = "支柱号")
+  @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+  private String pillarCode;
 
-    @ApiModelProperty(value = "a点值")
-    private BigDecimal pointA;
+  @ApiModelProperty(value = "分段号")
+  @Length(min = 1, max = 50, message = "【分段号】长度必须介于 {min} 和 {max} 之间")
+  private String fdh;
 
-    @ApiModelProperty(value = "b点值")
-    private BigDecimal pointB;
+  @ApiModelProperty(value = "图片路径")
+  @Length(message = "【图片路径】长度必须介于 {min} 和 {max} 之间")
+  private String picUrl;
 
-    @ApiModelProperty(value = "c点值")
-    private BigDecimal pointC;
+  @ApiModelProperty(value = "a点值")
+  private BigDecimal pointA;
 
-    @ApiModelProperty(value = "d点值")
-    private BigDecimal pointD;
+  @ApiModelProperty(value = "b点值")
+  private BigDecimal pointB;
 
-    @ApiModelProperty(value = "e点值")
-    private BigDecimal pointE;
+  @ApiModelProperty(value = "c点值")
+  private BigDecimal pointC;
 
-    @ApiModelProperty(value = "f点值")
-    private BigDecimal pointF;
+  @ApiModelProperty(value = "d点值")
+  private BigDecimal pointD;
 
-    @ApiModelProperty(value = "g点值")
-    private BigDecimal pointG;
+  @ApiModelProperty(value = "e点值")
+  private BigDecimal pointE;
 
-    @ApiModelProperty(value = "h点值")
-    private BigDecimal pointH;
+  @ApiModelProperty(value = "f点值")
+  private BigDecimal pointF;
 
-    @ApiModelProperty(value = "b点拉出值")
-    private BigDecimal pointBPull;
+  @ApiModelProperty(value = "g点值")
+  private BigDecimal pointG;
 
-    @ApiModelProperty(value = "g点拉出值")
-    private BigDecimal pointGPull;
+  @ApiModelProperty(value = "h点值")
+  private BigDecimal pointH;
 
-    @ApiModelProperty(value = "分段负驰度")
-    private BigDecimal fcd;
+  @ApiModelProperty(value = "b点拉出值")
+  private BigDecimal pointBPull;
 
-    @ApiModelProperty(value = "分段地面平顺度（任意两点间导高差最大值）")
-    private BigDecimal fddmpsd;
+  @ApiModelProperty(value = "g点拉出值")
+  private BigDecimal pointGPull;
 
-    @ApiModelProperty(value = "线路、分段数据-线路坡度")
-    private BigDecimal xlfdXlpd;
+  @ApiModelProperty(value = "分段负驰度")
+  private BigDecimal fcd;
 
-    @ApiModelProperty(value = "线路、分段数据-外轨超高")
-    private BigDecimal xlfdWgdg;
+  @ApiModelProperty(value = "分段地面平顺度（任意两点间导高差最大值）")
+  private BigDecimal fddmpsd;
 
-    @ApiModelProperty(value = "线路、分段数据-分段顺线路倾角")
-    private BigDecimal xlfdFdsxlqj;
+  @ApiModelProperty(value = "线路、分段数据-线路坡度")
+  private BigDecimal xlfdXlpd;
 
-    @ApiModelProperty(value = "线路、分段数据-分段垂直线路倾角")
-    private BigDecimal xlfdFdczxlqj;
+  @ApiModelProperty(value = "线路、分段数据-外轨超高")
+  private BigDecimal xlfdWgdg;
 
-    @ApiModelProperty(value = "分段绝缘器主绝缘状态")
-    @Length(min = 1, max = 1, message = "【分段绝缘器主绝缘状态】长度必须介于 {min} 和 {max} 之间")
-    private String jybjFdjyqzjyzt;
+  @ApiModelProperty(value = "线路、分段数据-分段顺线路倾角")
+  private BigDecimal xlfdFdsxlqj;
 
-    @ApiModelProperty(value = "分段绝缘器主绝缘状态(故障描述)")
-    @Length(max = 255, message = "【分段绝缘器主绝缘状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String jybjFdjyqzjyztDesc;
+  @ApiModelProperty(value = "线路、分段数据-分段垂直线路倾角")
+  private BigDecimal xlfdFdczxlqj;
 
-    @ApiModelProperty(value = "承力索绝缘子状态")
-    @Length(min = 1, max = 1, message = "【承力索绝缘子状态】长度必须介于 {min} 和 {max} 之间")
-    private String jybjClsjyzzt;
+  @ApiModelProperty(value = "分段绝缘器主绝缘状态")
+  @Length(min = 1, max = 1, message = "【分段绝缘器主绝缘状态】长度必须介于 {min} 和 {max} 之间")
+  private String jybjFdjyqzjyzt;
 
-    @ApiModelProperty(value = "承力索绝缘子状态(故障描述)")
-    @Length(max = 255, message = "【承力索绝缘子状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String jybjClsjyzztDesc;
+  @ApiModelProperty(value = "分段绝缘器主绝缘状态(故障描述)")
+  @Length(max = 255, message = "【分段绝缘器主绝缘状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String jybjFdjyqzjyztDesc;
 
-    @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹")
-    @Length(min = 1, max = 1, message = "【各螺栓无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztLs;
+  @ApiModelProperty(value = "承力索绝缘子状态")
+  @Length(min = 1, max = 1, message = "【承力索绝缘子状态】长度必须介于 {min} 和 {max} 之间")
+  private String jybjClsjyzzt;
 
-    @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹(故障描述)")
-    @Length(max = 255, message = "【各螺栓无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztLsDesc;
+  @ApiModelProperty(value = "承力索绝缘子状态(故障描述)")
+  @Length(max = 255, message = "【承力索绝缘子状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String jybjClsjyzztDesc;
 
-    @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹")
-    @Length(min = 1, max = 1, message = "【斜吊线无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztXdx;
+  @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹")
+  @Length(min = 1, max = 1, message = "【各螺栓无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztLs;
 
-    @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹(故障描述)")
-    @Length(max = 255, message = "【斜吊线无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztXdxDesc;
+  @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹(故障描述)")
+  @Length(max = 255, message = "【各螺栓无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztLsDesc;
 
-    @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹")
-    @Length(min = 1, max = 1, message = "【平衡支架无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztPhzj;
+  @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹")
+  @Length(min = 1, max = 1, message = "【斜吊线无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztXdx;
 
-    @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹(故障描述)")
-    @Length(max = 255, message = "【平衡支架无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztPhzjDesc;
+  @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹(故障描述)")
+  @Length(max = 255, message = "【斜吊线无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztXdxDesc;
 
-    @ApiModelProperty(value = "接触线接头处过渡平滑")
-    @Length(min = 1, max = 1, message = "【接触线接头处过渡平滑】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztJcxjt;
+  @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹")
+  @Length(min = 1, max = 1, message = "【平衡支架无锈蚀、烧伤、裂纹】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztPhzj;
 
-    @ApiModelProperty(value = "接触线接头处过渡平滑(故障描述)")
-    @Length(max = 255, message = "【接触线接头处过渡平滑(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztJcxjtDesc;
+  @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹(故障描述)")
+  @Length(max = 255, message = "【平衡支架无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztPhzjDesc;
 
-    @ApiModelProperty(value = "消弧角无裂纹、烧伤")
-    @Length(min = 1, max = 1, message = "【消弧角无裂纹、烧伤】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztXhj;
+  @ApiModelProperty(value = "接触线接头处过渡平滑")
+  @Length(min = 1, max = 1, message = "【接触线接头处过渡平滑】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztJcxjt;
 
-    @ApiModelProperty(value = "消弧角无裂纹、烧伤(故障描述)")
-    @Length(max = 255, message = "【消弧角无裂纹、烧伤(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztXhjDesc;
+  @ApiModelProperty(value = "接触线接头处过渡平滑(故障描述)")
+  @Length(max = 255, message = "【接触线接头处过渡平滑(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztJcxjtDesc;
 
-    @ApiModelProperty(value = "受电弓接触状态-两端长短滑轨分别与接触线三点等高")
-    @Length(min = 1, max = 1, message = "【受电弓接触状态-两端长短滑轨分别与接触线三点等高】长度必须介于 {min} 和 {max} 之间")
-    private String sdgjcztSddg;
+  @ApiModelProperty(value = "消弧角无裂纹、烧伤")
+  @Length(min = 1, max = 1, message = "【消弧角无裂纹、烧伤】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztXhj;
 
-    @ApiModelProperty(value = "受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)")
-    @Length(max = 255, message = "【受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String sdgjcztSddgDesc;
+  @ApiModelProperty(value = "消弧角无裂纹、烧伤(故障描述)")
+  @Length(max = 255, message = "【消弧角无裂纹、烧伤(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String lbjztXhjDesc;
 
-    @ApiModelProperty(value = "设备状态(故障描述)")
-    @Length(max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
-    private String sbztDesc;
+  @ApiModelProperty(value = "受电弓接触状态-两端长短滑轨分别与接触线三点等高")
+  @Length(min = 1, max = 1, message = "【受电弓接触状态-两端长短滑轨分别与接触线三点等高】长度必须介于 {min} 和 {max} 之间")
+  private String sdgjcztSddg;
 
-    public BigDecimal getDxlzxpy(){
-        if(pointB!=null&&pointG!=null){
-            return pointB.add(pointG).divide(new BigDecimal("2")).setScale(2,BigDecimal.ROUND_HALF_UP);
-        }else{
-            return null;
-        }
-    }
+  @ApiModelProperty(value = "受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)")
+  @Length(max = 255, message = "【受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String sdgjcztSddgDesc;
 
-    public String getJybjzt(){
-        if("1".equals(jybjFdjyqzjyzt)&&"1".equals(jybjClsjyzzt)){
-            return "合格";
-        }else{
-            return "不合格";
-        }
-    }
+  @ApiModelProperty(value = "设备状态(故障描述)")
+  @Length(max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+  private String sbztDesc;
 
-    public String getJtgdph(){
-        if("1".equals(lbjztJcxjt)){
-            return "是";
-        }else{
-            return "否";
-        }
+  public BigDecimal getDxlzxpy() {
+    if (pointB != null && pointG != null) {
+      return pointB.add(pointG).divide(new BigDecimal("2")).setScale(2, BigDecimal.ROUND_HALF_UP);
+    } else {
+      return null;
     }
+  }
 
-    public String getGlbjzt(){
-        if("1".equals(lbjztLs)&& "1".equals(lbjztXdx)&& "1".equals(lbjztPhzj)&& "1".equals(lbjztXhj)&& "1".equals(sdgjcztSddg)){
-            return "合格";
-        }else{
-            return "不合格";
-        }
+  public String getJybjzt() {
+    if ("1".equals(jybjFdjyqzjyzt) && "1".equals(jybjClsjyzzt)) {
+      return "合格";
+    } else {
+      return "不合格";
     }
+  }
 
-    public String getXb(){
-        return "检测";
+  public String getJtgdph() {
+    if ("1".equals(lbjztJcxjt)) {
+      return "是";
+    } else {
+      return "否";
     }
-
-    public String getCzwtAll(){
-        StringBuffer sb = new StringBuffer();
-        if(!StringUtils.isEmpty(jybjFdjyqzjyztDesc)){ sb.append(jybjFdjyqzjyztDesc).append(";"); }
-        if(!StringUtils.isEmpty(jybjClsjyzztDesc)){ sb.append(jybjClsjyzztDesc).append(";"); }
-        if(!StringUtils.isEmpty(lbjztLsDesc)){ sb.append(lbjztLsDesc).append(";"); }
-        if(!StringUtils.isEmpty(lbjztXdxDesc)){ sb.append(lbjztXdxDesc).append(";"); }
-        if(!StringUtils.isEmpty(lbjztPhzjDesc)){ sb.append(lbjztPhzjDesc).append(";"); }
-        if(!StringUtils.isEmpty(lbjztJcxjtDesc)){ sb.append(lbjztJcxjtDesc).append(";"); }
-        if(!StringUtils.isEmpty(lbjztXhjDesc)){ sb.append(lbjztXhjDesc).append(";"); }
-        if(!StringUtils.isEmpty(sdgjcztSddgDesc)){ sb.append(sdgjcztSddgDesc).append(";"); }
-        if(!StringUtils.isEmpty(sbztDesc)){ sb.append(sbztDesc).append(";"); }
-        if(!StringUtils.isEmpty(getCzwt())){ sb.append(getCzwt()).append(";"); }
-        return sb.toString();
+  }
+
+  public String getGlbjzt() {
+    if ("1".equals(lbjztLs) && "1".equals(lbjztXdx) && "1".equals(lbjztPhzj) && "1".equals(lbjztXhj)
+        && "1".equals(sdgjcztSddg)) {
+      return "合格";
+    } else {
+      return "不合格";
     }
+  }
+
+  public String getXb() {
+    return "检测";
+  }
+
+  public String getCzwtAll() {
+    StringBuilder sb = new StringBuilder();
+    append(sb, jybjFdjyqzjyztDesc);
+    append(sb, jybjFdjyqzjyztDesc);
+    append(sb, jybjClsjyzztDesc);
+    append(sb, lbjztLsDesc);
+    append(sb, lbjztXdxDesc);
+    append(sb, lbjztPhzjDesc);
+    append(sb, lbjztJcxjtDesc);
+    append(sb, lbjztXhjDesc);
+    append(sb, sdgjcztSddgDesc);
+    append(sb, sbztDesc);
+    append(sb, getCzwt());
+    return sb.toString();
+  }
 
 }

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentServiceImpl.java

@@ -25,12 +25,11 @@ import com.railway.business.safetool.service.ISecExperimentService;
 import com.railway.common.utils.DateUtils;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
-import com.railway.common.utils.file.FileUploadUtils;
-import com.railway.common.utils.file.FileUtils;
+import com.railway.common.utils.poi.EasyExcelUtil;
 import com.railway.system.service.ISysFileService;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -149,29 +148,12 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
       }
     }
 
-    StringBuilder report = new StringBuilder();
-    report.append("所属车间名称: ").append(secExpInfoVo.getDeptName()).append("\n");
-    report.append("实验室名称: ").append(secExpInfoVo.getLabName()).append("\n");
-    report.append("实验人: ").append(secExpInfoVo.getSyName()).append("\n");
-    report.append("实验时间: ").append(DateUtils.getTime()).append("\n");
-    report.append("工具各类: ").append(detailMap.size()).append("\n");
-    report.append("工具总数量: ").append(reportVo.getTotal()).append("\n");
-    report.append("正常工具数量: ").append(reportVo.getNormalTotal()).append("\n");
-    report.append("报废工具数量: ").append(reportVo.getScrapTotal()).append("\n");
-    report.append("实验工具明细: ").append("\n");
-    // 遍历map中的值
-    for (ExpReportDetailVo value : detailMap.values()) {
-      report.append("\t").append(value.getToolName())
-          .append(" --- 实验工具数量: ").append(value.getTotal()).append(" ").append(value.getUnit())
-          .append(", 正常工具数量: ").append(value.getNormalTotal()).append(" ").append(value.getUnit())
-          .append(", 报废工具数量: ").append(value.getScrapTotal()).append(" ").append(value.getUnit())
-          .append("\n");
-    }
-    String fileName = "实验报告.txt";
-    String filePath = FileUploadUtils.getAbsoluteFileEncoding(fileName);
-    File file = new File(filePath);
+    String fileName = "绝缘工具试验记录.xls";
+    String templateFileName = "excel/template/绝缘工具试验记录.xls";
+    Map<String, Object> params = new HashMap<>(0);
+    String filePath = new EasyExcelUtil().getExcel(params, toolList, templateFileName, fileName);
+
     try {
-      FileUtils.writeFile(file, report.toString());
       String reportUrl = fileService.getUploadFileUrl(filePath);
       secExperiment.setExpReport(reportUrl);
     } catch (Exception e) {