lidongyang/tvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
gulongcheng
2025-10-31 10:38:50 +08:00
parent a57454d5b3
commit efbca7d58b
3 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/SystemController.java
View File

@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Slf4j
@RestController
@Tag(name = "系统相关接口")
@@ -30,7 +33,7 @@ public class SystemController {
* @return SpdmResponse
*/
@PostMapping("/addKeyValue")
public SdmResponse addKeyValue(@RequestBody @Validated AddKeyValueReq req) {
public SdmResponse<Void> addKeyValue(@RequestBody @Validated AddKeyValueReq req) {
return systemService.addKeyValue(req);
}
@@ -42,7 +45,7 @@ public class SystemController {
*/
@PostMapping("/addApprove")
@Operation(summary = "添加系统评审")
public SdmResponse addApprove(@RequestBody @Validated AddApproveReq req) {
public SdmResponse<Long> addApprove(@RequestBody @Validated AddApproveReq req) {
return systemService.addApprove(req);
}
@@ -53,7 +56,7 @@ public class SystemController {
* @return SpdmResponse
*/
@PostMapping("/batchAddKeyValue")
public SdmResponse batchAddKeyValue(@RequestBody @Validated BatchAddKeyValueReq req) {
public SdmResponse<Void> batchAddKeyValue(@RequestBody @Validated BatchAddKeyValueReq req) {
return systemService.batchAddKeyValue(req);
}
@@ -64,7 +67,7 @@ public class SystemController {
* @return
*/
@PostMapping("/delAllKeyValue")
public SdmResponse delAllKeyValue(@RequestBody @Validated DelAllKeyValueReq req) {
public SdmResponse<Void> delAllKeyValue(@RequestBody @Validated DelAllKeyValueReq req) {
return systemService.delAllKeyValue(req);
}
@@ -76,7 +79,7 @@ public class SystemController {
*/
@PostMapping("/delApprove")
@Operation(summary = "删除评审")
public SdmResponse deleteApprove(@RequestBody @Validated DeleteApproveReq req) {
public SdmResponse<Void> deleteApprove(@RequestBody @Validated DeleteApproveReq req) {
return systemService.delApprove(req);
}
@@ -87,7 +90,7 @@ public class SystemController {
* @return
*/
@PostMapping("/delKeyValue")
public SdmResponse delKeyValue(@RequestBody @Validated DelKeyValueReq req) {
public SdmResponse<Void> delKeyValue(@RequestBody @Validated DelKeyValueReq req) {
return systemService.delKeyValue(req);
}
@@ -99,7 +102,7 @@ public class SystemController {
*/
@PostMapping("/delNotice")
@Operation(summary = "删除系统通知")
public SdmResponse delNotice(@RequestBody @Validated DelSystemNoticeReq req) {
public SdmResponse<Void> delNotice(@RequestBody @Validated DelSystemNoticeReq req) {
return systemService.delNotice(req);
}
@@ -111,7 +114,7 @@ public class SystemController {
*/
@PostMapping("/getAllApprove")
@Operation(summary = "获取系统所有评审信息")
public SdmResponse getAllApprove(@RequestBody @Validated GetAllApproveReq req) {
public SdmResponse<JSONObject> getAllApprove(@RequestBody @Validated GetAllApproveReq req) {
return systemService.getAllApprove(req);
}
@@ -123,7 +126,7 @@ public class SystemController {
*/
@PostMapping("/getApproveSuggests")
@Operation(summary = "获取某个评审的评审信息")
public SdmResponse getApproveSuggests(@RequestBody @Validated GetApproveSuggestsReq req) {
public SdmResponse<JSONObject> getApproveSuggests(@RequestBody @Validated GetApproveSuggestsReq req) {
return systemService.getApproveSuggests(req);
}
@@ -135,7 +138,7 @@ public class SystemController {
*/
@PostMapping("/getMyHistoryApproveSuggest")
@Operation(summary = "获取历史评审纪录")
public SdmResponse getMyHistoryApproveSuggest(@RequestBody @Validated GetMyHistoryApproveSuggestReq req) {
public SdmResponse<JSONObject> getMyHistoryApproveSuggest(@RequestBody @Validated GetMyHistoryApproveSuggestReq req) {
return systemService.getMyHistoryApproveSuggest(req);
}
@@ -147,7 +150,7 @@ public class SystemController {
*/
@PostMapping("/getMyLaunchApprove")
@Operation(summary = "获取我发起的评审信息")
public SdmResponse getMyLaunchApprove(@RequestBody @Validated GetMyLaunchApproveReq req) {
public SdmResponse<JSONObject> getMyLaunchApprove(@RequestBody @Validated GetMyLaunchApproveReq req) {
return systemService.getMyLaunchApprove(req);
}
@@ -159,7 +162,7 @@ public class SystemController {
*/
@PostMapping("/getMyProcessingApproveSuggest")
@Operation(summary = "获取待我处理的评审信息")
public SdmResponse getMyProcessingApproveSuggest(@RequestBody @Validated GetMyProcessingApproveSuggestReq req) {
public SdmResponse<JSONObject> getMyProcessingApproveSuggest(@RequestBody @Validated GetMyProcessingApproveSuggestReq req) {
return systemService.getMyProcessingApproveSuggest(req);
}
@@ -171,7 +174,7 @@ public class SystemController {
*/
@PostMapping("/queryHistorySystemNotice")
@Operation(summary = "获取用户历史通知")
public SdmResponse queryHistorySystemNotice(@RequestBody @Validated QueryHistorySystemNoticeReq req) {
public SdmResponse<JSONObject> queryHistorySystemNotice(@RequestBody @Validated QueryHistorySystemNoticeReq req) {
return systemService.queryHistorySystemNotice(req);
}
@@ -182,7 +185,7 @@ public class SystemController {
* @return
*/
@PostMapping("/queryKeyParams")
public SdmResponse queryKeyParams(@RequestBody @Validated QueryKeyParamsReq req) {
public SdmResponse<JSONObject> queryKeyParams(@RequestBody @Validated QueryKeyParamsReq req) {
return systemService.queryKeyParams(req);
}
@@ -194,7 +197,7 @@ public class SystemController {
*/
@PostMapping("/queryNotice")
@Operation(summary = "获取用户系统通知信息")
public SdmResponse queryNotice(@RequestBody @Validated QuerySystemNoticeReq req) {
public SdmResponse<JSONObject> queryNotice(@RequestBody @Validated QuerySystemNoticeReq req) {
return systemService.queryNotice(req);
}
@@ -206,7 +209,7 @@ public class SystemController {
*/
@PostMapping("/updateApproveSuggestStatus")
@Operation(summary = "更新评审意见状态")
public SdmResponse updateApproveSuggestStatus(@RequestBody @Validated UpdateApproveSuggestStatusReq req) {
public SdmResponse<Void> updateApproveSuggestStatus(@RequestBody @Validated UpdateApproveSuggestStatusReq req) {
return systemService.updateApproveSuggestStatus(req);
}
@@ -218,7 +221,7 @@ public class SystemController {
*/
@PostMapping("/updateApproveStatus")
@Operation(summary = "更新评审状态")
public SdmResponse updateApproveStatus(@RequestBody @Validated UpdateSystemApproveStatusReq req) {
public SdmResponse<Void> updateApproveStatus(@RequestBody @Validated UpdateSystemApproveStatusReq req) {
return systemService.updateApproveStatus(req);
}
@@ -230,7 +233,7 @@ public class SystemController {
*/
@PostMapping("/updateNoticeStatus")
@Operation(summary = "更新系统通知状态")
public SdmResponse updateNoticeStatus(@RequestBody @Validated UpdateSystemNoticeStatusReq req) {
public SdmResponse<Void> updateNoticeStatus(@RequestBody @Validated UpdateSystemNoticeStatusReq req) {
return systemService.updateNoticeStatus(req);
}
@@ -242,7 +245,7 @@ public class SystemController {
*/
@PostMapping("/delLoadcasePool")
@Operation(summary = "删除系统loadcase库")
public SdmResponse delLoadcasePool(@RequestBody @Validated DelSystemLoadcasePoolReq req) {
public SdmResponse<Void> delLoadcasePool(@RequestBody @Validated DelSystemLoadcasePoolReq req) {
return systemService.delLoadcasePool(req);
}
@@ -254,7 +257,7 @@ public class SystemController {
*/
@PostMapping("/queryLoadcasePool")
@Operation(summary = "查询系统loadcase库名称")
public SdmResponse queryLoadcasePool(@RequestBody @Validated QuerySystemLoadcasePoolReq req) {
public SdmResponse<List<Map>> queryLoadcasePool(@RequestBody @Validated QuerySystemLoadcasePoolReq req) {
return systemService.queryLoadcasePool(req);
}
@@ -266,7 +269,7 @@ public class SystemController {
*/
@PostMapping("/queryLoadcasePoolContent")
@Operation(summary = "查询系统loadcase库详情")
public SdmResponse queryLoadcasePoolContent(@RequestBody @Validated QueryLoadcasePoolContentReq req) {
public SdmResponse<List<JSONObject>> queryLoadcasePoolContent(@RequestBody @Validated QueryLoadcasePoolContentReq req) {
return SdmResponse.success(systemService.queryLoadcasePoolContent(req));
}
@@ -278,13 +281,13 @@ public class SystemController {
*/
@PostMapping("/queryLoadcasePoolAllLoadcase")
@Operation(summary = "查询系统库所有loadcase")
public SdmResponse queryLoadcasePoolAllLoadcase(@RequestBody @Validated QueryLoadcasePoolAllLoadcaseReq req) {
public SdmResponse<List<com.ccag.entity.pojo.system.SystemLoadcaseBean>> queryLoadcasePoolAllLoadcase(@RequestBody @Validated QueryLoadcasePoolAllLoadcaseReq req) {
return systemService.queryLoadcasePoolAllLoadcase(req);
}
@PostMapping("/queryLoadcasePerformance")
@Operation(summary = "查询loadcase性能指标")
public SdmResponse queryLoadcasePerformance(@RequestBody @Validated QueryLoadcasePerformanceReq req){
public SdmResponse<List<com.ccag.entity.pojo.system.SystemLoadcasePerformanceBean>> queryLoadcasePerformance(@RequestBody @Validated QueryLoadcasePerformanceReq req){
return systemService.queryLoadcasePerformance(req);
}
@@ -295,7 +298,7 @@ public class SystemController {
*/
@PostMapping ("/delKnowledgeLibraryRecord")
@Operation(summary = "删除知识库记录")
public SdmResponse delKnowledgeLibraryRecord(@RequestBody @Validated JSONObject json) {
public SdmResponse<Void> delKnowledgeLibraryRecord(@RequestBody @Validated JSONObject json) {
return systemService.delKnowledgeLibraryRecord(json.getLong("recordId"));
}
@@ -308,7 +311,7 @@ public class SystemController {
@IgnoreAuth
@PostMapping("/getKnowledgeLibraryRecordList")
@Operation(summary = "查询知识库记录列表（对外）")
public SdmResponse getKnowledgeLibraryRecordList(@RequestBody @Validated GetKnowledgeLibraryRecordListReq req) {
public SdmResponse<JSONObject> getKnowledgeLibraryRecordList(@RequestBody @Validated GetKnowledgeLibraryRecordListReq req) {
log.info("查询知识库记录列表getKnowledgeLibraryRecordList param:" + JSONObject.toJSONString(req));
return systemService.getKnowledgeLibraryRecordList(req);
}
@@ -321,7 +324,7 @@ public class SystemController {
*/
@PostMapping("/getKnowledgeLibraryRecord")
@Operation(summary = "查询知识库记录列表（对内）")
public SdmResponse getKnowledgeLibraryRecord(@RequestBody @Validated GetKnowledgeLibraryRecordListReq req) {
public SdmResponse<JSONObject> getKnowledgeLibraryRecord(@RequestBody @Validated GetKnowledgeLibraryRecordListReq req) {
return systemService.getKnowledgeLibraryRecordList(req);
}
@@ -332,7 +335,7 @@ public class SystemController {
*/
@GetMapping("/getKnowledgeLibraryRecordVersion")
@Operation(summary = "查询知识库记录版本列表")
public SdmResponse getKnowledgeLibraryRecordVersion(@RequestParam("code") String code) {
public SdmResponse<List<com.ccag.entity.pojo.system.KnowledgeLibraryRecord>> getKnowledgeLibraryRecordVersion(@RequestParam("code") String code) {
return systemService.getKnowledgeLibraryRecordVersion(code);
}
@@ -345,7 +348,7 @@ public class SystemController {
@IgnoreAuth
@PostMapping("/pushSimulationMap")
@Operation(summary = "推送仿真地图")
public SdmResponse pushSimulationMap(@RequestBody @Validated PushSimulationMapReq req) {
public SdmResponse<Void> pushSimulationMap(@RequestBody @Validated PushSimulationMapReq req) {
return systemService.pushSimulationMap(req);
}
@@ -357,7 +360,7 @@ public class SystemController {
*/
@PostMapping("/addInputFormTemplate")
@Operation(summary = "新增输入表单模版")
public SdmResponse addInputFormTemplate(@RequestBody @Validated AddInputFormTemplateReq req) {
public SdmResponse<Void> addInputFormTemplate(@RequestBody @Validated AddInputFormTemplateReq req) {
return systemService.addInputFormTemplate(req);
}
@@ -369,7 +372,7 @@ public class SystemController {
*/
@PostMapping("/updateInputFormTemplate")
@Operation(summary = "更新输入表单模版")
public SdmResponse updateInputFormTemplate(@RequestBody @Validated UpdateInputFormTemplateReq req) {
public SdmResponse<Void> updateInputFormTemplate(@RequestBody @Validated UpdateInputFormTemplateReq req) {
return systemService.updateInputFormTemplate(req);
}
@@ -381,7 +384,7 @@ public class SystemController {
*/
@PostMapping("/delInputFormTemplate")
@Operation(summary = "删除输入表单模版")
public SdmResponse delInputFormTemplate(@RequestBody @Validated DelInputFormTemplateReq req) {
public SdmResponse<Void> delInputFormTemplate(@RequestBody @Validated DelInputFormTemplateReq req) {
return systemService.delInputFormTemplate(req);
}
@@ -393,7 +396,7 @@ public class SystemController {
*/
@PostMapping("/getInputFormTemplateList")
@Operation(summary = "获取输入表单模版列表")
public SdmResponse getInputFormTemplateList(@RequestBody @Validated GetInputFormTemplateListReq req) {
public SdmResponse<JSONObject> getInputFormTemplateList(@RequestBody @Validated GetInputFormTemplateListReq req) {
return systemService.getInputFormTemplateList(req);
}
@@ -405,7 +408,7 @@ public class SystemController {
*/
@GetMapping("/getInputFormTemplate")
@Operation(summary = "获取输入表单模版")
public SdmResponse getInputFormTemplate(@RequestParam("id") long id, @RequestParam("type") @Parameter(description = "0输入表单模版id，1输入表单id") int type) {
public SdmResponse<JSONObject> getInputFormTemplate(@RequestParam("id") long id, @RequestParam("type") @Parameter(description = "0输入表单模版id，1输入表单id") int type) {
return systemService.getInputFormTemplate(id, type);
}
}
}

64
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/SystemService.java
View File

@@ -11,41 +11,41 @@ import java.util.List;
@Service
public interface SystemService {
SdmResponse addKeyValue(AddKeyValueReq req);
SdmResponse<Void> addKeyValue(AddKeyValueReq req);
SdmResponse addApprove(AddApproveReq req);
SdmResponse<Long> addApprove(AddApproveReq req);
SdmResponse batchAddKeyValue(BatchAddKeyValueReq req);
SdmResponse<Void> batchAddKeyValue(BatchAddKeyValueReq req);
SdmResponse delAllKeyValue(DelAllKeyValueReq req);
SdmResponse<Void> delAllKeyValue(DelAllKeyValueReq req);
SdmResponse delApprove(DeleteApproveReq req);
SdmResponse<Void> delApprove(DeleteApproveReq req);
SdmResponse delKeyValue(DelKeyValueReq req);
SdmResponse<Void> delKeyValue(DelKeyValueReq req);
SdmResponse delNotice(DelSystemNoticeReq req);
SdmResponse<Void> delNotice(DelSystemNoticeReq req);
SdmResponse getAllApprove(GetAllApproveReq req);
SdmResponse<JSONObject> getAllApprove(GetAllApproveReq req);
SdmResponse getApproveSuggests(GetApproveSuggestsReq req);
SdmResponse<JSONObject> getApproveSuggests(GetApproveSuggestsReq req);
SdmResponse getMyHistoryApproveSuggest(GetMyHistoryApproveSuggestReq req);
SdmResponse<JSONObject> getMyHistoryApproveSuggest(GetMyHistoryApproveSuggestReq req);
SdmResponse getMyLaunchApprove(GetMyLaunchApproveReq req);
SdmResponse<JSONObject> getMyLaunchApprove(GetMyLaunchApproveReq req);
SdmResponse getMyProcessingApproveSuggest(GetMyProcessingApproveSuggestReq req);
SdmResponse<JSONObject> getMyProcessingApproveSuggest(GetMyProcessingApproveSuggestReq req);
SdmResponse queryHistorySystemNotice(QueryHistorySystemNoticeReq req);
SdmResponse<JSONObject> queryHistorySystemNotice(QueryHistorySystemNoticeReq req);
SdmResponse queryKeyParams(QueryKeyParamsReq req);
SdmResponse<JSONObject> queryKeyParams(QueryKeyParamsReq req);
SdmResponse queryNotice(QuerySystemNoticeReq req);
SdmResponse<JSONObject> queryNotice(QuerySystemNoticeReq req);
SdmResponse updateApproveSuggestStatus(UpdateApproveSuggestStatusReq req);
SdmResponse<Void> updateApproveSuggestStatus(UpdateApproveSuggestStatusReq req);
SdmResponse updateApproveStatus(UpdateSystemApproveStatusReq req);
SdmResponse<Void> updateApproveStatus(UpdateSystemApproveStatusReq req);
SdmResponse updateNoticeStatus(UpdateSystemNoticeStatusReq req);
SdmResponse<Void> updateNoticeStatus(UpdateSystemNoticeStatusReq req);
int delSystemNotice(long noticeId);
@@ -67,33 +67,33 @@ public interface SystemService {
int delSystemProjectAssignNotice(String acceptor, String projectName);
SdmResponse delLoadcasePool(DelSystemLoadcasePoolReq req);
SdmResponse<Void> delLoadcasePool(DelSystemLoadcasePoolReq req);
SdmResponse queryLoadcasePool(QuerySystemLoadcasePoolReq req);
SdmResponse<List<java.util.Map>> queryLoadcasePool(QuerySystemLoadcasePoolReq req);
List<JSONObject> queryLoadcasePoolContent(QueryLoadcasePoolContentReq req);
SdmResponse queryLoadcasePoolAllLoadcase(QueryLoadcasePoolAllLoadcaseReq req);
SdmResponse<List<com.ccag.entity.pojo.system.SystemLoadcaseBean>> queryLoadcasePoolAllLoadcase(QueryLoadcasePoolAllLoadcaseReq req);
List<JSONObject> getLibraryFileList(String fileStr);
SdmResponse queryLoadcasePerformance(QueryLoadcasePerformanceReq req);
SdmResponse<List<com.ccag.entity.pojo.system.SystemLoadcasePerformanceBean>> queryLoadcasePerformance(QueryLoadcasePerformanceReq req);
SdmResponse delKnowledgeLibraryRecord(long recordId);
SdmResponse<Void> delKnowledgeLibraryRecord(long recordId);
SdmResponse getKnowledgeLibraryRecordList(GetKnowledgeLibraryRecordListReq req);
SdmResponse<JSONObject> getKnowledgeLibraryRecordList(GetKnowledgeLibraryRecordListReq req);
SdmResponse getKnowledgeLibraryRecordVersion(String code);
SdmResponse<List<com.ccag.entity.pojo.system.KnowledgeLibraryRecord>> getKnowledgeLibraryRecordVersion(String code);
SdmResponse pushSimulationMap(PushSimulationMapReq req);
SdmResponse<Void> pushSimulationMap(PushSimulationMapReq req);
SdmResponse addInputFormTemplate(AddInputFormTemplateReq req);
SdmResponse<Void> addInputFormTemplate(AddInputFormTemplateReq req);
SdmResponse updateInputFormTemplate(UpdateInputFormTemplateReq req);
SdmResponse<Void> updateInputFormTemplate(UpdateInputFormTemplateReq req);
SdmResponse delInputFormTemplate(DelInputFormTemplateReq req);
SdmResponse<Void> delInputFormTemplate(DelInputFormTemplateReq req);
SdmResponse getInputFormTemplateList(GetInputFormTemplateListReq req);
SdmResponse<JSONObject> getInputFormTemplateList(GetInputFormTemplateListReq req);
SdmResponse getInputFormTemplate(long id, int type);
}
SdmResponse<JSONObject> getInputFormTemplate(long id, int type);
}

71
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/SystemServiceImpl.java
View File

@@ -17,7 +17,6 @@ import com.ccag.knowledgeservice.KbManagementClientService;
import com.ccag.knowledgeservice.KbProjectLibraryGrpcService;
import com.ccag.knowledgeservice.entity.KbMenuFileManagement;
import com.ccag.knowledgeservice.entity.KbProjectLibrary;
import com.ccag.knowledgeservice.entity.KbProjectLibraryWork;
import com.ccag.messageService.MsgInfoGrpcService;
import com.ccag.service.*;
import com.ccag.service.remote.PlmService;
@@ -38,8 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
@@ -107,7 +104,7 @@ public class SystemServiceImpl implements SystemService {
private static final String TIME_FULL = "yyyy-MM-dd HH:mm:ss";
@Override
public SdmResponse addKeyValue(AddKeyValueReq req) {
public SdmResponse<Void> addKeyValue(AddKeyValueReq req) {
String strKey = req.getKeyValue();
String strValue1 = req.getValues1();
String strValue2 = req.getValues2();
@@ -125,7 +122,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse addApprove(AddApproveReq req) {
public SdmResponse<Long> addApprove(AddApproveReq req) {
// if (req.getType() == 1 && StringUtils.isBlank(req.getVersionName())) {
// return SdmResponse.failed("版本名称不能为空");
// }
@@ -140,7 +137,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse batchAddKeyValue(BatchAddKeyValueReq req) {
public SdmResponse<Void> batchAddKeyValue(BatchAddKeyValueReq req) {
int result;
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
StringBuilder batchKeys = new StringBuilder();
@@ -179,7 +176,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse delAllKeyValue(DelAllKeyValueReq req) {
public SdmResponse<Void> delAllKeyValue(DelAllKeyValueReq req) {
log.info(ThreadLocalContext.getIdCode() + " delAllKeyValue");
int result;
String strKey = req.getConfigKey();
@@ -188,28 +185,28 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse delApprove(DeleteApproveReq req) {
public SdmResponse<Void> delApprove(DeleteApproveReq req) {
log.info(ThreadLocalContext.getIdCode() + " delApprove");
int result = deleteApprove(req.getApproveId());
return SdmResponse.validResult(result, Constant.DEL_APPROVAL_SUCCESS);
}
@Override
public SdmResponse delKeyValue(DelKeyValueReq req) {
public SdmResponse<Void> delKeyValue(DelKeyValueReq req) {
log.info(ThreadLocalContext.getIdCode() + " delKeyValue");
int result = deleteKeyValueParam(req.getHashCode());
return SdmResponse.validResult(result, Constant.KEYVALUE_DEL_SUCCESS);
}
@Override
public SdmResponse delNotice(DelSystemNoticeReq req) {
public SdmResponse<Void> delNotice(DelSystemNoticeReq req) {
log.info(ThreadLocalContext.getIdCode() + " delNotice");
int result = delSystemNotice(req.getId());
return SdmResponse.validResult(result, Constant.DEL_SYSTEM_NOTICE_SUCCESS);
}
@Override
public SdmResponse getAllApprove(GetAllApproveReq req) {
public SdmResponse<JSONObject> getAllApprove(GetAllApproveReq req) {
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
List<SystemApprovalBean> systemApproves = systemMapper.getAllApprove((req.getPageNum() - 1) * req.getPageSize(), req.getPageSize(), req.getType(), company);
int count = getAllApproveCount(req.getType());
@@ -220,31 +217,31 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse getApproveSuggests(GetApproveSuggestsReq req) {
public SdmResponse<JSONObject> getApproveSuggests(GetApproveSuggestsReq req) {
JSONObject jsonObject = getApproveSuggests(req.getApproveId());
return SdmResponse.success(jsonObject);
}
@Override
public SdmResponse getMyHistoryApproveSuggest(GetMyHistoryApproveSuggestReq req) {
public SdmResponse<JSONObject> getMyHistoryApproveSuggest(GetMyHistoryApproveSuggestReq req) {
JSONObject jsonObject = getMyHistoryApproveSuggest((req.getPageNum() - 1) * req.getPageSize(), req.getPageSize(), req.getType());
return SdmResponse.success(jsonObject);
}
@Override
public SdmResponse getMyLaunchApprove(GetMyLaunchApproveReq req) {
public SdmResponse<JSONObject> getMyLaunchApprove(GetMyLaunchApproveReq req) {
JSONObject jsonObject = getMyLaunchApprove((req.getPageNum() - 1) * req.getPageSize(), req.getPageSize(), req.getType());
return SdmResponse.success(jsonObject);
}
@Override
public SdmResponse getMyProcessingApproveSuggest(GetMyProcessingApproveSuggestReq req) {
public SdmResponse<JSONObject> getMyProcessingApproveSuggest(GetMyProcessingApproveSuggestReq req) {
JSONObject jsonObject = getMyProcessingApproveSuggest((req.getPageNum() - 1) * req.getPageSize(), req.getPageSize(), req.getType());
return SdmResponse.success(jsonObject);
}
@Override
public SdmResponse queryHistorySystemNotice(QueryHistorySystemNoticeReq req) {
public SdmResponse<JSONObject> queryHistorySystemNotice(QueryHistorySystemNoticeReq req) {
JSONObject jsonObject = new JSONObject();
int count = getHistoryCountByStatus(req.getStatus(), req.getType());
jsonObject.put(TOTAL, count);
@@ -254,7 +251,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse queryKeyParams(QueryKeyParamsReq req) {
public SdmResponse<JSONObject> queryKeyParams(QueryKeyParamsReq req) {
String strKey = req.getConfigKey();
List<KeyValueParam> results = queryKeyParams(strKey);
int pageSize = req.getPageSize();
@@ -267,7 +264,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse queryNotice(QuerySystemNoticeReq req) {
public SdmResponse<JSONObject> queryNotice(QuerySystemNoticeReq req) {
String loginIdCode = ThreadLocalContext.getIdCode();
int pos = (req.getPageNum() - 1) * req.getPageSize();
List<SystemNoticeBean> noticeBeans = getSystemNotice(req.getType(), pos, req.getPageSize());
@@ -279,14 +276,14 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse updateApproveSuggestStatus(UpdateApproveSuggestStatusReq req) {
public SdmResponse<Void> updateApproveSuggestStatus(UpdateApproveSuggestStatusReq req) {
String strIdentity = req.getIdCode();
String strSuggest = req.getSuggestion();
return updateApproveSuggestStatus(req.getApproveId(), strIdentity, req.getStatus(), req.getApproveResult(), strSuggest);
}
@Override
public SdmResponse updateApproveStatus(UpdateSystemApproveStatusReq req) {
public SdmResponse<Void> updateApproveStatus(UpdateSystemApproveStatusReq req) {
return updateApproveStatus(req.getApproveId(), req.getStatus(), req.getApproveResult());
}
@@ -298,7 +295,7 @@ public class SystemServiceImpl implements SystemService {
// }
@Override
public SdmResponse updateNoticeStatus(UpdateSystemNoticeStatusReq req) {
public SdmResponse<Void> updateNoticeStatus(UpdateSystemNoticeStatusReq req) {
SimpleDateFormat dateFormat = new SimpleDateFormat(TIME_FULL);
Date now = new Date();
String handleTime = dateFormat.format(now);
@@ -679,7 +676,7 @@ public class SystemServiceImpl implements SystemService {
* @param approveId
* @return
*/
private SdmResponse approvePostprocess(long approveId, int status, int approveResult) {
private SdmResponse<Void> approvePostprocess(long approveId, int status, int approveResult) {
log.info("进入评审");
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
// status 1:评审中 2：评审结束 3：评审撤销 4:评审结果已发布
@@ -776,7 +773,7 @@ public class SystemServiceImpl implements SystemService {
* @param approveResult
* @return
*/
public SdmResponse updateApproveStatus(long approveId, byte status, byte approveResult) {
public SdmResponse<Void> updateApproveStatus(long approveId, byte status, byte approveResult) {
// int result = Constant.UPDATE_APPROVAL_STATUS_SUCCESS;
SimpleDateFormat df = new SimpleDateFormat(TIME_FULL);
String submitTime = df.format(new Date());
@@ -798,7 +795,7 @@ public class SystemServiceImpl implements SystemService {
* @param status
* @return
*/
public SdmResponse updateApproveSuggestStatus(long approveId, String identity, byte status, byte approveResult, String suggest) {
public SdmResponse<Void> updateApproveSuggestStatus(long approveId, String identity, byte status, byte approveResult, String suggest) {
// int result = Constant.UPDATE_APPROVAL_SUGGEST_STATUS_SUCCESS;
SimpleDateFormat df = new SimpleDateFormat(TIME_FULL);
String submitTime = df.format(new Date());
@@ -1098,7 +1095,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse delLoadcasePool(DelSystemLoadcasePoolReq req) {
public SdmResponse<Void> delLoadcasePool(DelSystemLoadcasePoolReq req) {
log.info(ThreadLocalContext.getIdCode() + " delLoadcasePool");
int result;
String strPoolName = req.getPoolName();
@@ -1130,7 +1127,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse queryLoadcasePool(QuerySystemLoadcasePoolReq req) {
public SdmResponse<List<Map>> queryLoadcasePool(QuerySystemLoadcasePoolReq req) {
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
List<Map> pools = systemMapper.getSystemLoadcasePoolNames(company);
return SdmResponse.success(pools);
@@ -1298,7 +1295,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse queryLoadcasePoolAllLoadcase(QueryLoadcasePoolAllLoadcaseReq req) {
public SdmResponse<List<SystemLoadcaseBean>> queryLoadcasePoolAllLoadcase(QueryLoadcasePoolAllLoadcaseReq req) {
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
List<String> versions = systemMapper.getSystemPoolVersion(req.getPoolName(), company);
int maxBigVersion = 0;
@@ -1355,14 +1352,14 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse queryLoadcasePerformance(QueryLoadcasePerformanceReq req) {
public SdmResponse<List<SystemLoadcasePerformanceBean>> queryLoadcasePerformance(QueryLoadcasePerformanceReq req) {
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
String loadcasePoolName = req.getLoadcasePoolName();
List<SystemLoadcasePerformanceBean> slpList = systemMapper.getSystemLoadcasePerformance(loadcasePoolName, company);
return SdmResponse.success(slpList);
}
@Override
public SdmResponse delKnowledgeLibraryRecord(long recordId) {
public SdmResponse<Void> delKnowledgeLibraryRecord(long recordId) {
KnowledgeLibraryRecord record = systemMapper.getKnowledgeLibraryRecordById(recordId);
if (ObjectUtils.isEmpty(record)) {
return SdmResponse.failed("记录不存在");
@@ -1379,7 +1376,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse getKnowledgeLibraryRecordList(GetKnowledgeLibraryRecordListReq req) {
public SdmResponse<JSONObject> getKnowledgeLibraryRecordList(GetKnowledgeLibraryRecordListReq req) {
String company = req.getTenantId();
int pos = (req.getPageNum() - 1) * req.getPageSize();
List<String> tags = StringUtils.isBlank(req.getTag()) ? null : List.of(req.getTag().split(","));
@@ -1506,7 +1503,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse getKnowledgeLibraryRecordVersion(String code) {
public SdmResponse<List<KnowledgeLibraryRecord>> getKnowledgeLibraryRecordVersion(String code) {
List<KnowledgeLibraryRecord> records = systemMapper.getKnowledgeLibraryRecordByCode(code, null);
if (CollectionUtils.isEmpty(records)) {
return SdmResponse.success(records);
@@ -1517,7 +1514,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse pushSimulationMap(PushSimulationMapReq req) {
public SdmResponse<Void> pushSimulationMap(PushSimulationMapReq req) {
String url = svsProperties.getUrl() + svsProperties.getPushSimulationMap();
JSONObject param = new JSONObject();
param.put("poolName", req.getPoolName());
@@ -1563,7 +1560,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse addInputFormTemplate(AddInputFormTemplateReq req) {
public SdmResponse<Void> addInputFormTemplate(AddInputFormTemplateReq req) {
InputFormTemplate formTemplate = req.getFormTemplate();
systemMapper.addInputFormTemplate(formTemplate);
List<InputDataTemplate> dataTemplates = req.getDataTemplates();
@@ -1580,7 +1577,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse updateInputFormTemplate(UpdateInputFormTemplateReq req) {
public SdmResponse<Void> updateInputFormTemplate(UpdateInputFormTemplateReq req) {
InputFormTemplate formTemplate = req.getFormTemplate();
InputFormTemplate oldTemplate = systemMapper.getInputFormTemplate(formTemplate.getId());
if (oldTemplate == null) {
@@ -1606,13 +1603,13 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse delInputFormTemplate(DelInputFormTemplateReq req) {
public SdmResponse<Void> delInputFormTemplate(DelInputFormTemplateReq req) {
systemMapper.delInputFormTemplate(req.getFormTemplateId());
return SdmResponse.success();
}
@Override
public SdmResponse getInputFormTemplateList(GetInputFormTemplateListReq req) {
public SdmResponse<JSONObject> getInputFormTemplateList(GetInputFormTemplateListReq req) {
int pos = (req.getPageNum() - 1) * req.getPageSize();
int limit = req.getPageSize();
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
@@ -1646,7 +1643,7 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse getInputFormTemplate(long id, int type) {
public SdmResponse<JSONObject> getInputFormTemplate(long id, int type) {
InputFormTemplate formTemplate;
// 0输入表单模板id，1输入表单id
if (type == 0) {