|
@@ -11,6 +11,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.modules.Statistics.entity.Statistics;
|
|
import org.jeecg.modules.Statistics.entity.Statistics;
|
|
import org.jeecg.modules.Statistics.service.IStatisticsService;
|
|
import org.jeecg.modules.Statistics.service.IStatisticsService;
|
|
|
|
+import org.jeecg.modules.Statistics.vo.StatisticsVo;
|
|
import org.jeecg.modules.equipmentOnoffSection.entity.EquipmentOnoffSection;
|
|
import org.jeecg.modules.equipmentOnoffSection.entity.EquipmentOnoffSection;
|
|
import org.jeecg.modules.tpmTag.entity.TpmTag;
|
|
import org.jeecg.modules.tpmTag.entity.TpmTag;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -20,6 +21,9 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -38,6 +42,18 @@ public class StatisticsController extends JeecgController<Statistics, IStatistic
|
|
private IStatisticsService statisticsService;
|
|
private IStatisticsService statisticsService;
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
+ * 今日开机数
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation("今日开机数")
|
|
|
|
+ @GetMapping("/machineSum")
|
|
|
|
+ public Result<List<StatisticsVo>> firstLoad()
|
|
|
|
+ {
|
|
|
|
+ // 今日开机数
|
|
|
|
+ List<StatisticsVo> list = statisticsService.selectEquipmentStatus();
|
|
|
|
+ return Result.OK(list);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
* 获取某设备实时数据-列表(按日期)
|
|
* 获取某设备实时数据-列表(按日期)
|
|
*
|
|
*
|
|
* @param statistics
|
|
* @param statistics
|