From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java
index 706e0ec..6c6a944 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java
@@ -1,18 +1,28 @@
 package com.sandu.ximon.admin.service;
 
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightPoleHeelingEnum;
+import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.dao.bo.LightPoleHeelingEquipmentBo;
 import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
 import com.sandu.ximon.dao.mapper.LightPoleHeelingEquipmentMapper;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * @author ZZQ
  * @date 2022/4/13 16:52
  */
 @Service
+@AllArgsConstructor
 public class LightPoleHeelingEquipmentService extends BaseServiceImpl<LightPoleHeelingEquipmentMapper, LightPoleHeelingEquipment> {
+    private LightPoleHeelingEquipmentMapper lightPoleHeelingEquipmentMapper;
+
     /**
      * 娣诲姞鐏潌鍊炬枩鍒拌澶囪〃
      *
@@ -25,4 +35,21 @@
                 , 1, 300L);
         return save(bean);
     }
+
+    /**
+     * 鐏潌鍊炬枩璁惧鍒楄〃
+     *
+     * @return
+     */
+    public List<LightPoleHeelingEquipmentBo> LightPoleHeelingEquipmentList(BaseConditionVO baseConditionVO) {
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+        //涓虹┖鏄秴绠�
+        List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos;
+        if (SecurityUtils.getClientId() == null) {
+            lightPoleHeelingEquipmentBos = lightPoleHeelingEquipmentMapper.LightPoleHeelingEquipmentList(null);
+        } else {
+            lightPoleHeelingEquipmentBos = lightPoleHeelingEquipmentMapper.LightPoleHeelingEquipmentList(SecurityUtils.getUserId());
+        }
+        return lightPoleHeelingEquipmentBos;
+    }
 }

--
Gitblit v1.9.3