From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 18 十月 2024 14:28:33 +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/system/SystemDictDataController.java | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java index 92793f0..49de57a 100644 --- a/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java +++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java @@ -7,7 +7,9 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageData; 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; @@ -19,8 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; @@ -85,6 +85,24 @@ } + @ApiOperation("鏌ヨ鍜栬眴浠诲姟瑙勫垯") + @PostMapping("/findAllList") + @RequiresPermissions("system:dict:update") + public ApiResponse findAllList (@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap) { + List<SystemDictData> list= systemDictDataBiz.queryListByCode(Constants.COFFEE_BEAN_TASK,null); + return ApiResponse.success(list); + } + + + @ApiOperation("缂栬緫鏌ヨ鍜栬眴浠诲姟瑙勫垯") + @PostMapping("/createCoffeeTask") + @RequiresPermissions("system:dict:update") + public ApiResponse createCoffeeTask(@Validated(OperaType.Create.class) @RequestBody List<SystemDictData> list) { + systemDictDataBiz.updateByDicId(list); + return ApiResponse.success(null); + } + + @ApiOperation(value = "鏌ヨ瀛楀吀鍊兼暟鎹�" ) @GetMapping("/getSystemDictData") @ApiImplicitParams({ @@ -95,5 +113,25 @@ 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){ + systemDictDataService.updateVisitConfig(visitConfigDTO); + return ApiResponse.success(null); + } } -- Gitblit v1.9.3