diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java index 33ce8f9..c3606a9 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/record/service/impl/RecordDataServiceImpl.java @@ -14,8 +14,10 @@ import com.zsc.edu.gateway.modules.iot.record.entity.RecordDataStatusVo; import com.zsc.edu.gateway.framework.springEvent.TemperatureExceededEvent; import com.zsc.edu.gateway.modules.iot.record.repo.RecordDataRepository; import com.zsc.edu.gateway.modules.iot.record.service.RecordDataService; +import com.zsc.edu.gateway.modules.iot.tsl.dto.ParamDto; import com.zsc.edu.gateway.modules.iot.tsl.entity.Event; import com.zsc.edu.gateway.modules.iot.tsl.entity.Param; +import com.zsc.edu.gateway.modules.iot.tsl.mapper.ParamMapper; import com.zsc.edu.gateway.modules.iot.tsl.repo.EventRepository; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; @@ -38,6 +40,8 @@ public class RecordDataServiceImpl extends ServiceImpl outputs; + private List outputs; public enum Type implements IEnum, IState { /** diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/repo/EventRepository.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/repo/EventRepository.java index 36d5f13..da4d22f 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/repo/EventRepository.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/repo/EventRepository.java @@ -25,6 +25,5 @@ public interface EventRepository extends BaseMapper { Event selectById(@Param("id") Long id); - List selectByProductId(@Param("productId") Long id); } diff --git a/src/main/resources/db/gateway.sql b/src/main/resources/db/gateway.sql index 150d6c7..968f005 100644 --- a/src/main/resources/db/gateway.sql +++ b/src/main/resources/db/gateway.sql @@ -938,6 +938,8 @@ ALTER TABLE iot_param ALTER COLUMN contrast_type SET DEFAULT NULL; ALTER TABLE iot_param - ALTER COLUMN "default_value " SET DEFAULT NULL; + ALTER COLUMN default_value SET DEFAULT NULL; +ALTER TABLE iot_param + ADD COLUMN default_value DOUBLE PRECISION; diff --git a/src/main/resources/mappers/iot/EventMapper.xml b/src/main/resources/mappers/iot/EventMapper.xml index 39f5e2a..1c68713 100644 --- a/src/main/resources/mappers/iot/EventMapper.xml +++ b/src/main/resources/mappers/iot/EventMapper.xml @@ -26,6 +26,26 @@ + + + + + + + + + + + + + + + + + + + - select e.*, ip.id as param_id, ip.data_type as param_data_type, @@ -50,7 +70,7 @@ ip.name as param_name, ip.remark as param_remark, ip.compare_type as param_compare_type, - ip."default_value " as param_default_value + ip.default_value as param_default_value from iot_event e left join iot_param ip on e.id = ip.foreign_id and ip.foreign_type = 1