2023-05-25 09:41:18 优化完善首页大屏、能源监测温度传感器查询接口!

psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java

@@ -24,6 +24,8 @@ public interface IPsdcDeviceService {
      */
     List<PsdcDevice> queryByUserId(Integer parent);
 
+    List<PsdcDevice> queryByModel(String model);
+
     /**
      * 查询所有设备状态
      * @return

psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java

@@ -20,11 +20,11 @@ public interface IPsdcThermometerHtdataService {
 
     AjaxResult selTodayThermometer();
 
-    AjaxResult sel8WnDu(Integer modelId);
+    AjaxResult sel8WnDu(String modelId);
 
     PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId);
 
-    List selTodayThermometerById(Integer modelId);
+    List selTodayThermometerById(String modelId);
 
     AjaxResult selDzglWenDu(Integer deviceId);
 

psdc-web/src/main/java/com/psdc/controller/index/Index.java

@@ -3,10 +3,7 @@ package com.psdc.controller.index;
 import com.psdc.core.domain.AjaxResult;
 import com.psdc.service.IPsdcThermometerHtdataService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
@@ -21,9 +18,9 @@ public class Index {
         return psdcThermometerHtdataService.selTodayThermometer();
     }
 
-    @RequestMapping(value = "/8wd/{modelId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/8wd", method = RequestMethod.POST)
-    public AjaxResult sel8WenDu(@PathVariable(value = "modelId", required = false) Integer modelId)  {
+    public AjaxResult sel8WenDu(@RequestParam(value="modelTypeName", defaultValue="") String modelname)  {
-        return psdcThermometerHtdataService.sel8WnDu(modelId);
+        return psdcThermometerHtdataService.sel8WnDu(modelname);
     }
 
     @RequestMapping(value = "/zdb/{modelId}", method = RequestMethod.GET)