From 1a29f8b47db7d3a205c278fac36deed6b1ef371f Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 06 六月 2022 17:37:36 +0800
Subject: [PATCH] 灯杆倾斜处理

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java
index 7b188c0..a632578 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java
@@ -22,10 +22,12 @@
 @Service
 @AllArgsConstructor
 public class LightPoleHeelingProcessingServices extends BaseServiceImpl<LightPoleHeelingProcessingMapper, LightPoleHeelingProcessing> {
+    private final LightPoleHeelingProcessingMapper lightPoleHeelingProcessingMapper;
+
     /**
      * 鐏潌鍊炬枩璀﹀憡澶勭悊
      */
-    public boolean ProcessingLightPoleHeeling(LightPoleHeelingProcessingParam param) {
+    public String ProcessingLightPoleHeeling(LightPoleHeelingProcessingParam param) {
         LightPoleHeelingService lightPoleHeelingService = SpringContextHolder.getBean(LightPoleHeelingService.class);
 
         LightPoleHeeling one = SpringContextHolder.getBean(LightPoleHeelingMapper.class).
@@ -45,6 +47,7 @@
         lightPoleHeelingProcessing.setTheXAxisOld(one.getTheXAxis());
         lightPoleHeelingProcessing.setTheYAxisOld(one.getTheYAxis());
         lightPoleHeelingProcessing.setTheZAxisOld(one.getTheZAxis());
+        lightPoleHeelingProcessing.setMac(one.getMac());
         lightPoleHeelingProcessing.setWarningLevelOld(one.getWarningLevel());
 
         //璀﹀憡绛夌骇
@@ -59,12 +62,36 @@
             //姝e父
             lightPoleHeelingProcessing.setWarningLevel(0);
         }
-        boolean save = save(lightPoleHeelingProcessing);
-        if (save) {
-            //璁剧疆涓哄凡澶勭悊
-            one.setProcessingState(1);
-            lightPoleHeelingService.updateById(one);
+        boolean save = false;
+
+        try {
+            save = save(lightPoleHeelingProcessing);
+            if (save) {
+                //璁剧疆涓哄凡澶勭悊
+                one.setProcessingState(1);
+                lightPoleHeelingService.updateById(one);
+                return "鐏潌鍊炬枩澶勭悊鎴愬姛锛�";
+            }
+        } catch (Exception e) {
+            System.out.println("寮傚父");
         }
-        return save;
+        throw new BusinessException("鐏潌鍊炬枩澶勭悊澶辫触锛�");
+    }
+
+    /**
+     * 鐏潌鍊炬枩澶勭悊璀﹀憡璇︽儏
+     *
+     * @param processingNumber
+     * @return
+     */
+    public LightPoleHeelingProcessing processingDetail(Long processingNumber) {
+        if (processingNumber == null) {
+            throw new BusinessException("鐏潌鍊炬枩璀﹀憡澶勭悊ID涓嶈兘涓虹┖锛�");
+        }
+        LightPoleHeelingProcessing bean = lightPoleHeelingProcessingMapper.processingDetail(SecurityUtils.getClientId(), processingNumber);
+        if (bean == null) {
+            throw new BusinessException("澶勭悊鍚庣殑鐏潌鍊炬枩鏁版嵁涓嶅瓨鍦紒");
+        }
+        return bean;
     }
 }

--
Gitblit v1.9.3