Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java

@@ -85,23 +85,28 @@
      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()); // 保存水库名称
      dangerReport.setReservoirId(attResBase.getGuid());

      // 获取用户
      dangerReportSUPO.setCreateUserName(encodeCreateUserName);
      dangerReportSUPO.setToUserName(encodeToUserName);
      dangerReportSUPO.setDesinfo(encodeDesinfo);

      String message = JSONObject.toJSONString(dangerReportSUPO);
      R<CBCResultDTO> cbcResultDTOR =  pwdClient.getCBCMacEncipher(message);