Merge branch 'master' of http://git.iamsee.com/dunbai/railway

.drone_prod.yml

@@ -44,6 +44,7 @@ steps:
     image: appleboy/drone-scp
     settings:
       host: 182.92.65.152
+      port: 27082
       username: root
       password: Swsc2021!bd
       debug: true
@@ -54,6 +55,7 @@ steps:
     image:  appleboy/drone-ssh
     settings:
       host: 182.92.65.152
+      port: 27082
       username: root
       password: Swsc2021!bd
       debug: true

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

@@ -1,13 +1,13 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcbBlqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.utils.DateUtils;
 import com.railway.common.utils.StringUtils;
-import com.railway.common.utils.poi.EasyExcelUtil;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -148,13 +148,8 @@ public class BusJcbBlqController extends BaseController {
 
     @ApiOperation(value = "导出excel")
     @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(BusJcbBlq busJcbBlq) {
-        List<BusJcbBlq> list = busJcbBlqService.getList(busJcbBlq);
-        Map<String, Object> params = new HashMap<>();
-
-        String fileName = "避雷器检测记录.xls";
-        String templateFileName = "excel/template/避雷器检测记录.xls";
-        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+    public AjaxResult exportExcel(JcebQueryVo query) {
+        String localFilePath = busJcbBlqService.exportExcel(query);
         return sysFileService.uploadFile(localFilePath);
     }
 

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

@@ -1,6 +1,7 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
@@ -9,7 +10,6 @@ import com.railway.common.utils.DateUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.file.BASE64DecodedMultipartFile;
 import com.railway.common.utils.http.HttpUtils;
-import com.railway.common.utils.poi.EasyExcelUtil;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -191,18 +191,8 @@ public class BusJcbFdfxjyqController extends BaseController {
 
     @ApiOperation(value = "导出excel")
     @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(BusJcbFdfxjyq busJcbFdfxjyq) {
-        List<BusJcbFdfxjyq> list = busJcbFdfxjyqService.getList(busJcbFdfxjyq);
-        Map<String, Object> params = new HashMap<>();
-        if(!list.isEmpty()) {
-            params.put("stationName", list.get(0).getStationName());
-            params.put("createBy",list.get(0).getCreateBy());
-            params.put("confirmUser",list.get(0).getConfirmUser());
-        }
-
-        String fileName = "分段绝缘器检测记录.xls";
-        String templateFileName = "excel/template/分段绝缘器检测记录.xls";
-        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+    public AjaxResult exportExcel(JcebQueryVo query) {
+        String localFilePath = busJcbFdfxjyqService.exportExcel(query);
         return sysFileService.uploadFile(localFilePath);
     }
 

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

@@ -1,17 +1,15 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcebGjsfx;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.utils.poi.EasyExcelUtil;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -96,13 +94,8 @@ public class BusJcebGjsfxController extends BaseController {
 
     @ApiOperation(value = "导出excel")
     @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(BusJcebGjsfx busJcebGjsfx) {
-        List<BusJcebGjsfx> list = busJcebGjsfxService.getList(busJcebGjsfx);
-        Map<String, Object> params = new HashMap<>();
-
-        String fileName = "关节式分相检测记录.xls";
-        String templateFileName = "excel/template/关节式分相检测记录.xls";
-        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+    public AjaxResult exportExcel(JcebQueryVo query) {
+        String localFilePath = busJcebGjsfxService.exportExcel(query);
         return sysFileService.uploadFile(localFilePath);
     }
 

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

@@ -83,7 +83,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/railway?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:27086/railway?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: railway
         password: 'F8b3LDBaBe5KeTSS'
       # 从库数据源

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

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
 /**
  * 检查表-避雷器
  * @author wuhonghao 2021-10-17
@@ -75,7 +78,7 @@ public class BusJcbBlq extends BusJcab{
 
     @ApiModelProperty(value = "高压侧引线对接地体的动态最小距离")
     @Length(min = 1, max = 20, message = "【高压侧引线对接地体的动态最小距离】长度必须介于 {min} 和 {max} 之间")
-    private String blqyxGycyxdjdtdtzxjl;
+    private BigDecimal blqyxGycyxdjdtdtzxjl;
 
     @ApiModelProperty(value = "状态良好，无破损、裂纹")
     @Length(min = 1, max = 1, message = "【状态良好，无破损、裂纹】长度必须介于 {min} 和 {max} 之间")
@@ -91,10 +94,58 @@ public class BusJcbBlq extends BusJcab{
 
     @ApiModelProperty(value = "避雷器接地状态-接地电阻")
     @Length(min = 1, max = 20, message = "【避雷器接地状态-接地电阻】长度必须介于 {min} 和 {max} 之间")
-    private String blqjdztJddz;
+    private BigDecimal blqjdztJddz;
 
     @ApiModelProperty(value = "设备状态(故障描述)")
     @Length(max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String sbztDesc;
 
+    @ApiModelProperty(value = "生产厂家")
+    private String sccj;
+
+    public String getXb(){
+        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 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 getFszzqt(){
+        if("1".equals(tjwzBlqtjazsp)&& "1".equals(tjwzWxs)&& "1".equals(tjwzGblsljjg)){
+            return "良好";
+        }else{
+            return "故障";
+        }
+    }
+
 }

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

@@ -141,7 +141,11 @@ public class BusJcbFdfxjyq extends BusJcab{
     private String sbztDesc;
 
     public BigDecimal getDxlzxpy(){
-        return pointB.add(pointG).divide(new BigDecimal("2")).setScale(2,BigDecimal.ROUND_HALF_UP);
+        if(pointB!=null&&pointG!=null){
+            return pointB.add(pointG).divide(new BigDecimal("2")).setScale(2,BigDecimal.ROUND_HALF_UP);
+        }else{
+            return null;
+        }
     }
 
     public String getJybjzt(){

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.data.annotation.Transient;
+
 /**
  * 检查表-隔离开关检查
  * @author author 2021-11-04
@@ -253,4 +255,7 @@ public class BusJcbGlkg extends BusJcab{
     @Length(min = 1, max = 100, message = "【设备状态-描述】长度必须介于 {min} 和 {max} 之间")
     private String sbztDesc;
 
+    @ApiModelProperty(value = "开关型号/厂家")
+    @Transient
+    private String xhcj;
 }

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

@@ -74,4 +74,16 @@ public class BusJcebGjsfx extends BusJceb{
     @Length(min = 1, max = 255, message = "【下锚支接触线垂直投影与钢轨交叉处抬高（mm）】长度必须介于 {min} 和 {max} 之间")
     private String xmzjcxcztyyggjcctg;
 
+    public String getXb(){
+        return "检测";
+    }
+
+    public String getJyjsffhbzText(){
+        if("1".equals(jyjsffhbz)){
+            return "是";
+        }else{
+            return "否";
+        }
+    }
+
 }

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

@@ -29,4 +29,6 @@ public class BusJcebJyzqsjl extends BusJceb{
     @ApiModelProperty(value = "数量")
     private Integer sl;
 
+    private Integer xh;
+
 }

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

@@ -166,8 +166,30 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 			busJcbGlkg.setYdfhsyA(StringUtils.goodOrBad(busJcbGlkg.getYdfhsyA()));
 			busJcbGlkg.setDdfhsyA(StringUtils.goodOrBad(busJcbGlkg.getDdfhsyA()));
 			busJcbGlkg.setSdfhsyA(StringUtils.goodOrBad(busJcbGlkg.getSdfhsyA()));
-			busJcbGlkg.setYxztA(StringUtils.goodOrBad(busJcbGlkg.getYxztA()));
-			busJcbGlkg.setJgxA(StringUtils.goodOrBad(busJcbGlkg.getJgxA()));
+
+			// 开关引线状态
+			if (StringUtils.YES_VALUE.equals(busJcbGlkg.getYxztA())
+				&& StringUtils.YES_VALUE.equals(busJcbGlkg.getYxztB())
+				&& StringUtils.YES_VALUE.equals(busJcbGlkg.getYxztC())) {
+				busJcbGlkg.setYxztA(StringUtils.goodOrBad(StringUtils.YES_VALUE));
+			}
+			else {
+				busJcbGlkg.setYxztA(StringUtils.goodOrBad(StringUtils.NO_VALUE));
+			}
+
+			// 操作机构
+			if (StringUtils.YES_VALUE.equals(busJcbGlkg.getQdzzA())
+				&& StringUtils.YES_VALUE.equals(busJcbGlkg.getJgxA())
+				&& StringUtils.YES_VALUE.equals(busJcbGlkg.getJgxB())
+				&& StringUtils.YES_VALUE.equals(busJcbGlkg.getJgxC())) {
+				busJcbGlkg.setJgxA(StringUtils.goodOrBad(StringUtils.YES_VALUE));
+			}
+			else {
+				busJcbGlkg.setJgxA(StringUtils.goodOrBad(StringUtils.NO_VALUE));
+			}
+
+			busJcbGlkg.setFzzt(StringUtils.goodOrBad(busJcbGlkg.getFzzt()));
+			busJcbGlkg.setHzzt(StringUtils.goodOrBad(busJcbGlkg.getHzzt()));
 		}
 	}
 

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

@@ -128,9 +128,15 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcebGjsfx> list = busJcebGjsfxMapper.getJcebList(query);
+    Map<String, Object> params = new HashMap<>();
+    if(!list.isEmpty()) {
+      params.put("stationName", list.get(0).getStationName());
+      params.put("createBy",list.get(0).getCreateBy());
+      params.put("operator",list.get(0).getOperator());
+    }
     String fileName = "关节式分相检测记录.xls";
     String templateFileName = "excel/template/关节式分相检测记录.xls";
-    return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
+    return new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
   }
 
 }

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

@@ -7,7 +7,11 @@ import com.railway.business.catenary.mapper.BusJcebJyzqsjlMapper;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -126,8 +130,17 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcebJyzqsjl> list = busJcebJyzqsjlMapper.getJcebList(query);
+    for(int i=0;i<list.size();i++){
+      list.get(i).setXh(i+1);
+    }
+    Map<String, Object> params = new HashMap<>();
+    if(!list.isEmpty()) {
+      params.put("stationName", list.get(0).getStationName());
+      params.put("createBy",list.get(0).getCreateBy());
+      params.put("operator",list.get(0).getOperator());
+    }
     String fileName = "绝缘子清扫记录.xls";
     String templateFileName = "excel/template/绝缘子清扫记录.xls";
-    return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
+    return new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
   }
 }

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

@@ -43,6 +43,7 @@
     <result column="update_time" property="updateTime"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="sccj" property="sccj"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -324,9 +325,7 @@
       <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 != 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 != blqyxBlqyxwssdg'>blqyx_blqyxwssdg = #{blqyxBlqyxwssdg},</if>
@@ -376,7 +375,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -513,8 +515,9 @@
 
   <select id="getJcebList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>,base.sccj
     FROM bus_jcb_blq t
+    LEFT JOIN base_blq base on t.pillar_code = base.pillar_code
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'
@@ -528,7 +531,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -570,7 +576,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}

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

@@ -360,7 +360,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="fenxiang!=null and fenxiang!=''">
         and t.fenxiang=#{fenxiang}
@@ -481,7 +484,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_area=#{pillarCode}
@@ -523,7 +529,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}

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

@@ -499,7 +499,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -699,7 +702,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -776,7 +782,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}

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

@@ -82,10 +82,11 @@
     <result column="update_time" property="updateTime"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="xhcj" property="xhcj"/>
   </resultMap>
 
   <sql id="Base_Column_List">
-    id,
+    t.id,
     v.dept_id,
     v.dept_name,
     v.station_name,
@@ -718,7 +719,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="xingbie!=null and xingbie!=''">
         and t.xingbie=#{xingbie}
@@ -971,9 +975,11 @@
 
   <select id="getJcebList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>,
+    concat(bg.sccj,'/',bg.kgxh) as xhcj
     FROM bus_jcb_glkg t
     LEFT JOIN  v_station v ON t.dept_station_id = v.dept_station_id
+    LEFT JOIN  base_glkg bg ON (t.dept_station_id = bg.dept_station_id and t.kgbh = bg.kgbh)
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
@@ -986,7 +992,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -1028,7 +1037,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}

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

@@ -501,7 +501,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -669,7 +672,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -711,7 +717,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}

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

@@ -484,7 +484,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -646,7 +649,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -688,7 +694,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}

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

@@ -286,7 +286,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarStart!=null and pillarStart!=''">
         and t.pillar_start=#{pillarStart}
@@ -391,7 +394,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
@@ -430,7 +436,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}

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

@@ -222,7 +222,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -306,7 +309,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
@@ -345,7 +351,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}

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

@@ -209,7 +209,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -275,7 +278,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
@@ -314,7 +320,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}

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

@@ -231,7 +231,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="dd!=null and dd!=''">
         and t.dd=#{dd}
@@ -318,7 +321,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
@@ -357,7 +363,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}

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

@@ -259,7 +259,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
@@ -355,7 +358,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
@@ -394,7 +400,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}

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

@@ -246,7 +246,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
@@ -339,7 +342,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
@@ -378,7 +384,10 @@
         and v.station_id=#{stationId}
       </if>
       <if test="stationIds!=null and stationIds.length > 0">
-        and v.station_id in (#{stationIds}
+        and v.station_id in
+        <foreach collection="stationIds" item="stationId" index="i" open="(" separator="," close=")">
+          #{stationId}
+        </foreach>
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}

railway-common/src/main/java/com/railway/common/utils/StringUtils.java

@@ -30,6 +30,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
   private static final String YES = "√";
   public static final String YES_VALUE = "1";
   private static final String NO = "×";
+  public static final String NO_VALUE = "0";
   private static final String SLASH = "/";
   private static final String GOOD = "良好";
   private static final String BAD = "差";

railway-framework/src/main/java/com/railway/framework/web/service/SysLoginService.java

@@ -60,7 +60,7 @@ public class SysLoginService {
     boolean captchaOnOff = configService.selectCaptchaOnOff();
     // 验证码开关
     if (captchaOnOff) {
-      // validateCaptcha(username, code, uuid);
+       validateCaptcha(username, code, uuid);
     }
     // 用户验证
     Authentication authentication;

railway-framework/src/main/java/com/railway/framework/web/service/SysRegisterService.java

@@ -44,7 +44,7 @@ public class SysRegisterService {
     boolean captchaOnOff = configService.selectCaptchaOnOff();
     // 验证码开关
     if (captchaOnOff) {
-      // validateCaptcha(registerBody.getCode(), registerBody.getUuid());
+       validateCaptcha(registerBody.getCode(), registerBody.getUuid());
     }
 
     if (StringUtils.isEmpty(username)) {