修改升压站信息查询

web/runeconomy-xk/pom.xml

@@ -79,20 +79,28 @@
             <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>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.data</groupId>-->
+<!--            <artifactId>spring-data-redis</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>
-
         <!-- 添加swagger2 -->
         <dependency>
             <groupId>io.springfox</groupId>

web/runeconomy-xk/src/main/java/com/gyee/RunEconomyApplication.java

@@ -1,8 +1,6 @@
 package com.gyee;
 
 
-import com.gyee.runeconomy.config.GyeeConfig;
-import com.gyee.runeconomy.util.SpringUtils;
 import lombok.extern.log4j.Log4j2;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -11,11 +9,8 @@ import org.springframework.boot.system.ApplicationHome;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 
-import java.io.File;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 
 @Log4j2
@@ -34,7 +29,7 @@ public class RunEconomyApplication {
         ApplicationHome home = new ApplicationHome(RunEconomyApplication.class);
         String filePath = home.getSource().getParentFile().getAbsolutePath();
 
-        createFolder();
+//        createFolder();
 
         log.info("\n-------------------------------------------------------------------\n\t" +
                 "经济运行系统启动成功，访问路径如下:\n\t" +
@@ -48,23 +43,23 @@ public class RunEconomyApplication {
     }
 
 
-    /**
-     * 功率曲线拟合的数据文件保存路径
-     */
-    private static void createFolder() {
-        GyeeConfig bean = SpringUtils.getBean(GyeeConfig.class);
-        File f1 = new File(bean.getFilePathPrepare());
-        File f2 = new File(bean.getFilePathProcess());
-        File f3 = new File(bean.getFilePathFitting());
-        File f4 = new File(bean.getFilePathDownload());
-        if (!f1.exists())
-            f1.mkdirs();
-        if (!f2.exists())
-            f2.mkdirs();
-        if (!f3.exists())
-            f3.mkdirs();
-        if (!f4.exists())
-            f4.mkdirs();
-    }
+//    /**
+//     * 功率曲线拟合的数据文件保存路径
+//     */
+//    private static void createFolder() {
+//        GyeeConfig bean = SpringUtils.getBean(GyeeConfig.class);
+//        File f1 = new File(bean.getFilePathPrepare());
+//        File f2 = new File(bean.getFilePathProcess());
+//        File f3 = new File(bean.getFilePathFitting());
+//        File f4 = new File(bean.getFilePathDownload());
+//        if (!f1.exists())
+//            f1.mkdirs();
+//        if (!f2.exists())
+//            f2.mkdirs();
+//        if (!f3.exists())
+//            f3.mkdirs();
+//        if (!f4.exists())
+//            f4.mkdirs();
+//    }
 
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/SwagerrConfiguration.java

@@ -1,76 +1,76 @@
-package com.gyee.runeconomy.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * Swagger 配置文件
- *
- * @author gyee
- * @ClassName: Swagger
- * @Description: 配置文件
- * @date 2022年11月10日
- */
-@Configuration(value = "true")
-@EnableSwagger2 //启动swagger注解 启动服务，浏览器输入"http://localhost:8080/swagger-ui.html"
-public class SwagerrConfiguration implements WebMvcConfigurer {
-
-
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                //.host("")
-                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
-                .apiInfo(apiInfo())
-                // 设置哪些接口暴露给Swagger展示
-                .select()
-                // 扫描所有有注解的api，用这种方式更灵活
-                .apis(RequestHandlerSelectors.basePackage("com.gyee.runeconomy"))
-                // 扫描指定包中的swagger注解
-                //.apis(RequestHandlerSelectors.basePackage("com.gyee.frame.controller"))
-                // 扫描所有 .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                //设置标题
-                .title("后台管理API文档")
-                //描述
-                .description("后台管理项目")
-                //作者信息
-                //.contact(new Contact(v2Config.getName(), null, V2Config.getEmail_account()))
-                //服务条款URL
-                .termsOfServiceUrl("")
-                //版本
-                .version("版本号:1.0")
-                .build();
-    }
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-
-        // 解决静态资源无法访问
-
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
-
-        // 解决swagger无法访问
-
-        registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
-
-        // 解决swagger的js文件无法访问
-
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-
-    }
-}
+//package com.gyee.runeconomy.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//
+///**
+// * Swagger 配置文件
+// *
+// * @author gyee
+// * @ClassName: Swagger
+// * @Description: 配置文件
+// * @date 2022年11月10日
+// */
+//@Configuration(value = "true")
+//@EnableSwagger2 //启动swagger注解 启动服务，浏览器输入"http://localhost:8080/swagger-ui.html"
+//public class SwagerrConfiguration implements WebMvcConfigurer {
+//
+//
+//    @Bean
+//    public Docket createRestApi() {
+//        return new Docket(DocumentationType.SWAGGER_2)
+//                //.host("")
+//                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
+//                .apiInfo(apiInfo())
+//                // 设置哪些接口暴露给Swagger展示
+//                .select()
+//                // 扫描所有有注解的api，用这种方式更灵活
+//                .apis(RequestHandlerSelectors.basePackage("com.gyee.runeconomy"))
+//                // 扫描指定包中的swagger注解
+//                //.apis(RequestHandlerSelectors.basePackage("com.gyee.frame.controller"))
+//                // 扫描所有 .apis(RequestHandlerSelectors.any())
+//                .paths(PathSelectors.any())
+//                .build();
+//    }
+//
+//    private ApiInfo apiInfo() {
+//        return new ApiInfoBuilder()
+//                //设置标题
+//                .title("后台管理API文档")
+//                //描述
+//                .description("后台管理项目")
+//                //作者信息
+//                //.contact(new Contact(v2Config.getName(), null, V2Config.getEmail_account()))
+//                //服务条款URL
+//                .termsOfServiceUrl("")
+//                //版本
+//                .version("版本号:1.0")
+//                .build();
+//    }
+//
+//    @Override
+//    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//
+//        // 解决静态资源无法访问
+//
+//        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+//
+//        // 解决swagger无法访问
+//
+//        registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+//
+//        // 解决swagger的js文件无法访问
+//
+//        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+//
+//    }
+//}

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

@@ -1,10 +1,13 @@
 package com.gyee.runeconomy.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.model.vo.TokenVo;
 import com.gyee.runeconomy.service.TokenService;
+import com.gyee.runeconomy.util.redis.RedisService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
@@ -15,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/auth")
@@ -24,17 +28,28 @@ public class AuthController {
 
     @Resource
     private TokenService tokenService;
-
+    @Resource
+    private RedisService redisService;
     @PostMapping("/login")
     @ResponseBody
     @ApiOperation(value = "使用账号密码登录")
     public R login(@RequestBody TokenVo tokenVo) {
 
         if (StringUtils.notEmp(tokenVo)) {
+            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())) {
                 tokenVo.setTime(new Date());
                 tokenService.sessionMap.put(tokenVo.getToken(), tokenVo);
+
+
+                String s = JSONObject.toJSONString(tokenService.sessionMap);
+                redisService.set("userSessions",s);
             }
 
         }
@@ -47,11 +62,21 @@ public class AuthController {
     @ResponseBody
     public R logout(@RequestBody TokenVo tokenVo) {
         if (StringUtils.notEmp(tokenVo) && StringUtils.notEmp(tokenVo.getToken())) {
+            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());
             }

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

@@ -1,8 +1,22 @@
 package com.gyee.runeconomy.controller;
 
 
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.gyee.runeconomy.service.TokenService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -13,7 +27,25 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-11-22
  */
 @RestController
-@RequestMapping("//pro-basic-sub-station")
+@RequestMapping("//substation")
 public class ProBasicSubStationController {
 
+
+    @Resource
+    private TokenService tokenService;
+
+    @GetMapping("/queryall")
+    @ResponseBody
+    @ApiOperation(value = "获得升压站信息", notes = "获得升压站信息")
+    public R queryAll() throws Exception {
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicSubStation> sublist = tokenService.getSubwpls(request);
+
+        if (StringUtils.isNotNull(sublist)) {
+            return R.data(ResultMsg.ok(sublist));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -76,7 +76,6 @@ public class CacheContext implements CommandLineRunner {
     @Resource
     private IProBasicEquipmentPointService proBasicEquipmentPointService;
 
-
     public static List<ProBasicBranch> bnls = new ArrayList<>();
     public static List<ProBasicEquipment> wtls = new ArrayList<>();
     public static List<ProBasicProject> pjls = new ArrayList<>();
@@ -176,6 +175,8 @@ public class CacheContext implements CommandLineRunner {
 //            }
 //        });
 
+
+
         equipmentmodels = proEconEquipmentmodelService.list();
         equipmentmodels.stream().forEach(e -> {
             modelMap.put(e.getId(), e);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconTargetdataCopyServiceImpl.java

@@ -53,5 +53,6 @@ public class ProEconTargetdataCopyServiceImpl extends ServiceImpl<ProEconTargetd
         IPage<ProEconTargetdataCopy> InputPage = getBaseMapper().selectPage(page, qw);
 //        List<Windpowerstation> list = companysPage.getRecords();
         return InputPage;
+
     }
 }