From 4e45a8252d7bccd23a1a57aa541a2ea521760572 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 21 十月 2024 15:39:04 +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 | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 f6e30dd..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,7 +9,9 @@
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;
import com.doumee.dao.system.vo.SystemDictDataListVO;
import com.doumee.service.system.SystemDictDataService;
@@ -30,7 +32,7 @@
*/
@Api(tags = "瀛楀吀鏁版嵁")
@RestController
-@RequestMapping("/cloudService/system/dictData")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/dictData")
public class SystemDictDataCloudController extends BaseController {
@Autowired
@@ -43,14 +45,16 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("system:dict:update")
- public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData) {
+ 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));
}
@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);
}
@@ -58,7 +62,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) {
@@ -71,7 +75,9 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("system:dict:update")
- public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData) {
+ 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);
}
@@ -79,9 +85,10 @@
@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(value = "鏌ヨ瀛楀吀鍊兼暟鎹�" )
@@ -90,9 +97,50 @@
@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);
+ };
+ /**
+ * 璁垮鏉ヨ閰嶇疆
+ * @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