Merge remote-tracking branch 'origin/master'

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

@@ -112,15 +112,15 @@ public class BusJcbFdfxjyqController extends BaseController {
         WordUtils wordUtil=new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("${fdh}", info.getFcd());
-        params.put("${qj}", info.getQj());
-        params.put("${jcrq}", info.getJcrq());
-        params.put("${wd}", info.getWd());
-        params.put("${jcr}", info.getJcr());
-        params.put("${pointB}", info.getPointB());
-        params.put("${pointG}", info.getPointG());
-        params.put("${fcd}", info.getFcd());
-        params.put("${fddmpsd}", info.getFddmpsd());
+        params.put("${fdh}", info.getFcd().toString());
+        params.put("${qj}", info.getQj().toString());
+        params.put("${jcrq}", info.getJcrq().toString());
+        params.put("${wd}", info.getWd().toString());
+        params.put("${jcr}", info.getJcr().toString());
+        params.put("${pointB}", info.getPointB().toString());
+        params.put("${pointG}", info.getPointG().toString());
+        params.put("${fcd}", info.getFcd().toString());
+        params.put("${fddmpsd}", info.getFddmpsd().toString());
         params.put("${jybjFdjyqzjyzt}", info.getJybjFdjyqzjyzt().equals("0")?"√":"×");
         params.put("${jybjClsjyzzt}", info.getJybjClsjyzzt().equals("0")?"√":"×");
         params.put("${lbjztLs}", info.getLbjztLs().equals("0")?"√":"×");
@@ -129,6 +129,11 @@ public class BusJcbFdfxjyqController extends BaseController {
         params.put("${lbjztJcxjt}", info.getLbjztJcxjt().equals("0")?"√":"×");
         params.put("${lbjztXhj}", info.getLbjztXhj().equals("0")?"√":"×");
         params.put("${sbzt}", info.getSbzt().equals("0")?"√":"×");
+        params.put("${xlfdXlpd}", info.getXlfdXlpd().toString());
+        params.put("${xlfdWgdg}", info.getXlfdWgdg().toString());
+        params.put("${xlfdFdsxlqj}", info.getXlfdFdsxlqj().toString());
+        params.put("${xlfdFdczxlqj}", info.getXlfdFdczxlqj().toString());
+        params.put("${sdgjcztSddg}", info.getSdgjcztSddg().equals("0")?"√":"×");
 
         try{
             //填充图片信息

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

@@ -25,6 +25,9 @@ public class BusBlq extends BaseEntity{
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
     private String db;
 
+    @ApiModelProperty(value = "部门ID")
+    private String deptId;
+
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
     private String bm;

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

@@ -25,6 +25,9 @@ public class BusFdfxjyq extends BaseEntity{
     @Length(min = 1, max = 200, message = "【段别】长度必须介于 {min} 和 {max} 之间")
     private String db;
 
+    @ApiModelProperty(value = "部门ID")
+    private String deptId;
+
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
     private String bm;

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

@@ -52,7 +52,7 @@ public class BusJcbBlq extends BaseEntity{
     private String tjwzBlqtjazsp;
 
     @ApiModelProperty(value = "避雷器托架安装水平(故障描述)")
-    @Length(min = 1, max = 225, message = "【避雷器托架安装水平(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 225, message = "【避雷器托架安装水平(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String tjwzBlqtjazspDesc;
 
     @ApiModelProperty(value = "无锈蚀")
@@ -60,7 +60,7 @@ public class BusJcbBlq extends BaseEntity{
     private String tjwzWxs;
 
     @ApiModelProperty(value = "无锈蚀(故障描述)")
-    @Length(min = 1, max = 225, message = "【无锈蚀(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 225, message = "【无锈蚀(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String tjwzWxsDesc;
 
     @ApiModelProperty(value = "各部螺栓连接紧固")
@@ -68,7 +68,7 @@ public class BusJcbBlq extends BaseEntity{
     private String tjwzGblsljjg;
 
     @ApiModelProperty(value = "各部螺栓连接紧固(故障描述)")
-    @Length(min = 1, max = 225, message = "【各部螺栓连接紧固(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 225, message = "【各部螺栓连接紧固(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String tjwzGblsljjgDesc;
 
     @ApiModelProperty(value = "避雷器及支持绝缘子呈竖直状态")
@@ -76,7 +76,7 @@ public class BusJcbBlq extends BaseEntity{
     private String blqjyzBlqjzcjyzcszzt;
 
     @ApiModelProperty(value = "避雷器及支持绝缘子呈竖直状态(故障描述)")
-    @Length(min = 1, max = 255, message = "【避雷器及支持绝缘子呈竖直状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【避雷器及支持绝缘子呈竖直状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String blqjyzBlqjzcjyzcszztDesc;
 
     @ApiModelProperty(value = "表面清洁，安装牢固")
@@ -84,7 +84,7 @@ public class BusJcbBlq extends BaseEntity{
     private String blqjyzBmqjazlg;
 
     @ApiModelProperty(value = "表面清洁，安装牢固(故障描述)")
-    @Length(min = 1, max = 255, message = "【表面清洁，安装牢固(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【表面清洁，安装牢固(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String blqjyzBmqjazlgDesc;
 
     @ApiModelProperty(value = "无裂纹、破损及放电痕迹")
@@ -92,7 +92,7 @@ public class BusJcbBlq extends BaseEntity{
     private String blqjyzWlhpsjfdhj;
 
     @ApiModelProperty(value = "无裂纹、破损及放电痕迹(故障描述)")
-    @Length(min = 1, max = 255, message = "【无裂纹、破损及放电痕迹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【无裂纹、破损及放电痕迹(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String blqjyzWlhpsjfdhjDesc;
 
     @ApiModelProperty(value = "避雷器引线无烧伤、断股")
@@ -100,7 +100,7 @@ public class BusJcbBlq extends BaseEntity{
     private String blqyxBlqyxwssdg;
 
     @ApiModelProperty(value = "避雷器引线无烧伤、断股(故障描述)")
-    @Length(min = 1, max = 1, message = "【避雷器引线无烧伤、断股(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【避雷器引线无烧伤、断股(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String blqyxBlqyxwssdgDesc;
 
     @ApiModelProperty(value = "高压侧引线对接地体的动态最小距离\r\n")
@@ -112,7 +112,7 @@ public class BusJcbBlq extends BaseEntity{
     private String tlqZtlhwpslh;
 
     @ApiModelProperty(value = "状态良好，无破损、裂纹(故障描述)")
-    @Length(min = 1, max = 1, message = "【状态良好，无破损、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【状态良好，无破损、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String tlqZtlhwpslhDesc;
 
     @ApiModelProperty(value = "计数器-动作计数")
@@ -128,7 +128,7 @@ public class BusJcbBlq extends BaseEntity{
     private String sbzt;
 
     @ApiModelProperty(value = "设备状态(故障描述)")
-    @Length(min = 1, max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String sbztDesc;
 
     @ApiModelProperty(value = "检查人")

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

@@ -77,23 +77,18 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private BigDecimal fcd;
 
     @ApiModelProperty(value = "分段地面平顺度（任意两点间导高差最大值）")
-    @Length(min = 1, max = 10, message = "【分段地面平顺度（任意两点间导高差最大值）】长度必须介于 {min} 和 {max} 之间")
     private BigDecimal fddmpsd;
 
     @ApiModelProperty(value = "线路、分段数据-线路坡度")
-    @Length(min = 1, max = 10, message = "【线路、分段数据-线路坡度】长度必须介于 {min} 和 {max} 之间")
     private BigDecimal xlfdXlpd;
 
     @ApiModelProperty(value = "线路、分段数据-外轨超高")
-    @Length(min = 1, max = 10, message = "【线路、分段数据-外轨超高】长度必须介于 {min} 和 {max} 之间")
     private BigDecimal xlfdWgdg;
 
     @ApiModelProperty(value = "线路、分段数据-分段顺线路倾角")
-    @Length(min = 1, max = 10, message = "【线路、分段数据-分段顺线路倾角】长度必须介于 {min} 和 {max} 之间")
     private BigDecimal xlfdFdsxlqj;
 
     @ApiModelProperty(value = "线路、分段数据-分段垂直线路倾角")
-    @Length(min = 1, max = 10, message = "【线路、分段数据-分段垂直线路倾角】长度必须介于 {min} 和 {max} 之间")
     private BigDecimal xlfdFdczxlqj;
 
     @ApiModelProperty(value = "分段绝缘器主绝缘状态")
@@ -101,7 +96,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String jybjFdjyqzjyzt;
 
     @ApiModelProperty(value = "分段绝缘器主绝缘状态(故障描述)")
-    @Length(min = 1, max = 255, message = "【分段绝缘器主绝缘状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【分段绝缘器主绝缘状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String jybjFdjyqzjyztDesc;
 
     @ApiModelProperty(value = "承力索绝缘子状态")
@@ -109,7 +104,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String jybjClsjyzzt;
 
     @ApiModelProperty(value = "承力索绝缘子状态(故障描述)")
-    @Length(min = 1, max = 255, message = "【承力索绝缘子状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【承力索绝缘子状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String jybjClsjyzztDesc;
 
     @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹")
@@ -117,7 +112,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String lbjztLs;
 
     @ApiModelProperty(value = "各螺栓无锈蚀、烧伤、裂纹(故障描述)")
-    @Length(min = 1, max = 255, message = "【各螺栓无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【各螺栓无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String lbjztLsDesc;
 
     @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹")
@@ -125,7 +120,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String lbjztXdx;
 
     @ApiModelProperty(value = "斜吊线无锈蚀、烧伤、裂纹(故障描述)")
-    @Length(min = 1, max = 255, message = "【斜吊线无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【斜吊线无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String lbjztXdxDesc;
 
     @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹")
@@ -133,7 +128,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String lbjztPhzj;
 
     @ApiModelProperty(value = "平衡支架无锈蚀、烧伤、裂纹(故障描述)")
-    @Length(min = 1, max = 255, message = "【平衡支架无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【平衡支架无锈蚀、烧伤、裂纹(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String lbjztPhzjDesc;
 
     @ApiModelProperty(value = "接触线接头处过渡平滑")
@@ -141,7 +136,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String lbjztJcxjt;
 
     @ApiModelProperty(value = "接触线接头处过渡平滑(故障描述)")
-    @Length(min = 1, max = 255, message = "【接触线接头处过渡平滑(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【接触线接头处过渡平滑(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String lbjztJcxjtDesc;
 
     @ApiModelProperty(value = "消弧角无裂纹、烧伤")
@@ -149,7 +144,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String lbjztXhj;
 
     @ApiModelProperty(value = "消弧角无裂纹、烧伤(故障描述)")
-    @Length(min = 1, max = 255, message = "【消弧角无裂纹、烧伤(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【消弧角无裂纹、烧伤(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String lbjztXhjDesc;
 
     @ApiModelProperty(value = "受电弓接触状态-两端长短滑轨分别与接触线三点等高")
@@ -157,7 +152,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String sdgjcztSddg;
 
     @ApiModelProperty(value = "受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)")
-    @Length(min = 1, max = 255, message = "【受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【受电弓接触状态-两端长短滑轨分别与接触线三点等高(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String sdgjcztSddgDesc;
 
     @ApiModelProperty(value = "设备状态")
@@ -165,7 +160,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
     private String sbzt;
 
     @ApiModelProperty(value = "设备状态(故障描述)")
-    @Length(min = 1, max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
+    @Length(min = 0, max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String sbztDesc;
 
     @ApiModelProperty(value = "检查人")

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

@@ -88,9 +88,18 @@ private BusJcbBlqMapper busJcbBlqMapper;
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcbBlq busJcbBlq) {
-		busJcbBlq.setUpdateTime(new Date());
-		busJcbBlq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcbBlqMapper.update(busJcbBlq);
+		if(busJcbBlq.getId()!=null){
+			busJcbBlq.setUpdateTime(new Date());
+			busJcbBlq.setUpdateBy(SecurityUtils.getUsername());
+			busJcbBlq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+			return busJcbBlqMapper.update(busJcbBlq);
+		}else{
+			busJcbBlq.setCreateTime(new Date());
+			busJcbBlq.setCreateBy(SecurityUtils.getUsername());
+			busJcbBlq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+			return busJcbBlqMapper.insert(busJcbBlq);
+		}
+
 	}
 
 	/**

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

@@ -89,9 +89,17 @@ private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcbFdfxjyq busJcbFdfxjyq) {
-		busJcbFdfxjyq.setUpdateTime(new Date());
-		busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+		if(busJcbFdfxjyq.getId()!=null){
+			busJcbFdfxjyq.setUpdateTime(new Date());
+			busJcbFdfxjyq.setUpdateBy(SecurityUtils.getUsername());
+			busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+			return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+		}else{
+			busJcbFdfxjyq.setCreateTime(new Date());
+			busJcbFdfxjyq.setCreateBy(SecurityUtils.getUsername());
+			busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+			return busJcbFdfxjyqMapper.insert(busJcbFdfxjyq);
+		}
 	}
 
 	/**

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

@@ -78,6 +78,7 @@
                 <result column="create_time" property="createTime"/>
                 <result column="update_by" property="updateBy"/>
                 <result column="update_time" property="updateTime"/>
+                <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -154,7 +155,8 @@
                 create_by,
                 create_time,
                 update_by,
-                update_time
+                update_time,
+                dept_id
     </sql>
 
     <insert id="insert" parameterType="com.railway.business.catenary.domain.BusBlq">
@@ -380,7 +382,10 @@
                     update_by,
                     </if>
                     <if test ='null != updateTime'>
-                    update_time
+                    update_time,
+                    </if>
+                    <if test ='null != deptId'>
+                        dept_id
                     </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -601,7 +606,10 @@
                     #{updateBy},
                     </if>
                     <if test ='null != updateTime'>
-                    #{updateTime}
+                    #{updateTime},
+                    </if>
+                    <if test ='null != deptId'>
+                    #{deptId}
                     </if>
         </trim>
     </insert>
@@ -687,7 +695,8 @@
                     <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 != updateTime'>update_time = #{updateTime},</if>
+                    <if test ='null != deptId'>dept_id = #{deptId}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -710,6 +719,9 @@
                 <if test="db!=null and db!=''">
                     and db=#{db}
                 </if>
+                <if test="deptId!=null and deptId!=''">
+                    and dept_id=#{deptId}
+                </if>
                 <if test="bm!=null and bm!=''">
                     and bm=#{bm}
                 </if>

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

@@ -52,6 +52,7 @@
                 <result column="create_time" property="createTime"/>
                 <result column="update_by" property="updateBy"/>
                 <result column="update_time" property="updateTime"/>
+                <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -102,7 +103,8 @@
                 create_by,
                 create_time,
                 update_by,
-                update_time
+                update_time,
+                dept_id
     </sql>
 
     <insert id="insert" parameterType="com.railway.business.catenary.domain.BusFdfxjyq">
@@ -250,7 +252,10 @@
                     update_by,
                     </if>
                     <if test ='null != updateTime'>
-                    update_time
+                    update_time,
+                    </if>
+                    <if test ='null != deptId'>
+                        dept_id
                     </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -393,7 +398,10 @@
                     #{updateBy},
                     </if>
                     <if test ='null != updateTime'>
-                    #{updateTime}
+                    #{updateTime},
+                    </if>
+                    <if test ='null != deptId'>
+                    #{deptId}
                     </if>
         </trim>
     </insert>
@@ -453,7 +461,8 @@
                     <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 != updateTime'>update_time = #{updateTime},</if>
+                    <if test ='null != deptId'>dept_id = #{deptId}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -476,6 +485,9 @@
                 <if test="db!=null and db!=''">
                     and db=#{db}
                 </if>
+                <if test="deptId!=null and deptId!=''">
+                    and dept_id=#{deptId}
+                </if>
                 <if test="bm!=null and bm!=''">
                     and bm=#{bm}
                 </if>

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

@@ -496,9 +496,6 @@
         <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>

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

@@ -709,7 +709,7 @@
 
     <select id="getList" resultMap="BaseResultMap">
         SELECT
-        a.*
+        a.*,b.dept_id,b.line_id
         FROM bus_zzdzxx a
         left join bus_station b
         on a.station_id = b.station_id