基础配置顺序调整

web/runeconomy-xk/pom.xml

@@ -33,6 +33,15 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>

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

@@ -1,84 +1,85 @@
-package com.gyee.runeconomy.config;
-
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.system.ApplicationHome;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-@Data
+//package com.gyee.runeconomy.config;
+//
+//
+//import lombok.Data;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.boot.system.ApplicationHome;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.File;
+//import java.util.Arrays;
+//import java.util.List;
+//
+//@Data
+//@Component
 //@ConfigurationProperties(prefix = "gyee")
-public class GyeeConfig {
-
-    public File jarF = null;
-
-    {
-        ApplicationHome h = new ApplicationHome(getClass());
-        jarF = h.getSource();
-    }
-
-    /**
-     * 数据适配器网址
-     **/
-    private String adapterUrl;
-    /**
-     * 数据准备保存路径(原始数据)
-     **/
-    private String filePathPrepare;
-    /**
-     * 数据处理保存路径(处理后的数据)
-     **/
-    private String filePathProcess;
-    /**
-     * 数据拟合保存路径(拟合后的数据)
-     **/
-    private String filePathFitting;
-    /**
-     * 数据压缩下载
-     **/
-    private String filePathDownload;
-    /**
-     * 功率曲线拟合测点
-     **/
-    private String points;
-
-    public List<String> getPoints() {
-        return Arrays.asList(this.points.split(","));
-    }
-
-    public String getFilePathPrepare() {
-        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathPrepare;
-    }
-
-    public void setFilePathPrepare(String filePathPrepare) {
-        this.filePathPrepare = filePathPrepare;
-    }
-
-    public String getFilePathProcess() {
-        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathProcess;
-    }
-
-    public void setFilePathProcess(String filePathProcess) {
-        this.filePathProcess = filePathProcess;
-    }
-
-    public String getFilePathFitting() {
-        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathFitting;
-    }
-
-    public void setFilePathFitting(String filePathFitting) {
-        this.filePathFitting = filePathFitting;
-    }
-
-    public String getFilePathDownload() {
-        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathDownload;
-    }
-
-    public void setFilePathDownload(String filePathDownload) {
-        this.filePathDownload = filePathDownload;
-    }
-}
+//public class GyeeConfig {
+//
+//    public File jarF = null;
+//
+//    {
+//        ApplicationHome h = new ApplicationHome(getClass());
+//        jarF = h.getSource();
+//    }
+//
+//    /**
+//     * 数据适配器网址
+//     **/
+//    private String adapterUrl;
+//    /**
+//     * 数据准备保存路径(原始数据)
+//     **/
+//    private String filePathPrepare;
+//    /**
+//     * 数据处理保存路径(处理后的数据)
+//     **/
+//    private String filePathProcess;
+//    /**
+//     * 数据拟合保存路径(拟合后的数据)
+//     **/
+//    private String filePathFitting;
+//    /**
+//     * 数据压缩下载
+//     **/
+//    private String filePathDownload;
+//    /**
+//     * 功率曲线拟合测点
+//     **/
+//    private String points;
+//
+//    public List<String> getPoints() {
+//        return Arrays.asList(this.points.split(","));
+//    }
+//
+//    public String getFilePathPrepare() {
+//        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathPrepare;
+//    }
+//
+//    public void setFilePathPrepare(String filePathPrepare) {
+//        this.filePathPrepare = filePathPrepare;
+//    }
+//
+//    public String getFilePathProcess() {
+//        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathProcess;
+//    }
+//
+//    public void setFilePathProcess(String filePathProcess) {
+//        this.filePathProcess = filePathProcess;
+//    }
+//
+//    public String getFilePathFitting() {
+//        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathFitting;
+//    }
+//
+//    public void setFilePathFitting(String filePathFitting) {
+//        this.filePathFitting = filePathFitting;
+//    }
+//
+//    public String getFilePathDownload() {
+//        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathDownload;
+//    }
+//
+//    public void setFilePathDownload(String filePathDownload) {
+//        this.filePathDownload = filePathDownload;
+//    }
+//}

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

@@ -46,7 +46,7 @@ public class AuthController {
     @ApiOperation(value = "登出系统")
     @ResponseBody
     public R logout(@RequestBody TokenVo tokenVo) {
-        if (StringUtils.notEmp(tokenVo)) {
+        if (StringUtils.notEmp(tokenVo) && StringUtils.notEmp(tokenVo.getToken())) {
 
             if (tokenService.sessionMap.containsKey(tokenVo.getToken())) {
                 tokenService.sessionMap.remove(tokenVo.getToken());

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

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.init;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.auto.*;
@@ -311,8 +312,9 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
-
-        wtls = proBasicEquipmentService.list().stream().filter(i -> i.getIsable() == 1).collect(Collectors.toList());
+        QueryWrapper<ProBasicEquipment> queryWtWrapper = new QueryWrapper<>();
+        queryWtWrapper.orderByAsc("order_num");
+        wtls = proBasicEquipmentService.list(queryWtWrapper).stream().filter(i -> i.getIsable() == 1).collect(Collectors.toList());
         logger.info(wtls.size() + "");
         wtls.forEach(wt -> {
             if (modelMap.containsKey(wt.getModelId())) {
@@ -416,7 +418,9 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
-        pjls = proBasicProjectService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
+        QueryWrapper<ProBasicProject> queryPjWrapper = new QueryWrapper<>();
+        queryPjWrapper.orderByAsc("order_num");
+        pjls = proBasicProjectService.list(queryPjWrapper).stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
         pjls.stream().forEach(p -> {
             pjmap.put(p.getId(), p);
             if (wppromap.containsKey(p.getWindpowerstationId())) {
@@ -433,8 +437,9 @@ public class CacheContext implements CommandLineRunner {
 
         });
         projmap = pjls.stream().collect(Collectors.groupingBy(ProBasicProject::getWindpowerstationId));
-
-        subwpls = proBasicSubStationService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
+        QueryWrapper<ProBasicSubStation> querySubWrapper = new QueryWrapper<>();
+        querySubWrapper.orderByAsc("order_num");
+        subwpls = proBasicSubStationService.list(querySubWrapper).stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
         subwpls.stream().forEach(sub -> {
 
             String subString = redisService.get(sub.getId());
@@ -458,7 +463,9 @@ public class CacheContext implements CommandLineRunner {
 
         });
         //线路
-        lnls = proBasicLineService.list().stream().filter(i -> StringUtils.isNotNull(pjmap.get(i.getProjectId())) && i.getIsAble() == 1).collect(Collectors.toList());
+        QueryWrapper<ProBasicLine> queryLnWrapper = new QueryWrapper<>();
+        queryLnWrapper.orderByAsc("order_num");
+        lnls = proBasicLineService.list(queryLnWrapper).stream().filter(i -> StringUtils.isNotNull(pjmap.get(i.getProjectId())) && i.getIsAble() == 1).collect(Collectors.toList());
         lnls.stream().forEach(l -> {
             lnmap.put(l.getId(), l);
             if (prolinemap.containsKey(l.getProjectId())) {
@@ -476,9 +483,10 @@ public class CacheContext implements CommandLineRunner {
 
 
         zwpls = proBasicWindpowerstationService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
-        ;
-        wpls = proBasicWindpowerstationService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
-        ;
+        QueryWrapper<ProBasicPowerstation> queryWpWrapper = new QueryWrapper<>();
+        queryWpWrapper.orderByAsc("order_num");
+        wpls = proBasicWindpowerstationService.list(queryWpWrapper).stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
+
         for (ProBasicPowerstation wp : wpls) {
             if (cpwpmap.containsKey(wp.getCompanyId())) {
                 cpwpmap.get(wp.getCompanyId()).add(wp);
@@ -488,6 +496,7 @@ public class CacheContext implements CommandLineRunner {
                 cpwpmap.put(wp.getCompanyId(), wps);
             }
         }
+
         meterpoints = proBasicMeterPointService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
         meterpoints.stream().forEach(meterpoint -> {
             meterpointMap.put(meterpoint.getId(), meterpoint);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/SysUserMapper.java

@@ -18,6 +18,8 @@ import java.util.List;
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
     //    @Select("SELECT d.nem_code FROM system_dept as d,system_users as u where u.dept_id=d.id and u.id=#{userId} ")
-    @Select("SELECT d.leader FROM sys_dept as d,sys_user as u where u.dept_id=d.dept_id and u.user_id=#{userId} ")
+//    @Select("SELECT d.leader FROM sys_dept as d,sys_user as u where u.dept_id=d.dept_id and u.user_id=#{userId} ")
+
+    @Select("SELECT d.nemcode FROM system_dept as d,system_users as u where u.dept_id=d.id and u.id=#{userId} ")
     public List<String> getUserByuserId(@Param(value = "userId") Long userId);
 }