From ebae0c1137ba96d38e5b2323577129d2c9ff2e6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 09:45:59 +0800
Subject: [PATCH] 1、优化配置文件； 2、优化ID生成器代码； 3、修改注释； 4、修改权限初始化时算法； 5、导出Excel文件功能归为一个新类； 6、工站数据库存入验空修改；
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java | 124 ++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 70 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
index 28c3c7e..4626135 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
@@ -1,20 +1,21 @@
package com.dy.pmsPlatform.product;
import com.alibaba.excel.converters.Converter;
-import com.alibaba.fastjson2.JSON;
import com.dy.common.aop.SsoPowerAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPlt.PltProduct;
+import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.util.ExportExcelUtil;
+import com.dy.pmsGlobal.util.QrCodeConstant;
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;
@@ -44,26 +45,15 @@
/**
* 淇濆瓨浜у搧淇℃伅
* @param pro
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300001")
@Log("淇濆瓨浜у搧淇℃伅")
- public BaseResponse<PltProduct> save(@RequestBody @Valid PltProduct pro,
- BindingResult bindingResult){
+ public BaseResponse<PltProduct> save(@RequestBody @Valid PltProduct pro){
pro.id = null;
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- pro.setDeleted(false);
- count = proSv.save(pro);
- }catch (Exception e){
- log.error("淇濆瓨浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ pro.setDeleted(false);
+ int count = proSv.save(pro);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -75,23 +65,13 @@
/**
* 鏇存柊浜у搧淇℃伅
* @param pro
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300001")
@Log("鏇存柊浜у搧淇℃伅")
- public BaseResponse<PltProduct> update(@RequestBody @Valid PltProduct pro,BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = proSv.update(pro);
- }catch (Exception e){
- log.error("鏇存柊浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<PltProduct> update(@RequestBody @Valid PltProduct pro){
+ int count = proSv.update(pro);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -108,13 +88,7 @@
@SsoPowerAop(power = "10300001")
@Log("鍒犻櫎浜у搧淇℃伅")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = proSv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = proSv.delete(Long.parseLong(id));
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -131,14 +105,9 @@
@SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ浜у搧淇℃伅")
public BaseResponse<PltProduct> one(String id){
- try{
- PltProduct pro=proSv.selectById(id);
+ PltProduct pro=proSv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(pro));
- }catch (Exception e){
- log.error("鏍规嵁ID鏌ヨ浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ return BaseResponseUtils.buildSuccess(pro);
}
/**
@@ -150,13 +119,8 @@
@SsoPowerAop(power = "10300000")
@Log("鍒嗛〉鏌ヨ浜у搧淇℃伅")
public BaseResponse<QueryResultVo<List<PltProduct>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltProduct>> list = proSv.selectSome(vo);
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鍒嗛〉鏌ヨ浜у搧寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltProduct>> list = proSv.selectSome(vo);
+ return BaseResponseUtils.buildSuccess(list);
}
/**
@@ -167,42 +131,62 @@
@SsoPowerAop(power = "10300000")
@Log("鏌ヨ鎵�鏈変骇鍝�")
public BaseResponse<List<PltProduct>> all(){
- try {
- QueryVo vo = new QueryVo();
- return BaseResponseUtils.buildSuccess(proSv.selectAll(vo));
- }catch (Exception e){
- log.error("鏌ヨ鎵�鏈変骇鍝佸紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryVo vo = new QueryVo();
+ return BaseResponseUtils.buildSuccess(proSv.selectAll(vo));
+ }
+ /**
+ * 鍙牴鎹畂rderId鏌ヨ浜у搧
+ * @return
+ */
+ @GetMapping(path="getProduct")
+ @SsoPowerAop(power = "10300000")
+ @Log("鏍规嵁orderId鏌ヨ浜у搧")
+ public BaseResponse<List<PltProduct>> getProduct(Long orderId){
+ return BaseResponseUtils.buildSuccess(proSv.getProduct(orderId));
}
+
@PostMapping(path="export")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300001")
@Log("瀵煎嚭浜у搧淇℃伅")
public void export(@RequestBody QueryVo queryVo, HttpServletResponse response){
- try{
- List<Converter> list = new ArrayList<>() ;
+ List<Converter> list = new ArrayList<>() ;
- List<PltProduct> porList = proSv.selectAll(queryVo);
- // 浣跨敤骞惰娴佹彁楂樻�ц兘
- porList.parallelStream().forEach(pro -> {
+ List<PltProduct> products = proSv.selectAll(queryVo);
+ if(products != null){
+ for(PltProduct product : products){
ExcelVo vo = new ExcelVo();
- vo.name = pro.name;
- vo.type = pro.type;
- vo.code = pro.code;
+ vo.name = product.name;
+ vo.type = product.type;
+ vo.code = product.code;
try {
- vo.qrCode = QrCodeUtil.genQrCode(pro.code);
+ vo.qrCode = QrCodeUtil.genQrCode(product.code);
} catch (IOException e) {
e.printStackTrace();
} catch (WriterException e) {
e.printStackTrace();
}
list.add(vo);
- });
- QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
- }catch (Exception e){
- log.error("瀵煎嚭浜у搧淇℃伅寮傚父", e);
+ }
}
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘锛屼絾鐢熸垚鐨勭粨鏋滃彉鎴愭棤搴忕殑浜�
+ /*
+ porList.parallelStream().forEach(pro -> {
+ ExcelVo vo = new ExcelVo();
+ vo.name = pro.name;
+ vo.type = pro.type;
+ vo.code = pro.code;
+ try {
+ vo.qrCode = QrCodeUtil.genQrCode(pro.code);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (WriterException e) {
+ e.printStackTrace();
+ }
+ list.add(vo);
+ });
+ */
+ ExportExcelUtil.downloadExcel(response, fileName, sheetName, list);
}
--
Gitblit v1.8.0