From a63751400e4a3415326b0bb4302e6d55ea4826bf Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 25 七月 2024 15:13:14 +0800
Subject: [PATCH] 定时任务修改
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 134 ++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 84 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
index 363ac83..5e5be8c 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java
@@ -7,21 +7,19 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
-import com.dy.pmsGlobal.pojoPr.PrEquip;
+import com.dy.pmsGlobal.pojoPr.PrDevice;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 缁勮浠诲姟璁″垝
@@ -41,17 +39,8 @@
@PostMapping(path="save")
@SsoPowerAop(power = "-1")
@Log("淇濆瓨缁勮浠诲姟璁″垝")
- public BaseResponse<Boolean> save(@RequestBody @Valid PrAssemblyPlan plan, BindingResult bindingResult){
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- int count;
- try {
- count = sv.save(plan);
- }catch (Exception e){
- log.error("淇濆瓨缁勮浠诲姟璁″垝寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> save(@RequestBody @Valid PrAssemblyPlan plan){
+ int count = sv.save(plan);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -62,23 +51,13 @@
/**
* 鏇存柊
* @param plan
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "-1")
@Log("鏇存柊缁勮浠诲姟璁″垝")
- public BaseResponse<Boolean> update(@RequestBody @Valid PrAssemblyPlan plan, BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = sv.update(plan);
- }catch (Exception e){
- log.error("鏇存柊缁勮浠诲姟璁″垝寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> update(@RequestBody @Valid PrAssemblyPlan plan){
+ int count = sv.update(plan);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -86,6 +65,17 @@
}
}
+ @PostMapping(path="updateStatus")
+ @SsoPowerAop(power = "-1")
+ @Log("鏇存柊浠诲姟璁″垝鐘舵��")
+ public BaseResponse<Boolean> updateStatus(@RequestBody PrAssemblyPlan plan){
+ int count = sv.updateStatus(plan);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
/**
* 鏍规嵁ID鏌ヨ
* @return
@@ -94,13 +84,8 @@
@SsoPowerAop(power = "-1")
@Log("鏍规嵁ID鏌ヨ缁勮浠诲姟璁″垝")
public BaseResponse<PrAssemblyPlan> one(Long id){
- try{
- PrAssemblyPlan plan=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(plan);
- }catch (Exception e){
- log.error("鏍规嵁ID鏌ヨ缁勮浠诲姟璁″垝寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PrAssemblyPlan plan=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(plan);
}
/**
@@ -112,76 +97,57 @@
@SsoPowerAop(power = "-1")
@Log("鍒嗛〉鏌ヨ缁勮浠诲姟璁″垝")
public BaseResponse<QueryResultVo<List<PrAssemblyPlan>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PrAssemblyPlan>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鍒嗛〉鏌ヨ缁勮浠诲姟璁″垝寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PrAssemblyPlan>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
/**
* 澧炲姞璁惧鍙�
*/
- @PostMapping(path="addEquip")
+ @PostMapping(path="addDevice")
@SsoPowerAop(power = "-1")
@Log("澧炲姞璁惧鍙�")
- public BaseResponse<Boolean> addEquip(@RequestBody QueryVo vo){
+ public BaseResponse<?> addDevice(@RequestBody QueryVo vo){
if(vo.addNum == null || vo.addNum <= 0 || vo.planId == null){
return BaseResponseUtils.buildFail("鍙傛暟閿欒");
}
- try {
- int count = sv.addEquip(vo.planId,vo.addNum);
- if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- }catch (Exception e){
- log.error("澧炲姞璁惧鍙峰紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ int count = sv.addDevice(vo.planId,vo.addNum);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
- @PostMapping(path="someEquip")
+ @PostMapping(path="someDevice")
@SsoPowerAop(power = "-1")
- @Log("鏌ヨ璁惧鍙�")
- public BaseResponse<QueryResultVo<List<PrEquip>>> someEquip(@RequestBody QueryVo queryVo){
- try {
- QueryResultVo<List<PrEquip>> list = sv.selectSomeEquip(queryVo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鍒嗛〉鏌ヨ缁勮浠诲姟璁″垝寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ @Log("鍒嗛〉鏌ヨ璁惧鍙�")
+ public BaseResponse<QueryResultVo<List<PrDevice>>> someDevice(@RequestBody QueryVo queryVo){
+ QueryResultVo<List<PrDevice>> list = sv.selectSomeDevice(queryVo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
- @GetMapping(path="exportEquip")
+ @GetMapping(path="exportDevice")
@SsoPowerAop(power = "-1")
@Log("瀵煎嚭璁惧鍙�")
- public void exportEquip(Long batchId, HttpServletResponse response){
+ public void exportDevice(Long batchId, HttpServletResponse response){
Date start = new Date() ;
- try{
- List<Converter> list = new ArrayList<>();
+ List<Converter> list = new ArrayList<>();
- List<PrEquip> equipList = sv.selectEquipByBatchId(batchId) ;
- // 浣跨敤骞惰娴佹彁楂樻�ц兘
- equipList.parallelStream().forEach(equip -> {
- ExcelVo vo = new ExcelVo();
- vo.equipNo = equip.equipNo;
- try {
- vo.qrCode = QrCodeUtil.genQrCode(vo.equipNo);
- } catch (IOException | WriterException e) {
- e.printStackTrace();
- }
- list.add(vo);
- });
- log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
- QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
- log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
- }catch (Exception e){
- log.error("瀵煎嚭璁惧鍙峰紓甯�", e);
- }
+ List<PrDevice> deviceList = sv.selectDeviceByBatchId(batchId) ;
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ deviceList.parallelStream().forEach(device -> {
+ ExcelVo vo = new ExcelVo();
+ vo.deviceNo = device.deviceNo;
+ try {
+ vo.qrCode = QrCodeUtil.genQrCode(vo.deviceNo);
+ } catch (IOException | WriterException e) {
+ e.printStackTrace();
+ }
+ list.add(vo);
+ });
+ log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+ log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
}
}
--
Gitblit v1.8.0