From 406105ea0f2912aa8446c3ed2357b5ec97fdf94c Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Wed, 11 Sep 2024 16:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E7=BC=BA=E5=B0=91=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/machine/MachineAuthController.java  | 15 ++++--
 .../service/machine/MachineServiceImpl.java   | 50 ++++++++++---------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java
index f4dab90bc..c2c8f6ad3 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java
@@ -27,11 +27,20 @@ public class MachineAuthController {
     @Resource
     private MachineService machineService;
 
-    @PostMapping("insert-organ-auth")
+
+    @PutMapping("insert-organ-auth")
     @Operation(summary = "组织机台授权信息更新")
     @PreAuthorize("@ss.hasPermission('machine-auth::update')")
-    public CommonResult<Boolean> auth(@RequestBody MachineOrgAuthReq vo) {
-        return success(machineService.auth(vo));
+    public CommonResult<Boolean> authInsert(@RequestBody MachineOrgAuthReq vo) {
+        return success(machineService.authInsert(vo));
+    }
+
+
+    @PostMapping("update-organ-auth")
+    @Operation(summary = "组织机台授权信息更新")
+    @PreAuthorize("@ss.hasPermission('machine-auth::update')")
+    public CommonResult<Boolean> authUpdate(@RequestBody MachineOrgAuthReq vo) {
+        return success(machineService.authUpdate(vo));
     }
 
     @GetMapping("organ-page")
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
index 779808721..0a0b27c0d 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
@@ -432,35 +432,39 @@ public class MachineServiceImpl implements MachineService {
         return machineVOS.stream().collect(Collectors.groupingBy(MachineVO::getMachineType));
     }
 
+
     @Override
-    public Boolean auth(MachineOrgAuthReq vo) {
+    public Boolean authInsert(MachineOrgAuthReq vo) {
+
+        OrganizationDO tenant = organMapper.selectById(vo.getOrganId());
+
+        if (tenant != null) {
+            throw exception(ORGAN_ALREADY_EXISTS);
+        }
+
+        MachineLimitDO machineLimitDO = MachineLimitDO.builder()
+                .organId(vo.getOrganId())
+                .cutLimit(vo.getCutLimit())
+                .drillLimit(vo.getDrillLimit())
+                .labelLimit(vo.getLabelLimit())
+                .sawLimit(vo.getSawLimit())
+                .sealedgeLimit(vo.getSealedgeLimit())
+                .setting(vo.getMachineAuthIds().toString())
+                .build();
+
+        machineLimitMapper.insert(machineLimitDO);
+
+        return Boolean.TRUE;
+    }
+
+
+    @Override
+    public Boolean authUpdate(MachineOrgAuthReq vo) {
 
         OrganizationDO tenant = organMapper.selectById(vo.getOrganId());
         if (tenant == null) {
             throw exception(ORGAN_NOT_EXISTS);
         }
-//        machineLimitMapper.delete(new LambdaQueryWrapperX<MachineLimitDO>().eq(MachineLimitDO::getOrganId, vo.getOrganId()));
-
-//        List<MachineAuth> machineAuthList = vo.getMachineAuthList();
-
-//        if(CollectionUtil.isNotEmpty(machineAuthList)) {
-//            List<MachineLimitDO> organMachineDOS = new ArrayList<>();
-//            LocalDateTime now = LocalDateTime.now();
-//            for (MachineAuth machineAuth : machineAuthList) {
-//                organMachineDOS.add(
-//                        MachineLimitDO.builder()
-//                                .createTime(now)
-//                                .organId(vo.getOrganId())
-////                                .machineId(machineAuth.getMachineId())
-////                                .showDualWorkstation(machineAuth.getShowDualWorkstation())
-////                                .showAutoNotePrinter(machineAuth.getShowAutoNotePrinter())
-////                                .showPriorFacing(machineAuth.getShowPriorFacing())
-//                                .build()
-//                );
-//
-//            }
-//            machineLimitMapper.insertBatch(organMachineDOS);
-//        }
 
         MachineLimitDO machineLimitDO = MachineLimitDO.builder()
                 .organId(vo.getOrganId())