From bc3fe7ea8eecca4d36793b80bfbe2e212cde5b4f Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 02 七月 2024 10:41:48 +0800
Subject: [PATCH] 修改测试库地址;pom文件打包时的依赖
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 119 +++++++++++++++++------------------------------------------
1 files changed, 34 insertions(+), 85 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 6dbf964..748f1cc 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
@@ -14,14 +14,12 @@
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 {
@@ -90,13 +69,7 @@
@SsoPowerAop(power = "-1")
@Log("鏇存柊浠诲姟璁″垝鐘舵��")
public BaseResponse<Boolean> updateStatus(@RequestBody PrAssemblyPlan plan){
- int count;
- try {
- count = sv.updateStatus(plan);
- }catch (Exception e){
- log.error("鏇存柊缁勮浠诲姟璁″垝寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = sv.updateStatus(plan);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -111,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);
}
/**
@@ -129,13 +97,8 @@
@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);
}
/**
@@ -144,34 +107,24 @@
@PostMapping(path="addEquip")
@SsoPowerAop(power = "-1")
@Log("澧炲姞璁惧鍙�")
- public BaseResponse<Boolean> addEquip(@RequestBody QueryVo vo){
+ public BaseResponse<?> addEquip(@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.addEquip(vo.planId,vo.addNum);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@PostMapping(path="someEquip")
@SsoPowerAop(power = "-1")
- @Log("鏌ヨ璁惧鍙�")
+ @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());
- }
+ QueryResultVo<List<PrEquip>> list = sv.selectSomeEquip(queryVo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
@GetMapping(path="exportEquip")
@@ -179,26 +132,22 @@
@Log("瀵煎嚭璁惧鍙�")
public void exportEquip(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<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");
}
}
--
Gitblit v1.8.0