From 7594869a187c79d599ec39863292dbe6af553712 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 01 十二月 2021 15:02:19 +0800
Subject: [PATCH] 分组功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java |   61 ++++++++++++++++++------------
 1 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
index ae7a032..360b58c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
@@ -3,6 +3,7 @@
 import cn.hutool.core.lang.Snowflake;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sandu.common.execption.BusinessException;
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.ximon.admin.param.LampPostParam;
 import com.sandu.ximon.admin.security.CountSet;
@@ -15,6 +16,7 @@
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -23,32 +25,31 @@
     private final CountSet countSet;
     private final LampCountService lampCountService;
     private final ClientMapper clientMapper;
-    private final Snowflake snowflake;
+    private final LampPostMapper lampPostMapper;
 
-    public boolean addLamp(LampPostParam lampPostParam){
-        LampPost lampPost=new LampPost();
-       // lampPost.setId(snowflake.nextId());
+    public boolean addLamp(LampPostParam lampPostParam) {
+        LampPost lampPost = new LampPost();
+        // lampPost.setId(snowflake.nextId());
         Long userId = SecurityUtils.getUserId();
         lampPost.setUserId(userId);
         lampPost.setLampId(countSet.aVoid());
         lampPost.setName(lampPostParam.getName());
         lampPost.setAddress(lampPostParam.getAddress());
-        if(lampPostParam.getBelongsClient()!=null){
+        if (lampPostParam.getBelongsClient() != null) {
             Long clientId = clientMapper.findClientIdByName(lampPostParam.getBelongsClient());
             lampPost.setBelongsClient(lampPostParam.getBelongsClient());
             lampPost.setClientId(clientId);
         }
-        if(lampPostParam.getMacCode()==null){
+        if (lampPostParam.getMacCode() == null) {
             lampPost.setMacCode("铏氭嫙鐏潌");
-        }else {
+        } else {
             lampPost.setMacCode(lampPostParam.getMacCode());
         }
-        lampPost.setGroup(null);
-        lampPost.setState("姝ｅ父");
+        lampPost.setState(1);
         boolean save = save(lampPost);
-        if(!save){
+        if (!save) {
             LampCount lampCount = lampCountService.list().get(0);
-            lampCount.setCount(lampCount.getCount()-1);
+            lampCount.setCount(lampCount.getCount() - 1);
             lampCountService.updateById(lampCount);
         }
 
@@ -56,39 +57,49 @@
 
     }
 
-    public  boolean  updateLamp(Long id, LampPostParam lampPostParam){
-        LampPost lampPost=new LampPost();
+    public boolean updateLamp(Long id, LampPostParam lampPostParam) {
+        LampPost lampPost = new LampPost();
+        LampPost byId = getById(id);
+        if (byId == null) {
+            throw new BusinessException("鏈壘鍒拌鐏潌");
+        }
         lampPost.setId(id);
         lampPost.setName(lampPostParam.getName());
         lampPost.setAddress(lampPostParam.getAddress());
-        if(lampPostParam.getBelongsClient()!=null){
+        if (lampPostParam.getBelongsClient() != null) {
             Long clientId = clientMapper.findClientIdByName(lampPostParam.getBelongsClient());
             lampPost.setBelongsClient(lampPostParam.getBelongsClient());
             lampPost.setClientId(clientId);
         }
-        if(lampPostParam.getMacCode()==null){
+        if (lampPostParam.getMacCode() == null) {
             lampPost.setMacCode("铏氭嫙鐏潌");
-        }else {
+        } else {
             lampPost.setMacCode(lampPostParam.getMacCode());
         }
-       return updateById(lampPost);
+        return updateById(lampPost);
     }
 
 
     /**
-     *
      * @param group
-     * @param lampPosts
-     *缂栬緫鍒嗙粍--閫夋嫨鐏潌
+     * @param Id 缂栬緫鍒嗙粍--閫夋嫨鐏潌
      */
 
-    public void  setGroup(String group, List<LampPost> lampPosts){
-        for (LampPost lamp:lampPosts
-             ) {
-            lamp.setGroup(group);
-            updateById(lamp);
+    public void setGroup(String group, List<Long> Id) {
+        // List<LampPost> update=new ArrayList<>();
+        for (Long id : Id
+        ) {
+            lampPostMapper.serGroup(group, id);
         }
 
+        // return updateBatchById(update);
+    }
+
+    public List<LampPost> listLamp() {
+        List<LampPost> list = lampPostMapper.listLamp();
+       // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
+        return list;
+
     }
 
 

--
Gitblit v1.9.3