From 030f7971cee2aa77408678f51b2f11e1a451fbb7 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 18:26:22 +0800 Subject: [PATCH] 钉钉通知 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 4 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 2ec6aff..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 @@ -5,6 +5,7 @@ import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; +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; @@ -15,12 +16,16 @@ 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; /** @@ -49,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); } @@ -69,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); } @@ -100,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鏌ヨ") @@ -124,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