Merge remote-tracking branch 'origin/master'

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/MaintenanceevaluationController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-11
+ */
+@RestController
+@RequestMapping("//maintenanceevaluation")
+public class MaintenanceevaluationController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/OperationevaluationController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-09
+ */
+@RestController
+@RequestMapping("//operationevaluation")
+public class OperationevaluationController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/operation/OperationController.java

@@ -0,0 +1,52 @@
+package com.gyee.gradeevaluation.controller.operation;
+
+import com.gyee.gradeevaluation.config.R;
+import com.gyee.gradeevaluation.model.auto.Maintenanceevaluation;
+import com.gyee.gradeevaluation.model.auto.Operationevaluation;
+import com.gyee.gradeevaluation.model.healthreport.HealthreportReport;
+import com.gyee.gradeevaluation.service.operation.OperationService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @ClassName : OperationController
+ * @Author : xieshengjie
+ * @Date: 2021/11/9 15:02
+ * @Description : 评价controller(运行评价，检修评价)
+ */
+@RestController
+@RequestMapping("//evaluation")
+public class OperationController {
+    @Resource
+    private OperationService operationService;
+
+    @GetMapping("/operation")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R operation(
+                          @RequestParam(value = "month",required = true)String month) throws IOException {
+        List<Operationevaluation> resultList  = operationService.operationevaluationList(month);
+        if (resultList!=null) {
+            return R.ok().data(resultList);
+        }else{
+            return R.ok().message("请求失败");
+        }
+    }
+
+
+    @GetMapping("/maintenance")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R maintenance(
+            @RequestParam(value = "month",required = true)String month) throws IOException {
+        List<Maintenanceevaluation> resultList  = operationService.maintenanceevaluationList(month);
+        if (resultList!=null) {
+            return R.ok().data(resultList);
+        }else{
+            return R.ok().message("请求失败");
+        }
+    }
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/MaintenanceevaluationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Maintenanceevaluation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-11
+ */
+public interface MaintenanceevaluationMapper extends BaseMapper<Maintenanceevaluation> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/OperationevaluationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Operationevaluation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-09
+ */
+public interface OperationevaluationMapper extends BaseMapper<Operationevaluation> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Maintenanceevaluation.java

@@ -0,0 +1,155 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("MAINTENANCEEVALUATION")
+public class Maintenanceevaluation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("YEAR")
+    private Integer year;
+
+    @TableField("MONTH")
+    private Integer month;
+
+    @TableField("WPID")
+    private String wpid;
+
+    @TableField("FNLYL")
+    private Double fnlyl;
+
+    @TableField("FNLYLPM")
+    private Integer fnlylpm;
+
+    @TableField("FNLYLPF")
+    private Double fnlylpf;
+
+    @TableField("JHJXSSL")
+    private Double jhjxssl;
+
+    @TableField("JHJXSSLPM")
+    private Integer jhjxsslpm;
+
+    @TableField("JHJXSSLPF")
+    private Double jhjxsslpf;
+
+    @TableField("FJHJXSSL")
+    private Double fjhjxssl;
+
+    @TableField("FJHJXSSLPM")
+    private Integer fjhjxsslpm;
+
+    @TableField("FJHJXSSLPF")
+    private Double fjhjxsslpf;
+
+    @TableField("QXDJDJSL")
+    private Double qxdjdjsl;
+
+    @TableField("QXDJDJSLPM")
+    private Integer qxdjdjslpm;
+
+    @TableField("QXDJDJSLPF")
+    private Double qxdjdjslpf;
+
+    @TableField("DDXQDDJSL")
+    private Double ddxqddjsl;
+
+    @TableField("DDXQDDJSLPM")
+    private Integer ddxqddjslpm;
+
+    @TableField("DDXQDDJSLPF")
+    private Double ddxqddjslpf;
+
+    @TableField("ZSXQJSL")
+    private Double zsxqjsl;
+
+    @TableField("ZSXQJSLPM")
+    private Integer zsxqjslpm;
+
+    @TableField("ZSXQJSLPF")
+    private Double zsxqjslpf;
+
+    @TableField("MTBF")
+    private Double mtbf;
+
+    @TableField("MTBFPM")
+    private Integer mtbfpm;
+
+    @TableField("MTBFPF")
+    private Double mtbfpf;
+
+    @TableField("MTTR")
+    private Double mttr;
+
+    @TableField("MTTRPM")
+    private Integer mttrpm;
+
+    @TableField("MTTRPF")
+    private Double mttrpf;
+
+    @TableField("SBLYXS")
+    private Double sblyxs;
+
+    @TableField("SBLYXSPM")
+    private Integer sblyxspm;
+
+    @TableField("SBLYXSPF")
+    private Double sblyxspf;
+
+    @TableField("SBKLYL")
+    private Double sbklyl;
+
+    @TableField("SBKLYLPM")
+    private Integer sbklylpm;
+
+    @TableField("SBKLYLPF")
+    private Double sbklylpf;
+
+    @TableField("DXKYXS")
+    private Double dxkyxs;
+
+    @TableField("DXKYXSPM")
+    private Integer dxkyxspm;
+
+    @TableField("DXKYXSPF")
+    private Double dxkyxspf;
+
+    @TableField("YHFXZQL")
+    private Double yhfxzql;
+
+    @TableField("YHFXZQLPM")
+    private Integer yhfxzqlpm;
+
+    @TableField("YHFXZQLPF")
+    private Double yhfxzqlpf;
+
+    @TableField("ZPM")
+    private Integer zpm;
+
+    @TableField("ZPF")
+    private Double zpf;
+
+    @TableField("GRADE")
+    private String grade;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/model/auto/Operationevaluation.java

@@ -0,0 +1,155 @@
+package com.gyee.gradeevaluation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("OPERATIONEVALUATION")
+public class Operationevaluation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("YEAR")
+    private Integer year;
+
+    @TableField("MONTH")
+    private Integer month;
+
+    @TableField("WPID")
+    private String wpid;
+
+    @TableField("FNLYL")
+    private Double fnlyl;
+
+    @TableField("FNLYLPM")
+    private Integer fnlylpm;
+
+    @TableField("FNLYLPF")
+    private Double fnlylpf;
+
+    @TableField("XDSSL")
+    private Double xdssl;
+
+    @TableField("XDSSLPM")
+    private Integer xdsslpm;
+
+    @TableField("XDSSLPF")
+    private Double xdsslpf;
+
+    @TableField("XNSSL")
+    private Double xnssl;
+
+    @TableField("XNSSLPM")
+    private Integer xnsslpm;
+
+    @TableField("XNSSLPF")
+    private Double xnsslpf;
+
+    @TableField("FWJSL")
+    private Double fwjsl;
+
+    @TableField("FWJSLPM")
+    private Integer fwjslpm;
+
+    @TableField("FWJSLPF")
+    private Double fwjslpf;
+
+    @TableField("ZTZHJSL")
+    private Double ztzhjsl;
+
+    @TableField("ZTZHJSLPM")
+    private Integer ztzhjslpm;
+
+    @TableField("ZTZHJSLPF")
+    private Double ztzhjslpf;
+
+    @TableField("QXXDJSL")
+    private Double qxxdjsl;
+
+    @TableField("QXXDJSLPM")
+    private Integer qxxdjslpm;
+
+    @TableField("QXXDJSLPF")
+    private Double qxxdjslpf;
+
+    @TableField("QXYSJSL")
+    private Double qxysjsl;
+
+    @TableField("QXYSJSLPM")
+    private Integer qxysjslpm;
+
+    @TableField("QXYSJSLPF")
+    private Double qxysjslpf;
+
+    @TableField("PJXFQRFS")
+    private Double pjxfqrfs;
+
+    @TableField("PJXFQRFSPM")
+    private Integer pjxfqrfspm;
+
+    @TableField("PJXFQRFSPF")
+    private Double pjxfqrfspf;
+
+    @TableField("MTTF")
+    private Double mttf;
+
+    @TableField("MTTFPM")
+    private Integer mttfpm;
+
+    @TableField("MTTFPF")
+    private Double mttfpf;
+
+    @TableField("SBLYXS")
+    private Double sblyxs;
+
+    @TableField("SBLYXSPM")
+    private Integer sblyxspm;
+
+    @TableField("SBLYXSPF")
+    private Double sblyxspf;
+
+    @TableField("ZHCYDL")
+    private Double zhcydl;
+
+    @TableField("ZHCYDLPM")
+    private Integer zhcydlpm;
+
+    @TableField("ZHCYDLPF")
+    private Double zhcydlpf;
+
+    @TableField("YHFXZQL")
+    private Double yhfxzql;
+
+    @TableField("YHFXZQLPM")
+    private Integer yhfxzqlpm;
+
+    @TableField("YHFXZQLPF")
+    private Double yhfxzqlpf;
+
+    @TableField("ZPM")
+    private Integer zpm;
+
+    @TableField("ZPF")
+    private Double zpf;
+
+    @TableField("GRADE")
+    private String grade;
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/IMaintenanceevaluationService.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Maintenanceevaluation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-11
+ */
+public interface IMaintenanceevaluationService extends IService<Maintenanceevaluation> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/IOperationevaluationService.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.service.auto;
+
+import com.gyee.gradeevaluation.model.auto.Operationevaluation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-09
+ */
+public interface IOperationevaluationService extends IService<Operationevaluation> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/impl/MaintenanceevaluationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Maintenanceevaluation;
+import com.gyee.gradeevaluation.mapper.auto.MaintenanceevaluationMapper;
+import com.gyee.gradeevaluation.service.auto.IMaintenanceevaluationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-11
+ */
+@Service
+public class MaintenanceevaluationServiceImpl extends ServiceImpl<MaintenanceevaluationMapper, Maintenanceevaluation> implements IMaintenanceevaluationService {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/impl/OperationevaluationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.service.auto.impl;
+
+import com.gyee.gradeevaluation.model.auto.Operationevaluation;
+import com.gyee.gradeevaluation.mapper.auto.OperationevaluationMapper;
+import com.gyee.gradeevaluation.service.auto.IOperationevaluationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-11-09
+ */
+@Service
+public class OperationevaluationServiceImpl extends ServiceImpl<OperationevaluationMapper, Operationevaluation> implements IOperationevaluationService {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/operation/OperationService.java

@@ -0,0 +1,59 @@
+package com.gyee.gradeevaluation.service.operation;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gradeevaluation.model.auto.Maintenanceevaluation;
+import com.gyee.gradeevaluation.model.auto.Operationevaluation;
+import com.gyee.gradeevaluation.service.auto.IMaintenanceevaluationService;
+import com.gyee.gradeevaluation.service.auto.IOperationevaluationService;
+import com.gyee.gradeevaluation.util.DateUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName : OperationService
+ * @Author : xieshengjie
+ * @Date: 2021/11/9 15:01
+ * @Description : 评价service(运行评价，检修评价)
+ */
+@Service
+public class OperationService {
+
+    @Resource
+    private IOperationevaluationService operationevaluationService;
+    @Resource
+    private IMaintenanceevaluationService maintenanceevaluationService;
+
+    /**
+     * 获取运行评价报告list
+     * @param date
+     * @return
+     */
+    public List<Operationevaluation> operationevaluationList(String date) {
+        Date parseDate = DateUtils.parseDate3(date);
+        int year = DateUtils.getYear(parseDate);
+        int month = DateUtils.getMonth(parseDate);
+        QueryWrapper<Operationevaluation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("year",year);
+        queryWrapper.eq("month",month);
+        List<Operationevaluation> operationevaluationList = operationevaluationService.list(queryWrapper);
+        return operationevaluationList;
+    }
+    /**
+     * 获取检修评价报告list
+     * @param date
+     * @return
+     */
+    public List<Maintenanceevaluation> maintenanceevaluationList(String date) {
+        Date parseDate = DateUtils.parseDate3(date);
+        int year = DateUtils.getYear(parseDate);
+        int month = DateUtils.getMonth(parseDate);
+        QueryWrapper<Maintenanceevaluation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("year",year);
+        queryWrapper.eq("month",month);
+        List<Maintenanceevaluation> maintenanceevaluationList = maintenanceevaluationService.list(queryWrapper);
+        return maintenanceevaluationList;
+    }
+}

gradeevaluation/src/test/java/com/gyee/gradeevaluation/GradeevaluationApplicationTests.java

@@ -7,6 +7,8 @@ import com.gyee.gradeevaluation.service.mttrmtbf.MTTRMTBFTaskService;
 import com.gyee.gradeevaluation.service.specific.SpecificService;
 import com.gyee.gradeevaluation.service.targetdata.TargetdataService;
 import com.gyee.gradeevaluation.util.DateUtils;
+import com.gyee.gradeevaluation.util.golden.EdosUtil;
+import com.gyee.gradeevaluation.util.golden.IEdosUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,9 +51,19 @@ class GradeevaluationApplicationTests {
 //        quartService.saveWindturbineinfodaytop3("2021-10-01","2021-10-13");
 //        quartService.saveEvaluationSub("2021-10-01","2021-10-13");
 //        quartService.saveEvaluationMain("2021-10-01","2021-10-13");
-        mttrmtbfTaskService.saveWpMttrAndMtbfDay(date,date);
-        mttrmtbfTaskService.saveWpMttrAndMtbMonth(date,date);
-        mttrmtbfTaskService.saveWpMttrAndMtbfYear(date,date);
+//        mttrmtbfTaskService.saveWpMttrAndMtbfDay(date,date);
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-01-31","2021-01-31");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-02-28","2021-02-28");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-03-31","2021-03-31");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-04-30","2021-04-30");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-05-31","2021-05-31");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-06-30","2021-06-30");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-07-31","2021-07-31");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-08-31","2021-08-31");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-09-30","2021-09-30");
+        mttrmtbfTaskService.saveWpMttrAndMtbMonth("2021-10-31","2021-10-31");
+
+//        mttrmtbfTaskService.saveWpMttrAndMtbfYear(date,date);
     }
 
     @Test
@@ -68,4 +80,11 @@ class GradeevaluationApplicationTests {
        // specificService.saveWindpowerspecificinfoday("2020-05-02","2020-06-01");
     }
 
+
+    @Test
+    void contextLoads2() throws ParseException, UnsupportedEncodingException, JsonProcessingException {
+
+      IEdosUtil edosUtil = new EdosUtil();
+    }
+
 }