guoshilong
2023-08-15 b76472d56b86434e5a30e920dacf01526a1e2c5d
险情上报水库模糊查询
2 files modified
11 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml 3 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java 8 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
@@ -42,10 +42,9 @@
               R.ENCDATA,
               R.SM4IV,
               R.KEYINDEXS FROM SM_DANGER_REPORT R
        LEFT JOIN BLADE_USER U2 ON U2.ID = R.CREATE_USER
        WHERE R.IS_DELETED = 0
        <if test="dangerReportVO.reservoirName != null and dangerReportVO.reservoirName !=''">
            AND arb."name" LIKE CONCAT('%',#{dangerReportVO.reservoirName},'%')
            AND r.reservoir_name LIKE CONCAT('%',#{dangerReportVO.reservoirName},'%')
        </if>
        <if test="dangerReportVO.toUser != null and dangerReportVO.toUser !=''">
            AND r.to_user = #{dangerReportVO.toUser}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
@@ -85,23 +85,27 @@
        String encodeCreateUserName = "";
        //转码后的处理人
        String encodeToUserName = "";
        String encodeDesinfo = "";
        R<User> userR = userClient.userInfoById(Long.parseLong(dangerReportSUPO.getToUser()));
        R<User> createUser = userClient.userInfoById(dangerReportSUPO.getCreateUser());
        try {
            encodeReservoirName= URLEncoder.encode(attResBase.getName(), "UTF-8");
            encodeCreateUserName = URLEncoder.encode(AuthUtil.getUser().getUserName(), "UTF-8");
            encodeCreateUserName = URLEncoder.encode(createUser.getData().getName(), "UTF-8");
            encodeToUserName=URLEncoder.encode(userR.getData().getName(), "UTF-8");
            encodeDesinfo = URLEncoder.encode(dangerReport.getDesinfo(), "UTF-8");
        }catch (Exception e){
            System.out.println(e);
        }
        dangerReportSUPO.setReservoirName(encodeReservoirName);
        dangerReport.setReservoirName(encodeReservoirName); // 保存水库名称
        dangerReport.setReservoirName(attResBase.getName()); // 保存水库名称
        // 获取用户
        dangerReportSUPO.setCreateUserName(encodeCreateUserName);
        dangerReportSUPO.setToUserName(encodeToUserName);
        dangerReportSUPO.setDesinfo(encodeDesinfo);
        String message = JSONObject.toJSONString(dangerReportSUPO);
        R<CBCResultDTO> cbcResultDTOR =  pwdClient.getCBCMacEncipher(message);