【BUG】#279,#289,#290,#292

railway-admin/src/main/java/com/railway/web/controller/system/SysLoginController.java

@@ -5,6 +5,7 @@ import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.domain.entity.SysMenu;
 import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.domain.model.LoginBody;
+import com.railway.common.exception.user.UserPasswordNotMatchException;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.framework.web.service.SysLoginService;
 import com.railway.framework.web.service.SysPermissionService;
@@ -51,10 +52,15 @@ public class SysLoginController {
   @PostMapping("/login")
   public AjaxResult login(@RequestBody LoginBody loginBody) {
     AjaxResult ajax = AjaxResult.success();
-    // 生成令牌
-    String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
-        loginBody.getCode(), loginBody.getUuid(), loginBody.getMobileId());
-    ajax.put(Constants.TOKEN, token);
+    try {
+      // 生成令牌
+      String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
+          loginBody.getCode(), loginBody.getUuid(), loginBody.getMobileId());
+      ajax.put(Constants.TOKEN, token);
+    }catch (UserPasswordNotMatchException e){
+      ajax.put(AjaxResult.CODE_TAG, AjaxResult.Type.ERROR.value());
+      ajax.put(AjaxResult.MSG_TAG, e.getMessage());
+    }
     return ajax;
   }
 

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcbJcxcController.java

@@ -89,8 +89,8 @@ public class BusJcbJcxcController extends BaseController {
 
   @ApiOperation(value = "获取上次检测值")
   @GetMapping(value = "/getLastOne")
-  public AjaxResult getLastOne() {
-    BusJcbJcxc info = busJcbJcxcService.getLastRecord();
+  public AjaxResult getLastOne(BusJcbJcxc busJcbJcxc) {
+    BusJcbJcxc info = busJcbJcxcService.getLastRecord(busJcbJcxc);
     AjaxResult ajax = AjaxResult.success();
     ajax.put("info", info);
     return ajax;
@@ -126,7 +126,7 @@ public class BusJcbJcxcController extends BaseController {
     BusJcbJcxc info = busJcbJcxcService.getInfo(id);
     WordUtils wordUtil = new WordUtils();
     //填充变量
-    Map<String, Object> params = new HashMap<>();
+    Map<String, Object> params = new HashMap<>(32);
     params.put("${xch}", info.getXch());
     params.put("${qj}", info.getStationName());
     params.put("${wendu}", info.getTemperature() == null ? "" : info.getTemperature());

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcbWjcxcController.java

@@ -1,5 +1,6 @@
 package com.railway.business.catenary.controller;
 
+import com.railway.business.catenary.domain.BusJcbJcxc;
 import com.railway.business.catenary.domain.BusJcbWjcxc;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
@@ -80,8 +81,8 @@ public class BusJcbWjcxcController extends BaseController {
 
   @ApiOperation(value = "获取上次检测值")
   @GetMapping(value = "/getLastOne")
-  public AjaxResult getLastOne() {
-    BusJcbWjcxc info = busJcbWjcxcService.getLastRecord();
+  public AjaxResult getLastOne(BusJcbWjcxc busJcbWjcxc) {
+    BusJcbWjcxc info = busJcbWjcxcService.getLastRecord(busJcbWjcxc);
     AjaxResult ajax = AjaxResult.success();
     ajax.put("info", info);
     return ajax;

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

@@ -53,7 +53,7 @@ public interface BusJcbJcxcMapper {
     /**
      * 获取上次检查记录
      */
-    BusJcbJcxc getLastRecord(Long userId);
+    BusJcbJcxc getLastRecord(BusJcbJcxc busJcbJcxc);
 
     /**
      * 查询列表

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

@@ -53,7 +53,7 @@ public interface BusJcbWjcxcMapper {
     /**
      * 获取上次检查记录
      */
-    BusJcbWjcxc getLastRecord(Long userId);
+    BusJcbWjcxc getLastRecord(BusJcbWjcxc busJcbWjcxc);
 
     /**
      * 查询列表

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

@@ -47,7 +47,7 @@ public interface IBusJcbJcxcService{
     /**
      * 获取上次检查记录
      */
-    BusJcbJcxc getLastRecord();
+    BusJcbJcxc getLastRecord(BusJcbJcxc busJcbJcxc);
 
     /**
      * 提交

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

@@ -47,7 +47,7 @@ public interface IBusJcbWjcxcService{
     /**
      * 获取上次检查记录
      */
-    BusJcbWjcxc getLastRecord();
+    BusJcbWjcxc getLastRecord(BusJcbWjcxc busJcbWjcxc);
 
     /**
      * 提交

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

@@ -127,8 +127,8 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
    * 获取上次检查记录
    */
   @Override
-  public BusJcbJcxc getLastRecord() {
-    return busJcbJcxcMapper.getLastRecord(SecurityUtils.getUserId());
+  public BusJcbJcxc getLastRecord(BusJcbJcxc busJcbJcxc) {
+    return busJcbJcxcMapper.getLastRecord(busJcbJcxc);
   }
 
   /**

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

@@ -129,8 +129,8 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
    * 获取上次检查记录
    */
   @Override
-  public BusJcbWjcxc getLastRecord() {
-    return busJcbWjcxcMapper.getLastRecord(SecurityUtils.getUserId());
+  public BusJcbWjcxc getLastRecord(BusJcbWjcxc busJcbWjcxc) {
+    return busJcbWjcxcMapper.getLastRecord(busJcbWjcxc);
   }
 
   /**

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

@@ -159,6 +159,8 @@ public class BusJcebFzswjfxcServiceImpl extends BusJcebServiceImpl<BusJcebFzswjf
       XlsFzswjfxcDTO dto = new XlsFzswjfxcDTO();
       BeanUtils.copyBeanProp(dto, fzswjfxc);
       dto.setXb("检测");
+      JcebTypeEnum jcebType = JcebTypeEnum.ofValue(fzswjfxc.getXchType());
+      dto.setXchType(null == jcebType ? JcebTypeEnum.Wjcxc.getDescribe() : jcebType.getDescribe());
       fzswjfxcList.add(dto);
     }
   }

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

@@ -805,8 +805,7 @@
   <select id="getLastOne" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM
-        bus_jcb_glkg t
+    FROM bus_jcb_glkg t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     WHERE
         t.del_flag = '0' and t.submit_state in ('1','9')
@@ -819,8 +818,7 @@
     <if test="kgbh!=null and kgbh!=''">
       and t.kgbh=#{kgbh}
     </if>
-    ORDER BY
-        t.update_time DESC
+    ORDER BY t.create_time DESC
     LIMIT 1
   </select>
 

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

@@ -497,16 +497,18 @@
 
   <select id="getLastRecord" resultMap="BaseResultMap">
     SELECT
-    a.gz1lcz, a.gz2lcz, a.fzlcz, a.zglcz, a.qglcz, a.ngj, a.plz, a.czjj, a.lgzzgc, a.gzyfzgc
-    FROM bus_jcb_jcxc a,
-    (
-    select max(update_time) as lastTime
-    from bus_jcb_jcxc
-    WHERE user_id = #{user_id}
-    and submit_state != '0'
-    ) b
-    WHERE a.update_time = b.lastTime
-
+    <include refid="Base_Column_List"/>
+    FROM bus_jcb_jcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    WHERE t.del_flag = '0' and t.submit_state in ('1','9')
+    <if test="stationId!=null and stationId!=''">
+      and v.station_id=#{stationId}
+    </if>
+    <if test="pillarCode!=null and pillarCode!=''">
+      and t.pillar_code=#{pillarCode}
+    </if>
+    ORDER BY t.create_time DESC
+    LIMIT 1
   </select>
 
   <select id="getList" resultMap="BaseResultMap">

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

@@ -479,17 +479,18 @@
 
   <select id="getLastRecord" resultMap="BaseResultMap">
     SELECT
-    a.zxlcz, a.zxdg, a.cxlcz, a.cxdg, a.zxwxjq, a.cxwxjq, a.azzxlcz, a.azzxdg, a.azcxlcz, a.azcxdg,
-    a.bzzxlcz, a.bzzxdg, a.bzcxlcz, a.bzcxdg,a.czzxlcz, a.czzxdg, a.czcxlcz, a.czcxdg
-    FROM bus_jcb_wjcxc a,
-    (
-    select max(update_time) as lastTime
-    from bus_jcb_wjcxc
-    WHERE user_id = #{user_id}
-    and submit_state != '0'
-    ) b
-    WHERE a.update_time = b.lastTime
-
+    <include refid="Base_Column_List"/>
+    FROM bus_jcb_wjcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    WHERE t.del_flag = '0' and t.submit_state in ('1','9')
+    <if test="stationId!=null and stationId!=''">
+      and v.station_id=#{stationId}
+    </if>
+    <if test="pillarCode!=null and pillarCode!=''">
+      and t.pillar_code=#{pillarCode}
+    </if>
+    ORDER BY t.create_time DESC
+    LIMIT 1
   </select>
 
   <select id="getList" resultMap="BaseResultMap">

railway-common/src/main/java/com/railway/common/utils/http/HttpHelper.java

@@ -4,7 +4,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import javax.servlet.ServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;