添加刷新接入站点

bill-manager/src/main/java/com/mortals/xhx/daemon/task/SiteStatTaskImpl.java

@@ -79,7 +79,7 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
     }
 
     private void statByDate() {
-        List<SitePdu> sitePduList = getStatSiteList();
+        List<SitePdu> sitePduList = accessService.getStatSiteList();
         for (SitePdu site : sitePduList) {
             if (ObjectUtils.isEmpty(site.getId())) continue;
             StopWatch allStopWatch = new StopWatch("allStopWatch");
@@ -196,7 +196,7 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
     }
 
 
-    private List<SitePdu> getStatSiteList() {
+  /*  private List<SitePdu> getStatSiteList() {
         AccessQuery accessQuery = new AccessQuery();
        // accessQuery.setTagNotList(Arrays.asList(""));
         List<AccessEntity> accessEntities = accessService.find(accessQuery);
@@ -234,10 +234,10 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
                             toCollection(() -> new TreeSet<>(Comparator.comparing(SitePdu::getId))), ArrayList::new));
         }
         return sitePduList;
-    }
+    }*/
 
     private void updateSiteCache() {
-        List<SitePdu> sitePduList = getStatSiteList();
+        List<SitePdu> sitePduList = accessService.getStatSiteList();
 
         for (SitePdu site : sitePduList) {
             updatePjSectionCache(site);

bill-manager/src/main/java/com/mortals/xhx/module/access/service/AccessService.java

 package com.mortals.xhx.module.access.service;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.module.access.model.AccessEntity;
 import com.mortals.xhx.module.access.dao.AccessDao;
+
+import java.util.List;
+
 /**
 * AccessService
 *
@@ -13,4 +17,6 @@ import com.mortals.xhx.module.access.dao.AccessDao;
 public interface AccessService extends ICRUDService<AccessEntity,Long>{
 
     AccessDao getDao();
+
+    List<SitePdu> getStatSiteList();
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/module/access/service/impl/AccessServiceImpl.java

 package com.mortals.xhx.module.access.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.ThreadPool;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.access.dao.AccessDao;
 import com.mortals.xhx.module.access.model.AccessEntity;
+import com.mortals.xhx.module.access.model.AccessQuery;
 import com.mortals.xhx.module.access.model.AccessSystemEntity;
 import com.mortals.xhx.module.access.model.AccessSystemQuery;
 import com.mortals.xhx.module.access.service.AccessService;
@@ -15,12 +24,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toCollection;
+
 /**
  * AccessService
  * 区域接入 service实现
@@ -33,7 +42,12 @@ import java.util.stream.Collectors;
 public class AccessServiceImpl extends AbstractCRUDServiceImpl<AccessDao, AccessEntity, Long> implements AccessService {
     @Autowired
     private AccessSystemService accessSystemService;
-
+    @Autowired
+    private ISiteFeign siteFeign;
+    @Autowired
+    private AccessService accessService;
+    @Autowired
+    private ICacheService cacheService;
 
     @Override
     protected void findAfter(AccessEntity params, PageInfo pageInfo, Context context, List<AccessEntity> list) throws AppException {
@@ -64,6 +78,16 @@ public class AccessServiceImpl extends AbstractCRUDServiceImpl<AccessDao, Access
                 item.setCreateTime(new Date());
             }).count();
             accessSystemService.save(entity.getAccessSystemList());
+
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    List<SitePdu> statSiteList = accessService.getStatSiteList();
+                    int total = statSiteList.size();
+                    cacheService.set(RedisKey.KEY_SITE_STAT_COUNT_CHCHE, total);
+                }
+            };
+            ThreadPool.getInstance().execute(runnable);
         }
         super.saveAfter(entity, context);
     }
@@ -91,4 +115,53 @@ public class AccessServiceImpl extends AbstractCRUDServiceImpl<AccessDao, Access
         accessSystemService.removeList(accessSystemlist, context);
         super.removeAfter(ids, context, result);
     }
+
+    @Override
+    public List<SitePdu> getStatSiteList() {
+        AccessQuery accessQuery = new AccessQuery();
+        // accessQuery.setTagNotList(Arrays.asList(""));
+        List<AccessEntity> accessEntities = this.find(accessQuery);
+        accessEntities = accessEntities.stream().filter(item -> {
+            List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
+            //判断排队机或者评价系统是否开通
+            if (ObjectUtils.isEmpty(accessSystemList)) return false;
+            List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
+            if (ObjectUtils.isEmpty(collect)) {
+                return false;
+            }
+            return true;
+        }).collect(Collectors.toList());
+
+        List<SitePdu> sitePduList = new ArrayList<>();
+        for (AccessEntity accessEntity : accessEntities) {
+            if (accessEntity.getSiteId() == 1L) {
+                SitePdu site = new SitePdu();
+                site.setId(accessEntity.getSiteId());
+                site.setSiteName(accessEntity.getSiteName());
+                site.setSiteCode(accessEntity.getSiteCode());
+                site.setAreaCode(accessEntity.getAreaCode());
+                sitePduList.add(site);
+                continue;
+            }
+            SitePdu sitePdu = new SitePdu();
+            sitePdu.setId(accessEntity.getSiteId());
+            Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+            if (YesNoEnum.YES.getValue() == sitesRest.getCode()) {
+                sitePduList.addAll(sitesRest.getData());
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(sitePduList)) {
+            sitePduList = sitePduList.stream().collect(
+                    collectingAndThen(
+                            toCollection(() -> new TreeSet<>(Comparator.comparing(SitePdu::getId))), ArrayList::new));
+        }
+        return sitePduList;
+    }
+
+
+    public static void main(String[] args) {
+        String a = StrUtil.prependIfMissing("a123", "a");
+        System.out.println(a);
+    }
 }
\ No newline at end of file