diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java index 3c26354..3c9b91a 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java @@ -24,6 +24,8 @@ public interface IPsdcDeviceService { */ List queryByUserId(Integer parent); + List queryByModel(String model); + /** * 查询所有设备状态 * @return diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java index e4f536a..48cfbe9 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java +++ b/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); diff --git a/psdc-web/src/main/java/com/psdc/controller/index/Index.java b/psdc-web/src/main/java/com/psdc/controller/index/Index.java index f65392d..801dcef 100644 --- a/psdc-web/src/main/java/com/psdc/controller/index/Index.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @@ -21,9 +18,9 @@ public class Index { return psdcThermometerHtdataService.selTodayThermometer(); } - @RequestMapping(value = "/8wd/{modelId}", method = RequestMethod.GET) - public AjaxResult sel8WenDu(@PathVariable(value = "modelId", required = false) Integer modelId) { - return psdcThermometerHtdataService.sel8WnDu(modelId); + @RequestMapping(value = "/8wd", method = RequestMethod.POST) + public AjaxResult sel8WenDu(@RequestParam(value="modelTypeName", defaultValue="") String modelname) { + return psdcThermometerHtdataService.sel8WnDu(modelname); } @RequestMapping(value = "/zdb/{modelId}", method = RequestMethod.GET)