From 9f7fcb82f43ac4905623b0239d0f3ef7f4079e47 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 08:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanCtrl.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 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 e96a2e3..02566d8 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
@@ -37,7 +37,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 +54,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 +66,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 +81,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 +94,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) ;
@@ -104,14 +104,14 @@
     /**
      * 澧炲姞璁惧鍙�
      */
-    @PostMapping(path="addEquip")
-    @SsoPowerAop(power = "-1")
+    @PostMapping(path="addDevice")
+    @SsoPowerAop(power = "10200001")
     @Log("澧炲姞璁惧鍙�")
-    public BaseResponse<?> addEquip(@RequestBody QueryVo vo){
+    public BaseResponse<?> addDevice(@RequestBody QueryVo vo){
         if(vo.addNum == null || vo.addNum <= 0 || vo.planId == null){
             return BaseResponseUtils.buildFail("鍙傛暟閿欒");
         }
-        int count = sv.addEquip(vo.planId,vo.addNum);
+        int count = sv.addDevice(vo.planId,vo.addNum);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
         } else {
@@ -119,28 +119,28 @@
         }
     }
 
-    @PostMapping(path="someEquip")
-    @SsoPowerAop(power = "-1")
+    @PostMapping(path="someDevice")
+    @SsoPowerAop(power = "10200000")
     @Log("鍒嗛〉鏌ヨ璁惧鍙�")
-    public BaseResponse<QueryResultVo<List<PrDevice>>> someEquip(@RequestBody QueryVo queryVo){
-        QueryResultVo<List<PrDevice>> list = sv.selectSomeEquip(queryVo) ;
+    public BaseResponse<QueryResultVo<List<PrDevice>>> someDevice(@RequestBody QueryVo queryVo){
+        QueryResultVo<List<PrDevice>> list = sv.selectSomeDevice(queryVo) ;
         return BaseResponseUtils.buildSuccess(list);
     }
 
-    @GetMapping(path="exportEquip")
-    @SsoPowerAop(power = "-1")
+    @GetMapping(path="exportDevice")
+    @SsoPowerAop(power = "10200001")
     @Log("瀵煎嚭璁惧鍙�")
-    public void exportEquip(Long batchId, HttpServletResponse response){
+    public void exportDevice(Long batchId, HttpServletResponse response){
         Date start = new Date() ;
         List<Converter> list = new ArrayList<>();
 
-        List<PrDevice> equipList = sv.selectEquipByBatchId(batchId) ;
+        List<PrDevice> deviceList = sv.selectDeviceByBatchId(batchId) ;
         // 浣跨敤骞惰娴佹彁楂樻�ц兘
-        equipList.parallelStream().forEach(equip -> {
+        deviceList.parallelStream().forEach(device -> {
             ExcelVo vo = new ExcelVo();
-            vo.equipNo = equip.deviceNo;
+            vo.deviceNo = device.deviceNo;
             try {
-                vo.qrCode = QrCodeUtil.genQrCode(vo.equipNo);
+                vo.qrCode = QrCodeUtil.genQrCode(vo.deviceNo);
             } catch (IOException | WriterException e) {
                 e.printStackTrace();
             }

--
Gitblit v1.8.0