From ed26dffb6e6df336ff7c31ddc3db1c5e27dc1543 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 31 Oct 2025 11:46:55 +0800 Subject: [PATCH] fix:sonar --- .../com/ccag/common/api/vo/ApiResult.java | 11 --- .../com/ccag/thread/ApprovePostProcessor.java | 22 ----- .../thread/PushLoadcaseRunResultThread.java | 2 - .../com/ccag/thread/PushProjectThread.java | 86 +++++++++---------- .../main/java/com/ccag/utils/FilesUtil.java | 8 +- .../main/java/com/ccag/utils/HttpUtil.java | 14 ++- .../src/main/java/com/ccag/utils/Tools.java | 43 ++-------- .../java/com/ccag/utils/excel/ExcelUtil.java | 12 ++- 8 files changed, 70 insertions(+), 128 deletions(-) diff --git a/ccag-boot-base-core/src/main/java/com/ccag/common/api/vo/ApiResult.java b/ccag-boot-base-core/src/main/java/com/ccag/common/api/vo/ApiResult.java index badb4f3..be58465 100644 --- a/ccag-boot-base-core/src/main/java/com/ccag/common/api/vo/ApiResult.java +++ b/ccag-boot-base-core/src/main/java/com/ccag/common/api/vo/ApiResult.java @@ -17,11 +17,6 @@ import java.io.Serializable; public class ApiResult implements Serializable { private static final long serialVersionUID = 1L; -// /** -// * 成功标志 -// */ -// @Schema(description = "成功标志") -// private boolean success = true; /** * 返回处理消息 @@ -41,12 +36,6 @@ public class ApiResult implements Serializable { @Schema(description = "返回数据对象") private T data; - /** - * 时间戳 - */ -// @Schema(description = "时间戳") -// private long timestamp = System.currentTimeMillis(); - public ApiResult() { } diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java index 6c57757..10819d0 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java @@ -350,7 +350,6 @@ public class ApprovePostProcessor implements Callable { } commonNewMsgInfoVo.setGroupType(0); commonNewMsgInfoVo.setMessageType(0); -// User user = userService.getUserByIdCode(memberRelate.getIdentityCode()); log.info("memberRelate.getIdentityCode()为：{}",memberRelate.getIdentityCode()); SysUser user = userService.getUserByWorkNo(memberRelate.getIdentityCode()); log.info("memberRelate.getIdentityCode()返回值为：{}",user); @@ -455,7 +454,6 @@ public class ApprovePostProcessor implements Callable { JSONObject addJson = JSON.parseObject(addStr); String type = addJson.getString("type"); switch (type) { -// case DISCIPLINE_TAG -> parseDiscipline(libName, addJson); case NODE_TAG, DISCIPLINE_TAG, COMPONENT_TAG -> { parseNode(libName, addJson, version, false); } @@ -520,8 +518,6 @@ public class ApprovePostProcessor implements Callable { systemMapper.delSystemLoadcaseVersion(null, version, poolName, company); systemMapper.delSystemNodeVersion(null, version, poolName, company); systemMapper.delSystemPerformanceVersion(null, version, poolName, company); -// systemMapper.delSystemLoadcasePoolFromNode(poolName); -// systemMapper.delSystemLoadcasePoolFromCase(poolName); } case NODE_TAG, DISCIPLINE_TAG, COMPONENT_TAG -> { poolName = delJson.getString("poolName"); @@ -565,7 +561,6 @@ public class ApprovePostProcessor implements Callable { } commonNewMsgInfoVo.setGroupType(0); commonNewMsgInfoVo.setMessageType(0); -// User user = userService.getUserByIdCode(approvalBean.getCreatorIdentity()); log.info("approvalBean.getCreatorIdentity()为：{}",approvalBean.getCreatorIdentity()); SysUser user = userService.getUserByWorkNo(approvalBean.getCreatorIdentity()); log.info("approvalBean.getCreatorIdentity()返回值为：{}",user); @@ -596,15 +591,6 @@ public class ApprovePostProcessor implements Callable { }else { log.error("接收人为空，仿真地图评审通过无法发送消息"); } - - - - - } else if (status == 2) { - - } else if (status == 3)//评审撤销 - { - //delSystemApproveFiles(approvalBean.id,systemMapper); } updateTvsResult(String.valueOf(approveId), "仿真地图评审"); return APPROVE_SUCCESS; @@ -897,10 +883,6 @@ public class ApprovePostProcessor implements Callable { if (status == 4) { //评审通过 String approveInfo = approvalBean.approveInfo; - JSONObject jsonObject = JSON.parseObject(approveInfo); - - } else if (status == 5) { - //评审不通过 } } @@ -920,10 +902,6 @@ public class ApprovePostProcessor implements Callable { String description = jsonObject.getString(DESCRIPTION); projectService.updateProjectLoadcaseInfo(id, loadcaseName, beginTime, endTime, days, exeStatus, description, idCode); projectService.updateProjectLoadcaseMember(id, userId, userName, idCode); - } else if (status == 2) { - - } else if (status == 3)//评审撤销 - { } } diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushLoadcaseRunResultThread.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushLoadcaseRunResultThread.java index a236692..ca1eae5 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushLoadcaseRunResultThread.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushLoadcaseRunResultThread.java @@ -40,7 +40,6 @@ public class PushLoadcaseRunResultThread implements Runnable { private final SvsService svsService; private final AttachmentGrpcClientService attachmentGrpcClientService; private final DataService dataService; - private final String UN_PUSH_STATUS = "0"; private final String SUCCESS_PUSH_STATUS = "1"; private final String FAILED_PUSH_STATUS = "2"; @@ -56,7 +55,6 @@ public class PushLoadcaseRunResultThread implements Runnable { private static final String CREATE_USER = "createUser"; private static final String TARGET_CODE = "targetCode"; - private static final String INPUT_FORM_ID = "inputFormId"; @Override @Transactional(propagation = Propagation.REQUIRES_NEW) diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushProjectThread.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushProjectThread.java index c9b14dd..d56bd11 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushProjectThread.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/PushProjectThread.java @@ -34,7 +34,7 @@ import static com.ccag.thread.ApprovePostProcessor.APPROVE_SUCCESS; @Slf4j public class PushProjectThread implements Callable { - private final UpdateProjectVersionReq req; + private final UpdateProjectVersionReq updateProjectVersionReq; private final SvsService svsService; private final User user; @@ -45,9 +45,9 @@ public class PushProjectThread implements Callable { private final List inputFormParams; private final List workNodeList; - public PushProjectThread(UpdateProjectVersionReq req, SvsService svsService, User user, int version, long approveId, + public PushProjectThread(UpdateProjectVersionReq updateProjectVersionReq, SvsService svsService, User user, int version, long approveId, List memberJsons, ProjectMapper projectMapper, List inputFormParams,List workNodeList) { - this.req = req; + this.updateProjectVersionReq = updateProjectVersionReq; this.svsService = svsService; this.user = user; this.version = version; @@ -66,28 +66,28 @@ public class PushProjectThread implements Callable { log.info("PushProjectThread用户信息为：{}",user); TenantContext.setTenant(user.getTenantId()); log.info("TenantContext：{}",TenantContext.getTenant()); - log.info("推送项目策划记录addLoadcaseList为：{}",req.getAddLoadcaseList()); - log.info("推送项目策划记录updateLoadcaseList为：{}",req.getUpdateLoadcaseList()); - log.info("推送项目策划记录delLoadcaseList为：{}",req.getDelLoadcaseList()); + log.info("推送项目策划记录addLoadcaseList为：{}",updateProjectVersionReq.getAddLoadcaseList()); + log.info("推送项目策划记录updateLoadcaseList为：{}",updateProjectVersionReq.getUpdateLoadcaseList()); + log.info("推送项目策划记录delLoadcaseList为：{}",updateProjectVersionReq.getDelLoadcaseList()); ProjectPlanRecord planRecord = new ProjectPlanRecord(); planRecord.setApproveId(approveId); - planRecord.setProjectId(req.getProjectId()); - planRecord.setUpdateContent(req.getUpdateContent()); - planRecord.setReason(req.getReason()); + planRecord.setProjectId(updateProjectVersionReq.getProjectId()); + planRecord.setUpdateContent(updateProjectVersionReq.getUpdateContent()); + planRecord.setReason(updateProjectVersionReq.getReason()); String reviewTime = DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"); planRecord.setReviewTime(reviewTime); - planRecord.setAddMsg(req.getAddMsg()); - planRecord.setUpdateMsg(req.getUpdateMsg()); - planRecord.setDelMsg(req.getDelMsg()); + planRecord.setAddMsg(updateProjectVersionReq.getAddMsg()); + planRecord.setUpdateMsg(updateProjectVersionReq.getUpdateMsg()); + planRecord.setDelMsg(updateProjectVersionReq.getDelMsg()); planRecord.setVersion(String.valueOf(version)); planRecord.setCreatorName(user.getName()); planRecord.setCreateBy(user.getJobNumber()); planRecord.setTenantId(user.getTenantId()); projectMapper.addProjectPlanRecord(planRecord); JSONObject planRecordJson = new JSONObject(); - planRecordJson.put("projectId", req.getProjectId()); - planRecordJson.put("updateContent", req.getUpdateContent()); - planRecordJson.put("reason", req.getReason()); + planRecordJson.put("projectId", updateProjectVersionReq.getProjectId()); + planRecordJson.put("updateContent", updateProjectVersionReq.getUpdateContent()); + planRecordJson.put("reason", updateProjectVersionReq.getReason()); planRecordJson.put("reviewTime", reviewTime); planRecordJson.put("resultList", memberJsons); planRecordJson.put("version", version); @@ -98,29 +98,29 @@ public class PushProjectThread implements Callable { log.info("推送项目策划记录成功"); log.info("开始推送项目数据"); List componentAndDisciplineReqs = new ArrayList<>(); - if (!CollectionUtils.isEmpty(req.getAddComponentList())) { - for (ProjectComponentBean componentBean : req.getAddComponentList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getAddComponentList())) { + for (ProjectComponentBean componentBean : updateProjectVersionReq.getAddComponentList()) { PushComponentAndDisciplineReq req = svsService.getComponentPushInfo(componentBean, version); req.setOperation("A"); componentAndDisciplineReqs.add(req); } } - if (!CollectionUtils.isEmpty(req.getUpdateComponentList())) { - for (ProjectComponentBean componentBean : req.getUpdateComponentList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getUpdateComponentList())) { + for (ProjectComponentBean componentBean : updateProjectVersionReq.getUpdateComponentList()) { PushComponentAndDisciplineReq req = svsService.getComponentPushInfo(componentBean, version); req.setOperation("M"); componentAndDisciplineReqs.add(req); } } - if (!CollectionUtils.isEmpty(req.getAddDisciplineList())) { - for (ProjectDisciplineBean disciplineBean : req.getAddDisciplineList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getAddDisciplineList())) { + for (ProjectDisciplineBean disciplineBean : updateProjectVersionReq.getAddDisciplineList()) { PushComponentAndDisciplineReq req = svsService.getDisciplinePushInfo(disciplineBean, version); req.setOperation("A"); componentAndDisciplineReqs.add(req); } } - if (!CollectionUtils.isEmpty(req.getUpdateDisciplineList())) { - for (ProjectDisciplineBean disciplineBean : req.getUpdateDisciplineList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getUpdateDisciplineList())) { + for (ProjectDisciplineBean disciplineBean : updateProjectVersionReq.getUpdateDisciplineList()) { PushComponentAndDisciplineReq req = svsService.getDisciplinePushInfo(disciplineBean, version); req.setOperation("M"); componentAndDisciplineReqs.add(req); @@ -148,15 +148,15 @@ public class PushProjectThread implements Callable { } List loadcaseReqs = new ArrayList<>(); - if (!CollectionUtils.isEmpty(req.getAddLoadcaseList())) { - for (ProjectLoadcaseBean loadcaseBean : req.getAddLoadcaseList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getAddLoadcaseList())) { + for (ProjectLoadcaseBean loadcaseBean : updateProjectVersionReq.getAddLoadcaseList()) { PushLoadcaseReq req = svsService.getLoadcasePushInfo(loadcaseBean, version); req.setOperation("A"); loadcaseReqs.add(req); } } - if (!CollectionUtils.isEmpty(req.getUpdateLoadcaseList())) { - for (ProjectLoadcaseBean loadcaseBean : req.getUpdateLoadcaseList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getUpdateLoadcaseList())) { + for (ProjectLoadcaseBean loadcaseBean : updateProjectVersionReq.getUpdateLoadcaseList()) { PushLoadcaseReq req = svsService.getLoadcasePushInfo(loadcaseBean, version); req.setOperation("M"); loadcaseReqs.add(req); @@ -167,8 +167,8 @@ public class PushProjectThread implements Callable { int count = 0; String eachProjectNode; if (workNodeList != null && workNodeList.isEmpty()) { - log.error("推送失败，当前项目id:{}在TVS中不存在节点信息",req.getProjectId()); - throw new JeecgBootException("推送失败，当前项目id:"+req.getProjectId()+"在TVS中不存在节点信息"); + log.error("推送失败，当前项目id:{}在TVS中不存在节点信息",updateProjectVersionReq.getProjectId()); + throw new JeecgBootException("推送失败，当前项目id:"+updateProjectVersionReq.getProjectId()+"在TVS中不存在节点信息"); } for (PushLoadcaseReq req : loadcaseReqs) { log.info("workNodeList：{}",workNodeList); @@ -203,15 +203,15 @@ public class PushProjectThread implements Callable { } List performanceReqs = new ArrayList<>(); - if (!CollectionUtils.isEmpty(req.getAddPerformanceList())) { - for (LoadcasePerformanceBean performanceBean : req.getAddPerformanceList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getAddPerformanceList())) { + for (LoadcasePerformanceBean performanceBean : updateProjectVersionReq.getAddPerformanceList()) { PushPerformanceReq req = svsService.getPerformancePushInfo(performanceBean, version); req.setOperation("A"); performanceReqs.add(req); } } - if (!CollectionUtils.isEmpty(req.getUpdatePerformanceList())) { - for (LoadcasePerformanceBean performanceBean : req.getUpdatePerformanceList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getUpdatePerformanceList())) { + for (LoadcasePerformanceBean performanceBean : updateProjectVersionReq.getUpdatePerformanceList()) { PushPerformanceReq req = svsService.getPerformancePushInfo(performanceBean, version); req.setOperation("M"); performanceReqs.add(req); @@ -239,8 +239,8 @@ public class PushProjectThread implements Callable { } performanceReqs.clear(); - if (!CollectionUtils.isEmpty(req.getDelPerformanceList())) { - for (LoadcasePerformanceBean performanceBean : req.getDelPerformanceList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getDelPerformanceList())) { + for (LoadcasePerformanceBean performanceBean : updateProjectVersionReq.getDelPerformanceList()) { PushPerformanceReq req = svsService.getPerformancePushInfo(performanceBean, null); req.setOperation("R"); performanceReqs.add(req); @@ -268,8 +268,8 @@ public class PushProjectThread implements Callable { } loadcaseReqs.clear(); - if (!CollectionUtils.isEmpty(req.getDelLoadcaseList())) { - for (ProjectLoadcaseBean loadcaseBean : req.getDelLoadcaseList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getDelLoadcaseList())) { + for (ProjectLoadcaseBean loadcaseBean : updateProjectVersionReq.getDelLoadcaseList()) { PushLoadcaseReq req = svsService.getLoadcasePushInfo(loadcaseBean, version); req.setOperation("R"); loadcaseReqs.add(req); @@ -277,8 +277,8 @@ public class PushProjectThread implements Callable { } if (!CollectionUtils.isEmpty(loadcaseReqs)) { if (workNodeList != null && workNodeList.isEmpty()) { - log.error("推送失败，当前项目id:{}在TVS中不存在节点信息",req.getProjectId()); - throw new JeecgBootException("推送失败，当前项目id:"+req.getProjectId()+"在TVS中不存在节点信息"); + log.error("推送失败，当前项目id:{}在TVS中不存在节点信息",updateProjectVersionReq.getProjectId()); + throw new JeecgBootException("推送失败，当前项目id:"+updateProjectVersionReq.getProjectId()+"在TVS中不存在节点信息"); } List temReqs = new ArrayList<>(); int count = 0; @@ -313,15 +313,15 @@ public class PushProjectThread implements Callable { } componentAndDisciplineReqs.clear(); - if (!CollectionUtils.isEmpty(req.getDelDisciplineList())) { - for (ProjectDisciplineBean disciplineBean : req.getDelDisciplineList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getDelDisciplineList())) { + for (ProjectDisciplineBean disciplineBean : updateProjectVersionReq.getDelDisciplineList()) { PushComponentAndDisciplineReq req = svsService.getDisciplinePushInfo(disciplineBean, version); req.setOperation("R"); componentAndDisciplineReqs.add(req); } } - if (!CollectionUtils.isEmpty(req.getDelComponentList())) { - for (ProjectComponentBean componentBean : req.getDelComponentList()) { + if (!CollectionUtils.isEmpty(updateProjectVersionReq.getDelComponentList())) { + for (ProjectComponentBean componentBean : updateProjectVersionReq.getDelComponentList()) { PushComponentAndDisciplineReq req = svsService.getComponentPushInfo(componentBean, version); req.setOperation("R"); componentAndDisciplineReqs.add(req); diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/FilesUtil.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/FilesUtil.java index 0507833..28f024e 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/FilesUtil.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/FilesUtil.java @@ -1,5 +1,6 @@ package com.ccag.utils; +import cn.hutool.core.io.IORuntimeException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; @@ -90,7 +91,6 @@ public class FilesUtil { public static Vector getPathAllFiles(File file, Vector vector) { if (file.isFile()) { // 如果是文件，直接装载 -// log.info("在迭代函数中文件" + file.getName() + "大小为：" + file.length()); vector.add(file); } else { // 文件夹 @@ -163,7 +163,7 @@ public class FilesUtil { } } catch (IOException e) { log.error("zip files failed", e); - throw new RuntimeException(e); + throw new IORuntimeException(e); } // 不再需要finally块，所有资源会自动关闭 } @@ -204,14 +204,14 @@ public class FilesUtil { // 读文件 public static String readFileContent(String filePath, String newString) { - StringBuffer bufAll = new StringBuffer();// 保存修改过后的所有内容 + StringBuilder bufAll = new StringBuilder();// 保存修改过后的所有内容 boolean isChange = false; try(BufferedReader br = new BufferedReader( new InputStreamReader(new FileInputStream(filePath), StandardCharsets.UTF_8))) { String line = null; while ((line = br.readLine()) != null) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); // 修改内容 if (!isChange && line.startsWith("\t