Merge remote-tracking branch 'origin/master'

datacenter/src/main/java/com/gyee/datacenter/controller/WindpowerstationController.java

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

datacenter/src/main/java/com/gyee/datacenter/mapper/auto/WindpowerstationMapper.java

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

datacenter/src/main/java/com/gyee/datacenter/model/auto/Windpowerstation.java

@@ -0,0 +1,87 @@
+package com.gyee.datacenter.model.auto;
+
+import java.math.BigDecimal;
+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-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERSTATION")
+public class Windpowerstation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @TableField("CAPACITY")
+    private BigDecimal capacity;
+
+    @TableField("CAPACITYUNIT")
+    private String capacityunit;
+
+    @TableField("QUANTITY")
+    private BigDecimal quantity;
+
+    @TableField("ANAME")
+    private String aname;
+
+    @TableField("LONGITUDE")
+    private BigDecimal longitude;
+
+    @TableField("LATITUDE")
+    private BigDecimal latitude;
+
+    @TableField("PHOTO")
+    private String photo;
+
+    @TableField("COMPANYID")
+    private String companyid;
+
+    @TableField("SYSTEMMANUFACT")
+    private String systemmanufact;
+
+    @TableField("HEADFARM")
+    private String headfarm;
+
+    @TableField("HEADFARMPHONE")
+    private String headfarmphone;
+
+    @TableField("MODEL")
+    private String model;
+
+    @TableField("ORDERNUM")
+    private BigDecimal ordernum;
+
+    @TableField("ALTITUDE")
+    private BigDecimal altitude;
+
+    @TableField("HEIGHT")
+    private BigDecimal height;
+
+
+}

datacenter/src/main/java/com/gyee/datacenter/service/auto/IWindpowerstationService.java

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

datacenter/src/main/java/com/gyee/datacenter/service/auto/impl/WindpowerstationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.service.auto.impl;
+
+import com.gyee.datacenter.model.auto.Windpowerstation;
+import com.gyee.datacenter.mapper.auto.WindpowerstationMapper;
+import com.gyee.datacenter.service.auto.IWindpowerstationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-06-01
+ */
+@Service
+public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMapper, Windpowerstation> implements IWindpowerstationService {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/init/CacheContext.java

@@ -36,8 +36,8 @@ public class CacheContext implements CommandLineRunner {
     private IProjectService projectService;
     @Autowired
     private ILineService lineService;
-//    @Resource
-//    private HealthReportService healthReportService;
+    @Resource
+    private HealthReportService healthReportService;
 
     public static List<Evaluationdatasource> datasourceList = new ArrayList<>();
 
@@ -104,9 +104,13 @@ public class CacheContext implements CommandLineRunner {
         });
         lineList = lineService.list();
 
-//        healthReportService.saveHealthReport("2021-08-03","2021-08-03");
 
 
+        healthReportService.saveHealthReport("2021-09-07","2021-09-07","MHS_FDC");
+        healthReportService.saveHealthReport("2021-09-07","2021-09-07","NSS_FDC");
+        healthReportService.saveHealthReport("2021-09-07","2021-09-07","QS_FDC");
+        healthReportService.saveHealthReport("2021-09-07","2021-09-07","SBQ_FDC");
+        healthReportService.saveHealthReport("2021-09-07","2021-09-07","XS_FDC");
         log.info("-------------------------------缓存结束--------------------------------------");
     }
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/experiencebase/ExperienceBaseService.java

@@ -141,7 +141,7 @@ public class ExperienceBaseService {
     }
 
     /**
-     * 作业知道知识
+     * 作业指导知识
      * @param name
      * @param pageNum
      * @param pageSize
@@ -187,7 +187,6 @@ public class ExperienceBaseService {
     public List<Riskprec> wxdnr(String rsnum, String pageNum, String pageSize) {
         QueryWrapper<Riskprec> qw = new QueryWrapper<>();
         qw.eq("rsnum",rsnum);
-
         Page<Riskprec> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<Riskprec> riskprecPage = riskprecService.getBaseMapper().selectPage(page, qw);
         List<Riskprec> list = riskprecPage.getRecords();