diff --git a/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java b/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java index 172a819c..b7ed5c58 100644 --- a/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java +++ b/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java @@ -7,9 +7,29 @@ import lombok.Data; */ @Data public class DeviceInfoCache { + /** + * 设备ID + */ private Long deviceId; + /** + * 设备Code + */ private String deviceCode; + /** + * 设备名称 + */ private String deviceName; + /** + * 设备类型 + */ private Integer objectType; + /** + * 父设备 + */ private Long parentDeviceId; + + /** + * 物模型ID + */ + private Long iotModelId; } diff --git a/das/src/main/java/com/das/modules/cache/service/CacheService.java b/das/src/main/java/com/das/modules/cache/service/CacheService.java index efffc4b6..0e3763a0 100644 --- a/das/src/main/java/com/das/modules/cache/service/CacheService.java +++ b/das/src/main/java/com/das/modules/cache/service/CacheService.java @@ -1,147 +1,13 @@ package com.das.modules.cache.service; -import com.das.modules.cache.domain.DeviceInfoCache; -import com.das.modules.equipment.entity.SysEquipment; -import com.das.modules.equipment.mapper.SysEquipmentMapper; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - /** - * 计算缓存服务 - * 用于缓存常用数据，供计算服务使用 + * 应用缓存接口 + * */ -@Service -public class CacheService { - - @Autowired - SysEquipmentMapper sysEquipmentMapper; - +public interface CacheService { /** - * 缓存初始化 - */ - @PostConstruct - public void init() { - initDeviceInfoCaches(); - } - - /** - * 缓存释放 - */ - @PreDestroy - public void destroy() { - freeDeviceInfoCaches(); - } - - ///-设备缓存---------------------------------------------------------------- - /** - * 设备缓存信息 - */ - private final List deviceInfoCaches = Collections.synchronizedList(new ArrayList<>()); - - /** - * 设备CODE索引，用于通过设备CODE访问设备缓存信息 - */ - private final ConcurrentHashMap deviceCodeIndex = new ConcurrentHashMap<>(); - private final ConcurrentHashMap deviceIdIndex = new ConcurrentHashMap<>(); - - private DeviceInfoCache windFarmCache = null; - /** - * 初始化设备缓存信息 - */ - private void initDeviceInfoCaches() { - List equipments = sysEquipmentMapper.selectList(); - for (int i = 0; i < equipments.size(); i++) { - SysEquipment equipment = equipments.get(i); - DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); - deviceInfoCache.setDeviceId(equipment.getId()); - deviceInfoCache.setDeviceCode(equipment.getCode()); - deviceInfoCache.setDeviceName(equipment.getName()); - deviceInfoCache.setObjectType(equipment.getObjectType()); - deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); - deviceInfoCaches.add(deviceInfoCache); - //创建Code索引 - deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i); - //创建Id索引 - deviceIdIndex.put(equipment.getId(),i); - - } - } - - /** - * 释放设备缓存信息 - */ - private void freeDeviceInfoCaches() { - deviceInfoCaches.clear(); - deviceCodeIndex.clear(); - } - - /** - * 返回设备缓存信息列表 + * 获取设备缓存接口 * @return */ - public List getDevicesCache() { - return deviceInfoCaches; - } - - /** - * 根据设备CODE返回设备缓存信息 - * @param deviceCode - * @return - */ - public DeviceInfoCache getDeviceInfoCache(String deviceCode) { - Integer index = deviceCodeIndex.get(deviceCode); - if (index != null) { - return deviceInfoCaches.get(index); - } - return null; - } - - /** - * 根据设备IRN返回设备缓存信息 - * @param deviceId - * @return - */ - public DeviceInfoCache getDeviceInfoCache(Long deviceId) { - Integer index = deviceIdIndex.get(deviceId); - if (index != null) { - return deviceInfoCaches.get(index); - } - return null; - } - - /** - * 刷新指定设备ID的设备缓存，如果缓存不存在则添加。 - * @param deviceId - */ - public void refreshDeviceCache(Long deviceId) { - SysEquipment equipment = sysEquipmentMapper.selectById(deviceId); - if (equipment != null) { - DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); - deviceInfoCache.setDeviceId(equipment.getId()); - deviceInfoCache.setDeviceCode(equipment.getCode()); - deviceInfoCache.setDeviceName(equipment.getName()); - deviceInfoCache.setObjectType(equipment.getObjectType()); - deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); - //如果是已经缓存过的设备直接缓存 - Integer index = deviceIdIndex.get(deviceId); - if (index != null) { - deviceInfoCaches.set(index, deviceInfoCache); - } - else{ - deviceInfoCaches.add(deviceInfoCache); - index = deviceInfoCaches.size(); - deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index); - deviceIdIndex.put(equipment.getId(),index); - } - } - } - - ///-设备缓存=END--------------------------------------------------------------- + EquipmentCache getEquipmentCache(); } diff --git a/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java b/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java new file mode 100644 index 00000000..b3f8f4ad --- /dev/null +++ b/das/src/main/java/com/das/modules/cache/service/EquipmentCache.java @@ -0,0 +1,19 @@ +package com.das.modules.cache.service; + +import com.das.modules.cache.domain.DeviceInfoCache; + +import java.util.List; + +/** + * 设备缓存 + */ +public interface EquipmentCache { + /** + * 获取设备缓存列表 + * @return List + */ + public List getDevicesCache(); + public void refreshDeviceCache(Long deviceId); + DeviceInfoCache getDeviceInfoCache(String deviceCode); + DeviceInfoCache getDeviceInfoCache(Long deviceId); +} diff --git a/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java new file mode 100644 index 00000000..0b0b669f --- /dev/null +++ b/das/src/main/java/com/das/modules/cache/service/impl/CacheServiceImpl.java @@ -0,0 +1,18 @@ +package com.das.modules.cache.service.impl; + +import com.das.modules.cache.service.CacheService; +import com.das.modules.cache.service.EquipmentCache; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class CacheServiceImpl implements CacheService { + + @Autowired + EquipmentCache equipmentCache;; + + @Override + public EquipmentCache getEquipmentCache() { + return equipmentCache; + } +} diff --git a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java new file mode 100644 index 00000000..6f9015b8 --- /dev/null +++ b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java @@ -0,0 +1,108 @@ +package com.das.modules.cache.service.impl; + +import com.das.modules.cache.domain.DeviceInfoCache; +import com.das.modules.cache.service.EquipmentCache; +import com.das.modules.equipment.entity.SysEquipment; +import com.das.modules.equipment.mapper.SysEquipmentMapper; +import jakarta.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +@Service +public class EquipmentCacheImpl implements EquipmentCache { + @Autowired + SysEquipmentMapper sysEquipmentMapper; + + private final List deviceInfoCaches = Collections.synchronizedList(new ArrayList<>()); + + /** + * 设备CODE索引，用于通过设备CODE访问设备缓存信息 + */ + private final ConcurrentHashMap deviceCodeIndex = new ConcurrentHashMap<>(); + private final ConcurrentHashMap deviceIdIndex = new ConcurrentHashMap<>(); + + /** + * 初始化设备缓存 + */ + @PostConstruct + private void initDeviceInfoCaches() { + List equipments = sysEquipmentMapper.selectList(); + for (int i = 0; i < equipments.size(); i++) { + SysEquipment equipment = equipments.get(i); + DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); + deviceInfoCache.setDeviceId(equipment.getId()); + deviceInfoCache.setDeviceCode(equipment.getCode()); + deviceInfoCache.setDeviceName(equipment.getName()); + deviceInfoCache.setObjectType(equipment.getObjectType()); + deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); + deviceInfoCaches.add(deviceInfoCache); + //创建Code索引 + deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),i); + //创建Id索引 + deviceIdIndex.put(equipment.getId(),i); + + } + } + /** + * 释放设备缓存信息 + */ + private void freeDeviceInfoCaches() { + deviceInfoCaches.clear(); + deviceCodeIndex.clear(); + } + + + + @Override + public List getDevicesCache() { + return Collections.unmodifiableList(deviceInfoCaches); + } + + @Override + public void refreshDeviceCache(Long deviceId) { + SysEquipment equipment = sysEquipmentMapper.selectById(deviceId); + if (equipment != null) { + DeviceInfoCache deviceInfoCache = new DeviceInfoCache(); + deviceInfoCache.setDeviceId(equipment.getId()); + deviceInfoCache.setDeviceCode(equipment.getCode()); + deviceInfoCache.setDeviceName(equipment.getName()); + deviceInfoCache.setObjectType(equipment.getObjectType()); + deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); + deviceInfoCache.setIotModelId(equipment.getIotModelId()); + //如果是已经缓存过的设备直接缓存 + Integer index = deviceIdIndex.get(deviceId); + if (index != null) { + deviceInfoCaches.set(index, deviceInfoCache); + } + else{ + deviceInfoCaches.add(deviceInfoCache); + index = deviceInfoCaches.size(); + deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),index); + deviceIdIndex.put(equipment.getId(),index); + } + } + } + + @Override + public DeviceInfoCache getDeviceInfoCache(String deviceCode) { + Integer index = deviceCodeIndex.get(deviceCode); + if (index != null) { + return deviceInfoCaches.get(index); + } + return null; + } + + @Override + public DeviceInfoCache getDeviceInfoCache(Long deviceId) { + Integer index = deviceIdIndex.get(deviceId); + if (index != null) { + return deviceInfoCaches.get(index); + } + return null; + } +} diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java index 4fa75677..75b69436 100644 --- a/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java +++ b/das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java @@ -37,7 +37,7 @@ public class FunctionRealData extends AbstractFunction { public AviatorObject call(Map env, AviatorObject deviceCode, AviatorObject attributes) { //设备Code String code = (String)deviceCode.getValue(env); - DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(code); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(code); //属性列表 List list = (List)attributes.getValue(env); List attrs = list.stream().map(String::toLowerCase).toList(); diff --git a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java index 71ce79e0..cd4fcb77 100644 --- a/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java +++ b/das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java @@ -62,7 +62,7 @@ public class FunctionSaveCalcData extends AbstractVariadicFunction { if ( (args.length - 1) % 3 != 0) { return AviatorRuntimeJavaType.valueOf(1);} //deviceCode String code = (String)args[0].getValue(env); - DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(code); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(code); List dataList = new ArrayList<>(); for (int i = 1; i < args.length; i+=3) { Date date = (Date)FunctionUtils.getJavaObject(args[i], env); diff --git a/das/src/main/java/com/das/modules/calc/service/CalcJob.java b/das/src/main/java/com/das/modules/calc/service/CalcJob.java index 98426749..5512c560 100644 --- a/das/src/main/java/com/das/modules/calc/service/CalcJob.java +++ b/das/src/main/java/com/das/modules/calc/service/CalcJob.java @@ -1,5 +1,6 @@ package com.das.modules.calc.service; + import com.das.modules.cache.service.CacheService; import com.das.modules.calc.domain.entity.CalcModule; import com.googlecode.aviator.AviatorEvaluatorInstance; @@ -32,7 +33,7 @@ public class CalcJob implements Job { if (expression == null) { throw new JobExecutionException("expression is null"); } - Map envs = expression.newEnv("G_DEVICES", cacheService.getDevicesCache()); + Map envs = expression.newEnv("G_DEVICES", cacheService.getEquipmentCache().getDevicesCache()); Object result = expression.execute(envs); sw.stop(); log.debug("任务[{}]已执行，结果:{}, 耗时:{}秒", calcModule.getName(), result, sw.getTotalTimeMillis()/1000.0); diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java index 6be2f9c0..40a7d714 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java @@ -6,20 +6,15 @@ import com.das.modules.cache.domain.DeviceInfoCache; import com.das.modules.cache.service.CacheService; import com.das.modules.data.domain.DeviceEventInfo; import com.das.modules.data.service.impl.DataServiceImpl; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.IdUtil; import com.das.common.constant.MeasType; import com.das.common.utils.AdminRedisTemplate; -import com.das.modules.equipment.domain.vo.IotModelFieldVo; -import com.das.modules.equipment.entity.SysIotModelField; import com.das.modules.equipment.mapper.SysIotModelMapper; import com.das.modules.node.disruptor.MessageEventFactory; import com.das.modules.node.disruptor.TerminalMessageEventHandler; -import com.das.modules.node.domain.bo.CalculateRTData; import com.das.modules.node.domain.bo.RTData; import com.das.modules.node.domain.bo.TerminalMessage; import com.das.modules.node.domain.vo.*; @@ -28,8 +23,6 @@ import com.das.modules.node.mapper.SysCommunicationLinkMapper; import com.das.modules.node.mapper.SysImpTabMappingMapper; import com.das.modules.node.service.NodeMessageService; import com.das.modules.data.service.TDEngineService; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.dsl.Disruptor; @@ -42,10 +35,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import java.util.stream.Collectors; @Slf4j @Service @@ -308,7 +299,7 @@ public class NodeMessageServiceImpl implements NodeMessageService { }); log.info("消息data转化deviceVo,{}",list); for (DeviceEventVo item : list){ - DeviceInfoCache deviceInfoCache = cacheService.getDeviceInfoCache(item.getDeviceId()); + DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCache(Long.valueOf(item.getDeviceId())); DeviceEventInfo deviceEventInfo = new DeviceEventInfo(); deviceEventInfo.setUpdateTime(item.getEventTime()); deviceEventInfo.setEventId(IdWorker.getId()); @@ -316,7 +307,7 @@ public class NodeMessageServiceImpl implements NodeMessageService { deviceEventInfo.setDeviceName(deviceInfoCache.getDeviceName()); deviceEventInfo.setDeviceCode(deviceInfoCache.getDeviceCode()); String eventType = getEventType(item.getEventType()); - String model = dataService.iotModelMap.get(item.getDeviceId()); + String model = dataService.deviceModelMap.get(item.getDeviceId()); if (StringUtils.isEmpty(model)){ log.debug("未查询到物模型code，设备id：{}",item.getDeviceId()); } diff --git a/database/风场采集.pdma.json b/database/风场采集.pdma.json index b12fbba3..53f2413d 100644 --- a/database/风场采集.pdma.json +++ b/database/风场采集.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.9.2", "createdTime": "2024-5-29 17:03:05", - "updatedTime": "2024-10-30 14:04:42", + "updatedTime": "2024-11-4 10:10:02", "dbConns": [], "profile": { "default": { @@ -1590,24 +1590,7 @@ "indexes": [], "defName": "设备基础属性表", "notes": {}, - "correlations": [ - { - "myField": "in2", - "refEntity": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03", - "refField": "out2", - "myRows": "1", - "refRows": "n", - "innerType": "" - }, - { - "myField": "out2", - "refEntity": "A1C3D378-5246-4F80-9E47-ADF91DFB7EBF", - "refField": "in2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03", @@ -2329,16 +2312,7 @@ "defName": "物模型_属性定义", "indexes": [], "notes": {}, - "correlations": [ - { - "myField": "bottom2", - "refEntity": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03", - "refField": "top", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "6CCDA6D5-AABD-4DCA-A3C6-868F4F23AFFB", @@ -2680,16 +2654,7 @@ "type": "P", "defName": "物模型_方法定义", "notes": {}, - "correlations": [ - { - "myField": "bottom2", - "refEntity": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03", - "refField": "top3", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "F146908D-A604-440F-9524-8C28E6A31564", @@ -2995,16 +2960,7 @@ "type": "P", "defName": "系统节点(服务器)", "notes": {}, - "correlations": [ - { - "myField": "bottom2", - "refEntity": "A1C3D378-5246-4F80-9E47-ADF91DFB7EBF", - "refField": "top2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -3329,16 +3285,7 @@ "type": "P", "defName": "通讯链路", "notes": {}, - "correlations": [ - { - "myField": "in2", - "refEntity": "F146908D-A604-440F-9524-8C28E6A31564", - "refField": "out2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "85CB25D9-D1CC-4C15-A0BE-611DCF579620", @@ -3698,16 +3645,7 @@ "type": "P", "defName": "链路映射表", "notes": {}, - "correlations": [ - { - "myField": "top2", - "refEntity": "C1EBE30B-0D85-4C7A-B992-FF70A793ED1D", - "refField": "bottom2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "61D89BFE-FE50-42F5-BDCF-CC7378570C56", @@ -4103,16 +4041,7 @@ "type": "P", "defName": "职业&账号表", "notes": {}, - "correlations": [ - { - "myField": "top2", - "refEntity": "A1C3D378-5246-4F80-9E47-ADF91DFB7EBF", - "refField": "bottom2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9", @@ -4976,24 +4905,7 @@ "type": "P", "defName": "职员与角色关系表", "notes": {}, - "correlations": [ - { - "myField": "in2", - "refEntity": "61D89BFE-FE50-42F5-BDCF-CC7378570C56", - "refField": "bottom2", - "myRows": "1", - "refRows": "n", - "innerType": "" - }, - { - "myField": "out2", - "refEntity": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9", - "refField": "bottom2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "AE06892E-BC15-4A74-9374-81B89277E005", @@ -5281,24 +5193,7 @@ "type": "P", "defName": "角色与权限关系表", "notes": {}, - "correlations": [ - { - "myField": "in2", - "refEntity": "9C865E82-EAC5-441E-A6E1-49B95EB0EFA9", - "refField": "bottom3", - "myRows": "1", - "refRows": "n", - "innerType": "" - }, - { - "myField": "out2", - "refEntity": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7", - "refField": "bottom3", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "172B2FD1-14C3-499B-A87B-758F8BF87C58", @@ -5694,16 +5589,7 @@ "type": "P", "defName": "系统菜单", "notes": {}, - "correlations": [ - { - "myField": "in2", - "refEntity": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7", - "refField": "out2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457", @@ -6333,16 +6219,7 @@ "type": "P", "defName": "枚举值表", "notes": {}, - "correlations": [ - { - "myField": "in2", - "refEntity": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457", - "refField": "out2", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "18957523-E336-46C8-8FF8-07D2915DAD55", @@ -6867,6 +6744,295 @@ "indexes": [], "notes": {}, "correlations": [] + }, + { + "id": "91968974-19D5-4C44-B8BD-741703AB01E3", + "defKey": "sys_report_template", + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "BIGINT", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "58BC5143-46F3-4541-B5A3-A4218DD071EC", + "extProps": {}, + "domain": "", + "id": "C98B9A9A-D265-42BE-A141-2D8ADB75C8F8" + }, + { + "defKey": "category", + "defName": "报表分类", + "comment": "", + "type": "VARCHAR", + "len": 64, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", + "extProps": {}, + "domain": "", + "id": "17FF2F6C-1980-4717-846A-559AD3146ECC" + }, + { + "defKey": "template", + "defName": "模板内容", + "comment": "", + "type": "TEXT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", + "extProps": {}, + "domain": "", + "id": "13BBDC69-05AE-452B-8A33-69D1190AE6E8" + }, + { + "defKey": "revision", + "defName": "乐观锁", + "comment": "", + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "uiHint": "", + "id": "8FFAA92C-FB04-4FB2-8691-F0623D7FF62E", + "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" + }, + { + "defKey": "created_by", + "defName": "创建人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "uiHint": "", + "id": "492D856C-05E3-48CF-9E20-4D092DDC360A", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" + }, + { + "defKey": "created_time", + "defName": "创建时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "uiHint": "", + "id": "84151548-DE76-4032-BB43-B5E3799DF9CA", + "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" + }, + { + "defKey": "updated_by", + "defName": "更新人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "uiHint": "", + "id": "1559A750-11FE-487C-BC44-03B52759AEA5", + "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" + }, + { + "defKey": "updated_time", + "defName": "更新时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "uiHint": "", + "id": "69EBF440-6B74-4D2A-968C-92C6C0235296", + "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" + } + ], + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "type": "P", + "defName": "报表模板", + "indexes": [], + "notes": {}, + "correlations": [] } ], "views": [], @@ -8362,6 +8528,981 @@ ] } }, + { + "id": "7ac8a5d4-1b88-4286-af3e-bf143e4511ca", + "shape": "table", + "position": { + "x": 960, + "y": -240 + }, + "count": 0, + "originKey": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7", + "type": "P", + "size": { + "width": 358, + "height": 215 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, + { + "id": "1d3dd585-bacc-4259-9521-98795230b154", + "shape": "table", + "position": { + "x": -1260, + "y": -630 + }, + "count": 0, + "originKey": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03", + "fillColor": "#DDE5FF", + "type": "P", + "size": { + "width": 396, + "height": 238 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, + { + "id": "ee3bb43a-2484-4a03-8cc3-219f30706ca2", + "shape": "table", + "position": { + "x": -1550, + "y": -1024.5 + }, + "count": 0, + "originKey": "044FECED-CF78-4907-806F-DC4C98C2BCBA", + "type": "P", + "size": { + "width": 393, + "height": 376 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, + { + "id": "5030703c-3b10-44b9-bc28-1bb8d31c8fac", + "shape": "table", + "position": { + "x": -1238, + "y": -200 + }, + "count": 0, + "originKey": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457", + "type": "P", + "size": { + "width": 352, + "height": 215 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, + { + "id": "a4493502-571d-4863-a467-39b891145b94", + "shape": "table", + "position": { + "x": -620, + "y": -768 + }, + "count": 0, + "originKey": "E88BA7F6-22EB-4733-B322-BDB382D57C62", + "type": "P", + "size": { + "width": 436, + "height": 514 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, + { + "id": "1a42f2a5-52d2-4f20-9ea7-6f3bd8f3441e", + "shape": "table", + "position": { + "x": -1060.5, + "y": -990 + }, + "count": 0, + "originKey": "6CCDA6D5-AABD-4DCA-A3C6-868F4F23AFFB", + "type": "P", + "size": { + "width": 386, + "height": 284 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, + { + "id": "289d4d31-5848-4f0f-9f39-62b5be3be9bf", + "shape": "table", + "position": { + "x": -2020, + "y": -590 + }, + "count": 0, + "originKey": "18957523-E336-46C8-8FF8-07D2915DAD55", + "isLock": false, + "type": "P", + "size": { + "width": 346, + "height": 123 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } + }, { "id": "06afc394-00c8-4dad-ab6a-3700d00d2c66", "shape": "erdRelation", @@ -8934,145 +10075,6 @@ ] } }, - { - "id": "7ac8a5d4-1b88-4286-af3e-bf143e4511ca", - "shape": "table", - "position": { - "x": 960, - "y": -240 - }, - "count": 0, - "originKey": "F68E1B95-2D0C-4F14-B395-10AB5F8910D7", - "type": "P", - "size": { - "width": 358, - "height": 215 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, { "id": "4e9a7a00-d60a-43d2-8600-f83922c37647", "shape": "table", @@ -9351,285 +10353,6 @@ ] } }, - { - "id": "1d3dd585-bacc-4259-9521-98795230b154", - "shape": "table", - "position": { - "x": -1260, - "y": -630 - }, - "count": 0, - "originKey": "3B7828B3-38C2-4A5B-9B5A-84E81DAB3A03", - "fillColor": "#DDE5FF", - "type": "P", - "size": { - "width": 396, - "height": 238 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, - { - "id": "ee3bb43a-2484-4a03-8cc3-219f30706ca2", - "shape": "table", - "position": { - "x": -1550, - "y": -1024.5 - }, - "count": 0, - "originKey": "044FECED-CF78-4907-806F-DC4C98C2BCBA", - "type": "P", - "size": { - "width": 393, - "height": 376 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, { "id": "192f839e-8983-466e-9df7-818c17430f45", "shape": "table", @@ -9769,563 +10492,6 @@ ] } }, - { - "id": "5030703c-3b10-44b9-bc28-1bb8d31c8fac", - "shape": "table", - "position": { - "x": -1238, - "y": -200 - }, - "count": 0, - "originKey": "C6F277B3-10D0-41E9-B401-C4A5EE8E6457", - "type": "P", - "size": { - "width": 352, - "height": 215 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, - { - "id": "a4493502-571d-4863-a467-39b891145b94", - "shape": "table", - "position": { - "x": -620, - "y": -768 - }, - "count": 0, - "originKey": "E88BA7F6-22EB-4733-B322-BDB382D57C62", - "type": "P", - "size": { - "width": 436, - "height": 514 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, - { - "id": "1a42f2a5-52d2-4f20-9ea7-6f3bd8f3441e", - "shape": "table", - "position": { - "x": -1060.5, - "y": -990 - }, - "count": 0, - "originKey": "6CCDA6D5-AABD-4DCA-A3C6-868F4F23AFFB", - "type": "P", - "size": { - "width": 386, - "height": 284 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, - { - "id": "289d4d31-5848-4f0f-9f39-62b5be3be9bf", - "shape": "table", - "position": { - "x": -2020, - "y": -590 - }, - "count": 0, - "originKey": "18957523-E336-46C8-8FF8-07D2915DAD55", - "isLock": false, - "type": "P", - "size": { - "width": 354, - "height": 123 - }, - "autoSize": true, - "ports": { - "groups": { - "in": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "zIndex": 3, - "position": { - "name": "left" - } - }, - "out": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "right" - } - }, - "top": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "top" - } - }, - "bottom": { - "attrs": { - "circle": { - "r": 4, - "magnet": true, - "stroke": "#1890FF", - "fill": "#FFF", - "strokeWidth": 1, - "style": { - "visibility": "hidden" - } - } - }, - "position": { - "name": "bottom" - } - } - }, - "items": [ - { - "group": "in", - "id": "in" - }, - { - "group": "in", - "id": "in2" - }, - { - "group": "in", - "id": "in3" - }, - { - "group": "out", - "id": "out" - }, - { - "group": "out", - "id": "out2" - }, - { - "group": "out", - "id": "out3" - }, - { - "group": "top", - "id": "top" - }, - { - "group": "top", - "id": "top2" - }, - { - "group": "top", - "id": "top3" - }, - { - "group": "bottom", - "id": "bottom" - }, - { - "group": "bottom", - "id": "bottom2" - }, - { - "group": "bottom", - "id": "bottom3" - } - ] - } - }, { "id": "57f1d22e-9b58-4f23-9cee-f9d539065bd3", "shape": "table", @@ -10464,6 +10630,145 @@ } ] } + }, + { + "id": "5b839cde-787e-4473-bf89-49516de59e45", + "shape": "table", + "position": { + "x": -2004.5, + "y": -85 + }, + "count": 0, + "originKey": "91968974-19D5-4C44-B8BD-741703AB01E3", + "type": "P", + "size": { + "width": 352, + "height": 215 + }, + "autoSize": true, + "ports": { + "groups": { + "in": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "zIndex": 3, + "position": { + "name": "left" + } + }, + "out": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "right" + } + }, + "top": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "top" + } + }, + "bottom": { + "attrs": { + "circle": { + "r": 4, + "magnet": true, + "stroke": "#1890FF", + "fill": "#FFF", + "strokeWidth": 1, + "style": { + "visibility": "hidden" + } + } + }, + "position": { + "name": "bottom" + } + } + }, + "items": [ + { + "group": "in", + "id": "in" + }, + { + "group": "in", + "id": "in2" + }, + { + "group": "in", + "id": "in3" + }, + { + "group": "out", + "id": "out" + }, + { + "group": "out", + "id": "out2" + }, + { + "group": "out", + "id": "out3" + }, + { + "group": "top", + "id": "top" + }, + { + "group": "top", + "id": "top2" + }, + { + "group": "top", + "id": "top3" + }, + { + "group": "bottom", + "id": "bottom" + }, + { + "group": "bottom", + "id": "bottom2" + }, + { + "group": "bottom", + "id": "bottom3" + } + ] + } } ] }, diff --git a/ui/dasadmin/src/views/backend/alarms/index.vue b/ui/dasadmin/src/views/backend/alarms/index.vue index 87cd9320..1c1aa3b0 100644 --- a/ui/dasadmin/src/views/backend/alarms/index.vue +++ b/ui/dasadmin/src/views/backend/alarms/index.vue @@ -200,7 +200,7 @@ const getalarmsList = () => { // }) } -const okSubmit = (val) => { +const okSubmit = (val: any) => { console.log(val) getalarmsList() } @@ -231,7 +231,7 @@ onMounted(() => { objectType: 10002, }).then((res) => { if (res.code == 200) { - airBlowerList.value = res.data.map((item) => { + airBlowerList.value = res.data.map((item: any) => { return { label: item.code, value: item.id, diff --git a/ui/dasadmin/src/views/backend/linkMonitor/index.vue b/ui/dasadmin/src/views/backend/linkMonitor/index.vue index 9a1c37d6..ac46229d 100644 --- a/ui/dasadmin/src/views/backend/linkMonitor/index.vue +++ b/ui/dasadmin/src/views/backend/linkMonitor/index.vue @@ -277,7 +277,7 @@ const linkMonitorTableData = ref([]) // 链路监视列表 const paginationOptions = reactive({ current: 1, - pageSize: 10, + pageSize: 20, total: 0, pageSizes: [20, 50, 100], }) diff --git a/ui/dasadmin/src/views/backend/report/measureList.vue b/ui/dasadmin/src/views/backend/report/measureList.vue index f1f8c95a..97678840 100644 --- a/ui/dasadmin/src/views/backend/report/measureList.vue +++ b/ui/dasadmin/src/views/backend/report/measureList.vue @@ -232,7 +232,7 @@ const pageSetting = reactive({ current: 1, pageSize: 20, total: 0, - pageSizes: [10, 20, 30], + pageSizes: [20, 50, 100], }) const getcurrentPage = () => {