From aca84c4752b1de331e9c2a7bb112298d5b97f92e Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 21 Mar 2024 16:05:42 +0800 Subject: [PATCH] =?UTF-8?q?2024-03-21=2016:05:40=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../psdc/mapper/SysDeviceHeatSceneMapper.java | 2 +- .../service/model/IBuildHeatingService.java | 2 +- .../model/impl/BuildHeatingServiceImpl.java | 5 +++-- .../business/SysDeviceHeatSceneMapper.xml | 5 ++++- .../model/BuildHeatingController.java | 20 ++++++++++++++----- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java b/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java index 63fca76..fe808f8 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java @@ -28,6 +28,6 @@ public interface SysDeviceHeatSceneMapper { * @param types 设备细类 * @return */ - List selDevicesBySubType(@Param(value = "types") String types); + List selDevicesBySubType(@Param(value = "types") List types); } diff --git a/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java b/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java index e9e5125..047d788 100644 --- a/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java +++ b/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java @@ -20,7 +20,7 @@ public interface IBuildHeatingService { List selAllDevices(); - List selDevicesBySubType(String types); + List selDevicesBySubType(List types); } diff --git a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java index bd9e656..e657cd1 100644 --- a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java @@ -61,8 +61,9 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService { } @Override - public List selDevicesBySubType(String types) { - return deviceHeatSceneMapper.selDevicesBySubType(types); + public List selDevicesBySubType(List types) { + List scenes = deviceHeatSceneMapper.selDevicesBySubType(types); + return scenes; } } diff --git a/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml b/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml index 4ba1a74..bd3ce44 100644 --- a/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml @@ -29,6 +29,9 @@ \ No newline at end of file diff --git a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java index 4d4882b..dc62aba 100644 --- a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java +++ b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java @@ -7,7 +7,9 @@ import com.psdc.service.model.IBuildHeatingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -48,17 +50,25 @@ public class BuildHeatingController { AjaxResult ajax = AjaxResult.success(); switch (typeCode){ case "0101": - String s = DeviceSubType.Cooling_Heating.getDesc() + "," + DeviceSubType.Cooling_Heating_Electric_Boiler.getDesc(); - ajax.put("data", buildHeatingService.selDevicesBySubType(s)); + List list1 = new ArrayList<>(); + list1.add(DeviceSubType.Cooling_Heating.getDesc()); + list1.add(DeviceSubType.Cooling_Heating_Electric_Boiler.getDesc()); + ajax.put("data", buildHeatingService.selDevicesBySubType(list1)); return ajax; case "0102": - ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Boiler_Heating.getDesc())); + List list2 = new ArrayList<>(); + list2.add(DeviceSubType.Cooling_Heating.getDesc()); + ajax.put("data", buildHeatingService.selDevicesBySubType(list2)); return ajax; case "0103" : - ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Kitchen_Cooking.getDesc())); + List list3 = new ArrayList<>(); + list3.add(DeviceSubType.Kitchen_Cooking.getDesc()); + ajax.put("data", buildHeatingService.selDevicesBySubType(list3)); return ajax; case "0104" : - ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Material_Kiln.getDesc())); + List list4 = new ArrayList<>(); + list4.add(DeviceSubType.Material_Kiln.getDesc()); + ajax.put("data", buildHeatingService.selDevicesBySubType(list4)); return ajax; default: ajax.put("data", buildHeatingService.selAllDevices());