From d1e3a87aad6f737394b33852d9496d673472ddbe Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期二, 16 五月 2023 18:19:17 +0800 Subject: [PATCH] 主要完成修改Class统一命名,与老平台命名一致,删除多余VOClass等。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java | 82 +++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 40 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java similarity index 68% rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java index 53c4684..9cea828 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java @@ -19,14 +19,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.vci.ubcs.code.dto.CodeClstemplateDTO; -import com.vci.ubcs.code.entity.CodeClstemplateEntity; +import com.vci.ubcs.code.dto.CodeClassifyTemplateDTO; +import com.vci.ubcs.code.entity.CodeClassifyTemplate; import com.vci.ubcs.code.enumpack.CodeClassifyTemplateLC; -import com.vci.ubcs.code.mapper.CodeClstemplateMapper; +import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper; import com.vci.ubcs.code.service.ICodeClstemplateService; -import com.vci.ubcs.code.vo.CodeClstemplateVO; +import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO; import com.vci.ubcs.starter.revision.model.TreeQueryObject; -import com.vci.ubcs.code.wrapper.PlCodeClstemplateWrapper; +import com.vci.ubcs.code.wrapper.CodeClassifyTemplateWrapper; +import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; +import com.vci.ubcs.starter.web.pagemodel.DataGrid; import com.vci.ubcs.starter.web.pagemodel.Tree; import com.vci.ubcs.starter.web.util.VciBaseUtil; import io.swagger.annotations.Api; @@ -52,13 +54,13 @@ */ @RestController @AllArgsConstructor -@RequestMapping("/codeClstemplate") +@RequestMapping("/codeClassifyTemplateController") @Api(value = "缂栫爜搴撳畾涔�-妯℃澘绠$悊", tags = "缂栫爜搴撳畾涔�-妯℃澘绠$悊鎺ュ彛") -public class CodeClstemplateController extends BladeController { +public class CodeClassifyTemplateController extends BladeController { private final ICodeClstemplateService plCodeClstemplateService; - CodeClstemplateMapper codeClstemplateMapper; + CodeClassifyTemplateMapper codeClassifyTemplateMapper; /** * 缂栫爜搴撳畾涔�-妯℃澘绠$悊 璇︽儏 @@ -66,9 +68,9 @@ @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "璇︽儏", notes = "浼犲叆plCodeClstemplate") - public R<CodeClstemplateVO> detail(CodeClstemplateEntity plCodeClstemplate) { - CodeClstemplateEntity detail = plCodeClstemplateService.getOne(Condition.getQueryWrapper(plCodeClstemplate)); - return R.data(PlCodeClstemplateWrapper.build().entityVO(detail)); + public R<CodeClassifyTemplateVO> detail(CodeClassifyTemplate plCodeClstemplate) { + CodeClassifyTemplate detail = plCodeClstemplateService.getOne(Condition.getQueryWrapper(plCodeClstemplate)); + return R.data(CodeClassifyTemplateWrapper.build().entityVO(detail)); } /** * 缂栫爜搴撳畾涔�-妯℃澘绠$悊 鍒嗛〉,鍒嗙被妯℃澘鍒楄〃瀵瑰簲浠ュ墠骞冲彴鐨刧ridCodeClassifyTemplate @@ -76,9 +78,9 @@ @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆plCodeClstemplate") - public R<IPage<CodeClstemplateVO>> list(CodeClstemplateEntity plCodeClstemplate, Query query) { - IPage<CodeClstemplateEntity> pages = plCodeClstemplateService.page(Condition.getPage(query), Condition.getQueryWrapper(plCodeClstemplate)); - return R.data(PlCodeClstemplateWrapper.build().pageVO(pages)); + public R<IPage<CodeClassifyTemplateVO>> list(CodeClassifyTemplate plCodeClstemplate, Query query) { + IPage<CodeClassifyTemplate> pages = plCodeClstemplateService.page(Condition.getPage(query), Condition.getQueryWrapper(plCodeClstemplate)); + return R.data(CodeClassifyTemplateWrapper.build().pageVO(pages)); } /** @@ -87,8 +89,8 @@ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆plCodeClstemplate") - public R<IPage<CodeClstemplateVO>> page(CodeClstemplateVO plCodeClstemplate, Query query) { - IPage<CodeClstemplateVO> pages = plCodeClstemplateService.selectPlCodeClstemplatePage(Condition.getPage(query), plCodeClstemplate); + public R<IPage<CodeClassifyTemplateVO>> page(CodeClassifyTemplateVO plCodeClstemplate, Query query) { + IPage<CodeClassifyTemplateVO> pages = plCodeClstemplateService.selectPlCodeClstemplatePage(Condition.getPage(query), plCodeClstemplate); return R.data(pages); } @@ -98,7 +100,7 @@ @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "鏂板", notes = "浼犲叆plCodeClstemplate") - public R save(@Valid @RequestBody CodeClstemplateEntity plCodeClstemplate) { + public R save(@Valid @RequestBody CodeClassifyTemplate plCodeClstemplate) { return R.status(plCodeClstemplateService.save(plCodeClstemplate)); } @@ -108,7 +110,7 @@ @PostMapping("/update") @ApiOperationSupport(order = 5) @ApiOperation(value = "淇敼", notes = "浼犲叆plCodeClstemplate") - public R update(@Valid @RequestBody CodeClstemplateEntity plCodeClstemplate) { + public R update(@Valid @RequestBody CodeClassifyTemplate plCodeClstemplate) { return R.status(plCodeClstemplateService.updateById(plCodeClstemplate)); } @@ -118,7 +120,7 @@ @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆plCodeClstemplate") - public R submit(@Valid @RequestBody CodeClstemplateEntity plCodeClstemplate) { + public R submit(@Valid @RequestBody CodeClassifyTemplate plCodeClstemplate) { return R.status(plCodeClstemplateService.saveOrUpdate(plCodeClstemplate)); } @@ -129,7 +131,7 @@ @ApiOperationSupport(order = 7) @ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids") public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) { - return R.status(SqlHelper.retBool(codeClstemplateMapper.deleteBatchIds(Func.toLongList(ids)))); + return R.status(SqlHelper.retBool(codeClassifyTemplateMapper.deleteBatchIds(Func.toLongList(ids)))); } /** @@ -142,16 +144,16 @@ return plCodeClstemplateService.treeCodeClassifyTemplate(treeQueryObject); } -// /** -// * 鍒嗙被妯℃澘鍒楄〃 -// * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄 -// * @return 鏄剧ず瀵硅薄 -// */ -// @GetMapping("/gridCodeClassifyTemplate") -// public DataGrid<CodeClstemplateVO> gridCodeClassifyTemplate(BaseQueryObject baseQueryObject){ -// -// return plCodeClstemplateService.gridCodeClassifyTemplate(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); -// } + /** + * 鍒嗙被妯℃澘鍒楄〃 + * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄 + * @return 鏄剧ず瀵硅薄 + */ + @GetMapping("/gridCodeClassifyTemplate") + public DataGrid<CodeClassifyTemplateVO> gridCodeClassifyTemplate(BaseQueryObject baseQueryObject){ + + return plCodeClstemplateService.gridCodeClassifyTemplate(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); + } /** @@ -160,7 +162,7 @@ * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾� */ @PostMapping( "/checkIsCanDelete") - public R checkIsCanDelete(@RequestBody CodeClstemplateDTO codeClstemplateDTO) { + public R checkIsCanDelete(@RequestBody CodeClassifyTemplateDTO codeClstemplateDTO) { return plCodeClstemplateService.checkIsCanDelete(codeClstemplateDTO); } @@ -171,7 +173,7 @@ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐� */ @DeleteMapping( "/deleteData") - public R delCodeClassifyTemplate(@Valid @RequestBody CodeClstemplateDTO codeClstemplateDTO) { + public R delCodeClassifyTemplate(@Valid @RequestBody CodeClassifyTemplateDTO codeClstemplateDTO) { return plCodeClstemplateService.deleteCodeClassifyTemplate(codeClstemplateDTO); } @@ -181,8 +183,8 @@ * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄 */ @GetMapping("/getObjectByOid") - public R<CodeClstemplateVO> getObjectByOid(String oid){ - CodeClstemplateVO codeClassifyTemplateVO = plCodeClstemplateService.getObjectByOid(oid); + public R<CodeClassifyTemplateVO> getObjectByOid(String oid){ + CodeClassifyTemplateVO codeClassifyTemplateVO = plCodeClstemplateService.getObjectByOid(oid); return R.data(codeClassifyTemplateVO); } @@ -192,8 +194,8 @@ * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄 */ @GetMapping("/listDataByOids") - public R<Collection<CodeClstemplateVO>> listCodeClassifyTemplateByOids(String oids){ - Collection<CodeClstemplateVO> voCollection = plCodeClstemplateService.listCodeClassifyTemplateByOids(VciBaseUtil.str2List(oids)); + public R<Collection<CodeClassifyTemplateVO>> listCodeClassifyTemplateByOids(String oids){ + Collection<CodeClassifyTemplateVO> voCollection = plCodeClstemplateService.listCodeClassifyTemplateByOids(VciBaseUtil.str2List(oids)); return R.data(voCollection) ; } @@ -214,7 +216,7 @@ * @return */ @PostMapping( "/enableData") - public R enable( CodeClstemplateDTO codeClstemplateDTO) { + public R enable( CodeClassifyTemplateDTO codeClstemplateDTO) { return plCodeClstemplateService.updateLcStatus(codeClstemplateDTO.getOid(), CodeClassifyTemplateLC.RELEASED.getValue()); } @@ -224,7 +226,7 @@ * @return */ @PostMapping( "/disableData") - public R disableData( CodeClstemplateDTO codeClassifyDTO) { + public R disableData( CodeClassifyTemplateDTO codeClassifyDTO) { return plCodeClstemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.DISABLED.getValue()); } @@ -234,7 +236,7 @@ * @return */ @PostMapping( "/editDate") - public R editDate( CodeClstemplateDTO codeClassifyDTO) { + public R editDate( CodeClassifyTemplateDTO codeClassifyDTO) { return plCodeClstemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.EDITING.getValue()); } @@ -244,7 +246,7 @@ * @return oid妯℃澘oid */ @PostMapping( "/upgrade") - public R Upgrade(@RequestBody CodeClstemplateDTO codeClassifyDTO) { + public R Upgrade(@RequestBody CodeClassifyTemplateDTO codeClassifyDTO) { return plCodeClstemplateService.Upgrade(codeClassifyDTO); } -- Gitblit v1.9.3