diff --git a/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java b/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java index 5c29123..b3a42af 100644 --- a/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java +++ b/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java @@ -7,6 +7,7 @@ import com.thing.alarm.alarm.dto.AlarmConfigDTO; import com.thing.alarm.alarm.dto.AlarmConfigDeleteParam; import com.thing.alarm.alarm.entity.AlarmConfigEntity; import com.thing.alarm.alarm.service.AlarmConfigService; +import com.thing.alarm.alarm.service.impl.AlarmConfigServiceImpl; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; @@ -41,13 +42,6 @@ public class AlarmConfigController { private AlarmConfigService alarmConfigService; @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码,从1开始") , - @Parameter(name = Constant.LIMIT, description ="每页显示记录数") , - @Parameter(name = Constant.ORDER_FIELD, description ="排序字段") , - @Parameter(name = Constant.ORDER, description ="排序方式,可选值(asc、desc)") - }) public Result> page( @RequestParam Map params){ PageData page = alarmConfigService.getPageData(params,AlarmConfigDTO.class); @@ -56,13 +50,6 @@ public class AlarmConfigController { @GetMapping("list") - @Operation(summary="列表") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description ="排序字段") , - @Parameter(name = Constant.ORDER, description ="排序方式,可选值(asc、desc)"), - @Parameter(name = "thingId", description ="物的id") , - @Parameter(name = "type", description ="1-峰谷指标告警配置 , 2-夜间用能告警配置") , - }) public Result> list( @RequestParam Map params){ List list = alarmConfigService.listAs(params,AlarmConfigDTO.class); if(CollectionUtil.isNotEmpty(list)){ diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java index 511b2a7..0d1febb 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java @@ -148,7 +148,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl iotVisualManageDTOS = ConvertUtils.sourceToTarget(mapper.selectListByQuery(wrapper), IotVisualManageDTO.class); + iotVisualManageDTOS.forEach(temp->{ + IotVisualDesignDTO desigDTO = iotVisualDesignService.getDetailByBoardManageId(temp.getId().toString()); + temp.setIotConfigurationDesigDTO(desigDTO); + + }); return iotVisualManageDTOS.stream().sorted(Comparator.comparing(IotVisualManageDTO::getCreateDate).reversed()).collect(Collectors.toList()); } @@ -352,22 +357,11 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl listIotBoardManageDTO(Map params) { - String val =""; List list = this.listAs(params, IotVisualManageDTO.class); list.forEach(temp->{ IotVisualDesignDTO desigDTO = iotVisualDesignService.getDetailByBoardManageId(temp.getId().toString()); if(ObjectUtil.isNotNull(desigDTO)){ - JSONObject object = JSONObject.parseObject(desigDTO.getPictureData()); - JSONArray object1 = JSONArray.parseArray(JSONObject.toJSONString(object.get("nodes"))); - JSONArray object2 = new JSONArray(); - object1.parallelStream().forEach(info->{ - JSONObject o1 = JSON.parseObject(info.toString()); - JSONObject o2 = JSONObject.parseObject(o1.getString("properties")); - o2.put("dynamic",JSONObject.parseObject(val)); - o1.put("properties",o2); - object2.add(o1); - }); - object.put("nodes",object2); + JSONArray object = JSONArray.parseArray(desigDTO.getPictureData()); desigDTO.setPictureData(JSONObject.toJSONString(object)); desigDTO.setApiSetIds(""); desigDTO.setIotThingApiDTOList(Lists.newArrayList());