数据导入

web/gdsx-ghost/src/main/java/com/gyee/ghost/controller/ghost/GhostController.java

@@ -12,8 +12,11 @@ import com.gyee.ghost.init.CacheContext;
 import com.gyee.ghost.model.auto.*;
 import com.gyee.ghost.model.auto.vo.FaultrecordCheckeVo;
 import com.gyee.ghost.model.auto.vo.FaultrecordVo;
+import com.gyee.ghost.model.auto.vo.MainrecordCheckeVo;
+import com.gyee.ghost.model.auto.vo.MainrecordVo;
 import com.gyee.ghost.service.auto.GhostService;
 import com.gyee.ghost.service.auto.IFaultrecordService;
+import com.gyee.ghost.service.auto.IMainrecordService;
 import com.gyee.ghost.service.auto.IWindpowerinfodayService;
 import com.gyee.ghost.util.realtimesource.ExcelUtils;
 import com.gyee.ghost.vo.InvolvedVo;
@@ -42,6 +45,9 @@ public class GhostController {
     @Resource
     private IWindpowerinfodayService windpowerinfodayService;
     @Resource
+    private IMainrecordService mainrecordService;
+
+    @Resource
     private IFaultrecordService faultrecordService;
     @GetMapping("/wplist")
     @ResponseBody
@@ -340,19 +346,22 @@ public class GhostController {
 
         SimpleDateFormat sf= new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
         List<FaultrecordVo> list = Arrays.asList(
-                FaultrecordVo.builder().wtname("").begindate(sf.parse("2023-09-09 00:00:00")).enddate(sf.parse("2023-09-09 00:03:00")).faulttype("").faultphenomenon("").defecteliminating("").processingresults("").faultduration(0.3).impactcapacity(0.3).type("").build(),
 
-                FaultrecordVo.builder().wtname("").enddate(sf.parse("2023-09-09 00:00:00")).enddate(sf.parse("2023-09-09 00:06:00")).faulttype("").faultphenomenon("").defecteliminating("").processingresults("").faultduration(0.5).impactcapacity(0.3).type("").build()
+                FaultrecordVo.builder().wtname("test1").begindate(null).enddate(null).faulttype("").faultphenomenon("").defecteliminating("").processingresults("").faultduration(0.0).impactcapacity(0.0).type("").build(),
+
+                FaultrecordVo.builder().wtname("test1").begindate(null).enddate(null).faulttype("").faultphenomenon("").defecteliminating("").processingresults("").faultduration(0.0).impactcapacity(0.0).type("").build()
 
         );
 
         // 输出
-        ExcelUtils.write(response, "导入模板.xls", "导入模板", FaultrecordVo.class, list);
+        ExcelUtils.write(response, "导入模板.xlsx", "导入模板", FaultrecordVo.class, list);
     }
 
     @PostMapping("/checking")
     @ApiOperation(value = "验证", notes = "验证")
     public R checking(@RequestParam("file") MultipartFile file) throws Exception {
+
+        boolean result=true;
         List<FaultrecordVo> list = ExcelUtils.read(file, FaultrecordVo.class);
         List<FaultrecordCheckeVo> vos = new ArrayList<>();
         if (StringUtils.notEmp(list) && !list.isEmpty()) {
@@ -367,6 +376,7 @@ public class GhostController {
                     sb.append("风机名称错误——");
                     sb.append(vo.getWtname());
                     po.setChecke(false);
+                    result=false;
                     po.setError(vo.getWtname());
                 }else if(StringUtils.empty(vo.getBegindate()))
                 {
@@ -374,6 +384,7 @@ public class GhostController {
                     sb.append("开始时间没有——");
                     sb.append(vo.getBegindate());
                     po.setChecke(false);
+                    result=false;
                     po.setError(String.valueOf(vo.getBegindate()));
 
                 }else if(StringUtils.empty(vo.getEnddate()))
@@ -382,6 +393,7 @@ public class GhostController {
                     sb.append("结束时间没有——");
                     sb.append(vo.getEnddate());
                     po.setChecke(false);
+                    result=false;
                     po.setError(String.valueOf(vo.getEnddate()));
 
                 }else
@@ -392,102 +404,229 @@ public class GhostController {
 
             }
         }
-        if (StringUtils.isNotNull(vos)) {
-            return R.ok().data(vos);
+
+
+       if(result)
+       {
+           if (StringUtils.notEmp(list) && !list.isEmpty()) {
+
+
+               Faultrecord po=new Faultrecord();
+               for (FaultrecordVo vo : list) {
+
+
+                   BeanUtil.copyProperties(vo, po);
+
+                   po.setId(StringUtils.getUUID());
+                   if(CacheContext.wtnamemap.containsKey(vo.getWtname()))
+                   {
+
+                       Windturbine wt=CacheContext.wtnamemap.get(vo.getWtname());
+                       po.setWtid(wt.getId());
+
+                       if(CacheContext.promap.containsKey(wt.getProjectid()))
+                       {
+                           Project pj=CacheContext.promap.get(wt.getProjectid());
+                           po.setProjectid(pj.getId());
+                           po.setProjectname(pj.getName());
+                       }
+
+                       if(CacheContext.wpmap.containsKey(wt.getWindpowerstationid()))
+                       {
+                           Windpowerstation wp=CacheContext.wpmap.get(wt.getWindpowerstationid());
+                           po.setWpid(wp.getId());
+                           po.setWpname(wp.getName());
+                       }
+
+                       if(StringUtils.notEmp(vo.getBegindate()) && StringUtils.notEmp(vo.getEnddate()))
+                       {
+                           po.setFaultduration(DateUtils.hoursDiff1(vo.getBegindate(),vo.getEnddate()));
+
+
+
+
+                           Date begin =vo.getBegindate();
+
+
+                           QueryWrapper<Windpowerinfoday> windturbineinfodayQueryWrapper = new QueryWrapper<>();
+                           windturbineinfodayQueryWrapper.eq("recorddate",DateUtils.truncate(begin));
+                           windturbineinfodayQueryWrapper.eq("foreignkeyid",po.getWpid());
+                           List<Windpowerinfoday> windturbineinfodayList = windpowerinfodayService.list(windturbineinfodayQueryWrapper);
+
+                           Map<String,Windpowerinfoday> wtdaymap=new HashMap<>();
+                           if(!windturbineinfodayList.isEmpty())
+                           {
+                               for ( Windpowerinfoday wtday:windturbineinfodayList)
+                               {
+                                   wtdaymap.put(wtday.getWindpowerstationid(),wtday);
+                               }
+                           }
+
+                           double gzsc=DateUtils.hoursDiff1(po.getBegindate(),po.getEnddate());
+
+                           if(wtdaymap.containsKey(po.getWpid()))
+                           {
+                               Windpowerinfoday wpday=wtdaymap.get(po.getWpid());
+
+                               if(CacheContext.wpwtlsmap.containsKey(wpday.getWindpowerstationid()))
+                               {
+                                   List<Windturbine> wtls=CacheContext.wpwtlsmap.get(wpday.getWindpowerstationid());
+                                   double rfdl= wpday.getGeneratingcapacity();
+                                   double ssdl = new BigDecimal(rfdl).divide(new BigDecimal(wtls.size()), 2, RoundingMode.HALF_EVEN).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(gzsc)).doubleValue();
+                                   po.setPowerloss(StringUtils.round(ssdl,2));
+
+                               }
+                               faultrecordService.saveOrUpdate(po);
+                           }
+                       }
+                   }
+               }
+           }
+       }
+
+
+        if (result) {
+            return R.ok().data("ok");
+
         }else{
-            return R.error().message("访问失败");
+
+            return R.error().data(vos);
         }
     }
 
     @PostMapping("/import")
     @ApiOperation(value = "导入", notes = "导入")
     public R importExcel(@RequestParam("file") MultipartFile file) throws Exception {
-        List<FaultrecordVo> list = ExcelUtils.read(file, FaultrecordVo.class);
-
+        boolean result=true;
+        List<MainrecordVo> list = ExcelUtils.read(file, MainrecordVo.class);
+        List<MainrecordCheckeVo> vos = new ArrayList<>();
         if (StringUtils.notEmp(list) && !list.isEmpty()) {
+            for (MainrecordVo vo : list) {
 
+                MainrecordCheckeVo po=new MainrecordCheckeVo();
+                BeanUtil.copyProperties(vo, po);
+                if(!CacheContext.wtnamemap.containsKey(vo.getWtname()))
+                {
 
-            Faultrecord po=new Faultrecord();
-            for (FaultrecordVo vo : list) {
-
+                    StringBuilder sb=new StringBuilder();
+                    sb.append("风机名称错误——");
+                    sb.append(vo.getWtname());
+                    po.setChecke(false);
+                    result=false;
+                    po.setError(vo.getWtname());
+                }else if(StringUtils.empty(vo.getBegindate()))
+                {
+                    StringBuilder sb=new StringBuilder();
+                    sb.append("开始时间没有——");
+                    sb.append(vo.getBegindate());
+                    po.setChecke(false);
+                    result=false;
+                    po.setError(String.valueOf(vo.getBegindate()));
 
-                BeanUtil.copyProperties(vo, po);
+                }else if(StringUtils.empty(vo.getEnddate()))
+                {
+                    StringBuilder sb=new StringBuilder();
+                    sb.append("结束时间没有——");
+                    sb.append(vo.getEnddate());
+                    po.setChecke(false);
+                    result=false;
+                    po.setError(String.valueOf(vo.getEnddate()));
 
-                po.setId(StringUtils.getUUID());
-                if(CacheContext.wtnamemap.containsKey(vo.getWtname()))
+                }else
                 {
+                    po.setChecke(true);
+                }
+                vos.add(po);
 
-                    Windturbine wt=CacheContext.wtnamemap.get(vo.getWtname());
-                    po.setWtid(wt.getId());
+            }
+        }
 
-                    if(CacheContext.promap.containsKey(wt.getProjectid()))
-                    {
-                        Project pj=CacheContext.promap.get(wt.getProjectid());
-                        po.setProjectid(pj.getId());
-                        po.setProjectname(pj.getName());
-                    }
 
-                    if(CacheContext.wpmap.containsKey(wt.getWindpowerstationid()))
-                    {
-                        Windpowerstation wp=CacheContext.wpmap.get(wt.getWindpowerstationid());
-                        po.setWpid(wp.getId());
-                        po.setWpname(wp.getName());
-                    }
+        if(result)
+        {
+            if (StringUtils.notEmp(list) && !list.isEmpty()) {
 
-                    if(StringUtils.notEmp(vo.getFaultduration()) && StringUtils.notEmp(vo.getBegindate()) && StringUtils.notEmp(vo.getEnddate()))
-                    {
-                      po.setFaultduration(DateUtils.hoursDiff1(vo.getBegindate(),vo.getEnddate()));
 
+                Mainrecord po=new Mainrecord();
+                for (MainrecordVo vo : list) {
 
-                        List<Faultrecord> resultList = new ArrayList<>();
 
-                        Date begin =vo.getBegindate();
+                    BeanUtil.copyProperties(vo, po);
 
+                    po.setId(StringUtils.getUUID());
+                    if(CacheContext.wtnamemap.containsKey(vo.getWtname()))
+                    {
 
-                        QueryWrapper<Windpowerinfoday> windturbineinfodayQueryWrapper = new QueryWrapper<>();
-                        windturbineinfodayQueryWrapper.eq("recorddate",begin);
-                        List<Windpowerinfoday> windturbineinfodayList = windpowerinfodayService.list(windturbineinfodayQueryWrapper);
+                        Windturbine wt=CacheContext.wtnamemap.get(vo.getWtname());
+                        po.setWtid(wt.getId());
 
-                        Map<String,Windpowerinfoday> wtdaymap=new HashMap<>();
-                        if(!windturbineinfodayList.isEmpty())
+                        if(CacheContext.promap.containsKey(wt.getProjectid()))
                         {
-                            for ( Windpowerinfoday wtday:windturbineinfodayList)
-                            {
-                                wtdaymap.put(wtday.getWindpowerstationid(),wtday);
-                            }
+                            Project pj=CacheContext.promap.get(wt.getProjectid());
+                            po.setProjectid(pj.getId());
+                            po.setProjectname(pj.getName());
                         }
 
-                        for(Faultrecord fr:resultList)
+                        if(CacheContext.wpmap.containsKey(wt.getWindpowerstationid()))
                         {
-                            if(StringUtils.notEmp(fr.getFaultduration()))
-                            {
-                                double gzsc=fr.getFaultduration();
+                            Windpowerstation wp=CacheContext.wpmap.get(wt.getWindpowerstationid());
+                            po.setWpid(wp.getId());
+                            po.setWpname(wp.getName());
+                        }
+
+                        if(StringUtils.notEmp(vo.getBegindate()) && StringUtils.notEmp(vo.getEnddate()))
+                        {
+                            po.setFaultduration(DateUtils.hoursDiff1(vo.getBegindate(),vo.getEnddate()));
+
+
+
+
+                            Date begin =vo.getBegindate();
+
+
+                            QueryWrapper<Windpowerinfoday> windturbineinfodayQueryWrapper = new QueryWrapper<>();
+                            windturbineinfodayQueryWrapper.eq("recorddate",DateUtils.truncate(begin));
+                            windturbineinfodayQueryWrapper.eq("foreignkeyid",po.getWpid());
+                            List<Windpowerinfoday> windturbineinfodayList = windpowerinfodayService.list(windturbineinfodayQueryWrapper);
 
-                                if(wtdaymap.containsKey(fr.getWtid()))
+                            Map<String,Windpowerinfoday> wtdaymap=new HashMap<>();
+                            if(!windturbineinfodayList.isEmpty())
+                            {
+                                for ( Windpowerinfoday wtday:windturbineinfodayList)
                                 {
-                                    Windpowerinfoday wpday=wtdaymap.get(fr.getWtid());
+                                    wtdaymap.put(wtday.getWindpowerstationid(),wtday);
+                                }
+                            }
 
-                                    if(CacheContext.wpwtlsmap.containsKey(wpday.getWindpowerstationid()))
-                                    {
-                                        List<Windturbine> wtls=CacheContext.wpwtlsmap.get(wpday.getWindpowerstationid());
-                                        double rfdl= wpday.getGeneratingcapacity();
-                                        double ssdl = new BigDecimal(rfdl).divide(new BigDecimal(wtls.size()), 2, RoundingMode.HALF_EVEN).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(gzsc)).doubleValue();
-                                        fr.setPowerloss(StringUtils.round(ssdl,2));
+                            double gzsc=DateUtils.hoursDiff1(po.getBegindate(),po.getEnddate());
 
-                                        faultrecordService.saveOrUpdate(fr);
-                                    }
+                            if(wtdaymap.containsKey(po.getWpid()))
+                            {
+                                Windpowerinfoday wpday=wtdaymap.get(po.getWpid());
+
+                                if(CacheContext.wpwtlsmap.containsKey(wpday.getWindpowerstationid()))
+                                {
+                                    List<Windturbine> wtls=CacheContext.wpwtlsmap.get(wpday.getWindpowerstationid());
+                                    double rfdl= wpday.getGeneratingcapacity();
+                                    double ssdl = new BigDecimal(rfdl).divide(new BigDecimal(wtls.size()), 2, RoundingMode.HALF_EVEN).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(gzsc)).doubleValue();
+                                    po.setPowerloss(StringUtils.round(ssdl,2));
 
                                 }
+                                mainrecordService.saveOrUpdate(po);
                             }
                         }
                     }
                 }
             }
         }
-        if (StringUtils.isNotNull("ok")) {
+
+
+        if (result) {
             return R.ok().data("ok");
+
         }else{
-            return R.error().message("访问失败");
+
+            return R.error().data(vos);
         }
     }
 

web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/vo/FaultrecordVo.java

@@ -3,6 +3,7 @@ package com.gyee.ghost.model.auto.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.*;
+import lombok.experimental.Accessors;
 
 import java.util.Date;
 
@@ -19,7 +20,7 @@ import java.util.Date;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class FaultrecordVo extends Model {
 
     private static final long serialVersionUID = 1L;

web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java

@@ -23,7 +23,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -67,38 +66,102 @@ public class GhostService {
     public void saveFaultrecord(String day) throws ParseException {
 
 
-        SimpleDateFormat sf= new SimpleDateFormat( "yyyy-MM-dd");
+//        SimpleDateFormat sf= new SimpleDateFormat( "yyyy-MM-dd");
         List<Faultrecord> resultList = new ArrayList<>();
-        Date begin =sf.parse(day);
-        Date end = DateUtils.addDays(begin,1);
+//        Date begin =sf.parse(day);
+//        Date end = DateUtils.addDays(begin,1);
         QueryWrapper<Faultrecord> listQw = new QueryWrapper<>();
-        listQw.ge("begindate",begin);
-        listQw.le("begindate",end);
+//        listQw.ge("begindate",begin);
+//        listQw.le("begindate",end);
+        listQw.isNull("powerloss");
+        listQw.isNotNull("begindate");
+        listQw.isNotNull("enddate");
+        listQw.isNotNull("wpid");
         resultList=faultrecordService.list(listQw);
 
 
-        QueryWrapper<Windpowerinfoday> windturbineinfodayQueryWrapper = new QueryWrapper<>();
-        windturbineinfodayQueryWrapper.eq("recorddate",begin);
-        List<Windpowerinfoday> windturbineinfodayList = windpowerinfodayService.list(windturbineinfodayQueryWrapper);
 
-        Map<String,Windpowerinfoday> wtdaymap=new HashMap<>();
-        if(!windturbineinfodayList.isEmpty())
+
+        for(Faultrecord fr:resultList)
         {
-            for ( Windpowerinfoday wtday:windturbineinfodayList)
+            if(StringUtils.notEmp(fr.getFaultduration()))
             {
-                wtdaymap.put(wtday.getWindpowerstationid(),wtday);
+                QueryWrapper<Windpowerinfoday> windturbineinfodayQueryWrapper = new QueryWrapper<>();
+                windturbineinfodayQueryWrapper.eq("recorddate",DateUtils.truncate(fr.getBegindate()));
+                windturbineinfodayQueryWrapper.eq("foreignkeyid",fr.getWpid());
+                List<Windpowerinfoday> windturbineinfodayList = windpowerinfodayService.list(windturbineinfodayQueryWrapper);
+
+                Map<String,Windpowerinfoday> wtdaymap=new HashMap<>();
+                if(!windturbineinfodayList.isEmpty())
+                {
+                    for ( Windpowerinfoday wtday:windturbineinfodayList)
+                    {
+                        wtdaymap.put(wtday.getWindpowerstationid(),wtday);
+                    }
+                }
+
+                double gzsc=DateUtils.hoursDiff1(fr.getBegindate(),fr.getEnddate());
+
+                if(wtdaymap.containsKey(fr.getWpid()))
+                {
+                    Windpowerinfoday wpday=wtdaymap.get(fr.getWpid());
+
+                    if(CacheContext.wpwtlsmap.containsKey(wpday.getWindpowerstationid()))
+                    {
+                        List<Windturbine> wtls=CacheContext.wpwtlsmap.get(wpday.getWindpowerstationid());
+                        double rfdl= wpday.getGeneratingcapacity();
+                        double ssdl = new BigDecimal(rfdl).divide(new BigDecimal(wtls.size()), 2, RoundingMode.HALF_EVEN).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(gzsc)).doubleValue();
+                        fr.setPowerloss(StringUtils.round(ssdl,2));
+                        faultrecordService.saveOrUpdate(fr);
+                    }
+
+                }
             }
         }
 
-        for(Faultrecord fr:resultList)
+    }
+
+
+    /**
+     * 统计内报维护损失电量
+     */
+    public void saveMainrecord(String day) throws ParseException {
+
+
+        List<Mainrecord> resultList = new ArrayList<>();
+
+        QueryWrapper<Mainrecord> listQw = new QueryWrapper<>();
+
+        listQw.isNull("powerloss");
+        listQw.isNotNull("begindate");
+        listQw.isNotNull("enddate");
+        listQw.isNotNull("wpid");
+        resultList=mainrecordService.list(listQw);
+
+
+        for(Mainrecord fr:resultList)
         {
             if(StringUtils.notEmp(fr.getFaultduration()))
             {
-                double gzsc=fr.getFaultduration();
+                QueryWrapper<Windpowerinfoday> windturbineinfodayQueryWrapper = new QueryWrapper<>();
+                windturbineinfodayQueryWrapper.eq("recorddate",DateUtils.truncate(fr.getBegindate()));
+                windturbineinfodayQueryWrapper.eq("foreignkeyid",fr.getWpid());
+                List<Windpowerinfoday> windturbineinfodayList = windpowerinfodayService.list(windturbineinfodayQueryWrapper);
+
+                Map<String,Windpowerinfoday> wtdaymap=new HashMap<>();
+                if(!windturbineinfodayList.isEmpty())
+                {
+                    for ( Windpowerinfoday wtday:windturbineinfodayList)
+                    {
+                        wtdaymap.put(wtday.getWindpowerstationid(),wtday);
+                    }
+                }
+
+                double gzsc=DateUtils.hoursDiff1(fr.getBegindate(),fr.getEnddate());
 
-                if(wtdaymap.containsKey(fr.getWtid()))
+                if(wtdaymap.containsKey(fr.getWpid()))
                 {
-                    Windpowerinfoday wpday=wtdaymap.get(fr.getWtid());
+                    Windpowerinfoday wpday=wtdaymap.get(fr.getWpid());
 
                     if(CacheContext.wpwtlsmap.containsKey(wpday.getWindpowerstationid()))
                     {
@@ -106,8 +169,7 @@ public class GhostService {
                         double rfdl= wpday.getGeneratingcapacity();
                         double ssdl = new BigDecimal(rfdl).divide(new BigDecimal(wtls.size()), 2, RoundingMode.HALF_EVEN).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(gzsc)).doubleValue();
                         fr.setPowerloss(StringUtils.round(ssdl,2));
-
-                        faultrecordService.saveOrUpdate(fr);
+                        mainrecordService.saveOrUpdate(fr);
                     }
 
                 }

web/gdsx-ghost/src/main/java/com/gyee/ghost/task/SaticScheduleTask.java

@@ -27,9 +27,24 @@ public class SaticScheduleTask {
 
 
     /**
+     * 统计内报维护损失电量
+     */
+    @Scheduled(cron = "0 5 0 * * ?")
+    //或直接指定时间间隔，例如：5秒
+    //@Scheduled(fixedRate=5000)
+    private void saveMainrecord() {
+        String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
+        try {
+            ghostService.saveMainrecord(yesterday);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
      * 统计内报故障损失电量
      */
-    @Scheduled(cron = "0 50 0 * * ?")
+    @Scheduled(cron = "0 5 0 * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
     private void saveFaultrecord() {

web/gdsx-ghost/src/main/resources/application-hf.yml

@@ -56,11 +56,11 @@ spring:
     #    password: root
     #    driver-class-name: com.mysql.jdbc.Driver
 
-    #    driver-class-name: org.postgresql.Driver
-    #    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    #    username: gdprod
-    #    password: gd123
-    #    oracle-schema=:
+        driver-class-name: org.postgresql.Driver
+        url: jdbc:postgresql://10.81.3.151:5432/wisdom
+        username: gdprod
+        password: gd123
+        oracle-schema=:
 
     druid:
       max-active: 20

web/gdsx-ghost/src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8082
+  port: 8089
   servlet:
     context-path: /
 
@@ -20,8 +20,8 @@ spring:
   #      password: nacos
   #redis集群
   redis:
-    #    host: 10.83.68.94
-    host: 10.81.3.155
+    host: 127.0.0.1
+#    host: 11.0.118.57
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -44,22 +44,23 @@ spring:
     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://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
-    oracle-schema=:
+#    driver-class-name: oracle.jdbc.OracleDriver
+    #外网
+#    url: jdbc:oracle:thin:@11.0.118.57:1521:gdsj
+#    username: gdprod
+#    password: gd123
+#    oracle-schema=:
 
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
     #    username: root
     #    password: root
     #    driver-class-name: com.mysql.jdbc.Driver
 
-    #    driver-class-name: org.postgresql.Driver
-    #    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    #    username: gdprod
-    #    password: gd123
-    #    oracle-schema=:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://localhost:5432/wisdom
+    username: postgres
+    password: gd123
+    oracle-schema=:
 
     druid:
       max-active: 20
@@ -102,6 +103,7 @@ logging:
     com.example: debug
 #db url
 db:
-  url: http://10.81.3.154:8011/ts
+  url: http://11.0.118.58:8011/ts
+
 
 

web/gdsx-ghost/src/main/resources/application.yml

@@ -1,3 +1,4 @@
 spring:
   profiles:
-    active: dev
+#    active: dev
+    active: test