From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 3943389..753fb4b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -19,6 +19,7 @@
import com.mchange.v2.beans.BeansUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -53,7 +54,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:platformjob:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- platformJobService.delete(id);
+ platformJobService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -73,9 +74,21 @@
}
@ApiOperation("鎵归噺鏇存柊wms鍚堝悓鎬昏繍杈撻噺")
@GetMapping("/updateTotalNum")
- @CloudRequiredPermission("business:platformjob:update")
+ @CloudRequiredPermission("business:platformjob:updateTotalNum")
public ApiResponse updateTotalNum(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- wmsService.computjobTotalNum(this.getIdList(ids));
+ List<Integer> idList =this.getIdList(ids);
+ if(idList == null || idList.size()==0){
+ idList = new ArrayList<>();
+ PlatformJob param = new PlatformJob();
+ param.setIsdeleted(Constants.ZERO);
+ param.setOrigin(Constants.ONE);
+ List<PlatformJob> list= platformJobService.findList(param);
+
+ for(PlatformJob j :list){
+ idList.add(j.getId());
+ }
+ }
+ wmsService.computjobTotalNum(idList);
return ApiResponse.success(null);
}
@@ -140,4 +153,22 @@
platformJobService.signIn(signInDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+
+
+ @ApiOperation("鎵嬪姩瀹屾垚浣滀笟")
+ @PostMapping("/dealJobFinish")
+ @CloudRequiredPermission("business:platformjob:update")
+ public ApiResponse dealJobFinish (@RequestBody List<Integer> list, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformJobService.dealJobFinish(list,getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+ @ApiOperation("鏇存崲鏈堝彴鍒嗙粍")
+ @PostMapping("/changPlatformGroup")
+ @CloudRequiredPermission("business:platformjob:update")
+ public ApiResponse changPlatformGroup (@RequestBody PlatformJob param, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformJobService.changPlatformGroup(param,getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3