切入切出接口，月度单机分析接口

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

@@ -33,12 +33,14 @@ public class OutputSpeedController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", required = true, dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页数量", required = true, dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "cmId", value = "公司编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "光伏(-2)/风场(-1)", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public R outputSpeedlist( Integer pageNum, Integer pageSize, String wpId, String recorddate) {
+    public R outputSpeedlist( Integer pageNum, Integer pageSize,String cmId,String type, String wpId, String recorddate) {
 
-        Page<ProEconInOrOutSpeedTotal> pageInfo=outputSpeedService.outputSpeedlist(pageNum,pageSize,wpId,recorddate);
+        Page<ProEconInOrOutSpeedTotal> pageInfo=outputSpeedService.outputSpeedlist(pageNum,pageSize,cmId,type,wpId,recorddate);
 
         return R.data(ResultMsg.ok(pageInfo));
 
@@ -51,15 +53,17 @@ public class OutputSpeedController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", required = true, dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页数量", required = true, dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "cmId", value = "公司编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "光伏(-2)/风场(-1)", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public R outputspeedhistorylist(Integer pageNum, Integer pageSize, String wpId,String wtId, String beginDate,String endDate) {
+    public R outputspeedhistorylist(Integer pageNum, Integer pageSize,String cmId,String type, String wpId,String wtId, String beginDate,String endDate) {
 
 
-        Page<ProEconInOrOutSpeedTotal> pageInfo=outputSpeedService.outputspeedhistorylist(pageNum,pageSize,wpId,wtId,beginDate,endDate);
+        Page<ProEconInOrOutSpeedTotal> pageInfo=outputSpeedService.outputspeedhistorylist(pageNum,pageSize,cmId,type,wpId,wtId,beginDate,endDate);
 
 
         return R.data(ResultMsg.ok(pageInfo));

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

@@ -34,11 +34,13 @@ public class SingleAnalysisController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", required = true, dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页数量", required = true, dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "cmId", value = "公司编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "光伏(-2)/风场(-1)", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
 
-    public R singleanalysisMain(Integer pageNum, Integer pageSize, String wpId, String year, String month) throws Exception {
+    public R singleanalysisMain(Integer pageNum, Integer pageSize,String cmId,String type, String wpId, String year, String month) throws Exception {
 
         List<SingleAnalysisVo> vos =new ArrayList<>();
 
@@ -61,7 +63,7 @@ public class SingleAnalysisController {
             }
 
 
-            vos =singleAnalysisService.SingleAnalysisList(pageNum, pageSize, wpId,recordDate);
+            vos =singleAnalysisService.SingleAnalysisList(pageNum, pageSize,cmId,type, wpId,recordDate);
 
         }
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.model.auto.ProEconWindturbineGoodness;
+import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
+import com.gyee.runeconomy.service.WtAlysisDayService;
 import com.gyee.runeconomy.service.goodness.WindturbinegoodnessService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -25,8 +27,8 @@ import javax.annotation.Resource;
 public class WindturbinegoodnessController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
-//    @Resource
-//    private WindturbineanalysisdayService windturbineanalysisdayService;
+    @Resource
+    private WtAlysisDayService wtAlysisDayService;
 
 
     /**
@@ -39,45 +41,36 @@ public class WindturbinegoodnessController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", required = true, dataType = "Integer", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页数量", required = true, dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "cmId", value = "公司编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "光伏(-2)/风场(-1)", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public R windturbinegoodness( Integer pageNum, Integer pageSize, String wpId, String recorddate) {
+    public R windturbinegoodness( Integer pageNum, Integer pageSize,String cmId,String type,  String wpId, String recorddate) {
 
-        Page<ProEconWindturbineGoodness> resultList = windturbinegoodnessService.windturbinegoodnessList(pageNum,pageSize, wpId, recorddate);
+        Page<ProEconWindturbineGoodness> resultList = windturbinegoodnessService.windturbinegoodnessList(pageNum,pageSize, cmId,type,wpId, recorddate);
         return R.data(ResultMsg.ok(resultList));
     }
 
 
-//    /**
-//     * 获得单机性能总览历史列表信息
-//     *
-//     * @param tablepar
-//     * @param wtId
-//     * @param beginDate
-//     * @param endDate
-//     * @return
-//     */
-//    @PostMapping("/goodhistorylist")
-//    @ResponseBody
-//    @ApiOperation(value = "获得单机性能总览历史列表信息", notes = "获得单机性能总览历史列表信息")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
-//            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
-//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
-//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
-//
-//    public AjaxResult goodhistorylist(@RequestBody Tablepar tablepar, String wtId, String beginDate, String endDate) {
-//        List<Windturbineanalysisday> resultList =new ArrayList<>();
-//        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
-//        {
-//            resultList = windturbineanalysisdayService.goodhistorylist(tablepar,wtId, DateUtils.parseDate(beginDate),  DateUtils.parseDate(endDate));
-//        }
-//        if (resultList != null) {
-//            return AjaxResult.successData(AjaxStatus.success.code, resultList);
-//        } else {
-//            return AjaxResult.successData(AjaxStatus.success.code, resultList);
-//        }
-//    }
+    /**
+     * 获得单机性能总览历史列表信息
+     */
+    @PostMapping("/goodhistorylist")
+    @ResponseBody
+    @ApiOperation(value = "获得单机性能总览历史列表信息", notes = "获得单机性能总览历史列表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页数量", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public R goodhistorylist( Integer pageNum, Integer pageSize, String wtId, String beginDate, String endDate) {
+
+        Page<ProEconWtAlysisDay> resultList = wtAlysisDayService.wtAlysisDayList(pageNum, pageSize,wtId, beginDate,  endDate);
+        return R.data(ResultMsg.ok(resultList));
+
+    }
 
 }

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

@@ -93,7 +93,7 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,List<ProBasicEquipment>> pjwtmap = new HashMap<>();
     public static Map<String,List<ProBasicEquipment>> lnwtmap = 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表
     public static Map<String,Map<String, ProBasicPowerstationPoint>> linepointmap =new HashMap<>();
@@ -300,6 +300,14 @@ public class CacheContext implements CommandLineRunner {
                 lnls.add(wt);
                 sqwtmap.put(wt.getSquareId(),lnls);
             }
+
+            if (cmwtmap.containsKey(wt.getCompanyId())){
+                cmwtmap.get(wt.getCompanyId()).put(wt.getId(),wt);
+            }else {
+                Map<String,ProBasicEquipment> map=new HashMap<>();
+                map.put(wt.getId(),wt);
+                cmwtmap.put(wt.getCompanyId(),map);
+            }
         });
 
         //初始化标杆风机

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
+
+/**
+ * <p>
+ * 风机日性能分析表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-24
+ */
+public interface ProEconWtAlysisDayMapper extends BaseMapper<ProEconWtAlysisDay> {
+
+}

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

@@ -373,6 +373,7 @@ public class ProEconInOrOutSpeedTotal extends Model {
      * 线路编号
      */
     private String lineId;
-
+    private String companyId;
+    private String types;
 
 }

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

@@ -93,6 +93,7 @@ public class ProEconWindturbineGoodness extends Model {
      */
     private Integer yearTop;
 
-
+    private String companyId;
+    private String types;
 
 }

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

@@ -0,0 +1,342 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 风机日性能分析表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconWtAlysisDay extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 日发电量
+     */
+    private Double rfdl;
+
+    /**
+     * 月发电量
+     */
+    private Double yfdl;
+
+    /**
+     * 年发电量
+     */
+    private Double nfdl;
+
+    /**
+     * 日应发电量
+     */
+    private Double ryfdl;
+
+    /**
+     * 月应发电量
+     */
+    private Double yyfdl;
+
+    /**
+     * 年应发电量
+     */
+    private Double nyfdl;
+
+    /**
+     * 日平均功率
+     */
+    private Double rpjgl;
+
+    /**
+     * 月平均功率
+     */
+    private Double ypjgl;
+
+    /**
+     * 年平均功率
+     */
+    private Double npjgl;
+
+    /**
+     * 日平均风速
+     */
+    private Double rpjfs;
+
+    /**
+     * 月平均风速
+     */
+    private Double ypjfs;
+
+    /**
+     * 年平均风速
+     */
+    private Double npjfs;
+
+    /**
+     * 日运行小时
+     */
+    private Double ryxxs;
+
+    /**
+     * 月运行小时
+     */
+    private Double yyxxs;
+
+    /**
+     * 年运行小时
+     */
+    private Double nyxxs;
+
+    /**
+     * 日待机小时
+     */
+    private Double rdjxs;
+
+    /**
+     * 月待机小时
+     */
+    private Double ydjxs;
+
+    /**
+     * 年待机小时
+     */
+    private Double ndjxs;
+
+    /**
+     * 日故障小时
+     */
+    private Double rgzxs;
+
+    /**
+     * 月故障小时
+     */
+    private Double ygzxs;
+
+    /**
+     * 年故障小时
+     */
+    private Double ngzxs;
+
+    /**
+     * 日检修小时
+     */
+    private Double rjxxs;
+
+    /**
+     * 月检修小时
+     */
+    private Double yjxxs;
+
+    /**
+     * 年检修小时
+     */
+    private Double njxxs;
+
+    /**
+     * 日中断小时
+     */
+    private Double rzdxs;
+
+    /**
+     * 月中断小时
+     */
+    private Double yzdxs;
+
+    /**
+     * 年中断小时
+     */
+    private Double nzdxs;
+
+    /**
+     * 日有效风时
+     */
+    private Double ryxfs;
+
+    /**
+     * 月有效风时
+     */
+    private Double yyxfs;
+
+    /**
+     * 年有效风时
+     */
+    private Double nyxfs;
+
+    /**
+     * 日损失电量
+     */
+    private Double rssdl;
+
+    /**
+     * 月损失电量
+     */
+    private Double yssdl;
+
+    /**
+     * 年损失电量
+     */
+    private Double nssdl;
+
+    /**
+     * 日报警次数
+     */
+    private Double rbjcs;
+
+    /**
+     * 月报警次数
+     */
+    private Double ybjcs;
+
+    /**
+     * 年报警次数
+     */
+    private Double nbjcs;
+
+    /**
+     * 日停机次数
+     */
+    private Double rtjcs;
+
+    /**
+     * 月停机次数
+     */
+    private Double ytjcs;
+
+    /**
+     * 年停机次数
+     */
+    private Double ntjcs;
+
+    /**
+     * 日不饱和次数
+     */
+    private Double rbbhcs;
+
+    /**
+     * 月不饱和次数
+     */
+    private Double ybbhcs;
+
+    /**
+     * 年不饱和次数
+     */
+    private Double nbbhcs;
+
+    /**
+     * 日设备可利用率
+     */
+    private Double rsbklyl;
+
+    /**
+     * 月设备可利用率
+     */
+    private Double ysbklyl;
+
+    /**
+     * 年设备可利用率
+     */
+    private Double nsbklyl;
+
+    /**
+     * 日平均温度
+     */
+    private Double rpjwd;
+
+    /**
+     * 月平均温度
+     */
+    private Double ypjwd;
+
+    /**
+     * 年平均温度
+     */
+    private Double npjwd;
+
+    /**
+     * 日平均湿度
+     */
+    private Double rpjsd;
+
+    /**
+     * 月平均湿度
+     */
+    private Double ypjsd;
+
+    /**
+     * 年平均湿度
+     */
+    private Double npjsd;
+
+    /**
+     * 日平均压强
+     */
+    private Double rpjyq;
+
+    /**
+     * 月平均压强
+     */
+    private Double ypjyq;
+
+    /**
+     * 年平均压强
+     */
+    private Double npjyq;
+
+    /**
+     * 日拟合优度
+     */
+    private Double rnhyd;
+
+    /**
+     * 月拟合优度
+     */
+    private Double ynhyd;
+
+    /**
+     * 年拟合优度
+     */
+    private Double nnhyd;
+
+    /**
+     * 日实际/保证
+     */
+    private Double rsjbz;
+
+    /**
+     * 月实际/保证
+     */
+    private Double ysjbz;
+
+    /**
+     * 年实际/保正
+     */
+    private Double nsjbz;
+
+
+}

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

@@ -74,5 +74,6 @@ public class SingleAnalysisVo implements java.io.Serializable {
 	//日期
 	private Date recorddate;
 
-
+    private String companyId;
+    private String types;
 }

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

@@ -0,0 +1,52 @@
+package com.gyee.runeconomy.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
+import com.gyee.runeconomy.service.auto.IProEconWtAlysisDayService;
+import com.gyee.runeconomy.util.DateUtils;
+import com.gyee.runeconomy.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Service
+public class WtAlysisDayService {
+
+    @Resource
+    private IProEconWtAlysisDayService proEconWtAlysisDayService;
+
+
+
+    public Page<ProEconWtAlysisDay> wtAlysisDayList(Integer pageNum, Integer pageSize, String wtId,String beginDate, String endDate) {
+
+        if(StringUtils.empty(pageNum))
+        {
+            pageNum=1;
+        }
+        if(StringUtils.empty(pageSize))
+        {
+            pageSize=10;
+        }
+        //构造分页构造器
+        Page<ProEconWtAlysisDay> pageInfo = new Page<>(pageNum, pageSize);
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+        {
+            Date begin= DateUtils.parseDate(beginDate);
+            Date end= DateUtils.parseDate(endDate);
+
+            //构造条件构造器
+            LambdaQueryWrapper<ProEconWtAlysisDay> queryWrapper = new LambdaQueryWrapper<>();
+            //添加过滤条件
+            queryWrapper.eq(ProEconWtAlysisDay::getWindturbineId, wtId).
+                    ge(ProEconWtAlysisDay::getRecordDate, begin).
+                    le(ProEconWtAlysisDay::getRecordDate, end);
+            //执行查询
+            proEconWtAlysisDayService.page(pageInfo, queryWrapper);
+        }
+
+        return pageInfo;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
+
+/**
+ * <p>
+ * 风机日性能分析表 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-24
+ */
+public interface IProEconWtAlysisDayService extends IService<ProEconWtAlysisDay> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.runeconomy.mapper.auto.ProEconWtAlysisDayMapper;
+import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
+import com.gyee.runeconomy.service.auto.IProEconWtAlysisDayService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 风机日性能分析表 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-24
+ */
+@Service
+public class ProEconWtAlysisDayServiceImpl extends ServiceImpl<ProEconWtAlysisDayMapper, ProEconWtAlysisDay> implements IProEconWtAlysisDayService {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -35,7 +35,7 @@ public class WindturbinegoodnessService {
     @Resource
     private IEdosUtil edosUtil;
 
-    public Page<ProEconWindturbineGoodness> windturbinegoodnessList(Integer pageNum, Integer pageSize, String wpId, String recorddate) {
+    public Page<ProEconWindturbineGoodness> windturbinegoodnessList(Integer pageNum, Integer pageSize,  String cmId,String type,String wpId, String recorddate) {
 
         if(StringUtils.empty(pageNum))
         {
@@ -47,22 +47,29 @@ public class WindturbinegoodnessService {
         }
         //构造分页构造器
         Page<ProEconWindturbineGoodness> pageInfo = new Page<>(pageNum, pageSize);
-        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate))
+        if (StringUtils.notEmp(cmId) && StringUtils.notEmp(type) && StringUtils.notEmp(recorddate))
         {
             Date date= DateUtils.parseDate(recorddate);
 
+            //构造条件构造器
+            LambdaQueryWrapper<ProEconWindturbineGoodness> queryWrapper = new LambdaQueryWrapper<>();
+            //添加过滤条件
 
-            if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
-
-                //构造条件构造器
-                LambdaQueryWrapper<ProEconWindturbineGoodness> queryWrapper = new LambdaQueryWrapper<>();
-                //添加过滤条件
+            if(StringUtils.notEmp(wpId))
+            {
                 queryWrapper.eq(ProEconWindturbineGoodness::getWindtpowerstationId, wpId).
+                        eq(ProEconWindturbineGoodness::getCompanyId,cmId).
+                        eq(ProEconWindturbineGoodness::getTypes,type).
+                        eq(ProEconWindturbineGoodness::getRecordDate, date);
+            }else
+            {
+                queryWrapper.eq(ProEconWindturbineGoodness::getCompanyId,cmId).
+                        eq(ProEconWindturbineGoodness::getTypes,type).
                         eq(ProEconWindturbineGoodness::getRecordDate, date);
-                //执行查询
-                proEconWindturbineGoodnessService.page(pageInfo, queryWrapper);
-
             }
+
+            //执行查询
+            proEconWindturbineGoodnessService.page(pageInfo, queryWrapper);
         }
 
         return pageInfo;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/outputspeed/OutputSpeedService.java

@@ -18,7 +18,7 @@ public class OutputSpeedService {
     @Resource
     private IProEconInOrOutSpeedTotalService proEconInOrOutSpeedTotalService;
 
-    public Page<ProEconInOrOutSpeedTotal> outputSpeedlist(Integer pageNum, Integer pageSize, String wpId, String recorddate) {
+    public Page<ProEconInOrOutSpeedTotal> outputSpeedlist(Integer pageNum, Integer pageSize, String cmId,String type, String wpId, String recorddate) {
 
         if(StringUtils.empty(pageNum))
         {
@@ -30,22 +30,31 @@ public class OutputSpeedService {
         }
         //构造分页构造器
         Page<ProEconInOrOutSpeedTotal> pageInfo = new Page<>(pageNum, pageSize);
-        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate))
+        if (StringUtils.notEmp(cmId) && StringUtils.notEmp(recorddate))
         {
             Date date= DateUtils.parseDate(recorddate);
+            //构造条件构造器
+            LambdaQueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new LambdaQueryWrapper<>();
+            //添加过滤条件
 
 
-            if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
+            if(StringUtils.notEmp(wpId))
+            {
 
-                //构造条件构造器
-                LambdaQueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new LambdaQueryWrapper<>();
-                //添加过滤条件
                 queryWrapper.eq(ProEconInOrOutSpeedTotal::getWindpowerstationId, wpId).
+                        eq(ProEconInOrOutSpeedTotal::getCompanyId,cmId).
+                        eq(ProEconInOrOutSpeedTotal::getTypes,type).
+                        eq(ProEconInOrOutSpeedTotal::getRecordDate, date);
+            }else
+            {
+                queryWrapper.
+                        eq(ProEconInOrOutSpeedTotal::getCompanyId,cmId).
+                        eq(ProEconInOrOutSpeedTotal::getTypes,type).
                         eq(ProEconInOrOutSpeedTotal::getRecordDate, date);
-                //执行查询
-                proEconInOrOutSpeedTotalService.page(pageInfo, queryWrapper);
-
             }
+
+            //执行查询
+            proEconInOrOutSpeedTotalService.page(pageInfo, queryWrapper);
         }
 
         return pageInfo;
@@ -53,7 +62,7 @@ public class OutputSpeedService {
     }
 
 
-    public Page<ProEconInOrOutSpeedTotal> outputspeedhistorylist(Integer pageNum, Integer pageSize, String wpId, String wtId, String beginDate, String endDate) {
+    public Page<ProEconInOrOutSpeedTotal> outputspeedhistorylist(Integer pageNum, Integer pageSize,String cmId,String type, String wpId, String wtId, String beginDate, String endDate) {
 
 
         if(StringUtils.empty(pageNum))
@@ -69,7 +78,7 @@ public class OutputSpeedService {
 
 
 
-        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) &&  StringUtils.notEmp(endDate))
+        if (StringUtils.notEmp(cmId)  && StringUtils.notEmp(type) && StringUtils.notEmp(beginDate) &&  StringUtils.notEmp(endDate))
         {
 
             Date begin=DateUtils.parseDate(beginDate);
@@ -78,15 +87,29 @@ public class OutputSpeedService {
             //构造条件构造器
             LambdaQueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new LambdaQueryWrapper<>();
             //添加过滤条件
-            if(StringUtils.notEmp(wtId))
+            if(StringUtils.notEmp(wpId))
             {
-                queryWrapper.eq(ProEconInOrOutSpeedTotal::getWindpowerstationId, wpId).
-                        eq(ProEconInOrOutSpeedTotal::getWindturbineId,wtId).
-                        ge(ProEconInOrOutSpeedTotal::getRecordDate, begin).
-                        le(ProEconInOrOutSpeedTotal::getRecordDate,end);
+
+                if(StringUtils.notEmp(wtId))
+                {
+                    queryWrapper.eq(ProEconInOrOutSpeedTotal::getWindpowerstationId, wpId).
+                            eq(ProEconInOrOutSpeedTotal::getCompanyId,cmId).
+                            eq(ProEconInOrOutSpeedTotal::getTypes,type).
+                            eq(ProEconInOrOutSpeedTotal::getWindturbineId,wtId).
+                            ge(ProEconInOrOutSpeedTotal::getRecordDate, begin).
+                            le(ProEconInOrOutSpeedTotal::getRecordDate,end);
+                }else
+                {
+                    queryWrapper.eq(ProEconInOrOutSpeedTotal::getWindpowerstationId, wpId).
+                            eq(ProEconInOrOutSpeedTotal::getCompanyId,cmId).
+                            eq(ProEconInOrOutSpeedTotal::getTypes,type).
+                            ge(ProEconInOrOutSpeedTotal::getRecordDate, begin).
+                            le(ProEconInOrOutSpeedTotal::getRecordDate,end);
+                }
             }else
             {
-                queryWrapper.eq(ProEconInOrOutSpeedTotal::getWindpowerstationId, wpId).
+                queryWrapper.eq(ProEconInOrOutSpeedTotal::getCompanyId,cmId).
+                        eq(ProEconInOrOutSpeedTotal::getTypes,type).
                         ge(ProEconInOrOutSpeedTotal::getRecordDate, begin).
                         le(ProEconInOrOutSpeedTotal::getRecordDate,end);
             }

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

@@ -30,52 +30,95 @@ public class SingleAnalysisService {
     @Resource
     private IProEconPowerstationInfoDay5Service proEconPowerstationInfoDay5Service;
 
-    private Map<String, ProEconInOrOutSpeedTotal> queryInOrOutSpeedTotal(String wpId, Date recordDate) {
+    private Map<String, ProEconInOrOutSpeedTotal> queryInOrOutSpeedTotal(String cmId,String type,String wpId, Date recordDate) {
+
+        List<ProEconInOrOutSpeedTotal> iostls=null;
+        if(StringUtils.notEmp(wpId))
+        {
+            iostls= proEconInOrOutSpeedTotalService.list()
+                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+                            && i.getCompanyId().equals(cmId)
+                            && i.getTypes().equals(type)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }else
+        {
+            iostls= proEconInOrOutSpeedTotalService.list()
+                    .stream().filter(i-> i.getCompanyId().equals(cmId)
+                            && i.getTypes().equals(type)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }
 
-        List<ProEconInOrOutSpeedTotal> iostls= proEconInOrOutSpeedTotalService.list()
-                .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
         //List转map
         Map<String, ProEconInOrOutSpeedTotal> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconInOrOutSpeedTotal::getWindturbineId, Function.identity(), (key1, key2) -> key2));
         return iostmap;
     }
 
-    private Map<String, ProEconEquipmentInfoDay1> queryEquipmentInfoDay1(String wpId,  Date recordDate) {
+    private Map<String, ProEconEquipmentInfoDay1> queryEquipmentInfoDay1(String cmId,String type,String wpId,  Date recordDate) {
 
 
-        List<ProEconEquipmentInfoDay1> iostls= proEconEquipmentInfoDay1Service.list()
-                .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        List<ProEconEquipmentInfoDay1> iostls=null;
+        if(StringUtils.notEmp(wpId))
+        {
+            iostls= proEconEquipmentInfoDay1Service.list()
+                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+                            && i.getCompanyId().equals(cmId)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }else
+        {
+            iostls= proEconEquipmentInfoDay1Service.list()
+                    .stream().filter(i-> i.getCompanyId().equals(cmId)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }
+
         //List转map
         Map<String, ProEconEquipmentInfoDay1> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconEquipmentInfoDay1::getWindturbineId, Function.identity(), (key1, key2) -> key2));
         return iostmap;
     }
-    private Map<String, ProEconEquipmentInfoDay2> queryEquipmentInfoDay2(String wpId,  Date recordDate) {
+    private Map<String, ProEconEquipmentInfoDay2> queryEquipmentInfoDay2(String cmId,String type,String wpId,  Date recordDate) {
 
-        List<ProEconEquipmentInfoDay2> iostls= proEconEquipmentInfoDay2Service.list()
-                .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        List<ProEconEquipmentInfoDay2> iostls=null;
+
+        if(StringUtils.notEmp(wpId))
+        {
+            iostls= proEconEquipmentInfoDay2Service.list()
+                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+                            && i.getCompanyId().equals(cmId)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }else
+        {
+            iostls= proEconEquipmentInfoDay2Service.list()
+                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+                            && i.getCompanyId().equals(cmId)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }
         //List转map
         Map<String, ProEconEquipmentInfoDay2> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconEquipmentInfoDay2::getWindturbineId, Function.identity(), (key1, key2) -> key2));
         return iostmap;
     }
-    private Map<String, ProEconPowerstationInfoDay5> queryPowerstationInfoDay5(String wpId, Date recordDate) {
+    private Map<String, ProEconPowerstationInfoDay5> queryPowerstationInfoDay5(String cmId, Date recordDate) {
 
 
-        List<ProEconPowerstationInfoDay5> iostls= proEconPowerstationInfoDay5Service.list()
+        List<ProEconPowerstationInfoDay5> iostls=null;
+        iostls= proEconPowerstationInfoDay5Service.list()
                 .stream().filter(i->
-                        i.getWindpowerstationId() !=null
-                        && i.getWindpowerstationId().equals(wpId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
+                        i.getCompanyId() !=null
+                                && i.getCompanyId().equals(cmId)
+                                && i.getRecordDate().compareTo(recordDate) == 0
                 )
                 .collect(Collectors.toList());
         //List转map
@@ -84,14 +127,26 @@ public class SingleAnalysisService {
         return iostmap;
     }
 
-    private Map<String, ProEconEquipmentInfoDay4> queryEquipmentInfoDay4(String wpId, Date recordDate) {
+    private Map<String, ProEconEquipmentInfoDay4> queryEquipmentInfoDay4(String cmId,String type,String wpId, Date recordDate) {
 
 
-        List<ProEconEquipmentInfoDay4> iostls= proEconEquipmentInfoDay4Service.list()
-                .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        List<ProEconEquipmentInfoDay4> iostls= null;
+        if(StringUtils.notEmp(wpId))
+        {
+            iostls= proEconEquipmentInfoDay4Service.list()
+                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+                            && i.getCompanyId().equals(cmId)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }else
+        {
+            iostls= proEconEquipmentInfoDay4Service.list()
+                    .stream().filter(i-> i.getCompanyId().equals(cmId)
+                            && i.getRecordDate().compareTo(recordDate) == 0
+                    )
+                    .collect(Collectors.toList());
+        }
         //List转map
         Map<String, ProEconEquipmentInfoDay4> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconEquipmentInfoDay4::getWindturbineId, Function.identity(), (key1, key2) -> key2));
@@ -157,17 +212,17 @@ public class SingleAnalysisService {
 
 
 
-    public List<SingleAnalysisVo> SingleAnalysisList(Integer pageNum, Integer pageSize,  String wpId,Date recordDate) {
+    public List<SingleAnalysisVo> SingleAnalysisList(Integer pageNum, Integer pageSize, String cmId,String type, String wpId,Date recordDate) {
 
         List<SingleAnalysisVo> vos = new ArrayList<>();
 
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recordDate) ) {
 
-            Map<String, ProEconInOrOutSpeedTotal> iostmap=queryInOrOutSpeedTotal(wpId, recordDate);
-            Map<String, ProEconEquipmentInfoDay1> eqday1map = queryEquipmentInfoDay1(wpId, recordDate);
-            Map<String, ProEconEquipmentInfoDay2> eqday2map = queryEquipmentInfoDay2(wpId, recordDate);
-            Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(wpId, recordDate);
-            Map<String, ProEconEquipmentInfoDay4> eqday4map = queryEquipmentInfoDay4(wpId, recordDate);
+            Map<String, ProEconInOrOutSpeedTotal> iostmap=queryInOrOutSpeedTotal(cmId,type,wpId, recordDate);
+            Map<String, ProEconEquipmentInfoDay1> eqday1map = queryEquipmentInfoDay1(cmId,type,wpId, recordDate);
+            Map<String, ProEconEquipmentInfoDay2> eqday2map = queryEquipmentInfoDay2(cmId,type,wpId, recordDate);
+            Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(cmId, recordDate);
+            Map<String, ProEconEquipmentInfoDay4> eqday4map = queryEquipmentInfoDay4(cmId,type,wpId, recordDate);
 
 
             if (CacheContext.wpwtmap.containsKey(wpId)) {
@@ -530,7 +585,7 @@ public class SingleAnalysisService {
             Map<String, ProEconEquipmentInfoDay1> eqday1map = queryEquipmentInfoDay1ByWt(wtId, recordDate);
             Map<String, ProEconEquipmentInfoDay2> eqday2map = queryEquipmentInfoDay2ByWt(wtId, recordDate);
             Map<String, ProEconEquipmentInfoDay4> eqday4map = queryEquipmentInfoDay4ByWt(wtId, recordDate);
-            Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(wt.getWindpowerstationId(), recordDate);
+            Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(wt.getCompanyId(), recordDate);
             String wpId = CacheContext.wtmap.get(wtId).getWindpowerstationId();
 
 
@@ -676,7 +731,7 @@ public class SingleAnalysisService {
 
 
             List<ProEconEquipmentInfoDay1> wtday1ls = proEconEquipmentInfoDay1Service.list()
-                    .stream().filter(i->i.getWindturbineId().equals(wtId)
+                    .stream().filter(i->i.getWindturbineId() !=null && i.getWindturbineId().equals(wtId)
                             && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
                             && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
                     )