Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.controller;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.model.vo.ProEconEquipmentInfoDay4Vo;
 import com.gyee.runeconomy.service.WindDeviationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -45,4 +47,25 @@ public class WindDeviationController {
         }
     }
 
+    /**
+     * 查询区间曲线偏差率
+     *
+     * @return
+     */
+    @GetMapping("/queryEquipmentInfoDay4")
+    @ResponseBody
+    @ApiOperation(value = "查询区间曲线偏差率", notes = "查询区间曲线偏差率")
+    public R queryEquipmentInfoDay4(
+            @RequestParam(value = "wpId", required = true) String wpId ,
+            @RequestParam(value = "recorddate", required = true) String recorddate) throws Exception {
+
+        List<ProEconEquipmentInfoDay4Vo> result=  windDeviationService.queryEquipmentInfoDay4(wpId,recorddate);
+
+        if (StringUtils.isNotNull(result)) {
+            return R.data(ResultMsg.ok(result));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
 }

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

@@ -0,0 +1,32 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author gyee
+ * @ClassName: AjaxResult
+ * @Description: ajax操作消息提醒
+ * @date 2018年8月18日
+ */
+@Data
+public class ProEconEquipmentInfoDay4Vo  {
+
+
+    public String wtId;
+
+    public String nemCode;
+    /**
+     * 月3-5米曲线偏差率
+     */
+    private Double y35mqxpcl;
+
+    /**
+     * 月5-11米曲线偏差率
+     */
+    private Double y511mqxpcl;
+
+    /**
+     * 月11米以上曲线偏差率
+     */
+    private Double y11mycqxpcl;
+}

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

@@ -2,13 +2,17 @@ package com.gyee.runeconomy.service;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatPower;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentDeviatSpeed;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay4;
 import com.gyee.runeconomy.model.vo.DeviatPowerVo;
 import com.gyee.runeconomy.model.vo.DeviatSpeedVo;
 import com.gyee.runeconomy.model.vo.DeviatValueVo;
+import com.gyee.runeconomy.model.vo.ProEconEquipmentInfoDay4Vo;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentDeviatPowerService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentDeviatSpeedService;
+import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay4Service;
 import com.gyee.runeconomy.util.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +30,8 @@ public class WindDeviationService {
     private IProEconEquipmentDeviatSpeedService proEconEquipmentDeviatSpeedService;
     @Resource
     private IProEconEquipmentDeviatPowerService proEconEquipmentDeviatPowerService;
-
+    @Resource
+    private IProEconEquipmentInfoDay4Service proEconEquipmentInfoDay4Service;
 
     /**
      * 保存对风偏差率描述
@@ -692,5 +697,52 @@ public class WindDeviationService {
 
     }
 
+    public   List<ProEconEquipmentInfoDay4Vo>  queryEquipmentInfoDay4(String wpId, String date) {
+
+        List<ProEconEquipmentInfoDay4Vo> vos = new ArrayList<>();
+
+        if(StringUtils.notEmp(wpId) && StringUtils.notEmp(date))
+        {
+
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+            Date recordDate=null;
+
+            try {
+                recordDate=df.parse(date);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
+
+            List<ProEconEquipmentInfoDay4> iostls = null;
+            if (com.gyee.common.model.StringUtils.notEmp(wpId)) {
+                QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("record_date", recordDate)
+                        .eq("windpowerstation_id", wpId);
+
+                iostls = proEconEquipmentInfoDay4Service.list(queryWrapper);
+            }
+
+            for(ProEconEquipmentInfoDay4 day4:iostls)
+            {
+                ProEconEquipmentInfoDay4Vo vo=new ProEconEquipmentInfoDay4Vo();
+
+                vo.setWtId(day4.getWindturbineId());
+
+                if(CacheContext.wtmap.containsKey(day4.getWindturbineId()))
+                {
+                    vo.setNemCode(CacheContext.wtmap.get(day4.getWindturbineId()).getNemCode());
+                }
+                vo.setY11mycqxpcl(day4.getY11mycqxpcl());
+                vo.setY35mqxpcl(day4.getY35mqxpcl());
+                vo.setY511mqxpcl(day4.getY511mqxpcl());
+
+            }
+
+        }
+
+        return vos;
+    }
 
 }

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

@@ -56,4 +56,7 @@ public class WtAlysisDayService {
         return pageInfo;
     }
 
+
+
+
 }