单机月度分析接口修改

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

@@ -80,7 +80,20 @@ public class OutputSpeedController {
 
         Page<ProEconInOrOutSpeedTotal> pageInfo=outputSpeedService.outputspeedhistorylist(pageNum,pageSize,cmId,type,wpId,wtId,beginDate,endDate);
 
+        if(pageInfo!=null && !pageInfo.getRecords().isEmpty())
+        {
 
+            for(ProEconInOrOutSpeedTotal pwg:pageInfo.getRecords())
+            {
+                if(CacheContext.wtmap.containsKey(pwg.getWindturbineId()))
+                {
+                    ProBasicEquipment wt= CacheContext.wtmap.get(pwg.getWindturbineId());
+                    pwg.setWtcode(wt.getAname());
+                    pwg.setModelId(wt.getModelId());
+                }
+
+            }
+        }
         return R.data(ResultMsg.ok(pageInfo));
 //        return AjaxResult.successData(ResultCode.SUCCESS, pageInfo);
 

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

@@ -3,6 +3,8 @@ package com.gyee.runeconomy.controller;
 
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.model.vo.SingleAnalysisVo;
 import com.gyee.runeconomy.service.singleanalysis.SingleAnalysisService;
 import com.gyee.runeconomy.util.DateUtils;
@@ -45,7 +47,7 @@ public class SingleAnalysisController {
         Map<String,Object> map=new HashMap<>();
         List<SingleAnalysisVo> vos =new ArrayList<>();
 
-        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
+        if (StringUtils.notEmp(cmId) && StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
 
             Calendar cal = Calendar.getInstance();
             int newyear=cal.get(Calendar.YEAR);
@@ -111,15 +113,25 @@ public class SingleAnalysisController {
                 recordDate= DateUtils.truncate(cal.getTime());
             }
 
+            String wtcode=null;
+            if(CacheContext.wtmap.containsKey(wtId))
+            {
+                ProBasicEquipment wt= CacheContext.wtmap.get(wtId);
+                wtcode=wt.getAname();
+
+            }
 
             SingleAnalysisVo  byzb =singleAnalysisService.SingleAnalysisListByWtId(wtId,recordDate);
 
+            byzb.setWtcode(wtcode);
             cal.add(Calendar.YEAR,-1);
             Date lastYear=DateUtils.truncate(cal.getTime());
 
             SingleAnalysisVo  tqzb =singleAnalysisService.SingleAnalysisListByWtId(wtId,lastYear);
             SingleAnalysisVo  tbzb =singleAnalysisService.SingleAnalysisListByWtId(byzb,tqzb);
 
+            tqzb.setWtcode(wtcode);
+            tbzb.setWtcode(wtcode);
 
             cal.setTime(recordDate);
             cal.add(Calendar.MONTH,-1);
@@ -128,7 +140,8 @@ public class SingleAnalysisController {
             SingleAnalysisVo  hqzb =singleAnalysisService.SingleAnalysisListByWtId(wtId,lastMonth);
             SingleAnalysisVo  hbzb =singleAnalysisService.SingleAnalysisListByWtId(byzb,hqzb);
 
-
+            hqzb.setWtcode(wtcode);
+            hbzb.setWtcode(wtcode);
 
             map.put("byzb",byzb);//本月指标
             map.put("tqzb",tqzb);//全年同期

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

@@ -151,7 +151,7 @@ public class WindturbineGoodnessDetailController {
             int month=cal.get(Calendar.MONTH)+1;
 
             QueryWrapper<ProEconWtCurveFittingMonth> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("windturbine_id",wtId).eq("year",year).eq("month",month);
+            queryWrapper.eq("windturbine_id",wtId).eq("year",String.valueOf(year)).eq("month",String.valueOf(month));
 
             List<ProEconWtCurveFittingMonth> wcls = proEconWtCurveFittingMonthService.list(queryWrapper);
 //                    .stream().filter(i->

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

@@ -85,6 +85,21 @@ public class WindturbinegoodnessController {
     public R goodhistorylist( Integer pageNum, Integer pageSize, String wtId, String beginDate, String endDate) {
 
         Page<ProEconWtAlysisDay> resultList = wtAlysisDayService.wtAlysisDayList(pageNum, pageSize,wtId, beginDate,  endDate);
+
+        if(resultList!=null && !resultList.getRecords().isEmpty())
+        {
+
+            for(ProEconWtAlysisDay pwg:resultList.getRecords())
+            {
+                if(CacheContext.wtmap.containsKey(pwg.getWindturbineId()))
+                {
+                    ProBasicEquipment wt= CacheContext.wtmap.get(pwg.getWindturbineId());
+                    pwg.setWtcode(wt.getAname());
+
+                }
+
+            }
+        }
         return R.data(ResultMsg.ok(resultList));
 
     }

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

@@ -92,7 +92,7 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,List<ProBasicEquipment>> wpwtmap = new HashMap<>();
     public static Map<String,List<ProBasicEquipment>> pjwtmap = new HashMap<>();
     public static Map<String,List<ProBasicEquipment>> lnwtmap = new HashMap<>();
-
+    public static Map<String,List<ProBasicEquipment>> cmwtlsmap = new HashMap<>();
     public static Map<String,Map<String,ProBasicEquipment>> cmwtmap = new HashMap<>();
     public static Map<String,List<ProBasicEquipment>> sqwtmap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
@@ -292,6 +292,14 @@ public class CacheContext implements CommandLineRunner {
                 lnls.add(wt);
                 lnwtmap.put(wt.getLineId(),lnls);
             }
+            if (cmwtlsmap.containsKey(wt.getCompanyId())){
+                cmwtlsmap.get(wt.getCompanyId()).add(wt);
+            }else {
+                List<ProBasicEquipment> lnls = new ArrayList<>();
+                lnls.add(wt);
+                cmwtlsmap.put(wt.getCompanyId(),lnls);
+            }
+
 
             if (sqwtmap.containsKey(wt.getSquareId())){
                 sqwtmap.get(wt.getSquareId()).add(wt);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconWtAlysisDay.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.model.auto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -337,6 +338,7 @@ public class ProEconWtAlysisDay extends Model {
      * 年实际/保正
      */
     private Double nsjbz;
-
+    @TableField(exist = false)
+    private String wtcode;
 
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconWtwindDayInfo.java

@@ -43,7 +43,7 @@ public class ProEconWtwindDayInfo extends Model {
      * 编号
      */
     @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Integer id;
+    private Long id;
 
     /**
      * 风机编号

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/SingleAnalysisVo.java

@@ -17,6 +17,8 @@ public class SingleAnalysisVo implements java.io.Serializable {
     private String windturbineid;
 	//风机名称
 	private String windturbineName;
+
+    private String wtcode;
     //风场编号
     private String windPowerStationId;
     //风场名称

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -72,7 +72,7 @@ public class SingleAnalysisService {
         if(StringUtils.notEmp(wpId))
         {
             QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("types",type).eq("record_date",recordDate)
+            queryWrapper.eq("record_date",recordDate)
                     .eq("company_id",cmId).eq("windpowerstation_id",wpId);
             iostls= proEconEquipmentInfoDay1Service.list(queryWrapper);
 //                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
@@ -83,7 +83,7 @@ public class SingleAnalysisService {
         }else
         {
             QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("types",type).eq("record_date",recordDate)
+            queryWrapper.eq("record_date",recordDate)
                     .eq("company_id",cmId);
             iostls= proEconEquipmentInfoDay1Service.list(queryWrapper);
 //                    .stream().filter(i-> i.getCompanyId().equals(cmId)
@@ -104,7 +104,7 @@ public class SingleAnalysisService {
         if(StringUtils.notEmp(wpId))
         {
             QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("types",type).eq("record_date",recordDate)
+            queryWrapper.eq("record_date",recordDate)
                     .eq("company_id",cmId).eq("windpowerstation_id",wpId);
             iostls= proEconEquipmentInfoDay2Service.list(queryWrapper);
 //                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
@@ -253,7 +253,7 @@ public class SingleAnalysisService {
 
         List<SingleAnalysisVo> vos = new ArrayList<>();
 
-        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recordDate) ) {
+        if (StringUtils.notEmp(cmId) && StringUtils.notEmp(recordDate) ) {
 
             Map<String, ProEconInOrOutSpeedTotal> iostmap=queryInOrOutSpeedTotal(cmId,type,wpId, recordDate);
             Map<String, ProEconEquipmentInfoDay1> eqday1map = queryEquipmentInfoDay1(cmId,type,wpId, recordDate);
@@ -261,14 +261,28 @@ public class SingleAnalysisService {
             Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(cmId, recordDate);
             Map<String, ProEconEquipmentInfoDay4> eqday4map = queryEquipmentInfoDay4(cmId,type,wpId, recordDate);
 
+            List<ProBasicEquipment> wtls =new ArrayList<>();
+            if(StringUtils.isNotEmpty(wpId))
+            {
+                if (CacheContext.wpwtmap.containsKey(cmId)) {
+                   wtls = CacheContext.wpwtmap.get(wpId);
+                }
+
+            }else
+            {
+                if (CacheContext.cmwtlsmap.containsKey(cmId)) {
+                     wtls = CacheContext.cmwtlsmap.get(cmId);
+                }
+            }
 
-            if (CacheContext.wpwtmap.containsKey(wpId)) {
-                List<ProBasicEquipment> wtls = CacheContext.wpwtmap.get(wpId);
+            //if (CacheContext.cmwtlsmap.containsKey(wpId)) {
+//                List<ProBasicEquipment> wtls = CacheContext.cmwtlsmap.get(wpId);
 
                 for (ProBasicEquipment wt : wtls) {
                     SingleAnalysisVo vo = new SingleAnalysisVo();
                     vo.setWindPowerStationId(wt.getWindpowerstationId());
                     vo.setWindturbineName(wt.getName());
+                    vo.setWtcode(wt.getAname());
                     if (CacheContext.wpmap.containsKey(wt.getWindpowerstationId())) {
                         ProBasicPowerstation wp = CacheContext.wpmap.get(wt.getWindpowerstationId());
                         vo.setWindPowerStationName(wp.getName());
@@ -388,7 +402,7 @@ public class SingleAnalysisService {
                     vos.add(vo);
                 }
 
-            }
+            //}
 
 
             if (null != vos && !vos.isEmpty()) {

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

@@ -106,7 +106,7 @@ logging:
     com.example: debug
 initialcode: INITIAL
 db:
-  url: http://127.0.0.1:8011/ts
+  url: http://124.70.75.91: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_LYDL_BH1_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_GHTZ_HZJ_GDC_STA
 

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

@@ -1,5 +1,5 @@
 spring:
   profiles:
 #    active: jn
-    active: xk
+    active: yun
 #    active: xk