From 59fb524d6b081f0faba177ffd13a0132d314dbae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 19 十一月 2024 14:15:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
index 5d21cfe..38ce34c 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
@@ -9,6 +9,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.system.dto.PlatformConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.dto.VisitConfigDTO;
import com.doumee.dao.system.model.SystemDictData;
@@ -46,6 +47,7 @@
@CloudRequiredPermission("system:dict:update")
public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
systemDictData.setLoginUserInfo(this.getLoginUser(token));
+ systemDictData.setCreateUser(systemDictData.getLoginUserInfo().getId());
return ApiResponse.success(systemDictDataBiz.create(systemDictData));
}
@@ -75,6 +77,7 @@
@CloudRequiredPermission("system:dict:update")
public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
systemDictData.setLoginUserInfo(this.getLoginUser(token));
+ systemDictData.setUpdateUser(systemDictData.getLoginUserInfo().getId());
systemDictDataBiz.updateById(systemDictData);
return ApiResponse.success(null);
}
@@ -84,15 +87,6 @@
@CloudRequiredPermission("system:dict:update")
public ApiResponse<PageData<SystemDictDataListVO>> findPage (@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(systemDictDataService.findPage(pageWrap));
- }
-
-
- @ApiOperation("鏌ヨ鍜栬眴浠诲姟瑙勫垯")
- @PostMapping("/findAllList")
- @CloudRequiredPermission("system:dict:update")
- public ApiResponse findAllList (@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- List<SystemDictData> list= systemDictDataBiz.queryListByCode(Constants.COFFEE_BEAN_TASK,null);
- return ApiResponse.success(list);
}
@@ -115,7 +109,7 @@
@GetMapping("/getVisitConfigDTO")
public ApiResponse<VisitConfigDTO> getVisitConfigDTO(){
return ApiResponse.success(systemDictDataService.getVisitConfigDTO());
- };
+ }
/**
* 淇敼璁垮鏉ヨ閰嶇疆
@@ -128,4 +122,25 @@
systemDictDataService.updateVisitConfig(visitConfigDTO);
return ApiResponse.success(null);
};
+ /**
+ * 璁垮鏉ヨ閰嶇疆
+ * @return
+ */
+ @ApiOperation(value = "璁垮鏉ヨ閰嶇疆" )
+ @GetMapping("/getPlatformConfigDTO")
+ public ApiResponse<PlatformConfigDTO> getPlatformConfigDTO(){
+ return ApiResponse.success(systemDictDataService.getPlatformConfigDTO());
+ };
+
+ /**
+ * 淇敼璁垮鏉ヨ閰嶇疆
+ * @param visitConfigDTO
+ */
+ @ApiOperation(value = "淇敼璁垮鏉ヨ閰嶇疆" )
+ @PostMapping("/updatePlatformConfig")
+ public ApiResponse updatePlatformConfig(@RequestBody PlatformConfigDTO visitConfigDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ visitConfigDTO.setLoginUserInfo(this.getLoginUser(token));
+ systemDictDataService.updatePlatformConfig(visitConfigDTO);
+ return ApiResponse.success(null);
+ };
}
--
Gitblit v1.9.3