From becbe54034f5803eee6540f533be9eb35ef8b86e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:46:52 +0800
Subject: [PATCH] 内网开发环境代码合并
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java
index fb40034..1586d75 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java
@@ -1,16 +1,16 @@
package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.service.CodeResembleRuleServiceI;
-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.CodeResembleRuleDTO;
+import com.vci.ubcs.code.service.ICodeResembleRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.Collection;
/**
@@ -22,94 +22,93 @@
@RestController
@RequestMapping("/resembleRuleController")
public class CodeResembleRuleController {
- /**
- * 鐩镐技鏌ヨ瑙勫垯 鏈嶅姟
- */
- @Autowired
- private CodeResembleRuleServiceI codeResembleRuleService;
+ /**
+ * 鐩镐技鏌ヨ瑙勫垯 鏈嶅姟
+ */
+ @Resource
+ private ICodeResembleRuleService codeResembleRuleService;
- /**
- * 鐩镐技鏌ヨ瑙勫垯鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridCodeResembleRule")
- public DataGrid<CodeResembleRuleVO> gridCodeResembleRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeResembleRuleService.gridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeResembleRuleVO> addSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){
- CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.addSave(codeResembleRuleDTO);
- return BaseResult.success(codeResembleRuleVO);
- }
+ /**
+ * 鐩镐技鏌ヨ瑙勫垯鍒楄〃
+ * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridCodeResembleRule")
+ public DataGrid<CodeResembleRuleVO> gridCodeResembleRule(BaseQueryObject baseQueryObject){
+ if(baseQueryObject == null){
+ baseQueryObject = new BaseQueryObject();
+ }
+ return codeResembleRuleService.gridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ }
+ /**
+ * 澧炲姞 鐩镐技鏌ヨ瑙勫垯
+ * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping( "/addSave")
+ public R<CodeResembleRuleVO> addSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){
+ CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.addSave(codeResembleRuleDTO);
+ return R.data(codeResembleRuleVO);
+ }
- /**
- * 淇敼 鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeResembleRuleVO> editSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){
- CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.editSave(codeResembleRuleDTO);
- return BaseResult.success(codeResembleRuleVO);
- }
+ /**
+ * 淇敼 鐩镐技鏌ヨ瑙勫垯
+ * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PutMapping("/editSave")
+ public R<CodeResembleRuleVO> editSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){
+ CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.editSave(codeResembleRuleDTO);
+ return R.data(codeResembleRuleVO);
+ }
- /**
- * 鍒犻櫎鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeResembleRule( CodeResembleRuleDTO codeResembleRuleDTO) {
- return codeResembleRuleService.deleteCodeResembleRule(codeResembleRuleDTO);
- }
+ /**
+ * 鍒犻櫎鐩镐技鏌ヨ瑙勫垯
+ * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ */
+ @DeleteMapping( "/deleteData")
+ public R delCodeResembleRule( CodeResembleRuleDTO codeResembleRuleDTO) {
+ return codeResembleRuleService.deleteCodeResembleRule(codeResembleRuleDTO);
+ }
- /**
- * 涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oid 涓婚敭
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeResembleRuleVO> getObjectByOid(String oid){
- CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.getObjectByOid(oid);
- return BaseResult.success(codeResembleRuleVO);
- }
+ /**
+ * 涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
+ * @param oid 涓婚敭
+ * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
+ */
+ @GetMapping("/getObjectByOid")
+ public R<CodeResembleRuleVO> getObjectByOid(String oid){
+ CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.getObjectByOid(oid);
+ return R.data(codeResembleRuleVO);
+ }
- /**
- * 涓婚敭鎵归噺鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeResembleRuleVO> listCodeResembleRuleByOids(String oids){
- Collection<CodeResembleRuleVO> voCollection = codeResembleRuleService.listCodeResembleRuleByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
+ /**
+ * 涓婚敭鎵归噺鑾峰彇鐩镐技鏌ヨ瑙勫垯
+ * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
+ * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
+ */
+ @GetMapping("/listDataByOids")
+ public R<CodeResembleRuleVO> listCodeResembleRuleByOids(String oids){
+ Collection<CodeResembleRuleVO> voCollection = codeResembleRuleService.listCodeResembleRuleByOids(VciBaseUtil.str2List(oids));
+ R baseResult = R.success("鏌ヨ鎴愬姛!");
+ baseResult.setData(voCollection);
+ return baseResult;
+ }
- /**
- * 鍙傜収鐩镐技鏌ヨ瑙勫垯鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeResembleRuleService.refDataGridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
+ /**
+ * 鍙傜収鐩镐技鏌ヨ瑙勫垯鍒楄〃
+ * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
+ */
+ @GetMapping("/refDataGrid")
+ public DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(BaseQueryObject baseQueryObject){
+ if(baseQueryObject == null){
+ baseQueryObject = new BaseQueryObject();
+ }
+ return codeResembleRuleService.refDataGridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
+ }
}
--
Gitblit v1.9.3