增加获取实时数据的功能

module_ems/src/main/java/org/jeecg/modules/cronJob/GenerateDataJob.java

@@ -42,7 +42,7 @@ public class GenerateDataJob  {
     @Autowired
     private IDataVoltageService voltageService; //设备实时电压service
 
-//    @Scheduled(cron = "0 * * * * ?")
+    @Scheduled(cron = "0 * * * * ?")
     public void execute() throws JobExecutionException {
         // 电流值范围：20-50、电压值范围：350-450、需量：400-1500、用电量、0-1.5
         // tagtype:4需量、5电流、6电压、7电量

module_tpm/src/main/java/org/jeecg/modules/Statistics/controller/StatisticsController.java

@@ -1,13 +1,27 @@
 package org.jeecg.modules.Statistics.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.Statistics.entity.Statistics;
 import org.jeecg.modules.Statistics.service.IStatisticsService;
+import org.jeecg.modules.equipmentOnoffSection.entity.EquipmentOnoffSection;
+import org.jeecg.modules.tpmTag.entity.TpmTag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * @Description: 统计报表
  * @Author: jeecg-boot
@@ -19,4 +33,93 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/equipmentStatistics/equipmentStatistics")
 @Slf4j
 public class StatisticsController extends JeecgController<Statistics, IStatisticsService> {
+
+    @Autowired
+    private IStatisticsService statisticsService;
+
+    /**
+     * 获取某设备实时数据-列表(按日期)
+     *
+     * @param statistics
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value="获取某设备实时数据-分页列表查询(按日期)", notes="获取某设备实时数据-分页列表查询(按日期)")
+    @GetMapping(value = "/listday")
+    public Result<IPage<Statistics>> listDay(Statistics statistics,
+                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                             HttpServletRequest req) {
+        Page<Statistics> page = new Page<Statistics>(pageNo, pageSize);
+        java.util.Map<java.lang.String,java.lang.String[]> params = req.getParameterMap();
+        IPage<Statistics> pageList = statisticsService.selectRunDataList(page, statistics.getEquipmentid(),
+                statistics.getTagtype(), statistics.getDay());
+
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 获取某设备实时数据-列表(按日期段)
+     *
+     * @param statistics
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value="获取某设备实时数据-分页列表查询(按日期段)", notes="获取某设备实时数据-分页列表查询(按日期段)")
+    @GetMapping(value = "/listdaysection")
+    public Result<IPage<Statistics>> listDaySection(Statistics statistics,
+                                                    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Page<Statistics> page = new Page<Statistics>(pageNo, pageSize);
+        IPage<Statistics> pageList = statisticsService.selectRunDataList(page, statistics.getEquipmentid(),
+                statistics.getTagtype(), statistics.getBegindtime(), statistics.getEndtime());
+
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 获取某设备实时数据(按日期)
+     *
+     * @param statistics
+     * @param req
+     * @return
+     */
+    @ApiOperation(value="获取某设备实时数据(按日期)", notes="获取某设备实时数据(按日期)")
+    @GetMapping(value = "/listdayinfo")
+    public Result listDayinfo(Statistics statistics, HttpServletRequest req) {
+        TpmTag tpmTag = new TpmTag();
+        tpmTag.setEquipmentid(statistics.getEquipmentid());
+        tpmTag.setTagtype(statistics.getTagtype());
+        QueryWrapper<TpmTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmTag, req.getParameterMap());
+        Map map = statisticsService.selectRunDataInfo(statistics.getEquipmentid(), statistics.getTagtype(),
+                statistics.getDay(), queryWrapper);
+
+        return Result.OK(map);
+    }
+
+    /**
+     * 获取某设备实时数据(按日期)
+     *
+     * @param statistics
+     * @param req
+     * @return
+     */
+    @ApiOperation(value="获取某设备实时数据(按日期)", notes="获取某设备实时数据(按日期)")
+    @GetMapping(value = "/listdayinfosection")
+    public Result listDayInfoSection(Statistics statistics, HttpServletRequest req) {
+        TpmTag tpmTag = new TpmTag();
+        tpmTag.setEquipmentid(statistics.getEquipmentid());
+        tpmTag.setTagtype(statistics.getTagtype());
+        QueryWrapper<TpmTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmTag, req.getParameterMap());
+        Map map = statisticsService.selectRunDataInfo(statistics.getEquipmentid(), statistics.getTagtype(),
+                statistics.getBegindtime(), statistics.getEndtime(), queryWrapper);
+
+        return Result.OK(map);
+    }
+
 }

module_tpm/src/main/java/org/jeecg/modules/Statistics/entity/Statistics.java

@@ -37,4 +37,12 @@ public class Statistics implements Serializable {
     private java.lang.Integer week;
     /**周几*/
     private java.lang.Integer dayofweek;
+
+
+    /**点位类型*/
+    private java.lang.String tagtype;
+    /**开始时间*/
+    private java.lang.String begindtime;
+    /**结束时间*/
+    private java.lang.String endtime;
 }

module_tpm/src/main/java/org/jeecg/modules/Statistics/mapper/StatisticsMapper.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.Statistics.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.Statistics.entity.Statistics;
 
@@ -10,120 +12,57 @@ public interface StatisticsMapper extends BaseMapper<Statistics> {
 
 
     /**
-     * 依据设备ID和日期查询 温度
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectTemperature(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 湿度
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectHumidity(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 需量
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
+     * 依据设备ID和日期查询 实时数据-翻页(日期段)
+     * @param page
+     * @param tablename 设备数据表名
+     * @param equipmentid 设备id
+     * @param begintime 开始日期
+     * @param endtime 结束日期
+     * @return
      */
-    public List<Statistics> selectDemand(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
+    public IPage<Statistics> selectDataPagesBySectionDay(Page<Statistics> page,
+                                                         @Param("tablename") String tablename,
+                                                         @Param("equipmentid") String equipmentid,
+                                                         @Param("begintime") String begintime,
+                                                         @Param("endtime") String endtime);
 
     /**
-     * 依据设备ID和日期查询 电流
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectCurrent(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 电压
-     *
-     * @param equipmentid 设备ID
+     * 依据设备ID和日期查询 实时数据-翻页(日期)
+     * @param page
+     * @param tablename 设备数据表名
+     * @param equipmentid 设备id
      * @param day 日期
-     * @return 分析统计
+     * @return
      */
-    public List<Statistics> selectVoltage(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
+    public IPage<Statistics> selectDataPagesByDay(Page<Statistics> page,
+                                                  @Param("tablename") String tablename,
+                                                  @Param("equipmentid") String equipmentid,
+                                                  @Param("day") String day);
 
     /**
-     * 依据设备ID和日期查询 电量
+     * 依据设备ID和日期查询 设备运行数据-所有(日期段)
      *
+     * @param tablename 设备数据表名
      * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectElectricity(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 功率
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectPower(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 故障状态
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectFault(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 转速
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectSpeed(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 真空度
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectVacuum(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 压力
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
-     * @return 分析统计
-     */
-    public List<Statistics> selectPressure(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
-
-    /**
-     * 依据设备ID和日期查询 流量
-     *
-     * @param equipmentid 设备ID
-     * @param day 日期
+     * @param begintime 开始日期
+     * @param endtime 结束日期
      * @return 分析统计
      */
-    public List<Statistics> selectFlow(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
+    public List<Statistics> selectDataListBySectionDay(@Param("tablename") String tablename,
+                                                        @Param("equipmentid") String equipmentid,
+                                                        @Param("begintime") String begintime,
+                                                        @Param("endtime") String endtime);
 
     /**
-     * 依据设备ID和日期查询 PH计
+     * 依据设备ID和日期查询 设备运行数据-所有(日期)
      *
+     * @param tablename 设备数据表名
      * @param equipmentid 设备ID
      * @param day 日期
      * @return 分析统计
      */
-    public List<Statistics> selectPh(@Param("equipmentid") String equipmentid, @Param("beginTime") String day);
+    public List<Statistics> selectDataListByDay(@Param("tablename") String tablename,
+                                                @Param("equipmentid") String equipmentid,
+                                                @Param("day") String day);
 
 }

module_tpm/src/main/java/org/jeecg/modules/Statistics/mapper/xml/StatisticsMapper.xml

@@ -1,6 +1,6 @@
 <?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="org.jeecg.modules.equipmentStatus.mapper.EquipmentStatusMapper">
+<mapper namespace="org.jeecg.modules.Statistics.mapper.StatisticsMapper">
 
     <resultMap type="org.jeecg.modules.Statistics.entity.Statistics" id="StatisticsResult">
         <result property="id"    column="id"    />
@@ -20,46 +20,36 @@
         <result property="dayofweek"    column="dayofweek"    />
     </resultMap>
 
-    <!--依据设备ID和日期查询电流-->
-    <select id="selectCurrent" resultMap="StatisticsResult">
+    <!--依据设备ID和日期查询 实时数据-翻页(日期段)-->
+    <select id="selectDataPagesBySectionDay" resultMap="StatisticsResult">
         select *
-        from ems_data_current
-        where equipmentid= #{equipmentid} and day = #{day}
-    </select>
-
-    <!--依据设备ID和日期查询需量-->
-    <select id="selectDemand" resultMap="StatisticsResult">
-        select *
-        from ems_data_demand
-        where equipmentid= #{equipmentid} and day = #{day}
+        from ${tablename}
+        where equipmentid= #{equipmentid} and day &gt;= #{begintime} and day &lt;= #{endtime}
+        order by id asc
     </select>
 
-    <!--依据设备ID和日期查询电量-->
-    <select id="selectElectricity" resultMap="StatisticsResult">
+    <!--依据设备ID和日期查询 设备运行数据-所有(日期)-->
+    <select id="selectDataPagesByDay" resultMap="StatisticsResult">
         select *
-        from ems_data_electricity
+        from ${tablename}
         where equipmentid= #{equipmentid} and day = #{day}
+        order by id asc
     </select>
 
-    <!--依据设备ID和日期查询功率-->
-    <select id="selectPower" resultMap="StatisticsResult">
+    <!--依据设备ID和日期查询 实时数据-翻页(日期段)-->
+    <select id="selectDataListBySectionDay" resultMap="StatisticsResult">
         select *
-        from ems_data_power
-        where equipmentid= #{equipmentid} and day = #{day}
-    </select>
-
-    <!--依据设备ID和日期查询电压-->
-    <select id="selectVoltage" resultMap="StatisticsResult">
-        select *
-        from ems_data_voltage
-        where equipmentid= #{equipmentid} and day = #{day}
+        from ${tablename}
+        where equipmentid= #{equipmentid} and day &gt;= #{begintime} and day &lt;= #{endtime}
+        order by id asc
     </select>
 
-    <!--依据设备ID和日期查询温湿度-->
-    <select id="selectEnvironment" resultMap="StatisticsResult">
+    <!--依据设备ID和日期查询 设备运行数据-所有(日期)-->
+    <select id="selectDataListByDay" resultMap="StatisticsResult">
         select *
-        from hsms_environment
+        from ${tablename}
         where equipmentid= #{equipmentid} and day = #{day}
+        order by id asc
     </select>
 
 </mapper>

module_tpm/src/main/java/org/jeecg/modules/Statistics/service/IStatisticsService.java

@@ -1,20 +1,63 @@
 package org.jeecg.modules.Statistics.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.Statistics.entity.Statistics;
+import org.jeecg.modules.equipmentOnoffSection.entity.EquipmentOnoffSection;
+import org.jeecg.modules.tpmTag.entity.TpmTag;
 
 import java.util.List;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 public interface IStatisticsService extends IService<Statistics> {
 
     /**
-     * 依据设备ID和日期查询电流
+     * 依据设备ID和日期查询 实时数据(日期)
      *
      * @param equipmentid 设备ID
+     * @param tagtype 点位类型
      * @param day 日期
+     * @param queryWrapper 查询参数
      * @return 分析统计
      */
-    public Result getRunInfo(String equipmentid, String day, String tagType);
+    public Map selectRunDataInfo(String equipmentid, String tagtype, String day, QueryWrapper<TpmTag> queryWrapper);
+
+    /**
+     * 依据设备ID和日期查询 实时数据(日期段)
+     *
+     * @param equipmentid 设备ID
+     * @param tagtype 点位类型
+     * @param begintime 开始日期
+     * @param endtime 结束日期
+     * @param queryWrapper 查询参数
+     * @return 分析统计
+     */
+    public Map selectRunDataInfo(String equipmentid, String tagtype, String begintime, String endtime, QueryWrapper<TpmTag> queryWrapper);
+
+    /**
+     * 依据设备ID和日期查询 实时数据-列表(日期)
+     * @param page
+     * @param equipmentid 设备id
+     * @param tagtype 点位类型
+     * @param day 日期
+     * @return
+     */
+    public IPage<Statistics> selectRunDataList(Page<Statistics> page, String equipmentid,
+                                           String tagtype, String day);
+
+    /**
+     * 依据设备ID和日期查询 实时数据-列表(日期段)
+     * @param page
+     * @param equipmentid 设备id
+     * @param tagtype 点位类型
+     * @param begintime 开始日期
+     * @param endtime 结束日期
+     * @return
+     */
+    public IPage<Statistics> selectRunDataList(Page<Statistics> page, String equipmentid,
+                                           String tagtype, String begintime, String endtime);
 
 }

module_tpm/src/main/java/org/jeecg/modules/Statistics/service/impl/StatisticsServiceImpl.java

@@ -1,20 +1,25 @@
 package org.jeecg.modules.Statistics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.Statistics.entity.Statistics;
 import org.jeecg.modules.Statistics.mapper.StatisticsMapper;
 import org.jeecg.modules.Statistics.service.IStatisticsService;
+import org.jeecg.modules.common.TableNameConstants;
+import org.jeecg.modules.common.TagTypeConstants;
 import org.jeecg.modules.tpmTag.entity.TpmTag;
 import org.jeecg.modules.tpmTag.mapper.TpmTagMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.jeecg.modules.Statistics.entity.Statistics;
-import org.jeecg.common.api.vo.Result;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class StatisticsServiceImpl extends ServiceImpl<StatisticsMapper, Statistics> implements IStatisticsService {
@@ -26,61 +31,172 @@ public class StatisticsServiceImpl extends ServiceImpl<StatisticsMapper, Statist
     private TpmTagMapper tagMapper;
 
     /**
-     * 获取某设备运行信息
+     * 依据设备ID和日期查询 实时数据-列表(日期)
+     * @param page
+     * @param equipmentid 设备id
+     * @param tagtype 点位类型
+     * @param day 日期
+     * @return
+     */
+    @Override
+    public IPage<Statistics> selectRunDataList(Page<Statistics> page, String equipmentid, String tagtype, String day) {
+        String tablename = getTableName(tagtype);
+        return statisticsMapper.selectDataPagesByDay(page, tablename, equipmentid, day);
+    }
+
+    /**
+     * 依据设备ID和日期查询 实时数据-列表 实时数据(日期段)
+     * @param page
+     * @param equipmentid 设备id
+     * @param tagtype 点位类型
+     * @param begintime 开始日期
+     * @param endtime 结束日期
+     * @return
+     */
+    @Override
+    public IPage<Statistics> selectRunDataList(Page<Statistics> page, String equipmentid, String tagtype,
+                                           String begintime, String endtime) {
+        String tablename = getTableName(tagtype);
+        return statisticsMapper.selectDataPagesBySectionDay(page, tablename, equipmentid, begintime, endtime);
+    }
+
+    /**
+     * 获取某设备实时数据(日期)
      * @param equipmentid 设备ID
+     * @param tagtype 点位类型
      * @param day 日期
+     * @param queryWrapper 查询参数
+     * @return
+     */
+    @Override
+    public Map selectRunDataInfo(String equipmentid, String tagtype, String day, QueryWrapper<TpmTag> queryWrapper) {
+        // 获取某种点位类型的点位信息
+        List<TpmTag> tags = tagMapper.selectList(queryWrapper);
+        Map rtn = new HashMap();
+        rtn.put("tag", tags);
+
+        // 获取设备下点位的实时数据
+        List<Statistics> statistics = null;
+        if (tagtype != null && !"".equals(tagtype)) {
+            String tablename = getTableName(tagtype);
+            statistics = statisticsMapper.selectDataListByDay(tablename, equipmentid, day);
+        }
+
+        // 依据点位名称，生成各点位的实时数据
+        List<Object> list = new ArrayList<>();
+        if (tags != null && tags.size() > 0) {
+            for (TpmTag tag : tags) {
+                list.add(statistics.stream().filter(item -> item.getTagid().equals(tag.getId())).collect(Collectors.toList()));
+            }
+        }
+        rtn.put("list", list);
+
+        return rtn;
+    }
+
+    /**
+     * 获取某设备实时数据 实时数据(日期段)
+     * @param equipmentid 设备ID
      * @param tagtype 点位类型
+     * @param begintime 开始日期
+     * @param endtime 结束日期
+     * @param queryWrapper 查询参数
      * @return
      */
     @Override
-    public Result getRunInfo(String equipmentid, String day, String tagtype) {
+    public Map selectRunDataInfo(String equipmentid, String tagtype, String begintime,
+                                 String endtime, QueryWrapper<TpmTag> queryWrapper) {
         // 获取某种点位类型的点位信息
-        TpmTag tpmTag = new TpmTag();
-        tpmTag.setEquipmentid(equipmentid);
-        QueryWrapper<TpmTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmTag, null);
         List<TpmTag> tags = tagMapper.selectList(queryWrapper);
+        Map rtn = new HashMap();
+        rtn.put("tag", tags);
 
         // 获取设备下点位的实时数据
         List<Statistics> statistics = null;
         if (tagtype != null && !"".equals(tagtype)) {
+            String tablename = getTableName(tagtype);
+
+            statistics = statisticsMapper.selectDataListBySectionDay(tablename, equipmentid, begintime, endtime);
+        }
+
+        // 依据点位名称，生成各点位的实时数据
+        List<Object> list = new ArrayList<>();
+        if (tags != null && tags.size() > 0) {
+            for (TpmTag tag : tags) {
+                list.add(statistics.stream().filter(item -> item.getTagid().equals(tag.getId())).collect(Collectors.toList()));
+            }
+        }
+        rtn.put("list", list);
+
+        return rtn;
+    }
+
+    /**
+     * 获取表名
+     * @param tagtype 点位类型
+     * @return
+     */
+    private String getTableName(String tagtype) {
+        String tablename = "";
+
+        if (tagtype != null && !"".equals(tagtype)) {
             switch (tagtype) {
-                case "temp": // 温度
-                    statistics = statisticsMapper.selectTemperature(equipmentid, day);
+                case TagTypeConstants.TEMPERATURE: // 温度 0
+                    tablename = TableNameConstants.TEMPERATURE;
+                    break;
+                case TagTypeConstants.HUMIDITY: // 湿度 1
+                    tablename = TableNameConstants.HUMIDITY;
                     break;
-                case "humi": // 湿度
-                    statistics = statisticsMapper.selectHumidity(equipmentid, day);
+                case TagTypeConstants.NOISE: // 噪声 2
+//                    tablename = TableNameConstants.NOISE;
                     break;
-                case "curr": // 电流
-                    statistics = statisticsMapper.selectCurrent(equipmentid, day);
+                case TagTypeConstants.OXYGEN: // 氧浓度 3
+//                    tablename = TableNameConstants.OXYGEN;
                     break;
-                case "volt": // 电压
-                    statistics = statisticsMapper.selectVoltage(equipmentid, day);
+                case TagTypeConstants.DEMAND: // 需量 4
+                    tablename = TableNameConstants.DEMAND;
                     break;
-                case "power": // 功率
-                    statistics = statisticsMapper.selectPower(equipmentid, day);
+                case TagTypeConstants.CURRENT: // 电流 5
+                    tablename = TableNameConstants.CURRENT;
                     break;
-                case "speed": // 转速
-//                    statistics = statisticsMapper.selectCurrent(equipmentid, day);
+                case TagTypeConstants.VOLTAGE: // 电压 6
+                    tablename = TableNameConstants.VOLTAGE;
                     break;
-                case "vacu": // 真空度
-//                    statistics = statisticsMapper.selectCurrent(equipmentid, day);
+                case TagTypeConstants.ELECTRICITY: // 电量 7
+                    tablename = TableNameConstants.ELECTRICITY;
                     break;
-                case "pres": // 压力
-//                    statistics = statisticsMapper.selectCurrent(equipmentid, day);
+                case TagTypeConstants.POWER: // 功率 9
+                    tablename = TableNameConstants.POWER;
                     break;
-                case "flow": // 流量
-//                    statistics = statisticsMapper.selectCurrent(equipmentid, day);
+                case TagTypeConstants.COMMUNICATE: // 通讯状态 8
+//                    tablename = TableNameConstants.COMMUNICATE;
                     break;
-                case "ph": // PH计
-//                    statistics = statisticsMapper.selectCurrent(equipmentid, day);
+                case TagTypeConstants.FAULT: // 故障状态 9
+                    tablename = TableNameConstants.FAULT;
+                    break;
+                case TagTypeConstants.SPEED: // 转速 11
+                    tablename = TableNameConstants.SPEED;
+                    break;
+                case TagTypeConstants.VACUUM: // 真空度 12
+                    tablename = TableNameConstants.VACUUM;
+                    break;
+                case TagTypeConstants.PRESSURE: // 压力 13
+                    tablename = TableNameConstants.PRESSURE;
+                    break;
+                case TagTypeConstants.FLOW: // 流量 14
+                    tablename = TableNameConstants.FLOW;
+                    break;
+                case TagTypeConstants.PH: // PH计 15
+                    tablename = TableNameConstants.PH;
+                    break;
+                case TagTypeConstants.OTHER: // 其它 100
+//                    tablename = TableNameConstants.OTHER;
                     break;
                 default:
                     break;
             }
         }
 
-        Result result = null;
-
-        return result;
+        return tablename;
     }
 }

module_tpm/src/main/java/org/jeecg/modules/common/TableNameConstants.java

@@ -0,0 +1,89 @@
+package org.jeecg.modules.common;
+
+public class TableNameConstants {
+
+    /**
+     * 温度
+     */
+    public static final String TEMPERATURE = "tpm_data_temperature";
+
+    /**
+     * 湿度
+     */
+    public final static String HUMIDITY = "tpm_data_humidity";
+
+    /**
+     * 噪声
+     */
+    public final static String NOISE = "tpm_data_noise";
+
+    /**
+     * 氧浓度
+     */
+    public final static String OXYGEN = "tpm_data_oxygen";
+
+    /**
+     * 需量
+     */
+    public final static String DEMAND = "ems_data_demand";
+
+    /**
+     * 电流
+     */
+    public final static String CURRENT = "ems_data_current";
+
+    /**
+     * 电压
+     */
+    public final static String VOLTAGE = "ems_data_voltage";
+
+    /**
+     * 电量
+     */
+    public final static String ELECTRICITY = "ems_data_electricity";
+
+    /**
+     * 功率
+     */
+    public final static String POWER = "ems_data_power";
+
+    /**
+     * 通讯状态
+     */
+    public final static String COMMUNICATE = "tpm_data_communicate";
+
+    /**
+     * 故障状态
+     */
+    public final static String FAULT = "tpm_data_fault";
+
+    /**
+     * 转速
+     */
+    public final static String SPEED = "tpm_data_speed";
+
+    /**
+     * 真空度
+     */
+    public final static String VACUUM = "tpm_data_vacuum";
+
+    /**
+     * 压力
+     */
+    public final static String PRESSURE = "tpm_data_pressure";
+
+    /**
+     * 流量
+     */
+    public final static String FLOW = "tpm_data_flow";
+
+    /**
+     * PH计
+     */
+    public final static String PH = "tpm_data_ph";
+
+    /**
+     * 其它
+     */
+    public final static String OTHER = "tpm_data_other";
+}

module_tpm/src/main/java/org/jeecg/modules/common/TagTypeConstants.java

@@ -0,0 +1,90 @@
+package org.jeecg.modules.common;
+
+public class TagTypeConstants {
+
+    /**
+     * 温度
+     */
+    public static final String TEMPERATURE = "0";
+
+    /**
+     * 湿度
+     */
+    public final static String HUMIDITY = "1";
+
+    /**
+     * 噪声
+     */
+    public final static String NOISE = "2";
+
+    /**
+     * 氧浓度
+     */
+    public final static String OXYGEN = "3";
+
+    /**
+     * 需量
+     */
+    public final static String DEMAND = "4";
+
+    /**
+     * 电流
+     */
+    public final static String CURRENT = "5";
+
+    /**
+     * 电压
+     */
+    public final static String VOLTAGE = "6";
+
+    /**
+     * 电量
+     */
+    public final static String ELECTRICITY = "7";
+
+    /**
+     * 功率
+     */
+    public final static String POWER = "8";
+
+    /**
+     * 通讯状态
+     */
+    public final static String COMMUNICATE = "9";
+
+    /**
+     * 故障状态
+     */
+    public final static String FAULT = "10";
+
+    /**
+     * 转速
+     */
+    public final static String SPEED = "11";
+
+    /**
+     * 真空度
+     */
+    public final static String VACUUM = "12";
+
+    /**
+     * 压力
+     */
+    public final static String PRESSURE = "13";
+
+    /**
+     * 流量
+     */
+    public final static String FLOW = "14";
+
+    /**
+     * PH计
+     */
+    public final static String PH = "15";
+
+    /**
+     * 其它
+     */
+    public final static String OTHER = "100";
+
+}