From 826a321e7122c4669b41f6a2add90c09749ec672 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 11 十月 2023 11:11:50 +0800
Subject: [PATCH] #pgsql 运营监控

---
 server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java |   66 ++++++++++++++------------------
 1 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index 7e7b37e..ded5f6d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -14,6 +14,8 @@
 import com.doumee.dao.business.SitesMapper;
 import com.doumee.dao.business.model.Locks;
 import com.doumee.dao.business.model.Sites;
+import com.doumee.dao.business.web.request.SitesMonitorBikeDTO;
+import com.doumee.dao.business.web.request.SitesMonitorDTO;
 import com.doumee.service.business.SitesService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -197,46 +199,36 @@
         return sitesMapper.selectCount(wrapper);
     }
 
-    @Async
     @Override
-    public void siteReservesNotice(String siteId) throws Exception{
-        //绔欑偣淇℃伅鏌ヨ
-        Sites sites = sitesMapper.selectById(siteId);
-        if(Objects.isNull(sites)){
-            return;
+    public PageData<SitesMonitorDTO> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
+
+        IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        Page<SitesMonitorDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorDTO(page, pageWrap.getModel().getCode(), pageWrap.getModel().getName());
+
+        if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
+            sitesMonitorDTO.getRecords().forEach(s->{
+                s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLocalCount()).setScale(2)));
+            });
         }
-        //鏌ヨ绔欑偣涓嬮攣澶存暟閲�
-        List<Locks> locksList = locksMapper.selectList(new QueryWrapper<Locks>().eq("status", Constants.ZERO).eq("site_id",siteId));
-        if(Objects.isNull(locksList)||locksList.size()==Constants.ZERO){
-            return;
-        }
-        //鑾峰彇绌洪攣澶存暟閲�
-        Integer empLocks =  locksList.stream().filter(l -> StringUtils.isEmpty(l.getBikeCode())).collect(Collectors.toList()).size();
-        //閿佸ご姝e父瀛樿溅鏁伴噺
-        Integer unEmpLocks = locksList.size() - empLocks;
-        BigDecimal warnMax = new BigDecimal(String.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.WARN_MAX)));
-        BigDecimal warnMin = new BigDecimal(String.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.WARN_MIN)));
-        //瓒呭嚭棰勮鏈�澶у��
-        if(empLocks>Constants.ZERO){
-            if(BigDecimal.valueOf(empLocks).divide(BigDecimal.valueOf(locksList.size())).multiply(BigDecimal.valueOf(100)).compareTo(warnMax)>Constants.ZERO){
-                DingDingNotice.reservesNotice(sites.getName(),
-                        systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
-                        systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),
-                        Constants.ZERO,warnMax);
-                return;
-            };
-        }
-        //浣庝簬棰勮鏈�灏忓��
-        if(unEmpLocks>Constants.ZERO){
-            if(BigDecimal.valueOf(unEmpLocks).divide(BigDecimal.valueOf(locksList.size())).multiply(BigDecimal.valueOf(100)).compareTo(warnMin)<Constants.ZERO){
-                DingDingNotice.reservesNotice(sites.getName(),
-                        systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
-                        systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),
-                        Constants.ONE,warnMin);
-                return;
-            }
-        }
+
+        return PageData.from(sitesMonitorDTO);
     }
 
+    @Override
+    public void siteReservesNotice(String siteId) throws Exception {
 
+    }
+
+    @Override
+    public PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap) {
+        IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        Page<SitesMonitorBikeDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorBikeDTO(page,
+                                                                        pageWrap.getModel().getCode(),
+                                                                        pageWrap.getModel().getName(),
+                                                                        pageWrap.getModel().getLockCode(),
+                                                                        pageWrap.getModel().getHasBike());
+
+
+        return PageData.from(sitesMonitorDTO);
+    }
 }

--
Gitblit v1.9.3