From 8c79ff2c695254275669390dc4353593b42b7475 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 20 五月 2024 11:16:48 +0800
Subject: [PATCH] 最新版本

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 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 c50f6cd..5d21cfe 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
@@ -10,6 +10,7 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
+import com.doumee.dao.system.dto.VisitConfigDTO;
 import com.doumee.dao.system.model.SystemDictData;
 import com.doumee.dao.system.vo.SystemDictDataListVO;
 import com.doumee.service.system.SystemDictDataService;
@@ -43,15 +44,15 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("system:dict:update")
-    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData) {
-        systemDictData.setCreateUser(this.getLoginUser(token).getId());
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDictData.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(systemDictDataBiz.create(systemDictData));
     }
 
     @ApiOperation("鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("system:dict:update")
-    public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
+    public ApiResponse deleteById(@PathVariable Integer id) {
         systemDictDataService.deleteById(id);
         return ApiResponse.success(null);
     }
@@ -59,7 +60,7 @@
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("system:dict:delete")
-    public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray) {
@@ -72,8 +73,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:dict:update")
-    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData) {
-        systemDictData.setUpdateUser(this.getLoginUser(token).getId());
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDictData.setLoginUserInfo(this.getLoginUser(token));
         systemDictDataBiz.updateById(systemDictData);
         return ApiResponse.success(null);
     }
@@ -81,9 +82,19 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("system:dict:update")
-    public ApiResponse<PageData<SystemDictDataListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap) {
+    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);
+    }
+
 
 
     @ApiOperation(value = "鏌ヨ瀛楀吀鍊兼暟鎹�" )
@@ -92,9 +103,29 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "鏁版嵁瀛楀吀鍊糎5_LINK_ADDR", required = true),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "dictCode", value = "绯荤粺瀛楀吀鍊糞YSTEM", required = true)
     })
-    public ApiResponse<SystemDictData> getSystemDictData(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String dictCode, @RequestParam String label) {
+    public ApiResponse<SystemDictData> getSystemDictData(@RequestParam String dictCode, @RequestParam String label,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(systemDictDataBiz.queryByCode(dictCode,label));
     }
 
+    /**
+     * 璁垮鏉ヨ閰嶇疆
+     * @return
+     */
+    @ApiOperation(value = "璁垮鏉ヨ閰嶇疆" )
+    @GetMapping("/getVisitConfigDTO")
+    public ApiResponse<VisitConfigDTO> getVisitConfigDTO(){
+        return ApiResponse.success(systemDictDataService.getVisitConfigDTO());
+    };
 
+    /**
+     * 淇敼璁垮鏉ヨ閰嶇疆
+     * @param visitConfigDTO
+     */
+    @ApiOperation(value = "淇敼璁垮鏉ヨ閰嶇疆" )
+    @PostMapping("/updateVisitConfig")
+    public ApiResponse updateVisitConfig(@RequestBody VisitConfigDTO visitConfigDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        visitConfigDTO.setLoginUserInfo(this.getLoginUser(token));
+        systemDictDataService.updateVisitConfig(visitConfigDTO);
+        return ApiResponse.success(null);
+    };
 }

--
Gitblit v1.9.3