From 84ee37e1f485a1d3136535f9ef1c43058d9308ab Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 29 十一月 2023 11:39:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java | 209 ++++++++++++++++++++++++++++------------------------
1 files changed, 113 insertions(+), 96 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
index bd6e209..5241479 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
@@ -1,116 +1,133 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
package com.vci.ubcs.code.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.vci.ubcs.code.entity.CodeSynonymEntity;
+import com.vci.ubcs.code.mapper.CodeSynonymMapper;
+import com.vci.ubcs.code.service.ICodeSynonymService;
+import com.vci.ubcs.code.vo.CodeSynonymVO;
+import com.vci.ubcs.code.wrapper.CodeSynonymWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
-import com.vci.ubcs.code.service.CodeSynonymServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeSynonymDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeSynonymVO;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
+import org.springblade.core.boot.ctrl.BladeController;
/**
- * 鍚屼箟璇嶉厤缃帶鍒跺櫒
+ * 杩戜箟璇嶇淮鎶� 鎺у埗鍣�
*
- * @author weidy
- * @date 2022-02-17
+ * @author yuxc
+ * @since 2023-04-04
*/
@RestController
-@RequestMapping("/codeSynonymController")
-public class CodeSynonymController {
- /**
- * 鍚屼箟璇嶉厤缃� 鏈嶅姟
- */
- @Autowired
- private CodeSynonymServiceI codeSynonymService;
+@AllArgsConstructor
+@RequestMapping("/codeSynonym")
+@Api(value = "杩戜箟璇嶇淮鎶�", tags = "杩戜箟璇嶇淮鎶ゆ帴鍙�")
+public class CodeSynonymController extends BladeController {
- /**
- * 鍚屼箟璇嶉厤缃垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeSynonym")
- public DataGrid<CodeSynonymVO> gridCodeSynonym(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeSynonymService.gridCodeSynonym(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeSynonymVO> addSave(@RequestBody CodeSynonymDTO codeSynonymDTO){
- CodeSynonymVO codeSynonymVO = codeSynonymService.addSave(codeSynonymDTO);
- return BaseResult.success(codeSynonymVO);
- }
+ private final ICodeSynonymService codeSynonymService;
- /**
- * 淇敼 鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeSynonymVO> editSave(@RequestBody CodeSynonymDTO codeSynonymDTO){
- CodeSynonymVO codeSynonymVO = codeSynonymService.editSave(codeSynonymDTO);
- return BaseResult.success(codeSynonymVO);
- }
+ CodeSynonymMapper codeSynonymMapper;
+ /**
+ * 杩戜箟璇嶇淮鎶� 璇︽儏
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "璇︽儏", notes = "codeSynonym")
+ public R<CodeSynonymVO> detail(CodeSynonymEntity codeSynonym) {
+ CodeSynonymEntity detail = codeSynonymMapper.selectOne(Condition.getQueryWrapper(codeSynonym));
+ return R.data(CodeSynonymWrapper.build().entityVO(detail));
+ }
+ /**
+ * 杩戜箟璇嶇淮鎶� 鍒嗛〉
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeSynonym")
+ public R<IPage<CodeSynonymVO>> list(CodeSynonymEntity codeSynonym, Query query) {
+ IPage<CodeSynonymEntity> pages = codeSynonymMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeSynonym));
+ return R.data(CodeSynonymWrapper.build().pageVO(pages));
+ }
- /**
- * 鍒犻櫎鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeSynonym( CodeSynonymDTO codeSynonymDTO) {
- return codeSynonymService.deleteCodeSynonym(codeSynonymDTO);
- }
+ /**
+ * 杩戜箟璇嶇淮鎶� 鑷畾涔夊垎椤�
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeSynonym")
+ public R<IPage<CodeSynonymVO>> page(CodeSynonymVO codeSynonym, Query query) {
+ IPage<CodeSynonymVO> pages = codeSynonymService.selectPlCodeSynonymPage(Condition.getPage(query), codeSynonym);
+ return R.data(pages);
+ }
- /**
- * 涓婚敭鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oid 涓婚敭
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeSynonymVO> getObjectByOid(String oid){
- CodeSynonymVO codeSynonymVO = codeSynonymService.getObjectByOid(oid);
- return BaseResult.success(codeSynonymVO);
- }
+ /**
+ * 杩戜箟璇嶇淮鎶� 鏂板
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "鏂板", notes = "浼犲叆codeSynonym")
+ public R save(@Valid @RequestBody CodeSynonymEntity codeSynonym) {
+ return R.status(SqlHelper.retBool(codeSynonymMapper.insert(codeSynonym)));
+ }
- /**
- * 涓婚敭鎵归噺鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeSynonymVO> listCodeSynonymByOids(String oids){
- Collection<CodeSynonymVO> voCollection = codeSynonymService.listCodeSynonymByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
+ /**
+ * 杩戜箟璇嶇淮鎶� 淇敼
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "淇敼", notes = "浼犲叆codeSynonym")
+ public R update(@Valid @RequestBody CodeSynonymEntity codeSynonym) {
+ return R.status(SqlHelper.retBool(codeSynonymMapper.updateById(codeSynonym)));
+ }
+ /**
+ * 杩戜箟璇嶇淮鎶� 鏂板鎴栦慨鏀�
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆codeSynonym")
+ public R submit(@Valid @RequestBody CodeSynonymEntity codeSynonym) {
+ if(codeSynonym.getOid() != null){
+ return R.status(SqlHelper.retBool(codeSynonymMapper.updateById(codeSynonym)));
+ }
+ return R.status(SqlHelper.retBool(codeSynonymMapper.insert(codeSynonym)));
+// return R.status(plCodeSynonymService.saveOrUpdate(plCodeSynonym));
+ }
+ /**
+ * 杩戜箟璇嶇淮鎶� 鍒犻櫎
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆oids")
+ public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oids) {
+ return R.status(SqlHelper.retBool(codeSynonymMapper.deleteBatchIds(Func.toLongList(oids))));
+ }
- /**
- * 鍙傜収鍚屼箟璇嶉厤缃垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeSynonymVO> refDataGridCodeSynonym(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeSynonymService.refDataGridCodeSynonym(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
}
--
Gitblit v1.9.3