liudongfang 3.11

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddayeleceightController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.project.aspen.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.aspen.domain.TDashboarddayeleceight;
+import com.ruoyi.project.aspen.service.ITDashboarddayeleceightService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据Controller
+ *
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+@RestController
+@RequestMapping("/his/dashboarddayeleceight")
+public class TDashboarddayeleceightController extends BaseController
+{
+    @Autowired
+    private ITDashboarddayeleceightService tDashboarddayeleceightService;
+
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        startPage();
+        List<TDashboarddayeleceight> list = tDashboarddayeleceightService.selectTDashboarddayeleceightList(tDashboarddayeleceight);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:export')")
+    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        List<TDashboarddayeleceight> list = tDashboarddayeleceightService.selectTDashboarddayeleceightList(tDashboarddayeleceight);
+        ExcelUtil<TDashboarddayeleceight> util = new ExcelUtil<TDashboarddayeleceight>(TDashboarddayeleceight.class);
+        return util.exportExcel(list, "dashboarddayeleceight");
+    }
+
+    /**
+     * 获取T_DASHBOARDDAYELECEIGHT每日抓取8：00数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tDashboarddayeleceightService.selectTDashboarddayeleceightById(id));
+    }
+
+    /**
+     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:add')")
+    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        return toAjax(tDashboarddayeleceightService.insertTDashboarddayeleceight(tDashboarddayeleceight));
+    }
+
+    /**
+     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:edit')")
+    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        return toAjax(tDashboarddayeleceightService.updateTDashboarddayeleceight(tDashboarddayeleceight));
+    }
+
+    /**
+     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:remove')")
+    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tDashboarddayeleceightService.deleteTDashboarddayeleceightByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboardelecdataController.java

@@ -2,7 +2,8 @@ package com.ruoyi.project.aspen.controller;
 
 import java.util.List;
 
-import com.ruoyi.project.aspen.domain.TDashboarddata;
+import com.ruoyi.project.aspen.domain.TDashboardelecdata;
+import com.ruoyi.project.aspen.service.ITDashboardelecdataService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +27,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * 电厂大屏DASHBOARDELEC抓取数据Controller
  *
  * @author ruoyi
- * @date 2022-03-09
+ * @date 2022-03-11
  */
 @RestController
 @RequestMapping("/aspen/dashboardelecdata")
@@ -113,4 +114,15 @@ public class TDashboardelecdataController extends BaseController
         TDashboardelecdata tDashboardelecdata1 = tDashboardelecdataService.selectLast(tDashboardelecdata);
         return AjaxResult.success(tDashboardelecdata1);
     }
+
+    /**
+     * 查询最近31条DASHBOARD每日抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
+    @GetMapping("/month")
+    public AjaxResult selectMonth(TDashboardelecdata tDashboardelecdata)
+    {
+        TDashboardelecdata tDashboardelecdata1 = tDashboardelecdataService.selectLast(tDashboardelecdata);
+        return AjaxResult.success(tDashboardelecdata1);
+    }
 }

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboardelecdayController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.project.aspen.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.aspen.domain.TDashboardelecday;
+import com.ruoyi.project.aspen.service.ITDashboardelecdayService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * ELECDASHBOARDDAY每日抓取数据Controller
+ *
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+@RestController
+@RequestMapping("/his/dashboardelecday")
+public class TDashboardelecdayController extends BaseController
+{
+    @Autowired
+    private ITDashboardelecdayService tDashboardelecdayService;
+
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDashboardelecday tDashboardelecday)
+    {
+        startPage();
+        List<TDashboardelecday> list = tDashboardelecdayService.selectTDashboardelecdayList(tDashboardelecday);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出ELECDASHBOARDDAY每日抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:export')")
+    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDashboardelecday tDashboardelecday)
+    {
+        List<TDashboardelecday> list = tDashboardelecdayService.selectTDashboardelecdayList(tDashboardelecday);
+        ExcelUtil<TDashboardelecday> util = new ExcelUtil<TDashboardelecday>(TDashboardelecday.class);
+        return util.exportExcel(list, "dashboardelecday");
+    }
+
+    /**
+     * 获取ELECDASHBOARDDAY每日抓取数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tDashboardelecdayService.selectTDashboardelecdayById(id));
+    }
+
+    /**
+     * 新增ELECDASHBOARDDAY每日抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:add')")
+    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDashboardelecday tDashboardelecday)
+    {
+        return toAjax(tDashboardelecdayService.insertTDashboardelecday(tDashboardelecday));
+    }
+
+    /**
+     * 修改ELECDASHBOARDDAY每日抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:edit')")
+    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDashboardelecday tDashboardelecday)
+    {
+        return toAjax(tDashboardelecdayService.updateTDashboardelecday(tDashboardelecday));
+    }
+
+    /**
+     * 删除ELECDASHBOARDDAY每日抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('his:dashboardelecday:remove')")
+    @Log(title = "ELECDASHBOARDDAY每日抓取数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tDashboardelecdayService.deleteTDashboardelecdayByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/domain/TDashboarddayeleceight.java

@@ -0,0 +1,223 @@
+package com.ruoyi.project.aspen.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据对象 t_dashboarddayeleceight
+ *
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+public class TDashboarddayeleceight extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 抓取时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "抓取时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 电量表昨日发电量Yesterday's power generation */
+    @Excel(name = "电量表昨日发电量Yesterday's power generation")
+    private String ypg;
+
+    /** 电量表倒电量 */
+    @Excel(name = "电量表倒电量")
+    private String daodianliang;
+
+    /** 电量表每日用电量 */
+    @Excel(name = "电量表每日用电量")
+    private String eveLec;
+
+    /** 电量表每日峰谷差 */
+    @Excel(name = "电量表每日峰谷差")
+    private String fenggucha;
+
+    /** 电量表BYC用电量 */
+    @Excel(name = "电量表BYC用电量")
+    private String bycElec;
+
+    /** 电量表BOC用电量 */
+    @Excel(name = "电量表BOC用电量")
+    private String bocElec;
+
+    /** 数据日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "数据日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dataDate;
+
+    /** 抓取数据日 */
+    @Excel(name = "抓取数据日")
+    private String dateDay;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setYpg(String ypg)
+    {
+        this.ypg = ypg;
+    }
+
+    public String getYpg()
+    {
+        return ypg;
+    }
+    public void setDaodianliang(String daodianliang)
+    {
+        this.daodianliang = daodianliang;
+    }
+
+    public String getDaodianliang()
+    {
+        return daodianliang;
+    }
+    public void setEveLec(String eveLec)
+    {
+        this.eveLec = eveLec;
+    }
+
+    public String getEveLec()
+    {
+        return eveLec;
+    }
+    public void setFenggucha(String fenggucha)
+    {
+        this.fenggucha = fenggucha;
+    }
+
+    public String getFenggucha()
+    {
+        return fenggucha;
+    }
+    public void setBycElec(String bycElec)
+    {
+        this.bycElec = bycElec;
+    }
+
+    public String getBycElec()
+    {
+        return bycElec;
+    }
+    public void setBocElec(String bocElec)
+    {
+        this.bocElec = bocElec;
+    }
+
+    public String getBocElec()
+    {
+        return bocElec;
+    }
+    public void setDataDate(Date dataDate)
+    {
+        this.dataDate = dataDate;
+    }
+
+    public Date getDataDate()
+    {
+        return dataDate;
+    }
+    public void setDateDay(String dateDay)
+    {
+        this.dateDay = dateDay;
+    }
+
+    public String getDateDay()
+    {
+        return dateDay;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("ypg", getYpg())
+            .append("daodianliang", getDaodianliang())
+            .append("eveLec", getEveLec())
+            .append("fenggucha", getFenggucha())
+            .append("bycElec", getBycElec())
+            .append("bocElec", getBocElec())
+            .append("dataDate", getDataDate())
+            .append("dateDay", getDateDay())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/domain/TDashboardelecdata.java

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 电厂大屏DASHBOARDELEC抓取数据对象 t_dashboardelecdata
  *
  * @author ruoyi
- * @date 2022-03-09
+ * @date 2022-03-11
  */
 public class TDashboardelecdata extends BaseEntity
 {

master/src/main/java/com/ruoyi/project/aspen/domain/TDashboardelecday.java

@@ -0,0 +1,195 @@
+package com.ruoyi.project.aspen.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * ELECDASHBOARDDAY每日抓取数据对象 t_dashboardelecday
+ *
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+public class TDashboardelecday extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 抓取时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "抓取时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 天然气表每日消耗量 every day consume */
+    @Excel(name = "天然气表每日消耗量 every day consume")
+    private String evconsume;
+
+    /** 天然气表电厂 */
+    @Excel(name = "天然气表电厂")
+    private String elecp;
+
+    /** 天然气表合成器 */
+    @Excel(name = "天然气表合成器")
+    private String hechengqi;
+
+    /** 天然气表U2 */
+    @Excel(name = "天然气表U2")
+    private String u2;
+
+    /** 数据日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "数据日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dataDate;
+
+    /** 抓取数据日 */
+    @Excel(name = "抓取数据日")
+    private String dateDay;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setEvconsume(String evconsume)
+    {
+        this.evconsume = evconsume;
+    }
+
+    public String getEvconsume()
+    {
+        return evconsume;
+    }
+    public void setElecp(String elecp)
+    {
+        this.elecp = elecp;
+    }
+
+    public String getElecp()
+    {
+        return elecp;
+    }
+    public void setHechengqi(String hechengqi)
+    {
+        this.hechengqi = hechengqi;
+    }
+
+    public String getHechengqi()
+    {
+        return hechengqi;
+    }
+    public void setU2(String u2)
+    {
+        this.u2 = u2;
+    }
+
+    public String getU2()
+    {
+        return u2;
+    }
+    public void setDataDate(Date dataDate)
+    {
+        this.dataDate = dataDate;
+    }
+
+    public Date getDataDate()
+    {
+        return dataDate;
+    }
+    public void setDateDay(String dateDay)
+    {
+        this.dateDay = dateDay;
+    }
+
+    public String getDateDay()
+    {
+        return dateDay;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("evconsume", getEvconsume())
+            .append("elecp", getElecp())
+            .append("hechengqi", getHechengqi())
+            .append("u2", getU2())
+            .append("dataDate", getDataDate())
+            .append("dateDay", getDateDay())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddayeleceightMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.project.aspen.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.aspen.domain.TDashboarddayeleceight;
+
+
+/**
+ * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+public interface TDashboarddayeleceightMapper 
+{
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    public TDashboarddayeleceight selectTDashboarddayeleceightById(Long id);
+
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     * 
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TDashboarddayeleceight> selectTDashboarddayeleceightList(TDashboarddayeleceight tDashboarddayeleceight);
+
+    /**
+     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return 结果
+     */
+    public int insertTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight);
+
+    /**
+     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return 结果
+     */
+    public int updateTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight);
+
+    /**
+     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayeleceightById(Long id);
+
+    /**
+     * 批量删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayeleceightByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboardelecdataMapper.java

@@ -2,14 +2,14 @@ package com.ruoyi.project.aspen.mapper;
 
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.aspen.domain.TDashboarddata;
 import com.ruoyi.project.aspen.domain.TDashboardelecdata;
 
+
 /**
  * 电厂大屏DASHBOARDELEC抓取数据Mapper接口
  * 
  * @author ruoyi
- * @date 2022-03-09
+ * @date 2022-03-11
  */
 public interface TDashboardelecdataMapper 
 {
@@ -68,4 +68,10 @@ public interface TDashboardelecdataMapper
      * @return dashboardelec抓取数据
      */
     public TDashboardelecdata selectLast(TDashboardelecdata tDashboardelecdata);
+    /**
+     * 查询最近一个月dashboardelec抓取数据
+     *
+     * @return dashboardelec抓取数据
+     */
+    public List<TDashboardelecdata> selectMonth(TDashboardelecdata tDashboardelecdata);
 }

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboardelecdayMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.project.aspen.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.aspen.domain.TDashboardelecday;
+
+
+/**
+ * ELECDASHBOARDDAY每日抓取数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+public interface TDashboardelecdayMapper 
+{
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param id ELECDASHBOARDDAY每日抓取数据ID
+     * @return ELECDASHBOARDDAY每日抓取数据
+     */
+    public TDashboardelecday selectTDashboardelecdayById(Long id);
+
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据列表
+     * 
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return ELECDASHBOARDDAY每日抓取数据集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TDashboardelecday> selectTDashboardelecdayList(TDashboardelecday tDashboardelecday);
+
+    /**
+     * 新增ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return 结果
+     */
+    public int insertTDashboardelecday(TDashboardelecday tDashboardelecday);
+
+    /**
+     * 修改ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return 结果
+     */
+    public int updateTDashboardelecday(TDashboardelecday tDashboardelecday);
+
+    /**
+     * 删除ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param id ELECDASHBOARDDAY每日抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboardelecdayById(Long id);
+
+    /**
+     * 批量删除ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDashboardelecdayByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/aspen/service/ITDashboarddayeleceightService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.aspen.service;
+
+import com.ruoyi.project.aspen.domain.TDashboarddayeleceight;
+
+import java.util.List;
+
+
+/**
+ * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+public interface ITDashboarddayeleceightService 
+{
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    public TDashboarddayeleceight selectTDashboarddayeleceightById(Long id);
+
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     * 
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据集合
+     */
+    public List<TDashboarddayeleceight> selectTDashboarddayeleceightList(TDashboarddayeleceight tDashboarddayeleceight);
+
+    /**
+     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return 结果
+     */
+    public int insertTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight);
+
+    /**
+     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return 结果
+     */
+    public int updateTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight);
+
+    /**
+     * 批量删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 
+     * @param ids 需要删除的T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayeleceightByIds(Long[] ids);
+
+    /**
+     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据信息
+     * 
+     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayeleceightById(Long id);
+}

master/src/main/java/com/ruoyi/project/aspen/service/ITDashboardelecdataService.java

@@ -1,13 +1,15 @@
 package com.ruoyi.project.aspen.service;
 
-import java.util.List;
 import com.ruoyi.project.aspen.domain.TDashboardelecdata;
 
+import java.util.List;
+
+
 /**
  * 电厂大屏DASHBOARDELEC抓取数据Service接口
  * 
  * @author ruoyi
- * @date 2022-03-09
+ * @date 2022-03-11
  */
 public interface ITDashboardelecdataService 
 {
@@ -65,4 +67,11 @@ public interface ITDashboardelecdataService
      * @return dashboardelec抓取数据
      */
     public TDashboardelecdata selectLast(TDashboardelecdata tDashboardelecdata);
+
+    /**
+     * 查询最近一个月dashboardelec抓取数据
+     *
+     * @return dashboardelec抓取数据
+     */
+    public List<TDashboardelecdata> selectMonth(TDashboardelecdata tDashboardelecdata);
 }

master/src/main/java/com/ruoyi/project/aspen/service/ITDashboardelecdayService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.aspen.service;
+
+import com.ruoyi.project.aspen.domain.TDashboardelecday;
+
+import java.util.List;
+
+
+/**
+ * ELECDASHBOARDDAY每日抓取数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+public interface ITDashboardelecdayService 
+{
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param id ELECDASHBOARDDAY每日抓取数据ID
+     * @return ELECDASHBOARDDAY每日抓取数据
+     */
+    public TDashboardelecday selectTDashboardelecdayById(Long id);
+
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据列表
+     * 
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return ELECDASHBOARDDAY每日抓取数据集合
+     */
+    public List<TDashboardelecday> selectTDashboardelecdayList(TDashboardelecday tDashboardelecday);
+
+    /**
+     * 新增ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return 结果
+     */
+    public int insertTDashboardelecday(TDashboardelecday tDashboardelecday);
+
+    /**
+     * 修改ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return 结果
+     */
+    public int updateTDashboardelecday(TDashboardelecday tDashboardelecday);
+
+    /**
+     * 批量删除ELECDASHBOARDDAY每日抓取数据
+     * 
+     * @param ids 需要删除的ELECDASHBOARDDAY每日抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboardelecdayByIds(Long[] ids);
+
+    /**
+     * 删除ELECDASHBOARDDAY每日抓取数据信息
+     * 
+     * @param id ELECDASHBOARDDAY每日抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboardelecdayById(Long id);
+}

master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboarddayeleceightServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.project.aspen.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.aspen.domain.TDashboarddayeleceight;
+import com.ruoyi.project.aspen.mapper.TDashboarddayeleceightMapper;
+import com.ruoyi.project.aspen.service.ITDashboarddayeleceightService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+@Service
+public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceightService
+{
+    @Resource
+    private TDashboarddayeleceightMapper tDashboarddayeleceightMapper;
+
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     *
+     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    @Override
+    public TDashboarddayeleceight selectTDashboarddayeleceightById(Long id)
+    {
+        return tDashboarddayeleceightMapper.selectTDashboarddayeleceightById(id);
+    }
+
+    /**
+     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     *
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     */
+    @Override
+    public List<TDashboarddayeleceight> selectTDashboarddayeleceightList(TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        return tDashboarddayeleceightMapper.selectTDashboarddayeleceightList(tDashboarddayeleceight);
+    }
+
+    /**
+     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     *
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return 结果
+     */
+    @Override
+    public int insertTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        return tDashboarddayeleceightMapper.insertTDashboarddayeleceight(tDashboarddayeleceight);
+    }
+
+    /**
+     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     *
+     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @return 结果
+     */
+    @Override
+    public int updateTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight)
+    {
+        return tDashboarddayeleceightMapper.updateTDashboarddayeleceight(tDashboarddayeleceight);
+    }
+
+    /**
+     * 批量删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     *
+     * @param ids 需要删除的T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboarddayeleceightByIds(Long[] ids)
+    {
+        return tDashboarddayeleceightMapper.deleteTDashboarddayeleceightByIds(ids);
+    }
+
+    /**
+     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据信息
+     *
+     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboarddayeleceightById(Long id)
+    {
+        return tDashboarddayeleceightMapper.deleteTDashboarddayeleceightById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboardelecdataServiceImpl.java

@@ -1,19 +1,19 @@
 package com.ruoyi.project.aspen.service.impl;
 
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.aspen.mapper.TDashboardelecdataMapper;
 import com.ruoyi.project.aspen.domain.TDashboardelecdata;
+import com.ruoyi.project.aspen.mapper.TDashboardelecdataMapper;
 import com.ruoyi.project.aspen.service.ITDashboardelecdataService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+
 /**
  * 电厂大屏DASHBOARDELEC抓取数据Service业务层处理
  *
  * @author ruoyi
- * @date 2022-03-09
+ * @date 2022-03-11
  */
 @Service
 public class TDashboardelecdataServiceImpl implements ITDashboardelecdataService
@@ -97,4 +97,9 @@ public class TDashboardelecdataServiceImpl implements ITDashboardelecdataService
     public TDashboardelecdata selectLast(TDashboardelecdata tDashboardelecdata) {
         return tDashboardelecdataMapper.selectLast(tDashboardelecdata);
     }
+
+    @Override
+    public List<TDashboardelecdata> selectMonth(TDashboardelecdata tDashboardelecdata) {
+        return tDashboardelecdataMapper.selectMonth(tDashboardelecdata);
+    }
 }

master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboardelecdayServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.project.aspen.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.aspen.domain.TDashboardelecday;
+import com.ruoyi.project.aspen.mapper.TDashboardelecdayMapper;
+import com.ruoyi.project.aspen.service.ITDashboardelecdayService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * ELECDASHBOARDDAY每日抓取数据Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-03-11
+ */
+@Service
+public class TDashboardelecdayServiceImpl implements ITDashboardelecdayService
+{
+    @Resource
+    private TDashboardelecdayMapper tDashboardelecdayMapper;
+
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据
+     *
+     * @param id ELECDASHBOARDDAY每日抓取数据ID
+     * @return ELECDASHBOARDDAY每日抓取数据
+     */
+    @Override
+    public TDashboardelecday selectTDashboardelecdayById(Long id)
+    {
+        return tDashboardelecdayMapper.selectTDashboardelecdayById(id);
+    }
+
+    /**
+     * 查询ELECDASHBOARDDAY每日抓取数据列表
+     *
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return ELECDASHBOARDDAY每日抓取数据
+     */
+    @Override
+    public List<TDashboardelecday> selectTDashboardelecdayList(TDashboardelecday tDashboardelecday)
+    {
+        return tDashboardelecdayMapper.selectTDashboardelecdayList(tDashboardelecday);
+    }
+
+    /**
+     * 新增ELECDASHBOARDDAY每日抓取数据
+     *
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return 结果
+     */
+    @Override
+    public int insertTDashboardelecday(TDashboardelecday tDashboardelecday)
+    {
+        return tDashboardelecdayMapper.insertTDashboardelecday(tDashboardelecday);
+    }
+
+    /**
+     * 修改ELECDASHBOARDDAY每日抓取数据
+     *
+     * @param tDashboardelecday ELECDASHBOARDDAY每日抓取数据
+     * @return 结果
+     */
+    @Override
+    public int updateTDashboardelecday(TDashboardelecday tDashboardelecday)
+    {
+        return tDashboardelecdayMapper.updateTDashboardelecday(tDashboardelecday);
+    }
+
+    /**
+     * 批量删除ELECDASHBOARDDAY每日抓取数据
+     *
+     * @param ids 需要删除的ELECDASHBOARDDAY每日抓取数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboardelecdayByIds(Long[] ids)
+    {
+        return tDashboardelecdayMapper.deleteTDashboardelecdayByIds(ids);
+    }
+
+    /**
+     * 删除ELECDASHBOARDDAY每日抓取数据信息
+     *
+     * @param id ELECDASHBOARDDAY每日抓取数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboardelecdayById(Long id)
+    {
+        return tDashboardelecdayMapper.deleteTDashboardelecdayById(id);
+    }
+}

master/src/main/resources/mybatis/aspen/TDashboarddayeleceightMapper.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.sems.his.mapper.TDashboarddayeleceightMapper">
+    
+    <resultMap type="TDashboarddayeleceight" id="TDashboarddayeleceightResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="ypg"    column="ypg"    />
+        <result property="daodianliang"    column="daodianliang"    />
+        <result property="eveLec"    column="eve_lec"    />
+        <result property="fenggucha"    column="fenggucha"    />
+        <result property="bycElec"    column="byc_elec"    />
+        <result property="bocElec"    column="boc_elec"    />
+        <result property="dataDate"    column="data_date"    />
+        <result property="dateDay"    column="date_day"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTDashboarddayeleceightVo">
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.ypg, d.daodianliang, d.eve_lec, d.fenggucha, d.byc_elec, d.boc_elec, d.data_date, d.date_day ,s.dept_name from t_dashboarddayeleceight d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTDashboarddayeleceightList" parameterType="TDashboarddayeleceight" resultMap="TDashboarddayeleceightResult">
+        <include refid="selectTDashboarddayeleceightVo"/>
+        <where>  
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="ypg != null  and ypg != ''"> and ypg = #{ypg}</if>
+            <if test="daodianliang != null  and daodianliang != ''"> and daodianliang = #{daodianliang}</if>
+            <if test="eveLec != null  and eveLec != ''"> and eve_lec = #{eveLec}</if>
+            <if test="fenggucha != null  and fenggucha != ''"> and fenggucha = #{fenggucha}</if>
+            <if test="bycElec != null  and bycElec != ''"> and byc_elec = #{bycElec}</if>
+            <if test="bocElec != null  and bocElec != ''"> and boc_elec = #{bocElec}</if>
+            <if test="dataDate != null "> and data_date = #{dataDate}</if>
+            <if test="dateDay != null  and dateDay != ''"> and date_day = #{dateDay}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTDashboarddayeleceightById" parameterType="Long" resultMap="TDashboarddayeleceightResult">
+        <include refid="selectTDashboarddayeleceightVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTDashboarddayeleceight" parameterType="TDashboarddayeleceight">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_dashboarddayeleceight.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_dashboarddayeleceight
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="ypg != null">ypg,</if>
+            <if test="daodianliang != null">daodianliang,</if>
+            <if test="eveLec != null">eve_lec,</if>
+            <if test="fenggucha != null">fenggucha,</if>
+            <if test="bycElec != null">byc_elec,</if>
+            <if test="bocElec != null">boc_elec,</if>
+            <if test="dataDate != null">data_date,</if>
+            <if test="dateDay != null">date_day,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="ypg != null">#{ypg},</if>
+            <if test="daodianliang != null">#{daodianliang},</if>
+            <if test="eveLec != null">#{eveLec},</if>
+            <if test="fenggucha != null">#{fenggucha},</if>
+            <if test="bycElec != null">#{bycElec},</if>
+            <if test="bocElec != null">#{bocElec},</if>
+            <if test="dataDate != null">#{dataDate},</if>
+            <if test="dateDay != null">#{dateDay},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDashboarddayeleceight" parameterType="TDashboarddayeleceight">
+        update t_dashboarddayeleceight
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="ypg != null">ypg = #{ypg},</if>
+            <if test="daodianliang != null">daodianliang = #{daodianliang},</if>
+            <if test="eveLec != null">eve_lec = #{eveLec},</if>
+            <if test="fenggucha != null">fenggucha = #{fenggucha},</if>
+            <if test="bycElec != null">byc_elec = #{bycElec},</if>
+            <if test="bocElec != null">boc_elec = #{bocElec},</if>
+            <if test="dataDate != null">data_date = #{dataDate},</if>
+            <if test="dateDay != null">date_day = #{dateDay},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTDashboarddayeleceightById" parameterType="Long">
+        update t_dashboarddayeleceight set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTDashboarddayeleceightByIds" parameterType="String">
+        update t_dashboarddayeleceight set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/aspen/TDashboardelecdataMapper.xml

@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectLast" parameterType="TDashboardelecdata" resultMap="TDashboardelecdataResult">
         select * from ( select * from t_dashboardelecdata where del_flag = 0 order by id desc ) WHERE ROWNUM = 1
     </select>
-    
+
     <select id="selectTDashboardelecdataById" parameterType="Long" resultMap="TDashboardelecdataResult">
         <include refid="selectTDashboardelecdataVo"/>
         where id = #{id}

master/src/main/resources/mybatis/aspen/TDashboardelecdayMapper.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.sems.his.mapper.TDashboardelecdayMapper">
+    
+    <resultMap type="TDashboardelecday" id="TDashboardelecdayResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="evconsume"    column="evconsume"    />
+        <result property="elecp"    column="elecp"    />
+        <result property="hechengqi"    column="hechengqi"    />
+        <result property="u2"    column="u2"    />
+        <result property="dataDate"    column="data_date"    />
+        <result property="dateDay"    column="date_day"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTDashboardelecdayVo">
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.evconsume, d.elecp, d.hechengqi, d.u2, d.data_date, d.date_day ,s.dept_name from t_dashboardelecday d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTDashboardelecdayList" parameterType="TDashboardelecday" resultMap="TDashboardelecdayResult">
+        <include refid="selectTDashboardelecdayVo"/>
+        <where>  
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="evconsume != null  and evconsume != ''"> and evconsume = #{evconsume}</if>
+            <if test="elecp != null  and elecp != ''"> and elecp = #{elecp}</if>
+            <if test="hechengqi != null  and hechengqi != ''"> and hechengqi = #{hechengqi}</if>
+            <if test="u2 != null  and u2 != ''"> and u2 = #{u2}</if>
+            <if test="dataDate != null "> and data_date = #{dataDate}</if>
+            <if test="dateDay != null  and dateDay != ''"> and date_day = #{dateDay}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTDashboardelecdayById" parameterType="Long" resultMap="TDashboardelecdayResult">
+        <include refid="selectTDashboardelecdayVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTDashboardelecday" parameterType="TDashboardelecday">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_dashboardelecday.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_dashboardelecday
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="evconsume != null">evconsume,</if>
+            <if test="elecp != null">elecp,</if>
+            <if test="hechengqi != null">hechengqi,</if>
+            <if test="u2 != null">u2,</if>
+            <if test="dataDate != null">data_date,</if>
+            <if test="dateDay != null">date_day,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="evconsume != null">#{evconsume},</if>
+            <if test="elecp != null">#{elecp},</if>
+            <if test="hechengqi != null">#{hechengqi},</if>
+            <if test="u2 != null">#{u2},</if>
+            <if test="dataDate != null">#{dataDate},</if>
+            <if test="dateDay != null">#{dateDay},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDashboardelecday" parameterType="TDashboardelecday">
+        update t_dashboardelecday
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="evconsume != null">evconsume = #{evconsume},</if>
+            <if test="elecp != null">elecp = #{elecp},</if>
+            <if test="hechengqi != null">hechengqi = #{hechengqi},</if>
+            <if test="u2 != null">u2 = #{u2},</if>
+            <if test="dataDate != null">data_date = #{dataDate},</if>
+            <if test="dateDay != null">date_day = #{dateDay},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTDashboardelecdayById" parameterType="Long">
+        update t_dashboardelecday set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTDashboardelecdayByIds" parameterType="String">
+        update t_dashboardelecday set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/aspen/dashboardelecdata.js

@@ -51,7 +51,7 @@ export function exportDashboardelecdata(query) {
     params: query
   })
 }
-// 查询最后一条dashboard抓取数据
+// 查询最后一条dashboardelec抓取数据
 export function selectLast(query) {
   return request({
     url: '/aspen/dashboardelecdata/selectLast',
@@ -59,3 +59,12 @@ export function selectLast(query) {
     params: query
   })
 }
+
+// 查询月度dashboardelec抓取数据
+export function selectMonth(query) {
+  return request({
+    url: '/aspen/dashboardelecdata/month',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/monitor/elec/center.vue

@@ -164,7 +164,7 @@ export default {
       rate: [
         {
           id: "centerRate0",
-          tips: this.dashboardelecdata.mwhWr,
+          tips: parseInt(this.dashboardelecdata.mwhWr),
           colorData: {
             textStyle: "#3fc0fb",
             series: {
@@ -178,7 +178,7 @@ export default {
         },
         {
           id: "centerRate1",
-          tips: this.dashboardelecdata.stg1Wr,
+          tips: parseInt(this.dashboardelecdata.stg1Wr),
           colorData: {
             textStyle: "#3fc0fb",
             series: {
@@ -192,7 +192,7 @@ export default {
         },
         {
           id: "centerRate2",
-          tips: this.dashboardelecdata.gtg3Wr,
+          tips: parseInt(this.dashboardelecdata.gtg3Wr),
           colorData: {
             textStyle: "#67e0e3",
             series: {
@@ -206,7 +206,7 @@ export default {
         },
         {
           id: "centerRate3",
-          tips: this.dashboardelecdata.gtg2Wr,
+          tips: parseInt(this.dashboardelecdata.gtg2Wr),
           colorData: {
             textStyle: "#67e0e3",
             series: {
@@ -220,7 +220,7 @@ export default {
         },
         {
           id: "centerRate4",
-          tips: this.dashboardelecdata.gtg1Wr,
+          tips: parseInt(this.dashboardelecdata.gtg1Wr),
           colorData: {
             textStyle: "#67e0e3",
             series: {

ui/src/views/monitor/elec/elecindex.vue

@@ -157,7 +157,7 @@ import frontElecThree from "@/views/monitor/elec/frontElecThree";
 import '@/assets/styles/index.scss' // global css
 import '@/common/flexible.js';
 import dayjs from "dayjs";
-import {selectLast} from "@/api/aspen/dashboardelecdata";
+import {selectLast,selectMonth} from "@/api/aspen/dashboardelecdata";
 
 export default {
   data() {
@@ -202,16 +202,34 @@ export default {
         shihua: null,
         shiyou: null,
         shunshiliang: null,
-        evconsume: null,
-        elecp: null,
-        hechengqi: null,
-        u2: null,
-        ypg: null,
-        daodianliang: null,
-        eveLec: null,
-        fenggucha: null,
-        bycElec: null,
-        bocElec: null
+      },
+      monthData:{
+        gtg1Lv: null,
+        gtg1Wr: null,
+        gtg2Lv: null,
+        gtg2Wr: null,
+        gtg3Lv: null,
+        gtg3Wr: null,
+        stg1Lv: null,
+        stg1Wr: null,
+        mwhLv: null,
+        mwhWr: null,
+        hhp: null,
+        hp: null,
+        lp: null,
+        mp: null,
+        totalConsumption: null,
+        hhpNum: null,
+        hhpTemp: null,
+        hpNum: null,
+        hpTemp: null,
+        lpNum: null,
+        lpTemp: null,
+        mpNum: null,
+        mpTemp: null,
+        shihua: null,
+        shiyou: null,
+        shunshiliang: null,
       }
     };
   },
@@ -245,6 +263,7 @@ export default {
   },
   created() {
     this.getList1();
+    this.getMonthList1();
     window.setInterval(() => {
       setTimeout(() => {
         ///调取接口获取数据
@@ -260,6 +279,12 @@ export default {
         this.dashboardelecdata = response.data;
       });
     },
+    getMonthList1()
+    {
+      selectMonth(this.queryParams).then(response => {
+        this.monthData = response.data;
+      });
+    },
     cancelLoading() {
       setTimeout(() => {
         this.loading = false;