liudongfang

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

@@ -0,0 +1,127 @@
+package com.ruoyi.project.aspen.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.aspen.domain.TDashboarddayelec;
+import com.ruoyi.project.aspen.service.ITDashboarddayelecService;
+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;
+
+/**
+ * 电厂大屏每日0：00抓取数据Controller
+ *
+ * @author ruoyi
+ * @date 2022-03-12
+ */
+@RestController
+@RequestMapping("/aspen/dashboarddayelec")
+public class TDashboarddayelecController extends BaseController
+{
+    @Autowired
+    private ITDashboarddayelecService tDashboarddayelecService;
+
+    /**
+     * 查询电厂大屏每日0：00抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDashboarddayelec tDashboarddayelec)
+    {
+        startPage();
+        List<TDashboarddayelec> list = tDashboarddayelecService.selectTDashboarddayelecList(tDashboarddayelec);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出电厂大屏每日0：00抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:export')")
+    @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDashboarddayelec tDashboarddayelec)
+    {
+        List<TDashboarddayelec> list = tDashboarddayelecService.selectTDashboarddayelecList(tDashboarddayelec);
+        ExcelUtil<TDashboarddayelec> util = new ExcelUtil<TDashboarddayelec>(TDashboarddayelec.class);
+        return util.exportExcel(list, "dashboarddayelec");
+    }
+
+    /**
+     * 获取电厂大屏每日0：00抓取数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tDashboarddayelecService.selectTDashboarddayelecById(id));
+    }
+
+    /**
+     * 新增电厂大屏每日0：00抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:add')")
+    @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDashboarddayelec tDashboarddayelec)
+    {
+        return toAjax(tDashboarddayelecService.insertTDashboarddayelec(tDashboarddayelec));
+    }
+
+    /**
+     * 修改电厂大屏每日0：00抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:edit')")
+    @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDashboarddayelec tDashboarddayelec)
+    {
+        return toAjax(tDashboarddayelecService.updateTDashboarddayelec(tDashboarddayelec));
+    }
+
+    /**
+     * 删除电厂大屏每日0：00抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:remove')")
+    @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tDashboarddayelecService.deleteTDashboarddayelecByIds(ids));
+    }
+
+    /**
+     * 查询最后一条dashboard抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:query')")
+    @GetMapping("/selectLast")
+    public AjaxResult selectLast(TDashboarddayelec tDashboarddayelec)
+    {
+        TDashboarddayelec tDashboarddayelec1 = tDashboarddayelecService.selectLast(tDashboarddayelec);
+        return AjaxResult.success(tDashboarddayelec1);
+    }
+
+    /**
+     * 查询最近31条DASHBOARD每日抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
+    @GetMapping("/month")
+    public AjaxResult selectMonth(TDashboarddayelec tDashboarddayelec)
+    {
+        List<TDashboarddayelec> tDashboarddayelecs = tDashboarddayelecService.selectMonth(tDashboarddayelec);
+        return AjaxResult.success(tDashboarddayelecs);
+    }
+}

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

@@ -16,28 +16,29 @@ 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
+ * 电厂大屏每日8：00抓取数据Controller
  *
  * @author ruoyi
- * @date 2022-03-11
+ * @date 2022-03-12
  */
 @RestController
-@RequestMapping("/his/dashboarddayeleceight")
+@RequestMapping("/aspen/dashboarddayeleceight")
 public class TDashboarddayeleceightController extends BaseController
 {
     @Autowired
     private ITDashboarddayeleceightService tDashboarddayeleceightService;
 
     /**
-     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     * 查询电厂大屏每日8：00抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:list')")
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:list')")
     @GetMapping("/list")
     public TableDataInfo list(TDashboarddayeleceight tDashboarddayeleceight)
     {
@@ -47,10 +48,10 @@ public class TDashboarddayeleceightController extends BaseController
     }
 
     /**
-     * 导出T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     * 导出电厂大屏每日8：00抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:export')")
-    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:export')")
+    @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TDashboarddayeleceight tDashboarddayeleceight)
     {
@@ -60,9 +61,9 @@ public class TDashboarddayeleceightController extends BaseController
     }
 
     /**
-     * 获取T_DASHBOARDDAYELECEIGHT每日抓取8：00数据详细信息
+     * 获取电厂大屏每日8：00抓取数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:query')")
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -70,10 +71,10 @@ public class TDashboarddayeleceightController extends BaseController
     }
 
     /**
-     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 新增电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:add')")
-    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:add')")
+    @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TDashboarddayeleceight tDashboarddayeleceight)
     {
@@ -81,10 +82,10 @@ public class TDashboarddayeleceightController extends BaseController
     }
 
     /**
-     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 修改电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:edit')")
-    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:edit')")
+    @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TDashboarddayeleceight tDashboarddayeleceight)
     {
@@ -92,10 +93,10 @@ public class TDashboarddayeleceightController extends BaseController
     }
 
     /**
-     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 删除电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('his:dashboarddayeleceight:remove')")
-    @Log(title = "T_DASHBOARDDAYELECEIGHT每日抓取8：00数据", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:remove')")
+    @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

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

@@ -8,12 +8,12 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * 电厂大屏DASHBOARDELEC抓取数据对象 t_dashboardelecdata
+ * 电厂大屏每日0：00抓取数据对象 t_dashboarddayelec
  *
  * @author ruoyi
- * @date 2022-03-11
+ * @date 2022-03-12
  */
-public class TDashboardelecdata extends BaseEntity
+public class TDashboarddayelec extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -145,6 +145,38 @@ public class TDashboardelecdata extends BaseEntity
     @Excel(name = "天然气表瞬时量")
     private String shunshiliang;
 
+    /** 电量表昨日发电量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)
     {
@@ -434,7 +466,78 @@ public class TDashboardelecdata extends BaseEntity
     {
         return shunshiliang;
     }
+    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() {
@@ -471,6 +574,14 @@ public class TDashboardelecdata extends BaseEntity
             .append("shihua", getShihua())
             .append("shiyou", getShiyou())
             .append("shunshiliang", getShunshiliang())
+            .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/TDashboarddayeleceight.java

@@ -8,10 +8,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据对象 t_dashboarddayeleceight
+ * 电厂大屏每日8：00抓取数据对象 t_dashboarddayeleceight
  *
  * @author ruoyi
- * @date 2022-03-11
+ * @date 2022-03-12
  */
 public class TDashboarddayeleceight extends BaseEntity
 {
@@ -41,29 +41,21 @@ public class TDashboarddayeleceight extends BaseEntity
     @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
-    /** 电量表昨日发电量Yesterday's power generation */
-    @Excel(name = "电量表昨日发电量Yesterday's power generation")
-    private String ypg;
+    /** 天然气表每日消耗量 every day consume */
+    @Excel(name = "天然气表每日消耗量 every day consume")
+    private String evconsume;
 
-    /** 电量表倒电量 */
-    @Excel(name = "电量表倒电量")
-    private String daodianliang;
+    /** 天然气表电厂 */
+    @Excel(name = "天然气表电厂")
+    private String elecp;
 
-    /** 电量表每日用电量 */
-    @Excel(name = "电量表每日用电量")
-    private String eveLec;
+    /** 天然气表合成器 */
+    @Excel(name = "天然气表合成器")
+    private String hechengqi;
 
-    /** 电量表每日峰谷差 */
-    @Excel(name = "电量表每日峰谷差")
-    private String fenggucha;
-
-    /** 电量表BYC用电量 */
-    @Excel(name = "电量表BYC用电量")
-    private String bycElec;
-
-    /** 电量表BOC用电量 */
-    @Excel(name = "电量表BOC用电量")
-    private String bocElec;
+    /** 天然气表U2 */
+    @Excel(name = "天然气表U2")
+    private String u2;
 
     /** 数据日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
@@ -128,59 +120,41 @@ public class TDashboarddayeleceight extends BaseEntity
     {
         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)
+    public void setEvconsume(String evconsume)
     {
-        this.eveLec = eveLec;
+        this.evconsume = evconsume;
     }
 
-    public String getEveLec()
+    public String getEvconsume()
     {
-        return eveLec;
+        return evconsume;
     }
-    public void setFenggucha(String fenggucha)
+    public void setElecp(String elecp)
     {
-        this.fenggucha = fenggucha;
+        this.elecp = elecp;
     }
 
-    public String getFenggucha()
+    public String getElecp()
     {
-        return fenggucha;
+        return elecp;
     }
-    public void setBycElec(String bycElec)
+    public void setHechengqi(String hechengqi)
     {
-        this.bycElec = bycElec;
+        this.hechengqi = hechengqi;
     }
 
-    public String getBycElec()
+    public String getHechengqi()
     {
-        return bycElec;
+        return hechengqi;
     }
-    public void setBocElec(String bocElec)
+    public void setU2(String u2)
     {
-        this.bocElec = bocElec;
+        this.u2 = u2;
     }
 
-    public String getBocElec()
+    public String getU2()
     {
-        return bocElec;
+        return u2;
     }
     public void setDataDate(Date dataDate)
     {
@@ -210,12 +184,10 @@ public class TDashboarddayeleceight extends BaseEntity
             .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("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/TDashboarddayelecMapper.java

@@ -0,0 +1,78 @@
+package com.ruoyi.project.aspen.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.aspen.domain.TDashboarddayelec;
+
+
+/**
+ * 电厂大屏每日0：00抓取数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-03-12
+ */
+public interface TDashboarddayelecMapper 
+{
+    /**
+     * 查询电厂大屏每日0：00抓取数据
+     * 
+     * @param id 电厂大屏每日0：00抓取数据ID
+     * @return 电厂大屏每日0：00抓取数据
+     */
+    public TDashboarddayelec selectTDashboarddayelecById(Long id);
+
+    /**
+     * 查询电厂大屏每日0：00抓取数据列表
+     * 
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 电厂大屏每日0：00抓取数据集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TDashboarddayelec> selectTDashboarddayelecList(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 新增电厂大屏每日0：00抓取数据
+     * 
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 结果
+     */
+    public int insertTDashboarddayelec(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 修改电厂大屏每日0：00抓取数据
+     * 
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 结果
+     */
+    public int updateTDashboarddayelec(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 删除电厂大屏每日0：00抓取数据
+     * 
+     * @param id 电厂大屏每日0：00抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayelecById(Long id);
+
+    /**
+     * 批量删除电厂大屏每日0：00抓取数据
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayelecByIds(Long[] ids);
+
+    /**
+     * 查询最后一条dashboardelec抓取数据
+     *
+     * @return dashboardelec抓取数据
+     */
+    public TDashboarddayelec selectLast(TDashboarddayelec tDashboarddayelec);
+    /**
+     * 查询最近一个月dashboardelec抓取数据
+     *
+     * @return dashboardelec抓取数据
+     */
+    public List<TDashboarddayelec> selectMonth(TDashboarddayelec tDashboarddayelec);
+
+}

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

@@ -6,56 +6,56 @@ import com.ruoyi.project.aspen.domain.TDashboarddayeleceight;
 
 
 /**
- * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据Mapper接口
+ * 电厂大屏每日8：00抓取数据Mapper接口
  * 
  * @author ruoyi
- * @date 2022-03-11
+ * @date 2022-03-12
  */
 public interface TDashboarddayeleceightMapper 
 {
     /**
-     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 查询电厂大屏每日8：00抓取数据
      * 
-     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
-     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param id 电厂大屏每日8：00抓取数据ID
+     * @return 电厂大屏每日8：00抓取数据
      */
     public TDashboarddayeleceight selectTDashboarddayeleceightById(Long id);
 
     /**
-     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     * 查询电厂大屏每日8：00抓取数据列表
      * 
-     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
-     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据集合
+     * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
+     * @return 电厂大屏每日8：00抓取数据集合
      */
     @DataScope(deptAlias = "d")
     public List<TDashboarddayeleceight> selectTDashboarddayeleceightList(TDashboarddayeleceight tDashboarddayeleceight);
 
     /**
-     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 新增电厂大屏每日8：00抓取数据
      * 
-     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 结果
      */
     public int insertTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight);
 
     /**
-     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 修改电厂大屏每日8：00抓取数据
      * 
-     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 结果
      */
     public int updateTDashboarddayeleceight(TDashboarddayeleceight tDashboarddayeleceight);
 
     /**
-     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 删除电厂大屏每日8：00抓取数据
      * 
-     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @param id 电厂大屏每日8：00抓取数据ID
      * @return 结果
      */
     public int deleteTDashboarddayeleceightById(Long id);
 
     /**
-     * 批量删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 批量删除电厂大屏每日8：00抓取数据
      * 
      * @param ids 需要删除的数据ID
      * @return 结果

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

@@ -0,0 +1,77 @@
+package com.ruoyi.project.aspen.service;
+
+import com.ruoyi.project.aspen.domain.TDashboarddayelec;
+
+import java.util.List;
+
+
+/**
+ * 电厂大屏每日0：00抓取数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-03-12
+ */
+public interface ITDashboarddayelecService 
+{
+    /**
+     * 查询电厂大屏每日0：00抓取数据
+     * 
+     * @param id 电厂大屏每日0：00抓取数据ID
+     * @return 电厂大屏每日0：00抓取数据
+     */
+    public TDashboarddayelec selectTDashboarddayelecById(Long id);
+
+    /**
+     * 查询电厂大屏每日0：00抓取数据列表
+     * 
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 电厂大屏每日0：00抓取数据集合
+     */
+    public List<TDashboarddayelec> selectTDashboarddayelecList(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 新增电厂大屏每日0：00抓取数据
+     * 
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 结果
+     */
+    public int insertTDashboarddayelec(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 修改电厂大屏每日0：00抓取数据
+     * 
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 结果
+     */
+    public int updateTDashboarddayelec(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 批量删除电厂大屏每日0：00抓取数据
+     * 
+     * @param ids 需要删除的电厂大屏每日0：00抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayelecByIds(Long[] ids);
+
+    /**
+     * 删除电厂大屏每日0：00抓取数据信息
+     * 
+     * @param id 电厂大屏每日0：00抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddayelecById(Long id);
+
+    /**
+     * 查询最后一条dashboardelec抓取数据
+     * @param tDashboarddayelec 电厂大屏DASHBOARDELEC抓取数据ID
+     * @return dashboardelec抓取数据
+     */
+    public TDashboarddayelec selectLast(TDashboarddayelec tDashboarddayelec);
+
+    /**
+     * 查询最近一个月dashboardelec抓取数据
+     *
+     * @return dashboardelec抓取数据
+     */
+    public List<TDashboarddayelec> selectMonth(TDashboarddayelec tDashboarddayelec);
+}

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

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

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

@@ -0,0 +1,100 @@
+package com.ruoyi.project.aspen.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.aspen.domain.TDashboarddayelec;
+import com.ruoyi.project.aspen.mapper.TDashboarddayelecMapper;
+import com.ruoyi.project.aspen.service.ITDashboarddayelecService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 电厂大屏每日0：00抓取数据Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-03-12
+ */
+@Service
+public class TDashboarddayelecServiceImpl implements ITDashboarddayelecService {
+    @Resource
+    private TDashboarddayelecMapper tDashboarddayelecMapper;
+
+    /**
+     * 查询电厂大屏每日0：00抓取数据
+     *
+     * @param id 电厂大屏每日0：00抓取数据ID
+     * @return 电厂大屏每日0：00抓取数据
+     */
+    @Override
+    public TDashboarddayelec selectTDashboarddayelecById(Long id) {
+        return tDashboarddayelecMapper.selectTDashboarddayelecById(id);
+    }
+
+    /**
+     * 查询电厂大屏每日0：00抓取数据列表
+     *
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 电厂大屏每日0：00抓取数据
+     */
+    @Override
+    public List<TDashboarddayelec> selectTDashboarddayelecList(TDashboarddayelec tDashboarddayelec) {
+        return tDashboarddayelecMapper.selectTDashboarddayelecList(tDashboarddayelec);
+    }
+
+    /**
+     * 新增电厂大屏每日0：00抓取数据
+     *
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 结果
+     */
+    @Override
+    public int insertTDashboarddayelec(TDashboarddayelec tDashboarddayelec) {
+        return tDashboarddayelecMapper.insertTDashboarddayelec(tDashboarddayelec);
+    }
+
+    /**
+     * 修改电厂大屏每日0：00抓取数据
+     *
+     * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
+     * @return 结果
+     */
+    @Override
+    public int updateTDashboarddayelec(TDashboarddayelec tDashboarddayelec) {
+        return tDashboarddayelecMapper.updateTDashboarddayelec(tDashboarddayelec);
+    }
+
+    /**
+     * 批量删除电厂大屏每日0：00抓取数据
+     *
+     * @param ids 需要删除的电厂大屏每日0：00抓取数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboarddayelecByIds(Long[] ids) {
+        return tDashboarddayelecMapper.deleteTDashboarddayelecByIds(ids);
+    }
+
+    /**
+     * 删除电厂大屏每日0：00抓取数据信息
+     *
+     * @param id 电厂大屏每日0：00抓取数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboarddayelecById(Long id) {
+        return tDashboarddayelecMapper.deleteTDashboarddayelecById(id);
+    }
+
+    @Override
+    public TDashboarddayelec selectLast(TDashboarddayelec tDashboarddayelec) {
+        return tDashboarddayelecMapper.selectLast(tDashboarddayelec);
+    }
+
+    @Override
+    public List<TDashboarddayelec> selectMonth(TDashboarddayelec tDashboarddayelec) {
+        return tDashboarddayelecMapper.selectMonth(tDashboarddayelec);
+    }
+}

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

@@ -12,10 +12,10 @@ import javax.annotation.Resource;
 
 
 /**
- * T_DASHBOARDDAYELECEIGHT每日抓取8：00数据Service业务层处理
+ * 电厂大屏每日8：00抓取数据Service业务层处理
  *
  * @author ruoyi
- * @date 2022-03-11
+ * @date 2022-03-12
  */
 @Service
 public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceightService
@@ -24,10 +24,10 @@ public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceigh
     private TDashboarddayeleceightMapper tDashboarddayeleceightMapper;
 
     /**
-     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 查询电厂大屏每日8：00抓取数据
      *
-     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
-     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param id 电厂大屏每日8：00抓取数据ID
+     * @return 电厂大屏每日8：00抓取数据
      */
     @Override
     public TDashboarddayeleceight selectTDashboarddayeleceightById(Long id)
@@ -36,10 +36,10 @@ public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceigh
     }
 
     /**
-     * 查询T_DASHBOARDDAYELECEIGHT每日抓取8：00数据列表
+     * 查询电厂大屏每日8：00抓取数据列表
      *
-     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
-     * @return T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
+     * @return 电厂大屏每日8：00抓取数据
      */
     @Override
     public List<TDashboarddayeleceight> selectTDashboarddayeleceightList(TDashboarddayeleceight tDashboarddayeleceight)
@@ -48,9 +48,9 @@ public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceigh
     }
 
     /**
-     * 新增T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 新增电厂大屏每日8：00抓取数据
      *
-     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 结果
      */
     @Override
@@ -60,9 +60,9 @@ public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceigh
     }
 
     /**
-     * 修改T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 修改电厂大屏每日8：00抓取数据
      *
-     * @param tDashboarddayeleceight T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 结果
      */
     @Override
@@ -72,9 +72,9 @@ public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceigh
     }
 
     /**
-     * 批量删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据
+     * 批量删除电厂大屏每日8：00抓取数据
      *
-     * @param ids 需要删除的T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @param ids 需要删除的电厂大屏每日8：00抓取数据ID
      * @return 结果
      */
     @Override
@@ -84,9 +84,9 @@ public class TDashboarddayeleceightServiceImpl implements ITDashboarddayeleceigh
     }
 
     /**
-     * 删除T_DASHBOARDDAYELECEIGHT每日抓取8：00数据信息
+     * 删除电厂大屏每日8：00抓取数据信息
      *
-     * @param id T_DASHBOARDDAYELECEIGHT每日抓取8：00数据ID
+     * @param id 电厂大屏每日8：00抓取数据ID
      * @return 结果
      */
     @Override

master/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java

@@ -1,28 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
-
-/**
- * 服务器监控
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/server")
-public class ServerController extends BaseController
-{
-    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
-    @GetMapping()
-    public AjaxResult getInfo() throws Exception
-    {
-        Server server = new Server();
-        server.copyTo();
-        return AjaxResult.success(server);
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java

@@ -1,142 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.job.CronUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-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.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.service.ISysJobService;
-
-/**
- * 调度任务信息操作处理
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/job")
-public class SysJobController extends BaseController
-{
-    @Autowired
-    private ISysJobService jobService;
-
-    /**
-     * 查询定时任务列表
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysJob sysJob)
-    {
-        startPage();
-        List<SysJob> list = jobService.selectJobList(sysJob);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出定时任务列表
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
-    @Log(title = "定时任务", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(SysJob sysJob)
-    {
-        List<SysJob> list = jobService.selectJobList(sysJob);
-        ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
-        return util.exportExcel(list, "定时任务");
-    }
-
-    /**
-     * 获取定时任务详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
-    @GetMapping(value = "/{jobId}")
-    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
-    {
-        return AjaxResult.success(jobService.selectJobById(jobId));
-    }
-
-    /**
-     * 新增定时任务
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:add')")
-    @Log(title = "定时任务", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
-    {
-        if (!CronUtils.isValid(sysJob.getCronExpression()))
-        {
-            return AjaxResult.error("cron表达式不正确");
-        }
-        sysJob.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(jobService.insertJob(sysJob));
-    }
-
-    /**
-     * 修改定时任务
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
-    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
-    {
-        if (!CronUtils.isValid(sysJob.getCronExpression()))
-        {
-            return AjaxResult.error("cron表达式不正确");
-        }
-        sysJob.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(jobService.updateJob(sysJob));
-    }
-
-    /**
-     * 定时任务状态修改
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
-    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
-    {
-        SysJob newJob = jobService.selectJobById(job.getJobId());
-        newJob.setStatus(job.getStatus());
-        return toAjax(jobService.changeStatus(newJob));
-    }
-
-    /**
-     * 定时任务立即执行一次
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
-    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
-    @PutMapping("/run")
-    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
-    {
-        jobService.run(job);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 删除定时任务
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
-    @Log(title = "定时任务", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{jobIds}")
-    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
-    {
-        jobService.deleteJobByIds(jobIds);
-        return AjaxResult.success();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java

@@ -1,90 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
-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;
-
-/**
- * 调度日志操作处理
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/jobLog")
-public class SysJobLogController extends BaseController
-{
-    @Autowired
-    private ISysJobLogService jobLogService;
-
-    /**
-     * 查询定时任务调度日志列表
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysJobLog sysJobLog)
-    {
-        startPage();
-        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出定时任务调度日志列表
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
-    @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(SysJobLog sysJobLog)
-    {
-        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
-        ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
-        return util.exportExcel(list, "调度日志");
-    }
-
-    /**
-     * 根据调度编号获取详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
-    @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long jobLogId)
-    {
-        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
-    }
-
-
-    /**
-     * 删除定时任务调度日志
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
-    @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{jobLogIds}")
-    public AjaxResult remove(@PathVariable Long[] jobLogIds)
-    {
-        return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
-    }
-
-    /**
-     * 清空定时任务调度日志
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
-    @Log(title = "调度日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
-    public AjaxResult clean()
-    {
-        jobLogService.cleanJobLog();
-        return AjaxResult.success();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java

@@ -1,67 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-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.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
-
-/**
- * 系统访问记录
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
-{
-    @Autowired
-    private ISysLogininforService logininforService;
-
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysLogininfor logininfor)
-    {
-        startPage();
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        return getDataTable(list);
-    }
-
-    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
-    @GetMapping("/export")
-    public AjaxResult export(SysLogininfor logininfor)
-    {
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
-        return util.exportExcel(list, "登录日志");
-    }
-
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
-    {
-        return toAjax(logininforService.deleteLogininforByIds(infoIds));
-    }
-
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
-    public AjaxResult clean()
-    {
-        logininforService.cleanLogininfor();
-        return AjaxResult.success();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java

@@ -1,66 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-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.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
-
-/**
- * 操作日志记录
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/operlog")
-public class SysOperlogController extends BaseController
-{
-    @Autowired
-    private ISysOperLogService operLogService;
-
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysOperLog operLog)
-    {
-        startPage();
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        return getDataTable(list);
-    }
-
-    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
-    @GetMapping("/export")
-    public AjaxResult export(SysOperLog operLog)
-    {
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
-        return util.exportExcel(list, "操作日志");
-    }
-
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
-    {
-        return toAjax(operLogService.deleteOperLogByIds(operIds));
-    }
-
-    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    @DeleteMapping("/clean")
-    public AjaxResult clean()
-    {
-        operLogService.cleanOperLog();
-        return AjaxResult.success();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java

@@ -1,92 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysUserOnline;
-import com.ruoyi.project.system.service.ISysUserOnlineService;
-
-/**
- * 在线用户监控
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
-{
-    @Autowired
-    private ISysUserOnlineService userOnlineService;
-
-    @Autowired
-    private RedisCache redisCache;
-
-    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(String ipaddr, String userName)
-    {
-        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
-        {
-            LoginUser user = redisCache.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(ipaddr))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
-            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-                }
-            }
-            else
-            {
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
-            }
-        }
-        Collections.reverse(userOnlineList);
-        userOnlineList.removeAll(Collections.singleton(null));
-        return getDataTable(userOnlineList);
-    }
-
-    /**
-     * 强退用户
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
-    @Log(title = "在线用户", businessType = BusinessType.FORCE)
-    @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
-    {
-        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-        return AjaxResult.success();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java

@@ -1,172 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.job.CronUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 定时任务调度表 sys_job
- *
- * @author ruoyi
- */
-public class SysJob extends BaseEntity implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 任务ID */
-    @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
-    private Long jobId;
-
-    /** 任务名称 */
-    @Excel(name = "任务名称")
-    private String jobName;
-
-    /** 任务组名 */
-    @Excel(name = "任务组名")
-    private String jobGroup;
-
-    /** 调用目标字符串 */
-    @Excel(name = "调用目标字符串")
-    private String invokeTarget;
-
-    /** cron执行表达式 */
-    @Excel(name = "执行表达式 ")
-    private String cronExpression;
-
-    /** cron计划策略 */
-    @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
-    private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
-
-    /** 是否并发执行（0允许 1禁止） */
-    @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
-    private String concurrent;
-
-    /** 任务状态（0正常 1暂停） */
-    @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
-    private String status;
-
-    public Long getJobId()
-    {
-        return jobId;
-    }
-
-    public void setJobId(Long jobId)
-    {
-        this.jobId = jobId;
-    }
-
-    @NotBlank(message = "任务名称不能为空")
-    @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
-    public String getJobName()
-    {
-        return jobName;
-    }
-
-    public void setJobName(String jobName)
-    {
-        this.jobName = jobName;
-    }
-
-    public String getJobGroup()
-    {
-        return jobGroup;
-    }
-
-    public void setJobGroup(String jobGroup)
-    {
-        this.jobGroup = jobGroup;
-    }
-
-    @NotBlank(message = "调用目标字符串不能为空")
-    @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
-    public String getInvokeTarget()
-    {
-        return invokeTarget;
-    }
-
-    public void setInvokeTarget(String invokeTarget)
-    {
-        this.invokeTarget = invokeTarget;
-    }
-
-    @NotBlank(message = "Cron执行表达式不能为空")
-    @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
-    public String getCronExpression()
-    {
-        return cronExpression;
-    }
-
-    public void setCronExpression(String cronExpression)
-    {
-        this.cronExpression = cronExpression;
-    }
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getNextValidTime()
-    {
-        if (StringUtils.isNotEmpty(cronExpression))
-        {
-            return CronUtils.getNextExecution(cronExpression);
-        }
-        return null;
-    }
-
-    public String getMisfirePolicy()
-    {
-        return misfirePolicy;
-    }
-
-    public void setMisfirePolicy(String misfirePolicy)
-    {
-        this.misfirePolicy = misfirePolicy;
-    }
-
-    public String getConcurrent()
-    {
-        return concurrent;
-    }
-
-    public void setConcurrent(String concurrent)
-    {
-        this.concurrent = concurrent;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobId", getJobId())
-            .append("jobName", getJobName())
-            .append("jobGroup", getJobGroup())
-            .append("cronExpression", getCronExpression())
-            .append("nextValidTime", getNextValidTime())
-            .append("misfirePolicy", getMisfirePolicy())
-            .append("concurrent", getConcurrent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java

@@ -1,155 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-import java.util.Date;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 定时任务调度日志表 sys_job_log
- *
- * @author ruoyi
- */
-public class SysJobLog extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    @Excel(name = "日志序号")
-    private Long jobLogId;
-
-    /** 任务名称 */
-    @Excel(name = "任务名称")
-    private String jobName;
-
-    /** 任务组名 */
-    @Excel(name = "任务组名")
-    private String jobGroup;
-
-    /** 调用目标字符串 */
-    @Excel(name = "调用目标字符串")
-    private String invokeTarget;
-
-    /** 日志信息 */
-    @Excel(name = "日志信息")
-    private String jobMessage;
-
-    /** 执行状态（0正常 1失败） */
-    @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败")
-    private String status;
-
-    /** 异常信息 */
-    @Excel(name = "异常信息")
-    private String exceptionInfo;
-
-    /** 开始时间 */
-    private Date startTime;
-
-    /** 停止时间 */
-    private Date stopTime;
-
-    public Long getJobLogId()
-    {
-        return jobLogId;
-    }
-
-    public void setJobLogId(Long jobLogId)
-    {
-        this.jobLogId = jobLogId;
-    }
-
-    public String getJobName()
-    {
-        return jobName;
-    }
-
-    public void setJobName(String jobName)
-    {
-        this.jobName = jobName;
-    }
-
-    public String getJobGroup()
-    {
-        return jobGroup;
-    }
-
-    public void setJobGroup(String jobGroup)
-    {
-        this.jobGroup = jobGroup;
-    }
-
-    public String getInvokeTarget()
-    {
-        return invokeTarget;
-    }
-
-    public void setInvokeTarget(String invokeTarget)
-    {
-        this.invokeTarget = invokeTarget;
-    }
-
-    public String getJobMessage()
-    {
-        return jobMessage;
-    }
-
-    public void setJobMessage(String jobMessage)
-    {
-        this.jobMessage = jobMessage;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getExceptionInfo()
-    {
-        return exceptionInfo;
-    }
-
-    public void setExceptionInfo(String exceptionInfo)
-    {
-        this.exceptionInfo = exceptionInfo;
-    }
-
-    public Date getStartTime()
-    {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime)
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStopTime()
-    {
-        return stopTime;
-    }
-
-    public void setStopTime(Date stopTime)
-    {
-        this.stopTime = stopTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobLogId", getJobLogId())
-            .append("jobName", getJobName())
-            .append("jobGroup", getJobGroup())
-            .append("jobMessage", getJobMessage())
-            .append("status", getStatus())
-            .append("exceptionInfo", getExceptionInfo())
-            .append("startTime", getStartTime())
-            .append("stopTime", getStopTime())
-            .toString();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java

@@ -1,144 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 系统访问记录表 sys_logininfor
- *
- * @author ruoyi
- */
-public class SysLogininfor extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
-    private Long infoId;
-
-    /** 用户账号 */
-    @Excel(name = "用户账号")
-    private String userName;
-
-    /** 登录状态 0成功 1失败 */
-    @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
-    private String status;
-
-    /** 登录IP地址 */
-    @Excel(name = "登录地址")
-    private String ipaddr;
-
-    /** 登录地点 */
-    @Excel(name = "登录地点")
-    private String loginLocation;
-
-    /** 浏览器类型 */
-    @Excel(name = "浏览器")
-    private String browser;
-
-    /** 操作系统 */
-    @Excel(name = "操作系统")
-    private String os;
-
-    /** 提示消息 */
-    @Excel(name = "提示消息")
-    private String msg;
-
-    /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date loginTime;
-
-    public Long getInfoId()
-    {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Date loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java

@@ -1,255 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 操作日志记录表 oper_log
- *
- * @author ruoyi
- */
-public class SysOperLog extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 日志主键 */
-    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
-
-    /** 操作模块 */
-    @Excel(name = "操作模块")
-    private String title;
-
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
-    private Integer businessType;
-
-    /** 业务类型数组 */
-    private Integer[] businessTypes;
-
-    /** 请求方法 */
-    @Excel(name = "请求方法")
-    private String method;
-
-    /** 请求方式 */
-    @Excel(name = "请求方式")
-    private String requestMethod;
-
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
-    private Integer operatorType;
-
-    /** 操作人员 */
-    @Excel(name = "操作人员")
-    private String operName;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /** 请求url */
-    @Excel(name = "请求地址")
-    private String operUrl;
-
-    /** 操作地址 */
-    @Excel(name = "操作地址")
-    private String operIp;
-
-    /** 操作地点 */
-    @Excel(name = "操作地点")
-    private String operLocation;
-
-    /** 请求参数 */
-    @Excel(name = "请求参数")
-    private String operParam;
-
-    /** 返回参数 */
-    @Excel(name = "返回参数")
-    private String jsonResult;
-
-    /** 操作状态（0正常 1异常） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
-    private Integer status;
-
-    /** 错误消息 */
-    @Excel(name = "错误消息")
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    public Long getOperId()
-    {
-        return operId;
-    }
-
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod()
-    {
-        return method;
-    }
-
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
-
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName()
-    {
-        return operName;
-    }
-
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp()
-    {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
-
-    public String getOperLocation()
-    {
-        return operLocation;
-    }
-
-    public void setOperLocation(String operLocation)
-    {
-        this.operLocation = operLocation;
-    }
-
-    public String getOperParam()
-    {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime()
-    {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java

@@ -1,113 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-/**
- * 当前在线会话
- *
- * @author ruoyi
- */
-public class SysUserOnline
-{
-    /** 会话编号 */
-    private String tokenId;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 用户名称 */
-    private String userName;
-
-    /** 登录IP地址 */
-    private String ipaddr;
-
-    /** 登录地址 */
-    private String loginLocation;
-
-    /** 浏览器类型 */
-    private String browser;
-
-    /** 操作系统 */
-    private String os;
-
-    /** 登录时间 */
-    private Long loginTime;
-
-    public String getTokenId()
-    {
-        return tokenId;
-    }
-
-    public void setTokenId(String tokenId)
-    {
-        this.tokenId = tokenId;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public Long getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java

@@ -1,64 +0,0 @@
-package com.ruoyi.project.monitor.mapper;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-
-/**
- * 调度任务日志信息 数据层
- *
- * @author ruoyi
- */
-public interface SysJobLogMapper
-{
-    /**
-     * 获取quartz调度器日志的计划任务
-     *
-     * @param jobLog 调度日志信息
-     * @return 调度任务日志集合
-     */
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
-
-    /**
-     * 查询所有调度任务日志
-     *
-     * @return 调度任务日志列表
-     */
-    public List<SysJobLog> selectJobLogAll();
-
-    /**
-     * 通过调度任务日志ID查询调度信息
-     *
-     * @param jobLogId 调度任务日志ID
-     * @return 调度任务日志对象信息
-     */
-    public SysJobLog selectJobLogById(Long jobLogId);
-
-    /**
-     * 新增任务日志
-     *
-     * @param jobLog 调度日志信息
-     * @return 结果
-     */
-    public int insertJobLog(SysJobLog jobLog);
-
-    /**
-     * 批量删除调度日志信息
-     *
-     * @param logIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteJobLogByIds(Long[] logIds);
-
-    /**
-     * 删除任务日志
-     *
-     * @param jobId 调度日志ID
-     * @return 结果
-     */
-    public int deleteJobLogById(Long jobId);
-
-    /**
-     * 清空任务日志
-     */
-    public void cleanJobLog();
-}

master/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java

@@ -1,67 +0,0 @@
-package com.ruoyi.project.monitor.mapper;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysJob;
-
-/**
- * 调度任务信息 数据层
- *
- * @author ruoyi
- */
-public interface SysJobMapper
-{
-    /**
-     * 查询调度任务日志集合
-     *
-     * @param job 调度信息
-     * @return 操作日志集合
-     */
-    public List<SysJob> selectJobList(SysJob job);
-
-    /**
-     * 查询所有调度任务
-     *
-     * @return 调度任务列表
-     */
-    public List<SysJob> selectJobAll();
-
-    /**
-     * 通过调度ID查询调度任务信息
-     *
-     * @param jobId 调度ID
-     * @return 角色对象信息
-     */
-    public SysJob selectJobById(Long jobId);
-
-    /**
-     * 通过调度ID删除调度任务信息
-     *
-     * @param jobId 调度ID
-     * @return 结果
-     */
-    public int deleteJobById(Long jobId);
-
-    /**
-     * 批量删除调度任务信息
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteJobByIds(Long[] ids);
-
-    /**
-     * 修改调度任务信息
-     *
-     * @param job 调度任务信息
-     * @return 结果
-     */
-    public int updateJob(SysJob job);
-
-    /**
-     * 新增调度任务信息
-     *
-     * @param job 调度任务信息
-     * @return 结果
-     */
-    public int insertJob(SysJob job);
-}

master/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java

@@ -1,42 +0,0 @@
-package com.ruoyi.project.monitor.mapper;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-
-/**
- * 系统访问日志情况信息 数据层
- *
- * @author ruoyi
- */
-public interface SysLogininforMapper
-{
-    /**
-     * 新增系统登录日志
-     *
-     * @param logininfor 访问日志对象
-     */
-    public void insertLogininfor(SysLogininfor logininfor);
-
-    /**
-     * 查询系统登录日志集合
-     *
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
-
-    /**
-     * 批量删除系统登录日志
-     *
-     * @param infoIds 需要删除的登录日志ID
-     * @return 结果
-     */
-    public int deleteLogininforByIds(Long[] infoIds);
-
-    /**
-     * 清空系统登录日志
-     *
-     * @return 结果
-     */
-    public int cleanLogininfor();
-}

master/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java

@@ -1,48 +0,0 @@
-package com.ruoyi.project.monitor.mapper;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-
-/**
- * 操作日志 数据层
- *
- * @author ruoyi
- */
-public interface SysOperLogMapper
-{
-    /**
-     * 新增操作日志
-     *
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
-
-    /**
-     * 查询系统操作日志集合
-     *
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     *
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     *
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
-}

master/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.project.monitor.service;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-
-/**
- * 定时任务调度日志信息信息 服务层
- *
- * @author ruoyi
- */
-public interface ISysJobLogService
-{
-    /**
-     * 获取quartz调度器日志的计划任务
-     *
-     * @param jobLog 调度日志信息
-     * @return 调度任务日志集合
-     */
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
-
-    /**
-     * 通过调度任务日志ID查询调度信息
-     *
-     * @param jobLogId 调度任务日志ID
-     * @return 调度任务日志对象信息
-     */
-    public SysJobLog selectJobLogById(Long jobLogId);
-
-    /**
-     * 新增任务日志
-     *
-     * @param jobLog 调度日志信息
-     */
-    public void addJobLog(SysJobLog jobLog);
-
-    /**
-     * 批量删除调度日志信息
-     *
-     * @param logIds 需要删除的日志ID
-     * @return 结果
-     */
-    public int deleteJobLogByIds(Long[] logIds);
-
-    /**
-     * 删除任务日志
-     *
-     * @param jobId 调度日志ID
-     * @return 结果
-     */
-    public int deleteJobLogById(Long jobId);
-
-    /**
-     * 清空任务日志
-     */
-    public void cleanJobLog();
-}

master/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java

@@ -1,102 +0,0 @@
-package com.ruoyi.project.monitor.service;
-
-import java.util.List;
-import org.quartz.SchedulerException;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.project.monitor.domain.SysJob;
-
-/**
- * 定时任务调度信息信息 服务层
- *
- * @author ruoyi
- */
-public interface ISysJobService
-{
-    /**
-     * 获取quartz调度器的计划任务
-     *
-     * @param job 调度信息
-     * @return 调度任务集合
-     */
-    public List<SysJob> selectJobList(SysJob job);
-
-    /**
-     * 通过调度任务ID查询调度信息
-     *
-     * @param jobId 调度任务ID
-     * @return 调度任务对象信息
-     */
-    public SysJob selectJobById(Long jobId);
-
-    /**
-     * 暂停任务
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public int pauseJob(SysJob job) throws SchedulerException;
-
-    /**
-     * 恢复任务
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public int resumeJob(SysJob job) throws SchedulerException;
-
-    /**
-     * 删除任务后，所对应的trigger也将被删除
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public int deleteJob(SysJob job) throws SchedulerException;
-
-    /**
-     * 批量删除调度信息
-     *
-     * @param jobIds 需要删除的任务ID
-     * @return 结果
-     */
-    public void deleteJobByIds(Long[] jobIds) throws SchedulerException;
-
-    /**
-     * 任务调度状态修改
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public int changeStatus(SysJob job) throws SchedulerException;
-
-    /**
-     * 立即运行任务
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public void run(SysJob job) throws SchedulerException;
-
-    /**
-     * 新增任务
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public int insertJob(SysJob job) throws SchedulerException, TaskException;
-
-    /**
-     * 更新任务
-     *
-     * @param job 调度信息
-     * @return 结果
-     */
-    public int updateJob(SysJob job) throws SchedulerException, TaskException;
-
-    /**
-     * 校验cron表达式是否有效
-     *
-     * @param cronExpression 表达式
-     * @return 结果
-     */
-    public boolean checkCronExpressionIsValid(String cronExpression);
-}

master/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java

@@ -1,40 +0,0 @@
-package com.ruoyi.project.monitor.service;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-
-/**
- * 系统访问日志情况信息 服务层
- *
- * @author ruoyi
- */
-public interface ISysLogininforService
-{
-    /**
-     * 新增系统登录日志
-     *
-     * @param logininfor 访问日志对象
-     */
-    public void insertLogininfor(SysLogininfor logininfor);
-
-    /**
-     * 查询系统登录日志集合
-     *
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
-
-    /**
-     * 批量删除系统登录日志
-     *
-     * @param infoIds 需要删除的登录日志ID
-     * @return
-     */
-    public int deleteLogininforByIds(Long[] infoIds);
-
-    /**
-     * 清空系统登录日志
-     */
-    public void cleanLogininfor();
-}

master/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java

@@ -1,48 +0,0 @@
-package com.ruoyi.project.monitor.service;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-
-/**
- * 操作日志 服务层
- *
- * @author ruoyi
- */
-public interface ISysOperLogService
-{
-    /**
-     * 新增操作日志
-     *
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
-
-    /**
-     * 查询系统操作日志集合
-     *
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     *
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     *
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
-}

master/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java

@@ -1,87 +0,0 @@
-package com.ruoyi.project.monitor.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.mapper.SysJobLogMapper;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
-
-/**
- * 定时任务调度日志信息 服务层
- *
- * @author ruoyi
- */
-@Service
-public class SysJobLogServiceImpl implements ISysJobLogService
-{
-    @Autowired
-    private SysJobLogMapper jobLogMapper;
-
-    /**
-     * 获取quartz调度器日志的计划任务
-     *
-     * @param jobLog 调度日志信息
-     * @return 调度任务日志集合
-     */
-    @Override
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
-    {
-        return jobLogMapper.selectJobLogList(jobLog);
-    }
-
-    /**
-     * 通过调度任务日志ID查询调度信息
-     *
-     * @param jobLogId 调度任务日志ID
-     * @return 调度任务日志对象信息
-     */
-    @Override
-    public SysJobLog selectJobLogById(Long jobLogId)
-    {
-        return jobLogMapper.selectJobLogById(jobLogId);
-    }
-
-    /**
-     * 新增任务日志
-     *
-     * @param jobLog 调度日志信息
-     */
-    @Override
-    public void addJobLog(SysJobLog jobLog)
-    {
-        jobLogMapper.insertJobLog(jobLog);
-    }
-
-    /**
-     * 批量删除调度日志信息
-     *
-     * @param logIds 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteJobLogByIds(Long[] logIds)
-    {
-        return jobLogMapper.deleteJobLogByIds(logIds);
-    }
-
-    /**
-     * 删除任务日志
-     *
-     * @param jobId 调度日志ID
-     */
-    @Override
-    public int deleteJobLogById(Long jobId)
-    {
-        return jobLogMapper.deleteJobLogById(jobId);
-    }
-
-    /**
-     * 清空任务日志
-     */
-    @Override
-    public void cleanJobLog()
-    {
-        jobLogMapper.cleanJobLog();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java

@@ -1,254 +0,0 @@
-package com.ruoyi.project.monitor.service.impl;
-
-import java.util.List;
-import javax.annotation.PostConstruct;
-import org.quartz.JobDataMap;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.utils.job.CronUtils;
-import com.ruoyi.common.utils.job.ScheduleUtils;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.mapper.SysJobMapper;
-import com.ruoyi.project.monitor.service.ISysJobService;
-
-/**
- * 定时任务调度信息 服务层
- *
- * @author ruoyi
- */
-@Service
-public class SysJobServiceImpl implements ISysJobService
-{
-    @Autowired
-    private Scheduler scheduler;
-
-    @Autowired
-    private SysJobMapper jobMapper;
-
-    /**
-     * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
-     */
-    @PostConstruct
-    public void init() throws SchedulerException, TaskException
-    {
-        scheduler.clear();
-        List<SysJob> jobList = jobMapper.selectJobAll();
-        for (SysJob job : jobList)
-        {
-            ScheduleUtils.createScheduleJob(scheduler, job);
-        }
-    }
-
-    /**
-     * 获取quartz调度器的计划任务列表
-     *
-     * @param job 调度信息
-     * @return
-     */
-    @Override
-    public List<SysJob> selectJobList(SysJob job)
-    {
-        return jobMapper.selectJobList(job);
-    }
-
-    /**
-     * 通过调度任务ID查询调度信息
-     *
-     * @param jobId 调度任务ID
-     * @return 调度任务对象信息
-     */
-    @Override
-    public SysJob selectJobById(Long jobId)
-    {
-        return jobMapper.selectJobById(jobId);
-    }
-
-    /**
-     * 暂停任务
-     *
-     * @param job 调度信息
-     */
-    @Override
-    @Transactional
-    public int pauseJob(SysJob job) throws SchedulerException
-    {
-        Long jobId = job.getJobId();
-        String jobGroup = job.getJobGroup();
-        job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
-        int rows = jobMapper.updateJob(job);
-        if (rows > 0)
-        {
-            scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
-        }
-        return rows;
-    }
-
-    /**
-     * 恢复任务
-     *
-     * @param job 调度信息
-     */
-    @Override
-    @Transactional
-    public int resumeJob(SysJob job) throws SchedulerException
-    {
-        Long jobId = job.getJobId();
-        String jobGroup = job.getJobGroup();
-        job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
-        int rows = jobMapper.updateJob(job);
-        if (rows > 0)
-        {
-            scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
-        }
-        return rows;
-    }
-
-    /**
-     * 删除任务后，所对应的trigger也将被删除
-     *
-     * @param job 调度信息
-     */
-    @Override
-    @Transactional
-    public int deleteJob(SysJob job) throws SchedulerException
-    {
-        Long jobId = job.getJobId();
-        String jobGroup = job.getJobGroup();
-        int rows = jobMapper.deleteJobById(jobId);
-        if (rows > 0)
-        {
-            scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
-        }
-        return rows;
-    }
-
-    /**
-     * 批量删除调度信息
-     *
-     * @param jobIds 需要删除的任务ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public void deleteJobByIds(Long[] jobIds) throws SchedulerException
-    {
-        for (Long jobId : jobIds)
-        {
-            SysJob job = jobMapper.selectJobById(jobId);
-            deleteJob(job);
-        }
-    }
-
-    /**
-     * 任务调度状态修改
-     *
-     * @param job 调度信息
-     */
-    @Override
-    @Transactional
-    public int changeStatus(SysJob job) throws SchedulerException
-    {
-        int rows = 0;
-        String status = job.getStatus();
-        if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
-        {
-            rows = resumeJob(job);
-        }
-        else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
-        {
-            rows = pauseJob(job);
-        }
-        return rows;
-    }
-
-    /**
-     * 立即运行任务
-     *
-     * @param job 调度信息
-     */
-    @Override
-    @Transactional
-    public void run(SysJob job) throws SchedulerException
-    {
-        Long jobId = job.getJobId();
-        String jobGroup = job.getJobGroup();
-        SysJob properties = selectJobById(job.getJobId());
-        // 参数
-        JobDataMap dataMap = new JobDataMap();
-        dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
-        scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap);
-    }
-
-    /**
-     * 新增任务
-     *
-     * @param job 调度信息 调度信息
-     */
-    @Override
-    @Transactional
-    public int insertJob(SysJob job) throws SchedulerException, TaskException
-    {
-        job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
-        int rows = jobMapper.insertJob(job);
-        if (rows > 0)
-        {
-            ScheduleUtils.createScheduleJob(scheduler, job);
-        }
-        return rows;
-    }
-
-    /**
-     * 更新任务的时间表达式
-     *
-     * @param job 调度信息
-     */
-    @Override
-    @Transactional
-    public int updateJob(SysJob job) throws SchedulerException, TaskException
-    {
-        SysJob properties = selectJobById(job.getJobId());
-        int rows = jobMapper.updateJob(job);
-        if (rows > 0)
-        {
-            updateSchedulerJob(job, properties.getJobGroup());
-        }
-        return rows;
-    }
-
-    /**
-     * 更新任务
-     *
-     * @param job 任务对象
-     * @param jobGroup 任务组名
-     */
-    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
-    {
-        Long jobId = job.getJobId();
-        // 判断是否存在
-        JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
-        if (scheduler.checkExists(jobKey))
-        {
-            // 防止创建时存在数据问题 先移除，然后在执行创建操作
-            scheduler.deleteJob(jobKey);
-        }
-        ScheduleUtils.createScheduleJob(scheduler, job);
-    }
-
-    /**
-     * 校验cron表达式是否有效
-     *
-     * @param cronExpression 表达式
-     * @return 结果
-     */
-    @Override
-    public boolean checkCronExpressionIsValid(String cronExpression)
-    {
-        return CronUtils.isValid(cronExpression);
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java

@@ -1,65 +0,0 @@
-package com.ruoyi.project.monitor.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.mapper.SysLogininforMapper;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
-
-/**
- * 系统访问日志情况信息 服务层处理
- *
- * @author ruoyi
- */
-@Service
-public class SysLogininforServiceImpl implements ISysLogininforService
-{
-
-    @Autowired
-    private SysLogininforMapper logininforMapper;
-
-    /**
-     * 新增系统登录日志
-     *
-     * @param logininfor 访问日志对象
-     */
-    @Override
-    public void insertLogininfor(SysLogininfor logininfor)
-    {
-        logininforMapper.insertLogininfor(logininfor);
-    }
-
-    /**
-     * 查询系统登录日志集合
-     *
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    @Override
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
-    {
-        return logininforMapper.selectLogininforList(logininfor);
-    }
-
-    /**
-     * 批量删除系统登录日志
-     *
-     * @param infoIds 需要删除的登录日志ID
-     * @return
-     */
-    @Override
-    public int deleteLogininforByIds(Long[] infoIds)
-    {
-        return logininforMapper.deleteLogininforByIds(infoIds);
-    }
-
-    /**
-     * 清空系统登录日志
-     */
-    @Override
-    public void cleanLogininfor()
-    {
-        logininforMapper.cleanLogininfor();
-    }
-}

master/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java

@@ -1,76 +0,0 @@
-package com.ruoyi.project.monitor.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.mapper.SysOperLogMapper;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
-
-/**
- * 操作日志 服务层处理
- *
- * @author ruoyi
- */
-@Service
-public class SysOperLogServiceImpl implements ISysOperLogService
-{
-    @Autowired
-    private SysOperLogMapper operLogMapper;
-
-    /**
-     * 新增操作日志
-     *
-     * @param operLog 操作日志对象
-     */
-    @Override
-    public void insertOperlog(SysOperLog operLog)
-    {
-        operLogMapper.insertOperlog(operLog);
-    }
-
-    /**
-     * 查询系统操作日志集合
-     *
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
-    {
-        return operLogMapper.selectOperLogList(operLog);
-    }
-
-    /**
-     * 批量删除系统操作日志
-     *
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    @Override
-    public int deleteOperLogByIds(Long[] operIds)
-    {
-        return operLogMapper.deleteOperLogByIds(operIds);
-    }
-
-    /**
-     * 查询操作日志详细
-     *
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    @Override
-    public SysOperLog selectOperLogById(Long operId)
-    {
-        return operLogMapper.selectOperLogById(operId);
-    }
-
-    /**
-     * 清空操作日志
-     */
-    @Override
-    public void cleanOperLog()
-    {
-        operLogMapper.cleanOperLog();
-    }
-}

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.aspen.mapper.TDashboardelecdataMapper">
+<mapper namespace="com.ruoyi.project.aspen.mapper.TDashboarddayelecMapper">
     
-    <resultMap type="TDashboardelecdata" id="TDashboardelecdataResult">
+    <resultMap type="TDashboarddayelec" id="TDashboarddayelecResult">
         <result property="id"    column="id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
@@ -37,16 +37,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="shihua"    column="shihua"    />
         <result property="shiyou"    column="shiyou"    />
         <result property="shunshiliang"    column="shunshiliang"    />
+        <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="selectTDashboardelecdataVo">
-        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.gtg1_lv, d.gtg1_wr, d.gtg2_lv, d.gtg2_wr, d.gtg3_lv, d.gtg3_wr, d.stg1_lv, d.stg1_wr, d.mwh_lv, d.mwh_wr, d.hhp, d.hp, d.lp, d.mp, d.total_consumption, d.hhp_num, d.hhp_temp, d.hp_num, d.hp_temp, d.lp_num, d.lp_temp, d.mp_num, d.mp_temp, d.shihua, d.shiyou, d.shunshiliang, s.dept_name from t_dashboardelecdata d
+    <sql id="selectTDashboarddayelecVo">
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.gtg1_lv, d.gtg1_wr, d.gtg2_lv, d.gtg2_wr, d.gtg3_lv, d.gtg3_wr, d.stg1_lv, d.stg1_wr, d.mwh_lv, d.mwh_wr, d.hhp, d.hp, d.lp, d.mp, d.total_consumption, d.hhp_num, d.hhp_temp, d.hp_num, d.hp_temp, d.lp_num, d.lp_temp, d.mp_num, d.mp_temp, d.shihua, d.shiyou, d.shunshiliang, 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_dashboarddayelec d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
-    <select id="selectTDashboardelecdataList" parameterType="TDashboardelecdata" resultMap="TDashboardelecdataResult">
-        <include refid="selectTDashboardelecdataVo"/>
+    <select id="selectTDashboarddayelecList" parameterType="TDashboarddayelec" resultMap="TDashboarddayelecResult">
+        <include refid="selectTDashboarddayelecVo"/>
         <where>  
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
             <if test="createdate != null "> and createdate = #{createdate}</if>
@@ -78,26 +86,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shihua != null  and shihua != ''"> and shihua = #{shihua}</if>
             <if test="shiyou != null  and shiyou != ''"> and shiyou = #{shiyou}</if>
             <if test="shunshiliang != null  and shunshiliang != ''"> and shunshiliang = #{shunshiliang}</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="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"/>
+    
+    <select id="selectTDashboarddayelecById" parameterType="Long" resultMap="TDashboarddayelecResult">
+        <include refid="selectTDashboarddayelecVo"/>
         where id = #{id}
     </select>
         
-    <insert id="insertTDashboardelecdata" parameterType="TDashboardelecdata">
+    <insert id="insertTDashboarddayelec" parameterType="TDashboarddayelec">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
-            SELECT seq_t_dashboardelecdata.NEXTVAL as id FROM DUAL
+            SELECT seq_t_dashboarddayelec.NEXTVAL as id FROM DUAL
         </selectKey>
-        insert into t_dashboardelecdata
+        insert into t_dashboarddayelec
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -131,6 +143,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shihua != null">shihua,</if>
             <if test="shiyou != null">shiyou,</if>
             <if test="shunshiliang != null">shunshiliang,</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>
@@ -165,11 +185,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shihua != null">#{shihua},</if>
             <if test="shiyou != null">#{shiyou},</if>
             <if test="shunshiliang != null">#{shunshiliang},</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="updateTDashboardelecdata" parameterType="TDashboardelecdata">
-        update t_dashboardelecdata
+    <update id="updateTDashboarddayelec" parameterType="TDashboarddayelec">
+        update t_dashboarddayelec
         <trim prefix="SET" suffixOverrides=",">
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>
@@ -202,19 +230,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shihua != null">shihua = #{shihua},</if>
             <if test="shiyou != null">shiyou = #{shiyou},</if>
             <if test="shunshiliang != null">shunshiliang = #{shunshiliang},</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="deleteTDashboardelecdataById" parameterType="Long">
-        update t_dashboardelecdata set del_flag = 2 where id = #{id}
+    <update id="deleteTDashboarddayelecById" parameterType="Long">
+        update t_dashboarddayelec set del_flag = 2 where id = #{id}
     </update>
 
-    <update id="deleteTDashboardelecdataByIds" parameterType="String">
-        update t_dashboardelecdata set del_flag = 2 where id in
+    <update id="deleteTDashboarddayelecByIds" parameterType="String">
+        update t_dashboarddayelec set del_flag = 2 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
+
+    <select id="selectLast" parameterType="TDashboarddayelec" resultMap="TDashboarddayelecResult">
+        select * from ( select * from t_dashboarddayelec where del_flag = 0 order by id desc ) WHERE ROWNUM = 1
+    </select>
+
+    <select id="selectMonth" parameterType="TDashboarddayelec" resultMap="TDashboarddayelecResult">
+        select * from ( select * from t_dashboarddayelec where del_flag = 0 order by id asc ) WHERE 32 > ROWNUM
+    </select>
     
 </mapper>

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

@@ -2,7 +2,7 @@
 <!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">
+<mapper namespace="com.ruoyi.project.aspen.mapper.TDashboarddayeleceightMapper">
     
     <resultMap type="TDashboarddayeleceight" id="TDashboarddayeleceightResult">
         <result property="id"    column="id"    />
@@ -11,19 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="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="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
+        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_dashboarddayeleceight d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -34,12 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="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
@@ -65,12 +61,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="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>
@@ -81,12 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="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>
@@ -100,12 +92,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="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>

ui/src/api/aspen/dashboarddayelec.js

@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 查询电厂大屏每日0：00抓取数据列表
+export function listDashboarddayelec(query) {
+  return request({
+    url: '/his/dashboarddayelec/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电厂大屏每日0：00抓取数据详细
+export function getDashboarddayelec(id) {
+  return request({
+    url: '/his/dashboarddayelec/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电厂大屏每日0：00抓取数据
+export function addDashboarddayelec(data) {
+  return request({
+    url: '/his/dashboarddayelec',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电厂大屏每日0：00抓取数据
+export function updateDashboarddayelec(data) {
+  return request({
+    url: '/his/dashboarddayelec',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电厂大屏每日0：00抓取数据
+export function delDashboarddayelec(id) {
+  return request({
+    url: '/his/dashboarddayelec/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出电厂大屏每日0：00抓取数据
+export function exportDashboarddayelec(query) {
+  return request({
+    url: '/his/dashboarddayelec/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询最后一条dashboarddayelec抓取数据
+export function selectLast(query) {
+  return request({
+    url: '/aspen/dashboarddayelec/selectLast',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询月度dashboarddayelec抓取数据
+export function selectMonth(query) {
+  return request({
+    url: '/aspen/dashboarddayelec/month',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/aspen/dashboarddayeleceight.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询电厂大屏每日8：00抓取数据列表
+export function listDashboarddayeleceight(query) {
+  return request({
+    url: '/his/dashboarddayeleceight/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电厂大屏每日8：00抓取数据详细
+export function getDashboarddayeleceight(id) {
+  return request({
+    url: '/his/dashboarddayeleceight/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电厂大屏每日8：00抓取数据
+export function addDashboarddayeleceight(data) {
+  return request({
+    url: '/his/dashboarddayeleceight',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电厂大屏每日8：00抓取数据
+export function updateDashboarddayeleceight(data) {
+  return request({
+    url: '/his/dashboarddayeleceight',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电厂大屏每日8：00抓取数据
+export function delDashboarddayeleceight(id) {
+  return request({
+    url: '/his/dashboarddayeleceight/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出电厂大屏每日8：00抓取数据
+export function exportDashboarddayeleceight(query) {
+  return request({
+    url: '/his/dashboarddayeleceight/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -65,7 +65,6 @@
 
 <script>
 import centerChart from "./echart/center/centerChartRate";
-import {addDashboardelecdata} from "@/api/aspen/dashboardelecdata";
 
 export default {
   props: ['dashboardelecdata'],

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

@@ -157,8 +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,selectMonth} from "@/api/aspen/dashboardelecdata";
-
+import {selectLast,selectMonth} from "@/api/aspen/dashboarddayelec";
 export default {
   data() {
     return {
@@ -176,6 +175,12 @@ export default {
       wh:"3.25rem",
       tAlign:"left",
       dashboardelecdata: {
+        pageNum: 1,
+        pageSize: 20,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
         gtg1Lv: null,
         gtg1Wr: null,
         gtg2Lv: null,
@@ -202,8 +207,22 @@ export default {
         shihua: null,
         shiyou: null,
         shunshiliang: null,
+        ypg: null,
+        daodianliang: null,
+        eveLec: null,
+        fenggucha: null,
+        bycElec: null,
+        bocElec: null,
+        dataDate: null,
+        dateDay: null
       },
       monthData:{
+        pageNum: 1,
+        pageSize: 20,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
         gtg1Lv: null,
         gtg1Wr: null,
         gtg2Lv: null,
@@ -230,6 +249,14 @@ export default {
         shihua: null,
         shiyou: null,
         shunshiliang: null,
+        ypg: null,
+        daodianliang: null,
+        eveLec: null,
+        fenggucha: null,
+        bycElec: null,
+        bocElec: null,
+        dataDate: null,
+        dateDay: null
       }
     };
   },
@@ -272,7 +299,7 @@ export default {
     }, 20000)
   },
   methods: {
-    /** 查询dashboardelec抓取数据列表 */
+    /** 查询dashboarddayelec抓取数据列表 */
     getList1()
     {
       selectLast(this.queryParams).then(response => {