diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java index 2e169eba..34312976 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java @@ -62,7 +62,6 @@ public class TbTaskInfo { @ApiModelProperty(value = "任务输出") @AutoMapping(ignore = true) @ReverseAutoMapping(ignore = true) - private String actions; /** diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java index 47908ddf..d30ac36f 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java @@ -9,12 +9,14 @@ */ package cc.iotkit.data.service; +import cc.iotkit.common.utils.JsonUtils; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.data.dao.IJPACommData; import cc.iotkit.data.manager.ITaskInfoData; import cc.iotkit.data.dao.TaskInfoRepository; import cc.iotkit.data.model.TbTaskInfo; import cc.iotkit.common.api.Paging; +import cc.iotkit.model.rule.RuleAction; import cc.iotkit.model.rule.TaskInfo; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; @@ -27,6 +29,7 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; @Primary @Service @@ -38,7 +41,8 @@ public class TaskInfoDataImpl implements ITaskInfoData, IJPACommData findByUid(String uid) { - return MapstructUtils.convert(taskInfoRepository.findByUid(uid), TaskInfo.class); + return taskInfoRepository.findByUid(uid).stream().map(this::to) + .collect(Collectors.toList()); } @Override @@ -46,7 +50,9 @@ public class TaskInfoDataImpl implements ITaskInfoData, IJPACommData paged = taskInfoRepository.findByUid(uid, Pageable.ofSize(size).withPage(page - 1)); return new Paging<>(paged.getTotalElements(), - MapstructUtils.convert(paged.getContent(), TaskInfo.class)); + paged.getContent().stream().map(this::to) + .collect(Collectors.toList()) + ); } @Override @@ -71,23 +77,31 @@ public class TaskInfoDataImpl implements ITaskInfoData, IJPACommData actions; @ApiModelProperty(value = "创建时间") private Long createAt; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/taskinfo/TaskInfoVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/taskinfo/TaskInfoVo.java index b1f3da0a..0e8af071 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/taskinfo/TaskInfoVo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/taskinfo/TaskInfoVo.java @@ -1,5 +1,6 @@ package cc.iotkit.manager.dto.vo.taskinfo; +import cc.iotkit.model.rule.RuleAction; import cc.iotkit.model.rule.TaskInfo; import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; @@ -11,6 +12,7 @@ import lombok.ToString; import java.util.Date; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -22,7 +24,6 @@ import io.github.linpeilie.annotations.AutoMapper; @Data @ExcelIgnoreUnannotated @AutoMapper(target = TaskInfo.class) - public class TaskInfoVo implements Serializable { private static final long serialVersionUID = -1L; @@ -33,9 +34,7 @@ public class TaskInfoVo implements Serializable { @ApiModelProperty(value = "任务输出") @ExcelProperty(value = "任务输出") - @AutoMapping(ignore = true) - @ReverseAutoMapping(ignore = true) - private String actions; + private List actions; @ApiModelProperty(value = "创建时间") @ExcelProperty(value = "创建时间")