From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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 5c71da5..e2d96a3 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,6 +2,7 @@
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;
@@ -9,13 +10,18 @@
import com.doumee.core.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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* @author 姹熻箘韫�
@@ -28,6 +34,8 @@
@Autowired
private PlatformJobService platformJobService;
+ @Autowired
+ private WmsService wmsService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -41,8 +49,15 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:platformjob:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- platformJobService.deleteById(id);
+ platformJobService.delete(id);
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("鎵归噺鍒犻櫎")
@@ -50,6 +65,13 @@
@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:update")
+ public ApiResponse updateTotalNum(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ wmsService.computjobTotalNum(this.getIdList(ids));
return ApiResponse.success(null);
}
@@ -72,7 +94,13 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:platformjob:exportExcel")
public void exportExcel (@RequestBody PageWrap<PlatformJob> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- ExcelExporter.build(PlatformJob.class).export(platformJobService.findPage(pageWrap).getRecords(), "鏈堝彴璋冨害浣滀笟淇℃伅琛�", response);
+ List<PlatformJob> platformJobList = platformJobService.findPage(pageWrap).getRecords();
+ if(CollectionUtils.isNotEmpty(platformJobList)){
+ for (PlatformJob platformJob:platformJobList) {
+ platformJob.setJobForm(Constants.ZERO);
+ }
+ }
+ ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -81,4 +109,19 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformJobService.findById(id));
}
+
+ @ApiOperation("浠诲姟璇︽儏")
+ @PostMapping("/jobDetail")
+ @CloudRequiredPermission("business:platformjob:query")
+ public ApiResponse<PlatformJob> jobDetail (@RequestBody JobDetailDTO jobDetailDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(platformJobService.getDetail(jobDetailDTO));
+ }
+
+ @ApiOperation("浠诲姟绛惧埌")
+ @PostMapping("/signIn")
+ public ApiResponse signIn (@RequestBody SignInDTO signInDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ signInDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.signIn(signInDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3