From aafa783165c9d365d7bc06dd76787f48f82b94ae Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 25 May 2023 09:41:52 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-25=2009:41:18=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A6=96=E9=A1=B5=E5=A4=A7=E5=B1=8F=E3=80=81?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=9B=91=E6=B5=8B=E6=B8=A9=E5=BA=A6=E4=BC=A0?= =?UTF-8?q?=E6=84=9F=E5=99=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/service/IPsdcDeviceService.java | 2 ++ .../psdc/service/IPsdcThermometerHtdataService.java | 4 ++-- .../main/java/com/psdc/controller/index/Index.java | 11 ++++------- 3 files changed, 8 insertions(+), 9 deletions(-) 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)