diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java index 4ad2a72..b86ca5f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java @@ -113,7 +113,7 @@ public class GovProjectCollectionController { @GetMapping("/operation/draft-detail/{draftId}") @ApiOperation("运维项目归集草稿箱详情") - public GovBizProjectDetailVO operationDraftDetail(@PathVariable Long draftId) { + public GovOperationProjectDetailVO operationDraftDetail(@PathVariable Long draftId) { return collectionManage.operationDraftDetail(draftId); } @@ -127,7 +127,7 @@ public class GovProjectCollectionController { @PostMapping("/operation/draft") @ApiOperation("运维项目归集暂存草稿箱") @WebLog("运维项目归集暂存草稿箱") - public String operationDraft(@Valid @RequestBody GovBizProjectSaveDTO saveDTO) { + public String operationDraft(@Valid @RequestBody GovOperationProjectSaveDTO saveDTO) { return collectionManage.operationDraft(saveDTO,null); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java index 412d1ad..afec155 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java @@ -569,8 +569,8 @@ public class GovProjectCollectionManage { } - public GovBizProjectDetailVO operationDraftDetail(Long draftId) { - GovBizProjectDetailVO res = new GovBizProjectDetailVO(); + public GovOperationProjectDetailVO operationDraftDetail(Long draftId) { + GovOperationProjectDetailVO res = new GovOperationProjectDetailVO(); //查询草稿表 GovOperationProjectDraft draft = operationProjectDraftService.getById(draftId); @@ -582,7 +582,7 @@ public class GovProjectCollectionManage { //1.基本信息 res.setBaseProjId(draft.getBaseProjId()); res.setBaseProjName(draft.getBaseProjName()); - res.setBaseinfo(BeanUtil.copyProperties(draft, GovBizProjectBaseinfoVO.class)); + res.setBaseinfo(BeanUtil.copyProperties(draft, GovOperationProjectBaseinfoVO.class)); //2.申报信息 res.setApply(BeanUtil.copyProperties(draft, GovBizProjectApplyVO.class)); @@ -1163,7 +1163,7 @@ public class GovProjectCollectionManage { return BizConst.SAVE_SUCCESS; } - public String operationDraft(GovBizProjectSaveDTO saveDTO, UserInfoDetails user) { + public String operationDraft(GovOperationProjectSaveDTO saveDTO, UserInfoDetails user) { if(Objects.isNull(user)){ user = LoginUserUtil.loginUserDetail(); } @@ -1184,7 +1184,7 @@ public class GovProjectCollectionManage { } //1.保存基本信息 - GovBizProjectBaseinfoDTO base = saveDTO.getBaseinfo(); + GovOperationProjectBaseinfoDTO base = saveDTO.getBaseinfo(); String baseProjId = base.getBaseProjId(); String baseProjName = base.getBaseProjName(); //要生成 草稿的项目编号 diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/cpu/CPUTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/cpu/CPUTest.java new file mode 100644 index 0000000..c5a991a --- /dev/null +++ b/pmapi/src/test/java/com/ningdatech/pmapi/cpu/CPUTest.java @@ -0,0 +1,29 @@ +package com.ningdatech.pmapi.cpu; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +public class CPUTest { + public static ExecutorService executorService = Executors.newFixedThreadPool(10); + + public static void main(String[] args) { + for(int i = 0;i < 10;i++){ + executorService.execute(() -> { + while (true) { + // 一个复杂的计算任务 + long x = 123456789123456789L; + for (int j = 0; j < 10000; j++) { + x = (x * 123456789123456789L) % 123456789; + } + } + }); + } + + try{ + Thread.sleep(10000); + executorService.shutdownNow(); + }catch (Exception e){ + e.printStackTrace(); + } + } +} \ No newline at end of file