From ac4f0d8e61c545c74f287563765179696b51b856 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 五月 2025 17:21:49 +0800
Subject: [PATCH] 增加排班删除功能
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 5e5be8c..e33670b 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
@@ -8,6 +8,7 @@
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrDevice;
+import com.dy.pmsGlobal.util.ExportExcelUtil;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
@@ -37,7 +38,7 @@
}
@PostMapping(path="save")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("淇濆瓨缁勮浠诲姟璁″垝")
public BaseResponse<Boolean> save(@RequestBody @Valid PrAssemblyPlan plan){
int count = sv.save(plan);
@@ -54,7 +55,7 @@
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("鏇存柊缁勮浠诲姟璁″垝")
public BaseResponse<Boolean> update(@RequestBody @Valid PrAssemblyPlan plan){
int count = sv.update(plan);
@@ -66,7 +67,7 @@
}
@PostMapping(path="updateStatus")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("鏇存柊浠诲姟璁″垝鐘舵��")
public BaseResponse<Boolean> updateStatus(@RequestBody PrAssemblyPlan plan){
int count = sv.updateStatus(plan);
@@ -81,7 +82,7 @@
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200000")
@Log("鏍规嵁ID鏌ヨ缁勮浠诲姟璁″垝")
public BaseResponse<PrAssemblyPlan> one(Long id){
PrAssemblyPlan plan=sv.selectById(id);
@@ -94,7 +95,7 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200000")
@Log("鍒嗛〉鏌ヨ缁勮浠诲姟璁″垝")
public BaseResponse<QueryResultVo<List<PrAssemblyPlan>>> some(@RequestBody QueryVo vo){
QueryResultVo<List<PrAssemblyPlan>> list = sv.selectSome(vo) ;
@@ -105,7 +106,7 @@
* 澧炲姞璁惧鍙�
*/
@PostMapping(path="addDevice")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200001")
@Log("澧炲姞璁惧鍙�")
public BaseResponse<?> addDevice(@RequestBody QueryVo vo){
if(vo.addNum == null || vo.addNum <= 0 || vo.planId == null){
@@ -120,7 +121,7 @@
}
@PostMapping(path="someDevice")
- @SsoPowerAop(power = "-1")
+ @SsoPowerAop(power = "10200000")
@Log("鍒嗛〉鏌ヨ璁惧鍙�")
public BaseResponse<QueryResultVo<List<PrDevice>>> someDevice(@RequestBody QueryVo queryVo){
QueryResultVo<List<PrDevice>> list = sv.selectSomeDevice(queryVo) ;
@@ -128,8 +129,8 @@
}
@GetMapping(path="exportDevice")
- @SsoPowerAop(power = "-1")
- @Log("瀵煎嚭璁惧鍙�")
+ @SsoPowerAop(power = "10200001")
+ @Log("瀵煎嚭璁惧鍙峰強浜岀淮鐮�")
public void exportDevice(Long batchId, HttpServletResponse response){
Date start = new Date() ;
List<Converter> list = new ArrayList<>();
@@ -146,8 +147,29 @@
}
list.add(vo);
});
+ log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ ExportExcelUtil.downloadExcel(response, fileName,sheetName,list);
+ log.info("瀵煎嚭璁惧鍙峰強浜岀淮鐮佽�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
+ }
+ @GetMapping(path="exportDeviceNo")
+ @SsoPowerAop(power = "10200001")
+ @Log("瀵煎嚭璁惧鍙�")
+ public void exportDeviceNo(Long batchId, HttpServletResponse response){
+ Date start = new Date() ;
+ List<Converter> list = new ArrayList<>();
+
+ List<PrDevice> deviceList = sv.selectDeviceByBatchId(batchId) ;
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ deviceList.parallelStream().forEach(device -> {
+ ExcelDeviceNoVo vo = new ExcelDeviceNoVo();
+ vo.deviceNo = device.deviceNo;
+ list.add(vo);
+ });
+ //鏍规嵁batchid鎵惧埌浠诲姟鍚嶇О
+ PrAssemblyPlan plan = sv.selectByBatchId(batchId);
+ String fileNameStr = plan.name +"-"+ fileName;
log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
- QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+ ExportExcelUtil.downloadExcel(response, fileNameStr,sheetName,list);
log.info("瀵煎嚭璁惧鍙疯�楁椂锛�"+(new Date().getTime()-start.getTime())+"ms");
}
}
--
Gitblit v1.8.0