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/DockingManagementController.java | 268 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 236 insertions(+), 32 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 07131a6..1f745af 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,19 +1,19 @@
package com.vci.ubcs.code.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
-import com.vci.ubcs.code.entity.CodeRule;
-import com.vci.ubcs.code.entity.DockingSystem;
-import com.vci.ubcs.code.entity.DockingSystemConfig;
-import com.vci.ubcs.code.service.IDockingSystemConfigService;
-import com.vci.ubcs.code.service.IDockingSystemService;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
-import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
-import com.vci.ubcs.code.wrapper.DockingSystemConfigWrapper;
-import com.vci.ubcs.code.wrapper.DockingSystemWrapper;
+import com.vci.ubcs.code.dto.DockingTaskDTO;
+import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.service.*;
+import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.code.wrapper.*;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,11 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* 鐮佹鍩虹淇℃伅鎺у埗鍣�
@@ -38,23 +42,37 @@
* 闆嗘垚绯荤粺绠＄悊鏈嶅姟
*/
private final IDockingSystemService dockingSystemService;
+
/***
* 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟
*/
private final IDockingSystemConfigService dockingSystemConfigService;
+ /***
+ * 寰呴泦绠＄悊閰嶇疆鏈嶅姟
+ */
+ private final IDokingSysManaentService dokingSysManaentService;
-
-
+ /***
+ * 鍚屾闆嗘垚鏈嶅姟
+ */
+ private final ICodeDuckingSyncService codeDuckingSyncService;
/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
- * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
*@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
- @GetMapping("/gridSysIntBase")
+ @GetMapping("/gridDockingSystem")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "dockingSystem")
- public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
- IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem));
+ @ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+ public R<IPage<DockingSystemVO>> page(BaseQueryObject queryObject) {
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return R.data(DockingSystemWrapper.build().pageVO(pages));
}
@@ -63,8 +81,8 @@
* @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
- @PostMapping( "/addSave")
- public R<DockingSystemVO> addSave(@RequestBody DockingSystemDTO dockingSystemDTO){
+ @PostMapping( "/addSaveDockingSystem")
+ public R<DockingSystemVO> addSaveDockingSystem(@RequestBody DockingSystemDTO dockingSystemDTO){
boolean res= dockingSystemService.addSave(dockingSystemDTO);
return R.status(res);
}
@@ -75,8 +93,8 @@
* @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
- @PutMapping("/editSave")
- public R<DockingSystemVO> editSave(@RequestBody DockingSystemDTO dockingSystemDTO){
+ @PutMapping("/editSaveDockingSystem")
+ public R<DockingSystemVO> editSaveDockingSystem(@RequestBody DockingSystemDTO dockingSystemDTO){
DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO);
return R.data(dockingSystemVO);
}
@@ -84,24 +102,210 @@
/**
* 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+ * @param oids 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
* @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
*/
- @DeleteMapping( "/deleteData")
- public R delSystemData( DockingSystemDTO dockingSystemDTO) {
- return R.status(dockingSystemService.delSystemData(dockingSystemDTO));
+ @DeleteMapping( "/deleteSystemsById")
+ public R deleteSystemsById( String oids) {
+ try {
+ return R.status(dockingSystemService.deleteDataById(oids));
+ }catch (VciBaseException e){
+ R.fail(e.getMessage());
+ }
+ return R.success("鎿嶄綔鎴愬姛");
}
/**
* 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
- * @param DockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
- @GetMapping("/gridSysIntInfo")
+ @GetMapping("/gridSystemConfig")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "DockingSystemConfig")
- public R<IPage<DockingSystemConfigVO>> gridSysIntInfo(DockingSystemConfig DockingSystemConfig, Query query){
- IPage<DockingSystemConfig> pages = dockingSystemConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
- return R.data(DockingSystemConfigWrapper.build().pageVO(pages));
+ @ApiOperation(value = "鍒嗛〉", notes = "dockingSystemConfig")
+ public R<IPage<DockingSystemConfigVO>> gridSystemConfig(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query);
+ return R.data(pages);
}
+ /**
+ * 澧炲姞 绯荤粺闆嗘垚鍩虹淇℃伅
+ * @param systemConfigDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping( "/addSaveSystemConfig")
+ public R addSaveSystemConfig(@RequestBody DockingSystemConfigDTO systemConfigDTO){
+ try {
+ boolean res = dockingSystemConfigService.addSave(systemConfigDTO);
+ return R.success("淇濆瓨鎴愬姛!");
+ }catch (Throwable e){
+ return R.fail("淇濆瓨澶辫触!"+e.getMessage());
+ }
+ }
+
+ /**
+ * 澧炲姞 绯荤粺闆嗘垚鍩虹淇℃伅
+ * @param dockingSystemConfigDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping( "/editSystemConfig")
+ public R editSystemConfig(@RequestBody DockingSystemConfigDTO dockingSystemConfigDTO){
+ try {
+ boolean res = dockingSystemConfigService.editSave(dockingSystemConfigDTO);
+ return R.success("淇濆瓨鎴愬姛!");
+ }catch (Throwable e){
+ return R.fail("淇濆瓨澶辫触!");
+ }
+ }
+ /**
+ * 鍒犻櫎绯荤粺闆嗘垚绯荤粺閰嶇疆淇℃伅
+ * @param oids 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ */
+ @DeleteMapping( "/deleteSystemConfigsById")
+ public R deleteSystemConfigsById( String oids) {
+ try {
+ return R.status(dockingSystemConfigService.deleteDataById(oids));
+ }catch (VciBaseException e){
+ R.fail(e.getMessage());
+ }
+ return R.success("鎿嶄綔鎴愬姛");
+ }
+ /***
+ * 鎺ュ彛淇℃伅鏄惁鍚敤/鍋滅敤
+ * @param sysInfoStatusDTO
+ * @return
+ */
+ @PostMapping("/updateStatus")
+ public R updateStatus(@RequestBody UpdateSysInfoStatusDTO sysInfoStatusDTO){
+ return dockingSystemConfigService.updateStatus(sysInfoStatusDTO);
+ }
+
+ /***
+ * 鎵嬪姩鎺ㄩ�佸垎绫�/鏁版嵁
+ * @param dockingSystemConfigDTO
+ * @return
+ */
+ @PostMapping("/pushData")
+ public R pushData(@RequestBody DockingSystemConfigDTO dockingSystemConfigDTO){
+ return dockingSystemConfigService.pushData(dockingSystemConfigDTO);
+ }
+
+ /**
+ * 寰呴泦鎴愭暟鎹�
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridDockingData")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
+ public R<IPage<DockingDataVO>> gridDockingData(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
+ return R.data(pages);
+ }
+
+
+ /**
+ * data鍒楄〃
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
+ */
+ @GetMapping("/gridDockingTask")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+ public R<IPage<DockingTaskVO>> gridDockingTask(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridLoge")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
+ public R<IPage<DockingLogeVO>> gridLoge(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridParam")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
+ public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(condtionMap,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridHeader")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
+ public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){
+ Map<String,String> condtionMap=queryObject.getConditionMap();
+ Query query=new Query();
+ if(CollectionUtils.isEmpty(condtionMap)){
+ condtionMap=new HashMap<>();
+ }
+ query.setCurrent(queryObject.getPage());
+ query.setSize(queryObject.getLimit());
+ IPage<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(condtionMap,query);
+ return R.data(pages);
+
+
+ }
+ /**
+ *鎵归噺澶勭悊
+ * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid
+ * @return
+ */
+ @PostMapping("/sendData")
+ public R sendData(String oid){
+ return codeDuckingSyncService.sendData(oid);
+ }
}
--
Gitblit v1.9.3