计算服务修改

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

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -28,10 +27,13 @@ public class AuthController {
     @PostMapping("/login")
     @ResponseBody
     @ApiOperation(value = "使用账号密码登录")
-    public AjaxResult login(@RequestBody  TokenVo tokenVo) {
+    public AjaxResult login(String token,String userId) {
 
-        if (StringUtils.notEmp(tokenVo)) {
+        if (StringUtils.notEmp(token) && StringUtils.notEmp(token)) {
 
+            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);
@@ -46,8 +48,13 @@ public class AuthController {
     @PostMapping("/logout")
     @ApiOperation(value = "登出系统")
     @ResponseBody
-    public AjaxResult logout(@RequestBody  TokenVo tokenVo) {
-        if (StringUtils.notEmp(tokenVo)) {
+    public AjaxResult logout(String token,String userId) {
+
+        if (StringUtils.notEmp(token) && StringUtils.notEmp(token)) {
+
+            TokenVo tokenVo=new TokenVo();
+            tokenVo.setToken(token);
+            tokenVo.setUserId(userId);
 
             if (tokenService.sessionMap.containsKey(tokenVo.getToken())) {
                 tokenService.sessionMap.remove(tokenVo.getToken());

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

@@ -1,5 +1,6 @@
 package com.gyee.health.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.gyee.common.model.StringUtils;
 import com.gyee.health.init.CacheContext;
 import com.gyee.health.model.auto.*;
@@ -40,14 +41,11 @@ public class TokenService {
             Date begin=vo.getTime();
             Date end=new Date();
 
-            double value= DateUtils.hoursDiff(begin,end);
-
+            double value=DateUtils.hoursDiff(begin,end);
             if(value>3)
             {
                 sessionMap.remove(entry.getKey());
 
-
-
                 if (sessionWtMap.containsKey(entry.getKey())) {
                     sessionWtMap.remove(entry.getKey());
                 }
@@ -82,14 +80,44 @@ public class TokenService {
                     String depId = depls.get(0);
 
                     if (CacheContext.wpwtmap.containsKey(depId)) {
-                        wtlist.addAll(CacheContext.wpwtmap.get(depId));
+
+                        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get(depId);
+                        for(ProBasicEquipment wt:wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     } else if (CacheContext.cmwtlsmap.containsKey(depId)) {
-                        wtlist.addAll(CacheContext.cmwtlsmap.get(depId));
+
+                        List<ProBasicEquipment> wtls=CacheContext.cmwtlsmap.get(depId);
+                        for(ProBasicEquipment wt:wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     } else if (CacheContext.rgwtlsmap.containsKey(depId)) {
-                        wtlist.addAll(CacheContext.rgwtlsmap.get(depId));
+
+                        List<ProBasicEquipment> wtls=CacheContext.rgwtlsmap.get(depId);
+                        for(ProBasicEquipment wt:wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     }else  if(depId.equals("0"))
                     {
-                        wtlist.addAll(CacheContext.wtls);
+                        for(ProBasicEquipment wt:CacheContext.wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     }
                 }
                 sessionWtMap.put(token,wtlist);
@@ -99,7 +127,12 @@ public class TokenService {
             }
         }else
         {
-            wtlist.addAll(CacheContext.wtls);
+            for(ProBasicEquipment wt:CacheContext.wtls)
+            {
+                ProBasicEquipment newWt=  new ProBasicEquipment();
+                BeanUtil.copyProperties( wt,newWt);
+                wtlist.add(newWt);
+            }
 
         }
         return wtlist;
@@ -123,23 +156,48 @@ public class TokenService {
 
                     if(CacheContext.wpmap.containsKey(depId))
                     {
-                        wplist.add(CacheContext.wpmap.get(depId));
+
+                        ProBasicPowerstation wp= CacheContext.wpmap.get(depId);
+                        ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                        BeanUtil.copyProperties(wp, newWp);
+                        wplist.add(newWp);
                     }else  if(CacheContext.cpwpmap.containsKey(depId))
                     {
-                        wplist.addAll(CacheContext.cpwpmap.get(depId));
+                        List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(depId);
+                        for(ProBasicPowerstation wp:wpls)
+                        {
+                            ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                            BeanUtil.copyProperties(wp, newWp);
+                            wplist.add(newWp);
+                        }
+
                     }else  if(CacheContext.rgmap.containsKey(depId))
                     {
                         List<ProBasicCompany> rgcpls= CacheContext.rgcpmap.get(depId);
                         for(ProBasicCompany cp:rgcpls)
                         {
-                            wplist.addAll(CacheContext.cpwpmap.get(cp.getId()));
+                            List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(cp.getId());
+                            for(ProBasicPowerstation wp:wpls)
+                            {
+                                ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                                BeanUtil.copyProperties(wp, newWp);
+                                wplist.add(newWp);
+                            }
                         }
+
                     }else if(depId.equals("0"))
                     {
                         wplist=sessionWpMap.get(token);
                     }else if(depId.equals("0"))
                     {
-                        wplist.addAll(CacheContext.wpls);
+                        List<ProBasicPowerstation> wpls=CacheContext.wpls;
+                        for(ProBasicPowerstation wp:wpls)
+                        {
+                            ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                            BeanUtil.copyProperties(wp, newWp);
+                            wplist.add(newWp);
+                        }
+
                     }
                 }
                 sessionWpMap.put(token,wplist);
@@ -150,7 +208,13 @@ public class TokenService {
 
         }else
         {
-            wplist.addAll(CacheContext.wpls);
+            List<ProBasicPowerstation> wpls=CacheContext.wpls;
+            for(ProBasicPowerstation wp:wpls)
+            {
+                ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                BeanUtil.copyProperties(wp, newWp);
+                wplist.add(newWp);
+            }
         }
         return wplist;
     }
@@ -176,7 +240,9 @@ public class TokenService {
                         {
                             if(subStation.getWindpowerstationId().equals(depId))
                             {
-                                wplist.add(subStation);
+                                ProBasicSubStation newSub=  new ProBasicSubStation();
+                                BeanUtil.copyProperties(subStation, newSub);
+                                wplist.add(newSub);
                             }
                         }
                     }else  if(CacheContext.cpwpmap.containsKey(depId))
@@ -189,7 +255,9 @@ public class TokenService {
                             {
                                 if(subStation.getWindpowerstationId().equals(wp.getId()))
                                 {
-                                    wplist.add(subStation);
+                                    ProBasicSubStation newSub=  new ProBasicSubStation();
+                                    BeanUtil.copyProperties(subStation, newSub);
+                                    wplist.add(newSub);
                                     break;
                                 }
                             }
@@ -207,7 +275,9 @@ public class TokenService {
                                 {
                                     if(subStation.getWindpowerstationId().equals(wp.getId()))
                                     {
-                                        wplist.add(subStation);
+                                        ProBasicSubStation newSub=  new ProBasicSubStation();
+                                        BeanUtil.copyProperties(subStation, newSub);
+                                        wplist.add(newSub);
                                         break;
                                     }
                                 }
@@ -216,7 +286,13 @@ public class TokenService {
                         }
                     }else if(depId.equals("0"))
                     {
-                        wplist.addAll(CacheContext.subwpls);
+                        for(ProBasicSubStation subStation:CacheContext.subwpls)
+                        {
+                            ProBasicSubStation newSub=  new ProBasicSubStation();
+                            BeanUtil.copyProperties(subStation, newSub);
+                            wplist.add(newSub);
+                        }
+
                     }
                 }
                 sessionSubMap.put(token,wplist);
@@ -227,7 +303,12 @@ public class TokenService {
             }
         }else
         {
-            wplist.addAll(CacheContext.subwpls);
+            for(ProBasicSubStation subStation:CacheContext.subwpls)
+            {
+                ProBasicSubStation newSub=  new ProBasicSubStation();
+                BeanUtil.copyProperties(subStation, newSub);
+                wplist.add(newSub);
+            }
         }
         return wplist;
     }
@@ -255,7 +336,10 @@ public class TokenService {
                         {
                             if(weatherStation.getWindpowerstationId().equals(depId))
                             {
-                                wplist.add(weatherStation);
+
+                                ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                                BeanUtil.copyProperties(weatherStation, newWeb);
+                                wplist.add(newWeb);
                             }
                         }
 
@@ -269,7 +353,9 @@ public class TokenService {
                             {
                                 if(weatherStation.getWindpowerstationId().equals(wp.getId()))
                                 {
-                                    wplist.add(weatherStation);
+                                    ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                                    BeanUtil.copyProperties(weatherStation, newWeb);
+                                    wplist.add(newWeb);
                                     break;
                                 }
                             }
@@ -288,7 +374,9 @@ public class TokenService {
                                 {
                                     if(weatherStation.getWindpowerstationId().equals(wp.getId()))
                                     {
-                                        wplist.add(weatherStation);
+                                        ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                                        BeanUtil.copyProperties(weatherStation, newWeb);
+                                        wplist.add(newWeb);
                                         break;
                                     }
                                 }
@@ -298,7 +386,12 @@ public class TokenService {
 
                     }else if(depId.equals("0"))
                     {
-                        wplist.addAll(CacheContext.weawpls);
+                        for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+                        {
+                            ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                            BeanUtil.copyProperties(weatherStation, newWeb);
+                            wplist.add(newWeb);
+                        }
                     }
                 }
                 sessionWeMap.put(token,wplist);
@@ -309,8 +402,13 @@ public class TokenService {
 
         }else
         {
+            for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+            {
+                ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                BeanUtil.copyProperties(weatherStation, newWeb);
+                wplist.add(newWeb);
+            }
 
-            wplist.addAll(CacheContext.weawpls);
 
         }
         return wplist;

web/health/src/main/resources/application-jn.properties

@@ -3,8 +3,8 @@ server.port=8172
 
 #\u670D\u52A1\u540D\u79F0
 spring.application.name=health-hb-provider
-#spring.cloud.nacos.discovery.server-addr=10.81.3.155:8848
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8870
+spring.cloud.nacos.discovery.server-addr=10.81.3.155:8848
+#spring.cloud.nacos.discovery.server-addr=127.0.0.1:8870
 
 #nacos\u7684\u7528\u6237\u540D\u548C\u5BC6\u7801
 spring.cloud.nacos.username=nacos