From dfe3eb2327962d2cace6ca85acd1dea629033886 Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期一, 17 十月 2022 16:21:22 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java |   57 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index 690a92d..2a1b83f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -7,12 +7,7 @@
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.common.util.SpringContextHolder;
 import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartBeatTimeReportInnerFrame;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereOperationReportInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereQueryVersionReportInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereQueryHeartBeatTimeReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereQueryVersionReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereRebootReqInnerFrame;
 import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereSetHeartBeatTimeReqInnerFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
@@ -23,11 +18,11 @@
 import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
 import com.sandu.ximon.admin.utils.StringUtil;
 import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
-import com.sandu.ximon.dao.domain.AirEquipment;
 import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
 import com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -74,11 +69,11 @@
             PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         }
         List<AirEquipmentNongGengBo> airEquipmentBos;
-//        if (SecurityUtils.getClientId() == null) {
-//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
-//        } else {
-//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
-//        }
+        if (SecurityUtils.getClientId() == null) {
+            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
+        } else {
+            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+        }
 
         if (SecurityUtils.getClientId() == null) {
             airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
@@ -94,15 +89,15 @@
      * 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
      */
     public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
-//        List<AirEquipmentNongGengBo> airEquipmentBos;
-//        if (SecurityUtils.getClientId() == null) {
-//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
-//        } else {
-//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
-//        }
+        List<AirEquipmentNongGengBo> airEquipmentBos;
+        if (SecurityUtils.getClientId() == null) {
+            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+        } else {
+            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+        }
 
-//        return airEquipmentBos;
-        return null;
+        return airEquipmentBos;
+//        return null;
     }
 
     /**
@@ -185,4 +180,28 @@
             throw new BusinessException("鏁版嵁鏍￠獙寮傚父锛�");
         }
     }
+
+
+    /**
+     * 璁剧疆绫诲瀷
+     *
+     * @param param
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean setAirEquipmentType(AirEquipmentNongGeng param) {
+        if (param.getType() == null || param.getId() == null || param.getType().isEmpty()) {
+            throw new BusinessException("璁惧id鎴栫被鍨嬩笉鑳戒负绌�");
+        }
+        if (!"0".equals(param.getType()) && !"1".equals(param.getType()) && !"2".equals(param.getType())) {
+            throw new BusinessException("璁惧绫诲瀷涓嶆纭�");
+        }
+        AirEquipmentNongGeng byId = getById(param.getId());
+        if (byId == null) {
+            throw new BusinessException("璁惧id閿欒鎴栬澶囦笉瀛樺湪!");
+        }
+        byId.setType(param.getType());
+
+        return updateById(byId);
+    }
 }

--
Gitblit v1.9.3