Quellcode durchsuchen

专题分析分页面开发

xieshengjie vor 2 Jahren
Ursprung
Commit
fd2d4d827e

+ 2 - 2
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -5,8 +5,8 @@ package com.gyee.runeconomy.controller.bmk;/*
 
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.vo.benchmark.FjjxbVo;
+import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.runeconomy.dto.R;
-import com.gyee.runeconomy.dto.response.EconHomePagePointRateDTO;
 import com.gyee.runeconomy.model.auto.ProBasicCompany;
 import com.gyee.runeconomy.model.auto.ProBasicLine;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
@@ -99,7 +99,7 @@ public class BenchmarkingController {
                          @RequestParam(value = "wpids", required = true) String wpids,
                          @RequestParam(value = "projectids", required = true) String projectids,
                          @RequestParam(value = "lineids", required = true) String lineids){
-        List<FjjxbVo> resultList = benchmarkingService.performanceMX(companyid,getype,sttype,beginDate,endDate,wpids,projectids,lineids);
+        List<FjjxbmxVo> resultList = benchmarkingService.performanceMX(companyid,getype,sttype,beginDate,endDate,wpids,projectids,lineids);
         if (StringUtils.isNotNull(resultList)) {
             return R.ok().data(resultList);
         } else {

+ 256 - 0
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/specific/SpecificController.java

@@ -0,0 +1,256 @@
+package com.gyee.runeconomy.controller.specific;/*
+@author   谢生杰
+@date   2022/11/23-21:39
+*/
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.vo.specific.SpecificTargetVo;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.service.specific.SpecificService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.List;
+
+@RestController
+@RequestMapping("//specific")
+public class SpecificController {
+
+    @Resource
+    private SpecificService specificService;
+
+    /**
+     * 查询风能利用率功能
+     * @return
+     */
+    @GetMapping("/fnlylList")
+    @ResponseBody
+    public R fnlylList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.fnlylList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询发电量
+     * @return
+     */
+    @GetMapping("/fdlList")
+    @ResponseBody
+    public R fdlList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.fdlList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询综合厂用电量
+     * @return
+     */
+    @GetMapping("/zhcydlList")
+    @ResponseBody
+    public R zhcydlList(@RequestParam(value = "companys",required = true) String companys,
+                     @RequestParam(value = "type",required = true) String type,
+                     @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.zhcydlList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询故障损失率
+     * @return
+     */
+    @GetMapping("/gzsslList")
+    @ResponseBody
+    public R gzsslList(@RequestParam(value = "companys",required = true) String companys,
+                        @RequestParam(value = "type",required = true) String type,
+                        @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.gzsslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询维护损失率
+     * @return
+     */
+    @GetMapping("/whsslList")
+    @ResponseBody
+    public R whsslList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.whsslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询限电损失率
+     * @return
+     */
+    @GetMapping("/xdsslList")
+    @ResponseBody
+    public R xdsslList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.xdsslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询性能损失率
+     * @return
+     */
+    @GetMapping("/xnsslList")
+    @ResponseBody
+    public R xnsslList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.xnsslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询受累损失率
+     * @return
+     */
+    @GetMapping("/slsslList")
+    @ResponseBody
+    public R slsslList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.slsslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询复位及时率
+     * @return
+     */
+    @GetMapping("/fwjslList")
+    @ResponseBody
+    public R fwjslList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.fwjslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询状态转换率
+     * @return
+     */
+    @GetMapping("/ztzhlList")
+    @ResponseBody
+    public R ztzhlList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.ztzhlList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询消缺及时率
+     * @return
+     */
+    @GetMapping("/xqjslList")
+    @ResponseBody
+    public R xqjslList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.xqjslList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询MTBF
+     * @return
+     */
+    @GetMapping("/mtbfList")
+    @ResponseBody
+    public R mtbfList(@RequestParam(value = "companys",required = true) String companys,
+                       @RequestParam(value = "type",required = true) String type,
+                       @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.mtbfList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 查询MTTR
+     * @return
+     */
+    @GetMapping("/mttrList")
+    @ResponseBody
+    public R mttrList(@RequestParam(value = "companys",required = true) String companys,
+                      @RequestParam(value = "type",required = true) String type,
+                      @RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.mttrList(companys,type,year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+}

+ 8 - 8
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -122,16 +122,16 @@ public class BenchmarkingService {
             FjjxbVo vo = new FjjxbVo();
             if (sttype.equals("1")){
                 vo.setId(i.getWindpowerstationId());
-                vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getName());
+                vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getAname());
             }else if(sttype.equals("2")){
                 vo.setId(i.getProjectId());
-                vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getName());
+                vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getAname());
             }else if(sttype.equals("3")){
                 vo.setId(i.getLineId());
-                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getName());
+                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
             }else{
                 vo.setId(i.getWindturbineId());
-                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getName());
+                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getAname());
             }
             vo.setSjfdl(BigDecimalUtils.divide(new BigDecimal(i.getRfdl()),new BigDecimal(10000),2).doubleValue());
             vo.setLlfdl(BigDecimalUtils.divide(new BigDecimal(i.getRllfdl()),new BigDecimal(10000),2).doubleValue());
@@ -242,16 +242,16 @@ public class BenchmarkingService {
             FjjxbmxVo vo = new FjjxbmxVo();
             if (sttype.equals("1")){
                 vo.setId(i.getWindpowerstationId());
-                vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getName());
+                vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getAname());
             }else if(sttype.equals("2")){
                 vo.setId(i.getProjectId());
-                vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getName());
+                vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getAname());
             }else if(sttype.equals("3")){
                 vo.setId(i.getLineId());
-                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getName());
+                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
             }else{
                 vo.setId(i.getWindturbineId());
-                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getName());
+                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getAname());
             }
             vo.setSjfdl(DoubleUtils.keepPrecision(i.getRfdl()/10000,2));
             vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl()/10000,2));

+ 0 - 189
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/initalcache/CacheService.java

@@ -1,189 +0,0 @@
-package com.gyee.runeconomy.service.initalcache;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.runeconomy.model.auto.*;
-import com.gyee.runeconomy.service.auto.*;
-import com.gyee.runeconomy.util.redis.RedisService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Service
-@Slf4j
-public class CacheService {
-
-    @Autowired
-    private RedisService redisService;
-    @Autowired
-    private IProBasicEquipmentService windturbineService;
-    @Autowired
-    private IProBasicLineService lineService;
-    @Autowired
-    private IProBasicProjectService projectService;
-    @Resource
-    private IProBasicSubStationService subStationService;
-    @Autowired
-    private IProBasicPowerstationService windpowerstationService;
-    @Autowired
-    private IProBasicEquipmentPointService windturbinetestingpointnewService;
-    @Autowired
-    private IProBasicPowerstationPointService windpowerstationpointnewService;
-    @Autowired
-    private IProBasicCompanyService companyService;
-    @Autowired
-    private IProBasicRegionService regionsService;
-    @Resource
-    private IProBasicModelPowerRdService proBasicModelPowerRdService;
-    @Resource
-    private IProBasicStatusPointService proBasicStatusPointService;
-
-
-    public void initRedisCache(){
-        log.info("--------------------------redisWT");
-        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i->i.getIsable().equals(1)).collect(Collectors.toList());
-        windturbineList.stream().forEach(i->{
-            Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
-            qw.eq("windturbine_id",i.getId());
-            List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
-            windturbinetestingpointai2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisLN");
-        List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        lineList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisPJ");
-        List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        projectList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisSubWP");
-        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        subStationList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisWP");
-        List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-
-        wpList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisCOMPANY");
-        List<ProBasicCompany> coms = companyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        List<String> comList = coms.stream().map(i->i.getId()).collect(Collectors.toList());
-        coms.stream().forEach(company -> {
-            comList.add(company.getId()+"0");
-            comList.add(company.getId()+"-1");
-            comList.add(company.getId()+"-2");
-        });
-        comList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i);
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i,s);
-        });
-
-        log.info("--------------------------redisREGION");
-        List<ProBasicRegion> regs = regionsService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
-        regs.stream().forEach(region -> {
-            regList.add(region.getId()+"0");
-            regList.add(region.getId()+"-1");
-            regList.add(region.getId()+"-2");
-        });
-        regList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i);
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i,s);
-        });
-        log.info("--------------------------redis理论保证功率");
-        Map<String, Map<Double, ProBasicModelPowerRd>> powerrdMap = new HashMap<>();
-
-        List<ProBasicModelPowerRd> proBasicModelPowerRds = proBasicModelPowerRdService.list();
-        proBasicModelPowerRds.stream().forEach(powerrd->{
-            if (powerrdMap.containsKey(powerrd.getModelId())){
-                powerrdMap.get(powerrd.getModelId()).put(powerrd.getSpeed(),powerrd);
-            }else {
-                Map<Double,ProBasicModelPowerRd> powerMap = new HashMap<>();
-                powerMap.put(powerrd.getSpeed(),powerrd);
-                powerrdMap.put(powerrd.getModelId(),powerMap);
-            }
-        });
-        redisService.set("ZLLGL", JSONObject.toJSONString(powerrdMap));
-
-        log.info("--------------------------redis十三种状态");
-        Map<String,List<ProBasicStatusPoint>> sszztMap = new HashMap<>();
-        List<ProBasicStatusPoint> windturbinestatusdis = proBasicStatusPointService.list();
-        windturbinestatusdis.stream().forEach(w->{
-            if (sszztMap.containsKey(w.getWindturbineId())){
-                sszztMap.get(w.getWindturbineId()).add(w);
-            }else {
-                List<ProBasicStatusPoint> wdisList = new ArrayList<>();
-                wdisList.add(w);
-                sszztMap.put(w.getWindturbineId(),wdisList);
-            }
-        });
-        redisService.set("SSZZT",JSONObject.toJSONString(sszztMap));
-    }
-}

+ 4 - 1
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/realtimelibrary/TheoreticalPowerService.java

@@ -1,6 +1,9 @@
-package com.gyee.runeconomy.service.realtimelibrary;/*
+package com.gyee.runeconomy.service.realtimelibrary;
+
+/*
 @author   谢生杰
 @date   2022/11/6-12:07
+
 */
 
 import com.gyee.runeconomy.init.CacheContext;

Datei-Diff unterdrückt, da er zu groß ist
+ 1143 - 0
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java


+ 113 - 0
web/runeconomy-xk/src/main/resources/application-yun.yml

@@ -0,0 +1,113 @@
+server:
+  port: 6060
+  servlet:
+    context-path: /
+
+spring:
+  application:
+    name: run-economy
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
+  #  cloud:
+  #    nacos:
+  #      discovery:
+  #        server-addr: 10.81.3.155:8848
+  #        #指定yaml格式的配置
+  #        file-extension: yaml
+  #        cluster-name: master
+  #      username: nacos
+  #      password: nacos
+  #redis集群
+  redis:
+    #host: 127.0.0.1
+    host: 124.70.18.168
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释,单机不需要打开
+    #    cluster:
+    #      #集群信息
+    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+    #      #默认值是5 一般当此值设置过大时,容易报:Too many Cluster redirections
+    #      maxRedirects: 3
+    password: gdnxfd123
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 0
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    username: postgres
+    password: gd123
+    #华为云测试地址
+    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    #    username: postgres
+    #    password: gd123
+
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      #id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+      #table-prefix: t_
+      id-type: assign_uuid
+  #配置类型别名对应的包
+  type-aliases-package: com.gyee.runeconomy.model.auto
+  #用于扫描通用枚举包
+  type-enums-package: com.gyee.runeconomy.config
+logging:
+  level:
+    root: info
+    com.example: debug
+initialcode: INITIAL
+db:
+  #url: http://127.0.0.1:8011/ts
+  url: http://192.168.11.250:8011/ts
+runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_BH1_FDC_STA,SD_GDDL_BH2_FDC_STA,SD_GDDL_CG_FDC_STA,SD_GDDL_FJ_FDC_STA,SD_GDDL_YS_FDC_STA,SD_GDDL_FXFC_FDC_STA,SD_GDDL_JNSS_FDC_STA,SD_GDDL_WFBH_FDC_STA,SD_GDDL_PLHS_FDC_STA,SD_GDDL_JNCQ_FDC_STA,SD_GDDL_LXLN_FDC_STA,SD_GDDL_LQJS_FDC_STA,SD_GDDL_ZYXD_FDC_STA,SD_GDDL_ZYFS_FDC_STA
+
+

+ 1 - 1
web/runeconomy-xk/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
 #    active: jn
-    active: test
+    active: yun