From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
index b8c30f1..d27cb07 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -4,11 +4,13 @@
 import com.doumee.config.annotation.CloudRequiredPermission;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Platform;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.PlatformGroup;
+import com.doumee.dao.web.reqeust.PlatformDataDTO;
 import com.doumee.service.business.PlatformGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +18,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * @author 姹熻箘韫�
  * @since 2024/04/28 16:06
@@ -33,6 +37,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:platformgroup:create")
     public ApiResponse create(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        platformGroup.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(platformGroupService.create(platformGroup));
     }
 
@@ -40,7 +45,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:platformgroup:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        platformGroupService.deleteById(id);
+        platformGroupService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -48,7 +53,15 @@
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:platformgroup:delete")
     public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        platformGroupService.deleteByIdInBatch(this.getIdList(ids));
+        platformGroupService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("鏍规嵁ID淇敼鏄惁鑷姩鍙彿")
+    @PostMapping("/updateAutoCallById")
+    @CloudRequiredPermission("business:platformgroup:update")
+    public ApiResponse updateAutoCallById(@RequestBody PlatformGroup platform, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        platform.setLoginUserInfo(this.getLoginUser(token));
+        platformGroupService.updateAutoCallById(platform);
         return ApiResponse.success(null);
     }
 
@@ -56,6 +69,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:platformgroup:update")
     public ApiResponse updateById(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        platformGroup.setLoginUserInfo(this.getLoginUser(token));
         platformGroupService.updateById(platformGroup);
         return ApiResponse.success(null);
     }
@@ -64,7 +78,15 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:platformgroup:query")
     public ApiResponse<PageData<PlatformGroup>> findPage (@RequestBody PageWrap<PlatformGroup> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setIsdeleted(Constants.ZERO);
         return ApiResponse.success(platformGroupService.findPage(pageWrap));
+    }
+    @ApiOperation("鏌ヨ鍒楄〃")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:platformgroup:query")
+    public ApiResponse<List<PlatformGroup>> list (@RequestBody PlatformGroup pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.setIsdeleted(Constants.ZERO);
+        return ApiResponse.success(platformGroupService.findList(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
@@ -80,4 +102,13 @@
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(platformGroupService.findById(id));
     }
+
+    @ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
+    @PostMapping("/getPlatformGroupList")
+    @CloudRequiredPermission("business:platformgroup:query")
+    public ApiResponse<List<PlatformGroup>>  getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
+    }
+
+
 }

--
Gitblit v1.9.3