修改计量表场站数据统计

web/health/pom.xml

@@ -95,16 +95,16 @@
             <artifactId>hutool-all</artifactId>
             <version>5.1.1</version>
         </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>3.2.0</version>
-        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
         </dependency>

web/health/src/main/java/com/gyee/health/controller/AuthController.java

@@ -1,10 +1,13 @@
 package com.gyee.health.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.common.model.StringUtils;
 import com.gyee.health.dto.AjaxResult;
 import com.gyee.health.dto.AjaxStatus;
 import com.gyee.health.model.vo.TokenVo;
 import com.gyee.health.service.TokenService;
+import com.gyee.health.util.redis.RedisService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
@@ -13,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/auth")
@@ -23,28 +26,40 @@ public class AuthController {
 
     @Resource
     private TokenService tokenService;
-
+    @Resource
+    private RedisService redisService;
     @PostMapping("/login")
     @ResponseBody
     @ApiOperation(value = "使用账号密码登录")
-    public AjaxResult login(String token,String userId) {
+    public AjaxResult login(String token, String userId) {
 
         if (StringUtils.notEmp(token) && StringUtils.notEmp(token)) {
 
+            redisService.select(9);
+            if (redisService.hasKey("userSessions")) {
+                String cp0String = redisService.get("userSessions");
+                tokenService.sessionMap= JSONObject.parseObject(cp0String, new TypeReference<Map<String, TokenVo>>() {
+                });
+            }
             TokenVo tokenVo=new TokenVo();
             tokenVo.setToken(token);
             tokenVo.setUserId(userId);
-            if (!tokenService.sessionMap.containsKey(tokenVo.getToken())) {
-                tokenVo.setTime(new Date());
-                tokenService.sessionMap.put(tokenVo.getToken(), tokenVo);
+
+            if (!tokenService.sessionMap.containsKey(token)) {
+//                tokenVo.setTime(new Date());
+                tokenService.sessionMap.put(token, tokenVo);
+
+
+                String s = JSONObject.toJSONString(tokenService.sessionMap);
+                redisService.set("userSessions",s);
             }
 
-            tokenService.judegeSession();
         }
-
         return AjaxResult.successData(AjaxStatus.success.code, "ok");
     }
 
+
+
     @PostMapping("/logout")
     @ApiOperation(value = "登出系统")
     @ResponseBody
@@ -55,11 +70,21 @@ public class AuthController {
             TokenVo tokenVo=new TokenVo();
             tokenVo.setToken(token);
             tokenVo.setUserId(userId);
+            redisService.select(9);
+            if (redisService.hasKey("userSessions")) {
+                String cp0String = redisService.get("userSessions");
+                tokenService.sessionMap= JSONObject.parseObject(cp0String, new TypeReference<Map<String, TokenVo>>() {
+                });
+            }
 
             if (tokenService.sessionMap.containsKey(tokenVo.getToken())) {
                 tokenService.sessionMap.remove(tokenVo.getToken());
             }
 
+            String s = JSONObject.toJSONString(tokenService.sessionMap);
+            redisService.set("userSessions",s);
+
+
             if (tokenService.sessionWtMap.containsKey(tokenVo.getToken())) {
                 tokenService.sessionWtMap.remove(tokenVo.getToken());
             }
@@ -78,10 +103,10 @@ public class AuthController {
 
         }
 
-        tokenService.judegeSession();
 
-        return AjaxResult.successData(AjaxStatus.success.code, "ok");
-    }
+            return AjaxResult.successData(AjaxStatus.success.code, "ok");
+        }
+
 
 
-}
+}

web/health/src/main/java/com/gyee/health/mapper/auto/AlarmTsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.health.model.auto.AlarmTs;
 import com.gyee.health.model.auto.ProBasicFeatureStat;
+import com.gyee.health.model.custom.SimpleVo2;
 import com.gyee.health.model.vo.AlarmSimpleVo;
 import com.gyee.health.model.vo.AlarmTsVo;
 import com.gyee.health.model.vo.AlarmVo;
@@ -85,10 +86,16 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
             "modelId,projectid,projectname,rank,resettable,stationid,stationname,subcomponents,suffix,tagid,triggertype,uniformcode from #{tbName}   limit #{limit} , #{offset} ")
     List<AlarmVo> selectByTbName(@Param("tbName") String tbName,@Param("limit") long limit,@Param("offset") long offset);
 
-    @Select("select alarmid,description,count(*) as val,max(rank),sum(timeLong) as timeLong) from #{superTableName} where ts>=#{begin} and ts<=#{end}  deviceid=#{deviceid}  group by description,alarmid  ")
+    @Select("select alarmid,description,count(*) as val,max(rank),sum(timeLong) as timeLong) from #{superTableName} where ts>=#{begin} and ts<=#{end} and deviceid=#{deviceid}  group by description,alarmid  ")
     List<AlarmTsVo> selectByWtGroup(@Param("superTableName") String superTableName, @Param("deviceid") String deviceid, @Param("begin")long begin, @Param("end") long end);
 
 
+    @Select("select projectname as name,count(*) total from #{superTableName} where ts>=#{begin} and ts<=#{end}   group by projectname  ")
+    List<SimpleVo2> selectByWp(@Param("superTableName") String superTableName, @Param("begin")long begin, @Param("end") long end);
+
+    @Select("select stationname as name,count(*) as total from #{superTableName} where ts>=#{begin} and ts<=#{end}   group by stationname  ")
+    List<SimpleVo2> selectByPj(@Param("superTableName") String superTableName, @Param("begin")long begin, @Param("end") long end);
+
 //    @Select("select ts,val,alarmid,alarmtype,characteristic,components,confirmed,description,deviceid,devicename,devicetype,enabled,lineid,linename," +
 //            "modelId,projectid,projectname,rank,resettable,stationid,stationname,subcomponents,suffix,tagid,triggertype,uniformcode from #{superTableName}  " +
 //            "#{whereSql}  order by ts desc limit #{limit} offset #{offset} ")

web/health/src/main/java/com/gyee/health/mapper/auto/ProEconShutdownEventMapper.java

@@ -39,16 +39,16 @@ public interface ProEconShutdownEventMapper extends BaseMapper<ProEconShutdownEv
 
     @Select(" select b.windpowerstation_id id, count(*) filter(where a.stop_time between (SELECT current_date - interval '7 day') and current_date) as" +
             "        value from pro_econ_shutdown_event a,pro_basic_equipment b" +
-            "    where  a.windturbine_id = b.id and a.status_code=2   group by b.windpowerstation_id")
+            "    where  a.windturbine_id = b.id and a.status_code=4   group by b.windpowerstation_id")
 
     List<SimpleVo> countStopByWp();
     @Select("select b.project_id id, count(*) filter(where a.stop_time between (SELECT current_date - interval '7 day') and current_date) as" +
             "        value from pro_econ_shutdown_event a,pro_basic_equipment b" +
-            "    where  a.windturbine_id = b.id and a.status_code=2   group by b.project_id")
+            "    where  a.windturbine_id = b.id and a.status_code=4   group by b.project_id")
     List<SimpleVo> countStopByPj();
 
 
-    @Select("select * from pro_econ_shutdown_event t  where  t.stop_time>=#{beginDate}   and  t.stop_time<=#{endDate} and t.status_code=2  and t.warning_id is null and t.stop_time is not null  order by t.windturbine_id")
+    @Select("select * from pro_econ_shutdown_event t  where  t.stop_time>=#{beginDate}   and  t.stop_time<=#{endDate} and t.status_code=4  and t.warning_id is null and t.stop_time is not null  order by t.windturbine_id")
     public List<ProEconShutdownEvent> queryShutdowneventList(@Param(value = "beginDate") Date beginDate, @Param(value = "endDate")Date endDate);
 
     @Select(" select h.id id,s.windturbineid windTurbineId,s.alertvalue warningId,s.alerttext warnDesc,h.alerttime stopTime,s.category2 stopTypeId " +

web/health/src/main/java/com/gyee/health/model/custom/SimpleVo2.java

@@ -0,0 +1,32 @@
+package com.gyee.health.model.custom;
+
+public class SimpleVo2 {
+
+    private String id;
+    private String name;
+    private Integer total;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

web/health/src/main/java/com/gyee/health/model/vo/TokenVo.java

@@ -4,8 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -13,5 +11,5 @@ public class TokenVo {
 
     private String token;
     private  String userId;
-    private Date time;
+
 }

web/health/src/main/java/com/gyee/health/service/TokenService.java

@@ -6,13 +6,11 @@ import com.gyee.health.init.CacheContext;
 import com.gyee.health.model.auto.*;
 import com.gyee.health.model.vo.TokenVo;
 import com.gyee.health.service.auto.ISysUserService;
-import com.gyee.health.util.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,40 +29,7 @@ public class TokenService {
     public static Map<String, TokenVo> sessionMap=  new ConcurrentHashMap<>();
 
 
-    public void  judegeSession() {
 
-
-
-        for (Map.Entry <String, TokenVo>  entry : sessionMap.entrySet()) {
-            TokenVo vo=entry.getValue();
-
-            Date begin=vo.getTime();
-            Date end=new Date();
-
-            double value=DateUtils.hoursDiff(begin,end);
-            if(value>3)
-            {
-                sessionMap.remove(entry.getKey());
-
-                if (sessionWtMap.containsKey(entry.getKey())) {
-                    sessionWtMap.remove(entry.getKey());
-                }
-                if (sessionWpMap.containsKey(entry.getKey())) {
-                    sessionWpMap.remove(entry.getKey());
-
-                }
-                if (sessionSubMap.containsKey(entry.getKey())) {
-                    sessionSubMap.remove(entry.getKey());
-
-                }
-                if (sessionWeMap.containsKey(entry.getKey())) {
-                    sessionWeMap.remove(entry.getKey());
-
-                }
-            }
-        }
-
-    }
     public  List<ProBasicEquipment>  getWtls(HttpServletRequest request ) {
 
         String token = request.getHeader("token");

web/health/src/main/java/com/gyee/health/service/auto/impl/ProEconWarningServiceImpl.java

@@ -1,13 +1,16 @@
 package com.gyee.health.service.auto.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.health.init.CacheContext;
+import com.gyee.health.mapper.auto.AlarmTsMapper;
 import com.gyee.health.mapper.auto.ProEconWarningMapper;
 import com.gyee.health.model.auto.ProBasicPowerstation;
 import com.gyee.health.model.auto.ProEconWarning;
 import com.gyee.health.model.custom.SimpleVo;
+import com.gyee.health.model.custom.SimpleVo2;
+import com.gyee.health.model.vo.AlarmSuperTalbeType;
 import com.gyee.health.service.TokenService;
 import com.gyee.health.service.auto.IProEconWarningService;
+import com.gyee.health.util.DateUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -32,7 +35,7 @@ import java.util.List;
 public class ProEconWarningServiceImpl extends ServiceImpl<ProEconWarningMapper, ProEconWarning> implements IProEconWarningService {
 
     @Resource
-    private ProEconWarningMapper proEconWarningMapper;
+    private AlarmTsMapper alarmTsMapper;
     @Resource
     private TokenService tokenService;
     /**
@@ -45,40 +48,29 @@ public class ProEconWarningServiceImpl extends ServiceImpl<ProEconWarningMapper,
         List<SimpleVo> vos=new ArrayList<>();
         SimpleDateFormat sdf_no_underline = new SimpleDateFormat("yyyyMM");
         Calendar cal = Calendar.getInstance();
-        Date endDate = cal.getTime();
+        Date endDate = DateUtils.truncate(cal.getTime());
+        cal.add(Calendar.DAY_OF_MONTH,-7);
+        Date beginDate = DateUtils.truncate(cal.getTime());
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
         List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
-        for(ProBasicPowerstation wp: wpls)
-        {
 
-            if (wp.getId().endsWith("_FDC")) {
-
-                SimpleVo vo=null;
-
-                StringBuilder tablename = new StringBuilder();
-                tablename.append("alarmhistory_");
-                tablename.append(wp.getId().split("_")[0]);
-                tablename.append("_");
-                tablename.append(sdf_no_underline.format(endDate));
-                List<SimpleVo> ls= proEconWarningMapper.countWpwarnByWp(String.valueOf(tablename));
-                if(!ls.isEmpty())
-                {
-                    vo=ls.get(0);
-                    vo.setName(wp.getName());
-                }else
-                {
-                    vo=new SimpleVo();
-                    vo.setId(wp.getId());
-                    vo.setName(wp.getName());
-                    vo.setValue(0);
-                }
+        List<SimpleVo2> ls=alarmTsMapper.selectByWp(AlarmSuperTalbeType.WT.getCode(),beginDate.getTime(),endDate.getTime());
+
 
+
+        if(!ls.isEmpty())
+        {
+            for(SimpleVo2 s :ls)
+            {
+                SimpleVo vo=new SimpleVo();
+                vo.setName(s.getName());
+                vo.setValue(s.getTotal());
                 vos.add(vo);
             }
 
-
         }
 
+
         return vos;
 
     }
@@ -89,39 +81,29 @@ public class ProEconWarningServiceImpl extends ServiceImpl<ProEconWarningMapper,
         List<SimpleVo> vos=new ArrayList<>();
         SimpleDateFormat sdf_no_underline = new SimpleDateFormat("yyyyMM");
         Calendar cal = Calendar.getInstance();
-        Date endDate = cal.getTime();
+        Date endDate = DateUtils.truncate(cal.getTime());
+        cal.add(Calendar.DAY_OF_MONTH,-7);
+        Date beginDate = DateUtils.truncate(cal.getTime());
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
         List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
-        for(ProBasicPowerstation wp:wpls)
-        {
 
-            if (wp.getId().endsWith("_FDC")) {
-
-                SimpleVo vo=null;
-
-                StringBuilder tablename = new StringBuilder();
-                tablename.append("alarmhistory_");
-                tablename.append(wp.getId().split("_")[0]);
-                tablename.append("_");
-                tablename.append(sdf_no_underline.format(endDate));
-                List<SimpleVo> ls= proEconWarningMapper.countWpwarnByPj(String.valueOf(tablename));
-                if(!ls.isEmpty())
-                {
-                    vo=ls.get(0);
-                    vo.setName(wp.getName());
-                }else
-                {
-                    vo=new SimpleVo();
-                    vo.setId(wp.getId());
-                    vo.setName(wp.getName());
-                    vo.setValue(0);
-                }
 
+        List<SimpleVo2> ls=alarmTsMapper.selectByPj(AlarmSuperTalbeType.WT.getCode(),beginDate.getTime(),endDate.getTime());
+
+
+        if(!ls.isEmpty())
+        {
+            for(SimpleVo2 s :ls)
+            {
+                SimpleVo vo=new SimpleVo();
+                vo.setName(s.getName());
+                vo.setValue(s.getTotal());
                 vos.add(vo);
             }
 
-
         }
+
+
         return vos;
 
     }