组态设计BUG修复

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<PageData<AlarmConfigDTO>> page( @RequestParam Map<String, Object> params){
         PageData<AlarmConfigDTO> 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<AlarmConfigDTO>> list( @RequestParam Map<String, Object> params){
         List<AlarmConfigDTO> list = alarmConfigService.listAs(params,AlarmConfigDTO.class);
         if(CollectionUtil.isNotEmpty(list)){

modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java

@@ -148,7 +148,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM
             menuDTO.setType(0);
             menuDTO.setOpenStyle(0);
             menuDTO.setSaView(1);
-            menuDTO.setUrl("scada/preview?id=" + entity.getId());
+            menuDTO.setUrl("visual/preview?id=" + entity.getId());
             SysMenuEntity sysMenuEntity = ConvertUtils.sourceToTarget(menuDTO, SysMenuEntity.class);
             sysMenuService.save(sysMenuEntity);
             sysLanguageService.saveOrUpdate("sys_menu", sysMenuEntity.getId(), "name", sysMenuEntity.getName(), HttpContextUtils.getLanguage());
@@ -314,6 +314,11 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM
             wrapper.and(is_default.eq(0).or(tenant_code.in(tenantSubsetUtil.paramsAddTenantCodeList(true))));
         }
         List<IotVisualManageDTO> 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<IotVisualManageM
 
     @Override
     public List<IotVisualManageDTO> listIotBoardManageDTO(Map<String, Object> params) {
-        String val ="";
         List<IotVisualManageDTO> 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());