Ver código fonte

产量曲线

wukai 2 meses atrás
pai
commit
81d4698dd7

+ 25 - 1
jjt-biz/src/main/java/com/jjt/calc/controller/TwinCalcHourSpecController.java

@@ -1,5 +1,8 @@
 package com.jjt.calc.controller;
 
+import cn.hutool.json.JSONObject;
+import com.jjt.biz.domain.TwinDevice;
+import com.jjt.biz.service.ITwinDeviceService;
 import com.jjt.calc.domain.TwinCalcHourSpec;
 import com.jjt.calc.service.ITwinCalcHourSpecService;
 import com.jjt.common.annotation.Log;
@@ -7,15 +10,17 @@ import com.jjt.common.core.controller.BaseController;
 import com.jjt.common.core.domain.AjaxResult;
 import com.jjt.common.core.page.TableDataInfo;
 import com.jjt.common.enums.BusinessType;
+import com.jjt.common.utils.DateUtils;
 import com.jjt.common.utils.StringUtils;
 import com.jjt.common.utils.poi.ExcelUtil;
+import com.jjt.utils.IotService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +37,10 @@ import java.util.Map;
 public class TwinCalcHourSpecController extends BaseController {
     @Resource
     private ITwinCalcHourSpecService twinCalcHourSpecService;
+    @Resource
+    private ITwinDeviceService twinDeviceService;
+    @Resource
+    private IotService iotService;
 
     /**
      * 查询按配方1小时统计数据列表
@@ -60,6 +69,21 @@ public class TwinCalcHourSpecController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询按配方1小时统计数据列表")
+    //@PreAuthorize("@ss.hasPermi('calc:calcSpec:list')")
+    @GetMapping("/trend")
+    public AjaxResult trend(TwinCalcHourSpec twinCalcHourSpec) {
+        TwinDevice device = twinDeviceService.selectTwinDeviceByDeviceId(twinCalcHourSpec.getDeviceId());
+        String sql = "select MAX_VALUE(Capacity_data_20) from %s group by ((%s,%s],5m)";
+        LocalDateTime end = LocalDateTime.now().withSecond(0).withNano(0).minusMinutes(LocalDateTime.now().getMinute() % 5);
+        LocalDateTime start = end.minusDays(5);
+        sql = String.format(sql, device.getDevicePath(), DateUtils.parseIso(start), DateUtils.parseIso(end));
+        iotService.query(sql);
+        JSONObject jsonObject = iotService.query(sql);
+        return AjaxResult.success(jsonObject);
+    }
+
+
     /**
      * 导出按配方1小时统计数据列表
      */