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

@@ -24,6 +24,9 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.io.Serializable;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.List;

/**
@@ -50,7 +53,18 @@

   @Override
   public IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO dangerReportVO) {
      return page.setRecords(baseMapper.selectRecordPage(page,dangerReportVO));
      List<DangerReportVO> dangerReportVOS = baseMapper.selectRecordPage(page, dangerReportVO);
      dangerReportVOS.forEach(item->{
         R<ResultDTO> res = pwdClient.getDecrypt(item.getSm4iv(), item.getKeyindexs(), item.getEncdata());
         if (res.getCode() == 200){
            item.setBase64Data(res.getData().getData());
         }

         item.setEncdata("");
         item.setKeyindexs("");
         item.setSm4iv("");
      });
      return page.setRecords(dangerReportVOS);
   }

   @Override
@@ -65,13 +79,34 @@

      // 获取水库名称
      AttResBase attResBase = attResBaseService.getDetailByCode(dangerReport.getReservoirId());
      dangerReportSUPO.setReservoirName(attResBase.getName());
      //转码后的水库名
      String encodeReservoirName = "";
      //转码后的上报人
      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(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(attResBase.getName()); // 保存水库名称
      dangerReport.setReservoirId(attResBase.getGuid());

      // 获取用户
      dangerReportSUPO.setCreateUserName(AuthUtil.getUser().getUserName());
      R<User> userR = userClient.userInfoById(Long.parseLong(dangerReportSUPO.getToUser()));
      dangerReportSUPO.setToUserName(userR.getData().getName());
      dangerReportSUPO.setCreateUserName(encodeCreateUserName);
      dangerReportSUPO.setToUserName(encodeToUserName);
      dangerReportSUPO.setDesinfo(encodeDesinfo);

      String message = JSONObject.toJSONString(dangerReportSUPO);
      R<CBCResultDTO> cbcResultDTOR =  pwdClient.getCBCMacEncipher(message);
@@ -94,4 +129,19 @@

   }

   @Override
   public DangerReportVO getVODetail(String id) {
      DangerReport item = super.getById(id);
      DangerReportVO newEntity = new DangerReportVO();
      newEntity.setId(item.getId());

      R<ResultDTO> res = pwdClient.getDecrypt(item.getSm4iv(), item.getKeyindexs(), item.getEncdata());
      if (res.getCode() == 200){
         newEntity.setBase64Data(res.getData().getData());
         newEntity.setCreateTime(item.getCreateTime());
      }

      return newEntity;
   }

}