能源管理

src/main/java/cn/com/energy/controller/EnergyApiController.java

@@ -1,11 +1,9 @@
 package cn.com.energy.controller;
 
-import cn.com.energy.model.SysOperLog;
-import cn.com.energy.service.ISysOperLogService;
+import cn.com.energy.model.DvMachineryData;
+import cn.com.energy.service.IDvMachineryDataService;
 import cn.com.v2.common.base.BaseController;
 import cn.com.v2.common.domain.AjaxResult;
-import cn.com.v2.common.interceptor.DS;
-import cn.com.v2.util.DataSourceUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -15,13 +13,13 @@ import java.util.List;
 @RequestMapping("/api/energy")
 public class EnergyApiController extends BaseController {
 	@Autowired
-	private ISysOperLogService iSysOperLogService;
+	private IDvMachineryDataService iDvMachineryDataService;
 
 	@ApiOperation(value = "获取数据", notes = "获取数据")
 	@GetMapping("/getEnergyData")
 	@ResponseBody
 	public AjaxResult getEnergyData() {
-		List<SysOperLog> sysOperLogList = iSysOperLogService.selectOperLogList(new SysOperLog());
-		return success().put("data", sysOperLogList);
+		List<DvMachineryData> dvMachineryData = iDvMachineryDataService.list();
+		return success().put("data", dvMachineryData);
 	}
 }

src/main/java/cn/com/energy/mapper/DvMachineryDataMapper.java

@@ -0,0 +1,14 @@
+package cn.com.energy.mapper;
+
+import cn.com.energy.model.DvMachineryData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 操作日志 数据层
+ * 
+ * @author ruoyi
+ */
+public interface DvMachineryDataMapper extends BaseMapper<DvMachineryData>
+{
+
+}

src/main/java/cn/com/energy/model/DvMachineryData.java

@@ -0,0 +1,36 @@
+package cn.com.energy.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 操作日志记录表 oper_log
+ * 
+ * @author ruoyi
+ */
+@TableName("dv_machinery_data")
+@Data
+public class DvMachineryData implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long dataId;
+    private String machineryCode;
+    private String machineryName;
+    private String runData;
+    private String parserData;
+    private String attr1;
+    private String attr2;
+    private String attr3;
+    private String remark;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

src/main/java/cn/com/energy/service/IDvMachineryDataService.java

@@ -0,0 +1,17 @@
+package cn.com.energy.service;
+
+import cn.com.energy.model.DvMachineryData;
+import cn.com.energy.model.SysOperLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 操作日志 服务层
+ * 
+ * @author ruoyi
+ */
+public interface IDvMachineryDataService extends IService<DvMachineryData>
+{
+
+}

src/main/java/cn/com/energy/service/impl/DvMachineryDataServiceImpl.java

@@ -0,0 +1,21 @@
+package cn.com.energy.service.impl;
+
+import cn.com.energy.mapper.DvMachineryDataMapper;
+import cn.com.energy.model.DvMachineryData;
+import cn.com.energy.service.IDvMachineryDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 操作日志 服务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class DvMachineryDataServiceImpl extends ServiceImpl<DvMachineryDataMapper, DvMachineryData> implements IDvMachineryDataService
+{
+    @Autowired
+    private DvMachineryDataMapper dvMachineryDataMapper;
+
+}

src/main/resources/mapper/energy/DvMachineryData.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.energy.mapper.DvMachineryDataMapper">
+
+	<resultMap type="DvMachineryData" id="DvMachineryDataResult">
+		<id     property="dataId"         column="data_id"        />
+		<result property="machineryCode"          column="machinery_code"          />
+		<result property="machineryName"   column="machinery_name"  />
+		<result property="runData"         column="run_data"         />
+		<result property="parserData"  column="parser_data" />
+		<result property="attr1"   column="attr1"  />
+		<result property="attr2"       column="attr2"      />
+		<result property="attr3"       column="attr3"      />
+		<result property="remark"        column="remark"       />
+		<result property="createTime"       column="create_time"      />
+	</resultMap>
+
+	<sql id="selectDvMachineryData">
+        select data_id, machinery_code, machinery_name, run_data, parser_data, attr1, attr2, attr3, oper_url, remark, create_time from dv_machinery_data
+    </sql>
+
+</mapper>