From 39fc2d6754953e41a7334a2166347baacfcfb40a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 11 十月 2025 18:21:18 +0800
Subject: [PATCH] 对接口
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 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 35013a6..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
@@ -2,23 +2,30 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
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.vo.PlatformJobExportVo;
+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.PlatformJob;
import com.doumee.dao.web.reqeust.JobDetailDTO;
import com.doumee.dao.web.reqeust.SignInDTO;
import com.doumee.service.business.PlatformJobService;
+import com.doumee.service.business.third.WmsService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+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.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -32,6 +39,8 @@
@Autowired
private PlatformJobService platformJobService;
+ @Autowired
+ private WmsService wmsService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -45,8 +54,15 @@
@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);
+ }
+
+ @ApiOperation("鑾峰彇褰撳墠鐢ㄦ埛鐨勬渶杩戜竴鏉″緟绛惧埌鐨勪綔涓氫俊鎭�")
+ @GetMapping("/getLastWaitJob")
+ @LoginNoRequired
+ public ApiResponse<PlatformJob> getLastWaitJob(@RequestParam String uuid,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success( platformJobService.getLastWaitJob(uuid,this.getLoginUser(token)));
}
@ApiOperation("鎵归噺鍒犻櫎")
@@ -54,6 +70,25 @@
@CloudRequiredPermission("business:platformjob:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
platformJobService.deleteByIdInBatch(this.getIdList(ids));
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("鎵归噺鏇存柊wms鍚堝悓鎬昏繍杈撻噺")
+ @GetMapping("/updateTotalNum")
+ @CloudRequiredPermission("business:platformjob:updateTotalNum")
+ public ApiResponse updateTotalNum(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ 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);
}
@@ -72,8 +107,6 @@
return ApiResponse.success(platformJobService.findPage(pageWrap));
}
-
-
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:platformjob:exportExcel")
@@ -84,7 +117,19 @@
platformJob.setJobForm(Constants.ZERO);
}
}
- ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
+ if(Constants.equalsInteger(pageWrap.getModel().getJobType(),1)){
+ List<PlatformJobExportVo> exportVoList =new ArrayList<>();
+ if(platformJobList!=null){
+ for(PlatformJob job : platformJobList){
+ PlatformJobExportVo t = new PlatformJobExportVo();
+ BeanUtils.copyProperties(job,t);
+ exportVoList.add(t);
+ }
+ ExcelExporter.build(PlatformJobExportVo.class).export(exportVoList, "棰勭害鍏ュ洯浣滀笟璁板綍", response);
+ }
+ }else{
+ ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
+ }
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -108,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