diff --git a/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java b/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java index 9d55a469..87a59e8a 100644 --- a/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java +++ b/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java @@ -5,6 +5,7 @@ import com.das.modules.auth.mapper.BaseMapperPlus; import com.das.modules.node.domain.vo.EquipmentVo; import com.das.modules.node.domain.vo.SysTabMappingVo; import com.das.modules.node.entity.SysTabMapping; +import com.das.modules.page.domian.dto.TemperatureLimitDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -48,8 +49,8 @@ public interface SysImpTabMappingMapper extends BaseMapperPlus getTemperatureMappingListByDeviceId(@Param("deviceId") Long deviceId); + List getTemperatureMappingListByDeviceId(@Param("info") TemperatureLimitDto temperatureLimitDto); } diff --git a/das/src/main/java/com/das/modules/page/controller/TemperatureDashboardController.java b/das/src/main/java/com/das/modules/page/controller/TemperatureDashboardController.java index 47cec419..8faff6ae 100644 --- a/das/src/main/java/com/das/modules/page/controller/TemperatureDashboardController.java +++ b/das/src/main/java/com/das/modules/page/controller/TemperatureDashboardController.java @@ -1,12 +1,15 @@ package com.das.modules.page.controller; import com.das.common.result.R; -import com.das.modules.equipment.domain.dto.SysEquipmentDto; +import com.das.modules.page.domian.dto.TemperatureLimitDto; import com.das.modules.page.domian.vo.TemperatureLimitVo; import com.das.modules.page.service.TemperatureDashboardService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -19,12 +22,12 @@ public class TemperatureDashboardController { /** * 根据设备id获取温度限制设置 - * @param device 设备{id:XXX} 只用到id即可 + * @param temperatureLimitDto 设备{id:XXX} ,attributes["测点"] * @return */ @PostMapping("/getTemperatureLimitByDeviceId") - public R> getTemperatureLimitByDeviceId(@RequestBody SysEquipmentDto device){ - List windTurbinesPageVos = service.getTemperatureLimitByDeviceId(device.getId()); + public R> getTemperatureLimitByDeviceId(@RequestBody TemperatureLimitDto temperatureLimitDto){ + List windTurbinesPageVos = service.getTemperatureLimitByDeviceId(temperatureLimitDto); return R.success(windTurbinesPageVos); } } diff --git a/das/src/main/java/com/das/modules/page/domian/dto/TemperatureLimitDto.java b/das/src/main/java/com/das/modules/page/domian/dto/TemperatureLimitDto.java new file mode 100644 index 00000000..867e9e17 --- /dev/null +++ b/das/src/main/java/com/das/modules/page/domian/dto/TemperatureLimitDto.java @@ -0,0 +1,20 @@ +package com.das.modules.page.domian.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class TemperatureLimitDto { + + + /** + * 设备所属物模型中的属性列表 + */ + private List attributes; + + /** + * 设备id + */ + private Long deviceId; +} diff --git a/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java b/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java index 492a2a4b..956a8b63 100644 --- a/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java +++ b/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java @@ -1,5 +1,6 @@ package com.das.modules.page.service; +import com.das.modules.page.domian.dto.TemperatureLimitDto; import com.das.modules.page.domian.vo.TemperatureLimitVo; import java.util.List; @@ -13,5 +14,5 @@ public interface TemperatureDashboardService { * @param deviceId 设备id * @return 限制配置列表(如果限制未设置 则不返回对应测点信息) */ - List getTemperatureLimitByDeviceId(Long deviceId); + List getTemperatureLimitByDeviceId(TemperatureLimitDto temperatureLimitDto); } diff --git a/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java index 41e4ef28..970b837c 100644 --- a/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java +++ b/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java @@ -3,6 +3,7 @@ package com.das.modules.page.service.impl; import com.alibaba.fastjson.JSONObject; import com.das.modules.node.entity.SysTabMapping; import com.das.modules.node.mapper.SysImpTabMappingMapper; +import com.das.modules.page.domian.dto.TemperatureLimitDto; import com.das.modules.page.domian.vo.TemperatureLimitVo; import com.das.modules.page.service.TemperatureDashboardService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,10 +21,10 @@ public class TemperatureDashboardServiceImpl implements TemperatureDashboardServ SysImpTabMappingMapper impTabMappingMapper; @Override - public List getTemperatureLimitByDeviceId(Long deviceId) { + public List getTemperatureLimitByDeviceId(TemperatureLimitDto temperatureLimitDto) { Map map = new HashMap<>(); - List mappings = impTabMappingMapper.getTemperatureMappingListByDeviceId(deviceId); + List mappings = impTabMappingMapper.getTemperatureMappingListByDeviceId(temperatureLimitDto); if (mappings != null && !mappings.isEmpty()) { mappings.forEach(mapping -> { String params = mapping.getParams(); diff --git a/das/src/main/resources/mapper/SysImpTabMappingMapper.xml b/das/src/main/resources/mapper/SysImpTabMappingMapper.xml index 98e0c5b1..b9e2b74d 100644 --- a/das/src/main/resources/mapper/SysImpTabMappingMapper.xml +++ b/das/src/main/resources/mapper/SysImpTabMappingMapper.xml @@ -128,6 +128,12 @@ and t3.id = t4.iot_model_id and t1.meas_point_code = t4.attribute_code and t4.attribute_type = 138 and t4.attribute_name like '%温度%' - and t2.id = #{deviceId} + and t2.id = #{info.deviceId} + + and t1.meas_point_code in + + #{attribute} + +