计划发电量修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/AuthController.java

@@ -37,7 +37,6 @@ public class AuthController {
                 tokenService.sessionMap.put(tokenVo.getToken(), tokenVo);
             }
 
-            tokenService.judegeSession();
         }
 
         return R.data(ResultMsg.ok("ok"));
@@ -71,7 +70,7 @@ public class AuthController {
 
         }
 
-        tokenService.judegeSession();
+
 
         return R.data(ResultMsg.ok("ok"));
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/TokenService.java

@@ -2,7 +2,6 @@ package com.gyee.runeconomy.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.gyee.common.model.StringUtils;
-import com.gyee.health.util.DateUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.model.vo.TokenVo;
@@ -12,7 +11,6 @@ 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,40 @@ 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 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>24)
+//            {
+//                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/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -129,6 +129,11 @@ public class MatrixService {
 
             });
             try {
+
+//                if(wp.getId().equals("SXJ_KGDL_HSM_FDC_STA"))
+//                {
+//                    System.out.println("");
+//                }
                 List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
                 List<PointData> wtRealdatas = edosUtil.getRealData(wtPoints);
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
@@ -213,6 +218,11 @@ public class MatrixService {
                 wz.addAndGet((int) wpRealdatas.get(13).getPointValueInDouble());
                 int index = 3;
                 for (int j = 0; j < equipments.size(); j++) {
+
+//                    if(equipments.get(j).getId().equals("SXJ_KGDL_HSM_F_WT_0047_EQ"))
+//                    {
+//                        System.out.println("");
+//                    }
                     MatrixVo vo = new MatrixVo();
                     vo.setWtid(equipments.get(j).getId());
                     vo.setWtname(equipments.get(j).getAname());

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -160,7 +160,8 @@ public class EdosUtil implements IEdosUtil {
         if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getNemCode()) && !initialcode.equals(point.getNemCode()))
         {
             String rawUrl = "";
-            if(point.getTypeId().equals("G")){
+//            if(point.getTypeId().equals("G")){
+            if (point.getNemCode().startsWith("GF-")){
                 rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
             }else {
                 rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
@@ -448,7 +449,8 @@ public class EdosUtil implements IEdosUtil {
 
             try {
                 String url = "";
-                if (point.getTypeId().equals("G")){
+//                if (point.getTypeId().equals("G")){
+                if (point.getNemCode().startsWith("GF-")){
                     url = baseURL2 + "/latest?null=0";
                 }else {
                     url = baseURL + "/latest?null=0";
@@ -519,7 +521,8 @@ public class EdosUtil implements IEdosUtil {
 
             try {
                 String url ="";
-                if (point.getTypeId().equals("G")){
+//                if (point.getTypeId().equals("G")){
+                if (point.getNemCode().startsWith("GF-")){
                     url = baseURL2 + "/history/snap?null=0";
                 }else {
                     url = baseURL + "/history/snap?null=0";
@@ -643,7 +646,8 @@ public class EdosUtil implements IEdosUtil {
             Optional<Long> endTs = Optional.ofNullable(endDate);
             try {
                 String url = "";
-                if (point.getTypeId().equals("G")){
+//                if (point.getTypeId().equals("G")){
+                if (point.getNemCode().startsWith("GF-")){
                     url = baseURL2 + "/history/snap?null=0";
                 }else {
                     url = baseURL + "/history/snap?null=0";
@@ -1224,7 +1228,8 @@ public class EdosUtil implements IEdosUtil {
 
             try {
                 String url = "";
-                if (point.getTypeId().equals("G")){
+//                if (point.getTypeId().equals("G")){
+                if (point.getNemCode().startsWith("GF-")){
                     url = baseURL2 + "/history/stat?null=0";
                 }else {
                     url = baseURL + "/history/stat?null=0";

web/runeconomy-xk/src/main/resources/application-jn.yml

@@ -96,8 +96,8 @@ logging:
     com.example: debug
 initialcode: INITIAL
 db:
-  URL1: http://10.81.3.152:8098/ts
-  URL2: http://10.81.3.152:8099/ts
+  URL1: http://10.81.3.160:8011/ts
+  URL2: http://10.81.3.160:8012/ts
 
 #
 #db: