From 81279264ecfa51cbc9ea058e81e0997d2330755f Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 09:14:17 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/data/pom.xml | 4 ++-- common/queue/pom.xml | 4 ++-- modules/filter-rule/pom.xml | 6 ++++++ .../listener/FilterLogSaveEventListener.java | 16 ++++++--------- .../service/impl/FilterLogServiceImpl.java | 18 ++++++++--------- .../service/impl/FilterRuleServiceImpl.java | 20 ++++++++----------- 6 files changed, 32 insertions(+), 36 deletions(-) diff --git a/common/data/pom.xml b/common/data/pom.xml index 8f74a8a..9cf2869 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -59,9 +59,9 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64 grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64 diff --git a/common/queue/pom.xml b/common/queue/pom.xml index 11f75fe..ca9af28 100644 --- a/common/queue/pom.xml +++ b/common/queue/pom.xml @@ -89,9 +89,9 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64 grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64 diff --git a/modules/filter-rule/pom.xml b/modules/filter-rule/pom.xml index 14f28b5..a3161b8 100644 --- a/modules/filter-rule/pom.xml +++ b/modules/filter-rule/pom.xml @@ -21,5 +21,11 @@ com.thing.modules thing + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + \ No newline at end of file diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java index 5e51953..88fcac2 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java @@ -2,13 +2,12 @@ package com.thing.filter.rule.listener; import static com.thing.filter.rule.event.FilterSuccessEvent.FILTER_SUCCESS; -import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; - import com.thing.common.core.enumeration.AggType; import com.thing.common.core.utils.DateTimeUtils; import com.thing.common.core.utils.MapUtil; import com.thing.common.data.tskv.TsKvDTO; import com.thing.common.data.tskv.TsKvEntity; +import com.thing.common.orm.utils.IdGenerator; import com.thing.common.tskv.event.FilterLogSaveEvent; import com.thing.common.tskv.service.TsKvService; import com.thing.filter.rule.dto.FilterRuleDTO; @@ -19,21 +18,18 @@ import com.thing.filter.rule.event.FilterSuccessEvent; import com.thing.filter.rule.service.FilterLogService; import com.thing.filter.rule.service.FilterRuleService; import com.thing.queue.util.Topics; - +import java.time.LocalDateTime; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.tuple.Pair; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - /** * @author siyang * @date 2024-03-21 @@ -200,7 +196,7 @@ public class FilterLogSaveEventListener { .appendSourceInfo(detail, tskv.getTs(), tskv.getVal()) .setStatus(LogStatus.MISMATCH.getCode()); filterLog - .setId(new SnowFlakeIDKeyGenerator().nextId()) + .setId(IdGenerator.nextId()) .setTenantCode(detail.getTenantCode()) .setCompanyId(detail.getCompanyId()) .setDeptId(detail.getDeptId()) diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java index 7a221ee..7ec16b2 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java @@ -1,6 +1,8 @@ package com.thing.filter.rule.service.impl; -import cn.hutool.core.map.MapUtil; + +import static com.thing.filter.rule.entity.table.FilterLogEntityTableDef.FILTER_LOG_ENTITY; +import static com.thing.filter.rule.entity.table.FilterRuleEntityTableDef.FILTER_RULE_ENTITY; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; @@ -13,16 +15,12 @@ import com.thing.filter.rule.enumeration.LogStatus; import com.thing.filter.rule.mapper.FilterLogMapper; import com.thing.filter.rule.service.FilterLogService; import com.thing.sys.security.context.UserContext; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - import java.util.List; import java.util.Map; import java.util.Objects; - -import static com.thing.filter.rule.entity.table.FilterLogEntityTableDef.FILTER_LOG_ENTITY; -import static com.thing.filter.rule.entity.table.FilterRuleEntityTableDef.FILTER_RULE_ENTITY; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; /** * 过滤日志 @@ -38,8 +36,8 @@ public class FilterLogServiceImpl extends BaseServiceImpl params) { - String filterRuleName = MapUtil.getStr(params, "filterRuleName"); - Integer status = MapUtil.getInt(params, "status"); + String filterRuleName = MapUtils.getString(params, "filterRuleName"); + Integer status = MapUtils.getInteger(params, "status"); return QueryWrapper.create() .select( FILTER_RULE_ENTITY.NAME.as("filter_rule_name"), diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java index 855e2c7..944e0ea 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java @@ -3,9 +3,6 @@ package com.thing.filter.rule.service.impl; import static com.thing.filter.rule.entity.table.FilterRuleDetailEntityTableDef.FILTER_RULE_DETAIL_ENTITY; import static com.thing.filter.rule.entity.table.FilterRuleEntityTableDef.FILTER_RULE_ENTITY; -import cn.hutool.core.map.MapUtil; -import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; - import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.cache.constants.CacheNameEnum; @@ -15,6 +12,7 @@ import com.thing.common.core.utils.ConvertUtils; import com.thing.common.core.utils.FormulaUtil; import com.thing.common.core.web.response.PageData; import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.common.orm.utils.IdGenerator; import com.thing.filter.rule.dto.FilterRuleDTO; import com.thing.filter.rule.dto.FilterRuleDetailDTO; import com.thing.filter.rule.entity.FilterRuleDetailEntity; @@ -22,19 +20,17 @@ import com.thing.filter.rule.entity.FilterRuleEntity; import com.thing.filter.rule.mapper.FilterRuleMapper; import com.thing.filter.rule.service.FilterRuleDetailService; import com.thing.filter.rule.service.FilterRuleService; - import com.thing.sys.security.context.UserContext; +import java.util.*; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; - +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; -import java.util.stream.Collectors; - /** * 过滤规则表 * @@ -50,9 +46,9 @@ public class FilterRuleServiceImpl extends BaseServiceImpl params) { - String name = MapUtil.getStr(params, "name"); - String thingKeyword = MapUtil.getStr(params, "thingKeyword"); - String attrKeyword = MapUtil.getStr(params, "attrKeyword"); + String name = MapUtils.getString(params, "name"); + String thingKeyword = MapUtils.getString(params, "thingKeyword"); + String attrKeyword = MapUtils.getString(params, "attrKeyword"); QueryWrapper wrapper = QueryWrapper.create() .select(FILTER_RULE_ENTITY.ALL_COLUMNS) @@ -190,7 +186,7 @@ public class FilterRuleServiceImpl extends BaseServiceImpl details = filterRule.getDetails(); From 2ff11479d3c254ecaf4c25ccba67246be15604b0 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 09:17:30 +0800 Subject: [PATCH 2/9] =?UTF-8?q?revert=E6=9C=AC=E5=9C=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/data/pom.xml | 4 ++-- common/queue/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/data/pom.xml b/common/data/pom.xml index 9cf2869..8f74a8a 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -59,9 +59,9 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64 + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64 + io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} diff --git a/common/queue/pom.xml b/common/queue/pom.xml index ca9af28..11f75fe 100644 --- a/common/queue/pom.xml +++ b/common/queue/pom.xml @@ -89,9 +89,9 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64 + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64 + io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} From b4fc9c2f08a157c763955be75a79d9055f41052c Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 09:27:13 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BB=BA=E8=A1=A8=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/sql/ddl_1.0.0.sql | 312 ++++++++++++++++++++--------------------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/help/sql/ddl_1.0.0.sql b/help/sql/ddl_1.0.0.sql index 476c8e2..fc2f724 100644 --- a/help/sql/ddl_1.0.0.sql +++ b/help/sql/ddl_1.0.0.sql @@ -21,7 +21,7 @@ -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_config"; CREATE TABLE "public"."alarm_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8, "thing_code" varchar(255) COLLATE "pg_catalog"."default", "attr_id" int8, @@ -66,7 +66,7 @@ COMMENT ON TABLE "public"."alarm_config" IS '尖峰谷平，夜间用能告警 -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_dict"; CREATE TABLE "public"."alarm_dict" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "pid" int8, "dict_type" varchar(100) COLLATE "pg_catalog"."default", "dict_name" varchar(255) COLLATE "pg_catalog"."default", @@ -97,7 +97,7 @@ COMMENT ON TABLE "public"."alarm_dict" IS '告警字典管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_dispose_log"; CREATE TABLE "public"."alarm_dispose_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "alarm_log_id" int8, "describe" varchar COLLATE "pg_catalog"."default", "status" varchar(5) COLLATE "pg_catalog"."default", @@ -121,7 +121,7 @@ COMMENT ON TABLE "public"."alarm_dispose_log" IS '告警处理日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule"; CREATE TABLE "public"."alarm_rule" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(500) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "level" varchar(5) COLLATE "pg_catalog"."default", @@ -165,7 +165,7 @@ COMMENT ON TABLE "public"."alarm_rule" IS '告警规则'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_action"; CREATE TABLE "public"."alarm_rule_action" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "rule_id" int8, "action_type" varchar(5) COLLATE "pg_catalog"."default", "action_id" int8, @@ -196,7 +196,7 @@ COMMENT ON TABLE "public"."alarm_rule_action" IS '告警动作'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_entity"; CREATE TABLE "public"."alarm_rule_entity" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "rule_id" int8 NOT NULL, "thing_id" int8 NOT NULL, "thing_code" varchar(100) COLLATE "pg_catalog"."default", @@ -227,7 +227,7 @@ COMMENT ON TABLE "public"."alarm_rule_entity" IS '告警设备'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_log"; CREATE TABLE "public"."alarm_rule_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "rule_id" int8, "action_id" int8, "content" varchar COLLATE "pg_catalog"."default", @@ -259,7 +259,7 @@ COMMENT ON TABLE "public"."alarm_rule_log" IS '告警日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_setting"; CREATE TABLE "public"."alarm_rule_setting" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "setting_type" varchar(255) COLLATE "pg_catalog"."default", "setting_ids" varchar COLLATE "pg_catalog"."default", "action_type" varchar(255) COLLATE "pg_catalog"."default", @@ -288,7 +288,7 @@ COMMENT ON TABLE "public"."alarm_rule_setting" IS '告警规则设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."calc_log"; CREATE TABLE "public"."calc_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "calc_target_config_id" int8 NOT NULL, "formula" varchar(255) COLLATE "pg_catalog"."default", "source_info" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -331,7 +331,7 @@ COMMENT ON TABLE "public"."calc_log" IS '物计算日志表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."calc_source_config"; CREATE TABLE "public"."calc_source_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "calc_target_config_id" int8 NOT NULL, "source_thing_name" varchar(100) COLLATE "pg_catalog"."default", "source_thing_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, @@ -368,7 +368,7 @@ COMMENT ON TABLE "public"."calc_source_config" IS '物计算（目标物）配 -- ---------------------------- DROP TABLE IF EXISTS "public"."calc_target_config"; CREATE TABLE "public"."calc_target_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "config_type" int4 NOT NULL, "target_thing_name" varchar(100) COLLATE "pg_catalog"."default", "target_thing_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, @@ -411,7 +411,7 @@ COMMENT ON TABLE "public"."calc_target_config" IS '物计算（目标物）配 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_energy_dict_relation"; CREATE TABLE "public"."carbon_energy_dict_relation" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "energy_variety_id" int8 NOT NULL, "attr_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, "attr_name" varchar(255) COLLATE "pg_catalog"."default", @@ -448,7 +448,7 @@ COMMENT ON TABLE "public"."carbon_energy_dict_relation" IS '能源属性关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_energy_price"; CREATE TABLE "public"."carbon_energy_price" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "attr_code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "attr_name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "energy_variety_id" int8, @@ -491,7 +491,7 @@ COMMENT ON TABLE "public"."carbon_energy_price" IS '能源价格'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_peak_config"; CREATE TABLE "public"."carbon_peak_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "year" varchar(255) COLLATE "pg_catalog"."default", "months" varchar(255) COLLATE "pg_catalog"."default", "start_time" int8, @@ -537,7 +537,7 @@ COMMENT ON TABLE "public"."carbon_peak_config" IS '尖峰谷平设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_certificate"; CREATE TABLE "public"."carbon_pub_certificate" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_id" int8, "product_name" varchar(500) COLLATE "pg_catalog"."default", "boundary_start" int8, @@ -584,7 +584,7 @@ COMMENT ON TABLE "public"."carbon_pub_certificate" IS '碳足迹证书'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_eng_eff"; CREATE TABLE "public"."carbon_pub_eng_eff" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_type" varchar(255) COLLATE "pg_catalog"."default", "product_name" varchar(255) COLLATE "pg_catalog"."default", "eff_kpi" varchar(255) COLLATE "pg_catalog"."default", @@ -673,7 +673,7 @@ COMMENT ON TABLE "public"."carbon_pub_material_factor" IS '原材料碳排因子 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_material_factor_use"; CREATE TABLE "public"."carbon_pub_material_factor_use" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "material_factor_id" varchar(100) COLLATE "pg_catalog"."default", "tenant_code" int8, "use_time" int8 @@ -689,7 +689,7 @@ COMMENT ON TABLE "public"."carbon_pub_material_factor_use" IS '原材料碳排 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_points_logs"; CREATE TABLE "public"."carbon_pub_points_logs" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "type" varchar(255) COLLATE "pg_catalog"."default", "points" int8, "tenant_code" int8, @@ -708,7 +708,7 @@ COMMENT ON TABLE "public"."carbon_pub_points_logs" IS '积分增减记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_points_rule"; CREATE TABLE "public"."carbon_pub_points_rule" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "model_shared_points" int4, "model_click_points" int4, "result_shared_points" int4, @@ -730,7 +730,7 @@ COMMENT ON TABLE "public"."carbon_pub_points_rule" IS '碳足迹积分规则'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_model"; CREATE TABLE "public"."carbon_pub_production_model" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_id" int8, "product_code" varchar(255) COLLATE "pg_catalog"."default", "product_name" varchar(500) COLLATE "pg_catalog"."default", @@ -786,7 +786,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_model" IS '产品工艺模型'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_report"; CREATE TABLE "public"."carbon_pub_production_report" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_id" int8, "config_id" int8, "boundary" varchar(4) COLLATE "pg_catalog"."default", @@ -834,7 +834,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_report" IS '产品碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_report_config"; CREATE TABLE "public"."carbon_pub_production_report_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "tenant_code" int8, "product_id" int8, "boundary_type" int4, @@ -857,7 +857,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_report_config" IS '碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_result"; CREATE TABLE "public"."carbon_pub_production_result" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_id" int8, "product_name" varchar(255) COLLATE "pg_catalog"."default", "product_code" varchar(255) COLLATE "pg_catalog"."default", @@ -950,7 +950,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_result" IS '生产记录核算 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_supplier"; CREATE TABLE "public"."carbon_pub_supplier" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(200) COLLATE "pg_catalog"."default", "code" int8, "access_token" varchar(200) COLLATE "pg_catalog"."default", @@ -999,7 +999,7 @@ COMMENT ON TABLE "public"."carbon_ts_kv" IS '企业遥测数据缓存'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_attacment"; CREATE TABLE "public"."eq_attacment" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8, "creator" int8, "create_date" timestamp(6), @@ -1027,7 +1027,7 @@ COMMENT ON TABLE "public"."eq_attacment" IS '附件表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_bx"; CREATE TABLE "public"."eq_bx" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "fault_type" varchar(16) COLLATE "pg_catalog"."default", "wx_team" varchar(255) COLLATE "pg_catalog"."default", "urgent_level" varchar(16) COLLATE "pg_catalog"."default", @@ -1088,7 +1088,7 @@ COMMENT ON TABLE "public"."eq_bx" IS '设备报修'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by"; CREATE TABLE "public"."eq_by" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "by_team" varchar(255) COLLATE "pg_catalog"."default", "by_level" varchar(16) COLLATE "pg_catalog"."default", "shutdown" varchar(16) COLLATE "pg_catalog"."default" DEFAULT 0, @@ -1137,7 +1137,7 @@ COMMENT ON TABLE "public"."eq_by" IS '设备保养'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_detail"; CREATE TABLE "public"."eq_by_detail" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "by_id" int8, "name" varchar(255) COLLATE "pg_catalog"."default", "description" varchar(255) COLLATE "pg_catalog"."default", @@ -1169,7 +1169,7 @@ COMMENT ON TABLE "public"."eq_by_detail" IS '保养明细'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_plan"; CREATE TABLE "public"."eq_by_plan" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "by_team" varchar(255) COLLATE "pg_catalog"."default", "creator" int8, "create_date" timestamp(0), @@ -1228,7 +1228,7 @@ COMMENT ON TABLE "public"."eq_by_plan" IS '设备保养计划'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_plan_part"; CREATE TABLE "public"."eq_by_plan_part" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "use_count" varchar(16) COLLATE "pg_catalog"."default", "creator" int8, "create_date" timestamp(0), @@ -1253,7 +1253,7 @@ COMMENT ON TABLE "public"."eq_by_plan_part" IS '保养计划部件更换'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_template"; CREATE TABLE "public"."eq_by_template" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "by_tool" varchar(255) COLLATE "pg_catalog"."default", "by_purpose" varchar(16) COLLATE "pg_catalog"."default", @@ -1285,7 +1285,7 @@ COMMENT ON TABLE "public"."eq_by_template" IS '保养模板'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_template_detail"; CREATE TABLE "public"."eq_by_template_detail" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "by_template_id" int8, "name" varchar(255) COLLATE "pg_catalog"."default", "description" varchar(255) COLLATE "pg_catalog"."default", @@ -1311,7 +1311,7 @@ COMMENT ON TABLE "public"."eq_by_template_detail" IS '保养模板明细'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_result"; CREATE TABLE "public"."eq_check_result" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "check_record_id" int8, "type" varchar(5) COLLATE "pg_catalog"."default", "check_result" text COLLATE "pg_catalog"."default", @@ -1344,7 +1344,7 @@ COMMENT ON COLUMN "public"."eq_check_result"."check_plan_id" IS '巡检计划id' -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_setting"; CREATE TABLE "public"."eq_check_setting" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8, "standard_id" int8, "user_id" int8, @@ -1373,7 +1373,7 @@ COMMENT ON TABLE "public"."eq_check_setting" IS '设备检查设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_standard"; CREATE TABLE "public"."eq_check_standard" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "group_id" int8, "name" varchar(100) COLLATE "pg_catalog"."default", "check_tool" varchar(255) COLLATE "pg_catalog"."default", @@ -1406,7 +1406,7 @@ COMMENT ON TABLE "public"."eq_check_standard" IS '检查标准'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_standard_detail"; CREATE TABLE "public"."eq_check_standard_detail" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "standard_id" int8, "name" varchar(255) COLLATE "pg_catalog"."default", "reference_value" varchar(255) COLLATE "pg_catalog"."default", @@ -1442,7 +1442,7 @@ COMMENT ON TABLE "public"."eq_check_standard_detail" IS '检查标准明细'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_file_delete"; CREATE TABLE "public"."eq_file_delete" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "url" varchar(255) COLLATE "pg_catalog"."default" ) ; @@ -1454,7 +1454,7 @@ COMMENT ON COLUMN "public"."eq_file_delete"."url" IS '文件路径'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_file_manage"; CREATE TABLE "public"."eq_file_manage" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "file_name" varchar(255) COLLATE "pg_catalog"."default", "file_type" varchar(5) COLLATE "pg_catalog"."default", "file_suffix" varchar(255) COLLATE "pg_catalog"."default", @@ -1492,7 +1492,7 @@ COMMENT ON COLUMN "public"."eq_file_manage"."tenant_code" IS '租户code'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_part_record"; CREATE TABLE "public"."eq_part_record" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "use_count" varchar(16) COLLATE "pg_catalog"."default", "creator" int8, "create_date" timestamp(0), @@ -1523,7 +1523,7 @@ COMMENT ON TABLE "public"."eq_part_record" IS '部件使用记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_patrol_check_plan"; CREATE TABLE "public"."eq_patrol_check_plan" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1588,7 +1588,7 @@ COMMENT ON TABLE "public"."eq_patrol_check_plan" IS '设备巡检计划'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_patrol_check_record"; CREATE TABLE "public"."eq_patrol_check_record" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "patrol_check_plan_id" int8, "user_id" int8, "creator" int8, @@ -1629,7 +1629,7 @@ COMMENT ON TABLE "public"."eq_patrol_check_record" IS '设备巡检记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_plan_record"; CREATE TABLE "public"."eq_plan_record" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1672,7 +1672,7 @@ COMMENT ON TABLE "public"."eq_plan_record" IS '计划未执行记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_plan_remind_record"; CREATE TABLE "public"."eq_plan_remind_record" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1705,7 +1705,7 @@ COMMENT ON TABLE "public"."eq_plan_remind_record" IS '计划到期提醒记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_scrap"; CREATE TABLE "public"."eq_scrap" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1736,7 +1736,7 @@ COMMENT ON TABLE "public"."eq_scrap" IS '设备报废'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_spot_check_plan"; CREATE TABLE "public"."eq_spot_check_plan" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8, "last_check_time" timestamp(6), "use_id" varchar(255) COLLATE "pg_catalog"."default", @@ -1764,7 +1764,7 @@ COMMENT ON COLUMN "public"."eq_spot_check_plan"."tenant_code" IS '租户code'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_spot_check_record"; CREATE TABLE "public"."eq_spot_check_record" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8, "standard_id" int8, "user_id" int8, @@ -1803,7 +1803,7 @@ COMMENT ON TABLE "public"."eq_spot_check_record" IS '设备点检记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_user_group"; CREATE TABLE "public"."eq_user_group" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "user_id" varchar(255) COLLATE "pg_catalog"."default", "name" varchar(255) COLLATE "pg_catalog"."default", "creator" int8, @@ -1829,7 +1829,7 @@ COMMENT ON COLUMN "public"."eq_user_group"."tenant_code" IS '租户code'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_wx"; CREATE TABLE "public"."eq_wx" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "fault_reason" varchar(255) COLLATE "pg_catalog"."default", "wx_team" varchar(255) COLLATE "pg_catalog"."default", "urgent_level" varchar(16) COLLATE "pg_catalog"."default", @@ -1878,7 +1878,7 @@ COMMENT ON TABLE "public"."eq_wx" IS '设备维修'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_wx_plan"; CREATE TABLE "public"."eq_wx_plan" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "wx_team" varchar(255) COLLATE "pg_catalog"."default", "urgent_level" varchar(5) COLLATE "pg_catalog"."default", "creator" int8, @@ -1932,7 +1932,7 @@ COMMENT ON TABLE "public"."eq_wx_plan" IS '设备维修计划'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_wx_replacement"; CREATE TABLE "public"."eq_wx_replacement" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "wx_plan_id" int8, "thing_id" int8, "use_count" int4 @@ -1947,7 +1947,7 @@ COMMENT ON COLUMN "public"."eq_wx_replacement"."use_count" IS '使用数量'; -- ---------------------------- DROP TABLE IF EXISTS "public"."filter_log"; CREATE TABLE "public"."filter_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "filter_rule_id" int8 NOT NULL, "formula" varchar(255) COLLATE "pg_catalog"."default", "source_info" text COLLATE "pg_catalog"."default" NOT NULL, @@ -1988,7 +1988,7 @@ COMMENT ON TABLE "public"."filter_log" IS '过滤日志表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."filter_rule"; CREATE TABLE "public"."filter_rule" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "formula" varchar(255) COLLATE "pg_catalog"."default", "formula_description" varchar(255) COLLATE "pg_catalog"."default", @@ -2023,7 +2023,7 @@ COMMENT ON TABLE "public"."filter_rule" IS '过滤规则表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gateway_component"; CREATE TABLE "public"."gateway_component" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(100) COLLATE "pg_catalog"."default", "type" varchar(255) COLLATE "pg_catalog"."default", "description" varchar(500) COLLATE "pg_catalog"."default" @@ -2040,7 +2040,7 @@ COMMENT ON TABLE "public"."gateway_component" IS '网关组件'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gateway_component_config"; CREATE TABLE "public"."gateway_component_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "cmpt_id" int8, "cmpt_cfg_name" varchar(255) COLLATE "pg_catalog"."default", "cmpt_cfg_context" text COLLATE "pg_catalog"."default", @@ -2061,7 +2061,7 @@ COMMENT ON TABLE "public"."gateway_component_config" IS '网关组件配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gateway_component_instance"; CREATE TABLE "public"."gateway_component_instance" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "cmpt_id" int8, "cmpt_type" varchar(255) COLLATE "pg_catalog"."default", "cmpt_cfg_id" int8, @@ -2088,7 +2088,7 @@ COMMENT ON TABLE "public"."gateway_component_instance" IS '网关组件实例'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_base_class"; CREATE TABLE "public"."gen_base_class" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "package_name" varchar(200) COLLATE "pg_catalog"."default", "code" varchar(200) COLLATE "pg_catalog"."default", "fields" varchar(200) COLLATE "pg_catalog"."default", @@ -2109,7 +2109,7 @@ COMMENT ON TABLE "public"."gen_base_class" IS '基类管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_datasource"; CREATE TABLE "public"."gen_datasource" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "db_type" varchar(200) COLLATE "pg_catalog"."default", "conn_name" varchar(200) COLLATE "pg_catalog"."default", "conn_url" varchar(500) COLLATE "pg_catalog"."default", @@ -2134,7 +2134,7 @@ COMMENT ON TABLE "public"."gen_datasource" IS '数据源管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_field_type"; CREATE TABLE "public"."gen_field_type" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "column_type" varchar(200) COLLATE "pg_catalog"."default", "attr_type" varchar(200) COLLATE "pg_catalog"."default", "package_name" varchar(200) COLLATE "pg_catalog"."default", @@ -2153,7 +2153,7 @@ COMMENT ON TABLE "public"."gen_field_type" IS '字段类型管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_table_field"; CREATE TABLE "public"."gen_table_field" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "table_id" int8, "table_name" varchar(200) COLLATE "pg_catalog"."default", "column_name" varchar(200) COLLATE "pg_catalog"."default", @@ -2200,7 +2200,7 @@ COMMENT ON TABLE "public"."gen_table_field" IS '代码生成表列'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_table_info"; CREATE TABLE "public"."gen_table_info" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "table_name" varchar(200) COLLATE "pg_catalog"."default", "class_name" varchar(200) COLLATE "pg_catalog"."default", "table_comment" varchar(200) COLLATE "pg_catalog"."default", @@ -2239,7 +2239,7 @@ COMMENT ON TABLE "public"."gen_table_info" IS '代码生成表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_template"; CREATE TABLE "public"."gen_template" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(200) COLLATE "pg_catalog"."default", "file_name" varchar(200) COLLATE "pg_catalog"."default", "content" text COLLATE "pg_catalog"."default", @@ -2262,7 +2262,7 @@ COMMENT ON TABLE "public"."gen_template" IS '模板管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_board_manage"; CREATE TABLE "public"."iot_board_manage" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "type" varchar(255) COLLATE "pg_catalog"."default", "thumbnail_url" text COLLATE "pg_catalog"."default", @@ -2352,7 +2352,7 @@ COMMENT ON TABLE "public"."iot_carbon_bom" IS '产品bom信息'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_certificate"; CREATE TABLE "public"."iot_carbon_certificate" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_id" int8, "product_name" varchar(500) COLLATE "pg_catalog"."default", "boundary_start" int8, @@ -2401,7 +2401,7 @@ COMMENT ON TABLE "public"."iot_carbon_certificate" IS '碳足迹证书'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_energy_variety"; CREATE TABLE "public"."iot_carbon_energy_variety" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(128) COLLATE "pg_catalog"."default", "code" varchar(128) COLLATE "pg_catalog"."default", "type" varchar(24) COLLATE "pg_catalog"."default", @@ -2478,7 +2478,7 @@ COMMENT ON COLUMN "public"."iot_carbon_enterprise_auth"."opinion" IS '审核意 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_indirect_energy"; CREATE TABLE "public"."iot_carbon_indirect_energy" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "ie_code" varchar(255) COLLATE "pg_catalog"."default", "ie_name" varchar(500) COLLATE "pg_catalog"."default", "ev_id" int8, @@ -2513,7 +2513,7 @@ COMMENT ON TABLE "public"."iot_carbon_indirect_energy" IS '间接用能配置记 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_outbound_config"; CREATE TABLE "public"."iot_carbon_outbound_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "m_id" int8, "m_code" varchar(255) COLLATE "pg_catalog"."default", "m_name" varchar(255) COLLATE "pg_catalog"."default", @@ -2539,7 +2539,7 @@ COMMENT ON COLUMN "public"."iot_carbon_outbound_config"."outbound_time" IS '出 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_process_steps"; CREATE TABLE "public"."iot_carbon_process_steps" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "mid" int8, "order_num" int8, "process_code" varchar(255) COLLATE "pg_catalog"."default", @@ -2564,7 +2564,7 @@ COMMENT ON TABLE "public"."iot_carbon_process_steps" IS '产品工艺工序配 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_custom"; CREATE TABLE "public"."iot_carbon_production_custom" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "production_id" int8, "title" varchar(2550) COLLATE "pg_catalog"."default", "info" varchar(2550) COLLATE "pg_catalog"."default" @@ -2581,7 +2581,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_custom" IS '产品自定义信 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_process_variety"; CREATE TABLE "public"."iot_carbon_production_process_variety" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "pr_id" int8, "pr_code" varchar(500) COLLATE "pg_catalog"."default", "m_id" int8, @@ -2612,7 +2612,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_process_variety" IS '工单工 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_record"; CREATE TABLE "public"."iot_carbon_production_record" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "pr_code" varchar(255) COLLATE "pg_catalog"."default", "m_id" int8, "work_name" varchar(500) COLLATE "pg_catalog"."default", @@ -2671,7 +2671,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_record" IS '生产记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_report"; CREATE TABLE "public"."iot_carbon_production_report" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "product_id" int8, "config_id" int8, "boundary" varchar(4) COLLATE "pg_catalog"."default", @@ -2717,7 +2717,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_report" IS '产品碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_report_config"; CREATE TABLE "public"."iot_carbon_production_report_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "tenant_code" int8, "product_id" int8, "boundary_type" int4, @@ -2738,7 +2738,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_report_config" IS '碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_result"; CREATE TABLE "public"."iot_carbon_production_result" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "m_id" int8, "pr_code" varchar(255) COLLATE "pg_catalog"."default", "num" int8, @@ -2820,7 +2820,7 @@ COMMENT ON COLUMN "public"."iot_carbon_production_result"."life" IS '产品使 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_sync"; CREATE TABLE "public"."iot_carbon_production_sync" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "m_id" int8, "type" varchar(4) COLLATE "pg_catalog"."default", "tenant_code" int8, @@ -2848,7 +2848,7 @@ COMMENT ON COLUMN "public"."iot_carbon_production_sync"."update_date" IS '更新 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_variety"; CREATE TABLE "public"."iot_carbon_production_variety" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "code" varchar(2550) COLLATE "pg_catalog"."default", "name" varchar(500) COLLATE "pg_catalog"."default", "model" varchar(2550) COLLATE "pg_catalog"."default", @@ -2956,7 +2956,7 @@ COMMENT ON TABLE "public"."iot_carbon_ratio" IS '折标煤碳排因子基本信 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_share"; CREATE TABLE "public"."iot_carbon_share" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(2550) COLLATE "pg_catalog"."default", "url" varchar(2550) COLLATE "pg_catalog"."default", "token" varchar(2550) COLLATE "pg_catalog"."default", @@ -2987,7 +2987,7 @@ COMMENT ON TABLE "public"."iot_carbon_share" IS '协议配置详情表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_share_details"; CREATE TABLE "public"."iot_carbon_share_details" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "type" varchar(255) COLLATE "pg_catalog"."default", "m_id" int8, "code" varchar(255) COLLATE "pg_catalog"."default", @@ -3029,7 +3029,7 @@ COMMENT ON COLUMN "public"."iot_carbon_share_details"."update_date" IS '更新 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_use_config"; CREATE TABLE "public"."iot_carbon_use_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "life" numeric(20,10), "m_id" int8, "ev_id" int8, @@ -3078,7 +3078,7 @@ COMMENT ON TABLE "public"."iot_carbon_use_config" IS '产品运输，使用， -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_configuration_design"; CREATE TABLE "public"."iot_configuration_design" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "board_manage_id" int8, "width" int4, "height" int4, @@ -3115,7 +3115,7 @@ COMMENT ON TABLE "public"."iot_configuration_design" IS '组态设计管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard"; CREATE TABLE "public"."iot_dashboard" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "dashboard_group_id" int8, "svg_url" varchar(500) COLLATE "pg_catalog"."default", "img_url" varchar(500) COLLATE "pg_catalog"."default", @@ -3164,7 +3164,7 @@ COMMENT ON TABLE "public"."iot_dashboard" IS '看板表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard_element"; CREATE TABLE "public"."iot_dashboard_element" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "dashboard_id" int8, "element_id" varchar(255) COLLATE "pg_catalog"."default", "element_name" varchar(255) COLLATE "pg_catalog"."default", @@ -3215,7 +3215,7 @@ COMMENT ON TABLE "public"."iot_dashboard_element" IS '看板元素表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard_group"; CREATE TABLE "public"."iot_dashboard_group" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(64) COLLATE "pg_catalog"."default", "preview_picture" varchar COLLATE "pg_catalog"."default", "exist_menu" varchar(10) COLLATE "pg_catalog"."default", @@ -3256,7 +3256,7 @@ COMMENT ON TABLE "public"."iot_dashboard_group" IS '看板管理表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard_svg"; CREATE TABLE "public"."iot_dashboard_svg" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "dashboard_id" int8, "svg_xml" xml, "creator" int8, @@ -3279,7 +3279,7 @@ COMMENT ON TABLE "public"."iot_dashboard_svg" IS '看板svg'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_data_entry"; CREATE TABLE "public"."iot_data_entry" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_code" varchar(255) COLLATE "pg_catalog"."default", "thing_name" varchar(255) COLLATE "pg_catalog"."default", "attr_code" varchar(255) COLLATE "pg_catalog"."default", @@ -3316,7 +3316,7 @@ COMMENT ON TABLE "public"."iot_data_entry" IS '数据报表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_device_control"; CREATE TABLE "public"."iot_device_control" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "thing_id" int8, "attr_code" varchar(20) COLLATE "pg_catalog"."default", @@ -3379,7 +3379,7 @@ COMMENT ON TABLE "public"."iot_device_control" IS '设备控制'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_device_control_log"; CREATE TABLE "public"."iot_device_control_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "control_id" int8, "in_msg" varchar COLLATE "pg_catalog"."default", "out_msg" varchar COLLATE "pg_catalog"."default", @@ -3406,7 +3406,7 @@ COMMENT ON TABLE "public"."iot_device_control_log" IS '设备控制日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_device_management"; CREATE TABLE "public"."iot_device_management" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_relation_id" int8, "thing_id" int8, "thing_code" varchar(255) COLLATE "pg_catalog"."default", @@ -3447,7 +3447,7 @@ COMMENT ON TABLE "public"."iot_device_management" IS '设备监控属性配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_enterprise_dashboard"; CREATE TABLE "public"."iot_enterprise_dashboard" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "tenant_code" int8, "company_id" int8, "dept_id" int8, @@ -3484,7 +3484,7 @@ COMMENT ON TABLE "public"."iot_enterprise_dashboard" IS '企业主页配置管 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_group_info"; CREATE TABLE "public"."iot_group_info" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL, "code" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -3525,7 +3525,7 @@ COMMENT ON TABLE "public"."iot_group_info" IS '物的组信息表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_group_relation"; CREATE TABLE "public"."iot_group_relation" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "group_id" int8 NOT NULL, "entity_id" int8 NOT NULL, "entity_type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL @@ -3542,7 +3542,7 @@ COMMENT ON TABLE "public"."iot_group_relation" IS '实体&组 的关系表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_section_detail"; CREATE TABLE "public"."iot_section_detail" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "alias_name" varchar(255) COLLATE "pg_catalog"."default", "group_id" int8, @@ -3599,7 +3599,7 @@ COMMENT ON TABLE "public"."iot_section_detail" IS '部件管理基本信息'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_source_material"; CREATE TABLE "public"."iot_source_material" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "type" varchar(255) COLLATE "pg_catalog"."default", "is_default" int4, @@ -3638,7 +3638,7 @@ COMMENT ON TABLE "public"."iot_source_material" IS '素材管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_task"; CREATE TABLE "public"."iot_task" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(100) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "time_type" varchar(10) COLLATE "pg_catalog"."default", @@ -3683,7 +3683,7 @@ COMMENT ON TABLE "public"."iot_task" IS '定时任务'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_api"; CREATE TABLE "public"."iot_thing_api" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "thing_condition" text COLLATE "pg_catalog"."default", "attr_condition" text COLLATE "pg_catalog"."default", @@ -3737,7 +3737,7 @@ COMMENT ON COLUMN "public"."iot_thing_api"."req_params" IS '请求参数'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_api_log"; CREATE TABLE "public"."iot_thing_api_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "api_id" int8 NOT NULL, "call_entity" text COLLATE "pg_catalog"."default" NOT NULL, "creator" int8, @@ -3765,7 +3765,7 @@ COMMENT ON COLUMN "public"."iot_thing_api_log"."ip" IS '调用ip'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_base_info"; CREATE TABLE "public"."iot_thing_base_info" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8, "standard" varchar(255) COLLATE "pg_catalog"."default", "image_url" varchar(255) COLLATE "pg_catalog"."default", @@ -3827,7 +3827,7 @@ COMMENT ON TABLE "public"."iot_thing_base_info" IS '设备属性信息'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_biz_config"; CREATE TABLE "public"."iot_thing_biz_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8 NOT NULL, "thing_code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "thing_name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, @@ -3860,7 +3860,7 @@ COMMENT ON TABLE "public"."iot_thing_biz_config" IS '设备业务配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_biz_config_item"; CREATE TABLE "public"."iot_thing_biz_config_item" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "config_id" int8 NOT NULL, "item_name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, "item_alias" varchar(100) COLLATE "pg_catalog"."default", @@ -3887,7 +3887,7 @@ COMMENT ON TABLE "public"."iot_thing_biz_config_item" IS '设备业务配置项' -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_dict"; CREATE TABLE "public"."iot_thing_dict" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "unit" varchar(50) COLLATE "pg_catalog"."default", @@ -3946,7 +3946,7 @@ COMMENT ON TABLE "public"."iot_thing_dict" IS '物字典信息表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_dict_relation"; CREATE TABLE "public"."iot_thing_dict_relation" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "group_name" varchar(255) COLLATE "pg_catalog"."default", "code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, @@ -4017,7 +4017,7 @@ COMMENT ON TABLE "public"."iot_thing_dict_relation" IS '物指标信息表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_entity"; CREATE TABLE "public"."iot_thing_entity" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "code" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "real_type" varchar(2) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 1, @@ -4067,7 +4067,7 @@ COMMENT ON TABLE "public"."iot_thing_entity" IS '物实体表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_menu_config"; CREATE TABLE "public"."iot_thing_menu_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "menu_id" varchar(255) COLLATE "pg_catalog"."default", "menu_config" varchar COLLATE "pg_catalog"."default", "config_type" varchar(2) COLLATE "pg_catalog"."default", @@ -4100,7 +4100,7 @@ COMMENT ON TABLE "public"."iot_thing_menu_config" IS '物关系菜单配置表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_model"; CREATE TABLE "public"."iot_thing_model" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "code" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "token" varchar(128) COLLATE "pg_catalog"."default", "gateway" varchar(2) COLLATE "pg_catalog"."default" DEFAULT 0, @@ -4139,7 +4139,7 @@ COMMENT ON TABLE "public"."iot_thing_model" IS '物模型表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_relation_detail"; CREATE TABLE "public"."iot_thing_relation_detail" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "from_id" int8 NOT NULL, "from_code" varchar(255) COLLATE "pg_catalog"."default", "from_name" varchar(255) COLLATE "pg_catalog"."default", @@ -4190,7 +4190,7 @@ COMMENT ON TABLE "public"."iot_thing_relation_detail" IS '物关系详情信息 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_relation_root"; CREATE TABLE "public"."iot_thing_relation_root" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "remark" varchar(2048) COLLATE "pg_catalog"."default", "url" varchar(2048) COLLATE "pg_catalog"."default", @@ -4231,7 +4231,7 @@ COMMENT ON TABLE "public"."iot_thing_relation_root" IS '物关系根表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_source"; CREATE TABLE "public"."iot_thing_source" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_id" int8 NOT NULL, "thing_name" varchar(255) COLLATE "pg_catalog"."default", "thing_code" varchar(255) COLLATE "pg_catalog"."default", @@ -4310,7 +4310,7 @@ COMMENT ON TABLE "public"."iot_thing_source" IS '监控分析、用量分析、 -- ---------------------------- DROP TABLE IF EXISTS "public"."mock_data_config"; CREATE TABLE "public"."mock_data_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "thing_name" varchar(100) COLLATE "pg_catalog"."default", "thing_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, "attr_name" varchar(100) COLLATE "pg_catalog"."default", @@ -4355,7 +4355,7 @@ COMMENT ON TABLE "public"."mock_data_config" IS '数据模拟配置表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."mock_data_log"; CREATE TABLE "public"."mock_data_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "mock_config_id" int8 NOT NULL, "formula" varchar(255) COLLATE "pg_catalog"."default", "time" int8, @@ -4419,7 +4419,7 @@ COMMENT ON TABLE "public"."mqtt_broker_connect" IS 'mqttBroker连接日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."mqtt_broker_msg"; CREATE TABLE "public"."mqtt_broker_msg" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "client_id" varchar(255) COLLATE "pg_catalog"."default", "user_name" varchar(255) COLLATE "pg_catalog"."default", "msg" varchar COLLATE "pg_catalog"."default", @@ -4447,7 +4447,7 @@ COMMENT ON TABLE "public"."mqtt_broker_msg" IS 'mqttBroker调试日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_cache"; CREATE TABLE "public"."msg_cache" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "cache_key" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "cache_key_type" varchar(255) COLLATE "pg_catalog"."default", "cache_value" varchar(255) COLLATE "pg_catalog"."default", @@ -4477,7 +4477,7 @@ COMMENT ON TABLE "public"."msg_cache" IS '消息缓存表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_his"; CREATE TABLE "public"."msg_his" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "publisher" varchar(100) COLLATE "pg_catalog"."default", "receiver" varchar(100) COLLATE "pg_catalog"."default", "his_msg" varchar(255) COLLATE "pg_catalog"."default", @@ -4525,7 +4525,7 @@ COMMENT ON TABLE "public"."msg_his" IS '消息历史表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_push"; CREATE TABLE "public"."msg_push" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "config_name" varchar(50) COLLATE "pg_catalog"."default", "config_type" varchar(5) COLLATE "pg_catalog"."default", "template_msg" varchar(255) COLLATE "pg_catalog"."default", @@ -4562,7 +4562,7 @@ COMMENT ON TABLE "public"."msg_push" IS '消息推送'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_push_setting"; CREATE TABLE "public"."msg_push_setting" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "push_ids" varchar(255) COLLATE "pg_catalog"."default", "template_id" int8, "receivers" varchar(255) COLLATE "pg_catalog"."default", @@ -4605,7 +4605,7 @@ COMMENT ON TABLE "public"."msg_push_setting" IS '消息推送设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_template"; CREATE TABLE "public"."msg_template" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(100) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "subject" varchar(100) COLLATE "pg_catalog"."default", @@ -4637,7 +4637,7 @@ COMMENT ON TABLE "public"."msg_template" IS '消息模板'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_user"; CREATE TABLE "public"."msg_user" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "user_id" int8, "email_username" varchar(255) COLLATE "pg_catalog"."default", "wx_open_id" varchar(255) COLLATE "pg_catalog"."default", @@ -4833,7 +4833,7 @@ CREATE TABLE "public"."qrtz_triggers" ( -- ---------------------------- DROP TABLE IF EXISTS "public"."queue_log"; CREATE TABLE "public"."queue_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "time" timestamp(6), "queue_num" varchar(25) COLLATE "pg_catalog"."default", "enter_num" varchar(25) COLLATE "pg_catalog"."default", @@ -4862,7 +4862,7 @@ COMMENT ON TABLE "public"."queue_log" IS '队列消息数量日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."queue_msg_log"; CREATE TABLE "public"."queue_msg_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "channel_name" varchar(30) COLLATE "pg_catalog"."default", "msg" varchar COLLATE "pg_catalog"."default", "time" int8, @@ -4886,7 +4886,7 @@ COMMENT ON TABLE "public"."queue_msg_log" IS '队列消息日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."schedule_job"; CREATE TABLE "public"."schedule_job" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "bean_name" varchar(200) COLLATE "pg_catalog"."default", "params" varchar(2000) COLLATE "pg_catalog"."default", "cron_expression" varchar(100) COLLATE "pg_catalog"."default", @@ -4915,7 +4915,7 @@ COMMENT ON TABLE "public"."schedule_job" IS '定时任务'; -- ---------------------------- DROP TABLE IF EXISTS "public"."schedule_job_log"; CREATE TABLE "public"."schedule_job_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "job_id" int8 NOT NULL, "bean_name" varchar(200) COLLATE "pg_catalog"."default", "params" varchar(2000) COLLATE "pg_catalog"."default", @@ -4940,7 +4940,7 @@ COMMENT ON TABLE "public"."schedule_job_log" IS '定时任务日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."script_info"; CREATE TABLE "public"."script_info" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default", "script_type" varchar(25) COLLATE "pg_catalog"."default", "script_body" varchar COLLATE "pg_catalog"."default", @@ -4980,7 +4980,7 @@ COMMENT ON TABLE "public"."script_info" IS '数据解析'; -- ---------------------------- DROP TABLE IF EXISTS "public"."script_log"; CREATE TABLE "public"."script_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "script_id" int8, "msg" varchar COLLATE "pg_catalog"."default", "creator" int8, @@ -5002,7 +5002,7 @@ COMMENT ON TABLE "public"."script_log" IS '数据解析日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_dept"; CREATE TABLE "public"."sys_dept" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "pid" int8, "pids" varchar(500) COLLATE "pg_catalog"."default", "name" varchar(50) COLLATE "pg_catalog"."default", @@ -5031,7 +5031,7 @@ COMMENT ON TABLE "public"."sys_dept" IS '部门管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_dict_data"; CREATE TABLE "public"."sys_dict_data" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "dict_type_id" int8 NOT NULL, "dict_label" varchar(255) COLLATE "pg_catalog"."default", "dict_value" varchar(255) COLLATE "pg_catalog"."default", @@ -5060,7 +5060,7 @@ COMMENT ON TABLE "public"."sys_dict_data" IS '字典数据'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_dict_type"; CREATE TABLE "public"."sys_dict_type" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "dict_type" varchar(100) COLLATE "pg_catalog"."default", "dict_name" varchar(255) COLLATE "pg_catalog"."default", "remark" varchar(255) COLLATE "pg_catalog"."default", @@ -5087,7 +5087,7 @@ COMMENT ON TABLE "public"."sys_dict_type" IS '字典类型'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_energy_check"; CREATE TABLE "public"."sys_energy_check" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "location" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "dept_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "check_time" date NOT NULL, @@ -5126,7 +5126,7 @@ COMMENT ON TABLE "public"."sys_energy_check" IS '能源检查'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_energy_people"; CREATE TABLE "public"."sys_energy_people" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "username" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "realname" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "dept_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -5153,7 +5153,7 @@ COMMENT ON TABLE "public"."sys_energy_people" IS '节能项目-用户关联'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_energy_project"; CREATE TABLE "public"."sys_energy_project" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "project_name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "department" varchar(125) COLLATE "pg_catalog"."default" NOT NULL, "people" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -5188,7 +5188,7 @@ COMMENT ON TABLE "public"."sys_energy_project" IS '节能项目'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_industry_type"; CREATE TABLE "public"."sys_industry_type" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "code" varchar(20) COLLATE "pg_catalog"."default", "parent_code" varchar(20) COLLATE "pg_catalog"."default", "name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, @@ -5234,7 +5234,7 @@ COMMENT ON TABLE "public"."sys_language" IS '国际化'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_log_error"; CREATE TABLE "public"."sys_log_error" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "request_uri" varchar(200) COLLATE "pg_catalog"."default", "request_method" varchar(20) COLLATE "pg_catalog"."default", "request_params" text COLLATE "pg_catalog"."default", @@ -5261,7 +5261,7 @@ COMMENT ON TABLE "public"."sys_log_error" IS '异常日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_log_login"; CREATE TABLE "public"."sys_log_login" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "operation" int4, "status" int4, "user_agent" varchar(500) COLLATE "pg_catalog"."default", @@ -5288,7 +5288,7 @@ COMMENT ON TABLE "public"."sys_log_login" IS '登录日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_log_operation"; CREATE TABLE "public"."sys_log_operation" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "operation" varchar(50) COLLATE "pg_catalog"."default", "request_uri" varchar(200) COLLATE "pg_catalog"."default", "request_method" varchar(20) COLLATE "pg_catalog"."default", @@ -5323,7 +5323,7 @@ COMMENT ON TABLE "public"."sys_log_operation" IS '操作日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_mail_log"; CREATE TABLE "public"."sys_mail_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "template_id" int8 NOT NULL, "mail_from" varchar(200) COLLATE "pg_catalog"."default", "mail_to" varchar(400) COLLATE "pg_catalog"."default", @@ -5352,7 +5352,7 @@ COMMENT ON TABLE "public"."sys_mail_log" IS '邮件发送记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_mail_template"; CREATE TABLE "public"."sys_mail_template" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(100) COLLATE "pg_catalog"."default", "subject" varchar(200) COLLATE "pg_catalog"."default", "content" text COLLATE "pg_catalog"."default", @@ -5377,7 +5377,7 @@ COMMENT ON TABLE "public"."sys_mail_template" IS '邮件模板'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_menu"; CREATE TABLE "public"."sys_menu" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "pid" int8, "url" varchar(200) COLLATE "pg_catalog"."default", "permissions" varchar(500) COLLATE "pg_catalog"."default", @@ -5418,7 +5418,7 @@ COMMENT ON TABLE "public"."sys_menu" IS '菜单管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_notice"; CREATE TABLE "public"."sys_notice" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "type" int4 NOT NULL, "title" varchar(200) COLLATE "pg_catalog"."default", "content" text COLLATE "pg_catalog"."default", @@ -5466,7 +5466,7 @@ COMMENT ON TABLE "public"."sys_notice_user" IS '我的通知'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_oss"; CREATE TABLE "public"."sys_oss" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "url" varchar(200) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "single" bool, @@ -5485,7 +5485,7 @@ COMMENT ON TABLE "public"."sys_oss" IS '文件上传'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_params"; CREATE TABLE "public"."sys_params" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "param_code" varchar(32) COLLATE "pg_catalog"."default", "param_value" varchar(2000) COLLATE "pg_catalog"."default", "param_type" int4 NOT NULL DEFAULT 1, @@ -5511,7 +5511,7 @@ COMMENT ON TABLE "public"."sys_params" IS '参数管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_post"; CREATE TABLE "public"."sys_post" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "post_code" varchar(100) COLLATE "pg_catalog"."default", "post_name" varchar(100) COLLATE "pg_catalog"."default", "sort" int4, @@ -5540,7 +5540,7 @@ COMMENT ON TABLE "public"."sys_post" IS '岗位管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_region"; CREATE TABLE "public"."sys_region" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "pid" int8, "name" varchar(100) COLLATE "pg_catalog"."default", "tree_level" int4, @@ -5583,7 +5583,7 @@ COMMENT ON TABLE "public"."sys_region_weather" IS '区域对应天气编码'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role"; CREATE TABLE "public"."sys_role" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(50) COLLATE "pg_catalog"."default", "remark" varchar(100) COLLATE "pg_catalog"."default", "dept_id" int8, @@ -5616,7 +5616,7 @@ COMMENT ON TABLE "public"."sys_role" IS '角色管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role_data_scope"; CREATE TABLE "public"."sys_role_data_scope" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "role_id" int8, "dept_id" int8, "creator" int8, @@ -5634,7 +5634,7 @@ COMMENT ON TABLE "public"."sys_role_data_scope" IS '角色数据权限'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role_menu"; CREATE TABLE "public"."sys_role_menu" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "role_id" int8, "menu_id" int8, "creator" int8, @@ -5652,7 +5652,7 @@ COMMENT ON TABLE "public"."sys_role_menu" IS '角色菜单关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role_user"; CREATE TABLE "public"."sys_role_user" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "role_id" int8, "user_id" int8, "creator" int8, @@ -5670,7 +5670,7 @@ COMMENT ON TABLE "public"."sys_role_user" IS '角色用户关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_sms"; CREATE TABLE "public"."sys_sms" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "sms_code" varchar(32) COLLATE "pg_catalog"."default", "platform" int4, "sms_config" varchar(2000) COLLATE "pg_catalog"."default", @@ -5697,7 +5697,7 @@ COMMENT ON TABLE "public"."sys_sms" IS '短信'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_sms_log"; CREATE TABLE "public"."sys_sms_log" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "sms_code" varchar(32) COLLATE "pg_catalog"."default", "platform" int4, "mobile" varchar(20) COLLATE "pg_catalog"."default", @@ -5728,7 +5728,7 @@ COMMENT ON TABLE "public"."sys_sms_log" IS '短信发送记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_tenant"; CREATE TABLE "public"."sys_tenant" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "tenant_code" int8, "tenant_name" varchar(50) COLLATE "pg_catalog"."default", "status" int4, @@ -5773,7 +5773,7 @@ COMMENT ON TABLE "public"."sys_tenant" IS '租户管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_tenant_detail"; CREATE TABLE "public"."sys_tenant_detail" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "corporation_code" varchar(32) COLLATE "pg_catalog"."default", "industry_category" varchar(64) COLLATE "pg_catalog"."default", @@ -5822,7 +5822,7 @@ COMMENT ON TABLE "public"."sys_tenant_detail" IS '企业详情'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_tenant_group"; CREATE TABLE "public"."sys_tenant_group" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "parent_code" int8, "code" int8, "creator" int8, @@ -5840,7 +5840,7 @@ COMMENT ON TABLE "public"."sys_tenant_group" IS '租户组关系表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user"; CREATE TABLE "public"."sys_user" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "username" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "password" varchar(100) COLLATE "pg_catalog"."default", "real_name" varchar(50) COLLATE "pg_catalog"."default", @@ -5891,7 +5891,7 @@ COMMENT ON TABLE "public"."sys_user" IS '用户管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user_menu"; CREATE TABLE "public"."sys_user_menu" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "user_id" int8, "menu_id" int8, "url" varchar(255) COLLATE "pg_catalog"."default", @@ -5923,7 +5923,7 @@ COMMENT ON TABLE "public"."sys_user_menu" IS '用户菜单关系表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user_post"; CREATE TABLE "public"."sys_user_post" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "post_id" int8, "user_id" int8, "creator" int8, @@ -5940,7 +5940,7 @@ COMMENT ON TABLE "public"."sys_user_post" IS '用户岗位关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user_token"; CREATE TABLE "public"."sys_user_token" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "user_id" int8, "token" varchar(100) COLLATE "pg_catalog"."default", "expire_date" timestamp(6), @@ -5961,7 +5961,7 @@ COMMENT ON TABLE "public"."sys_user_token" IS '系统用户Token'; -- ---------------------------- DROP TABLE IF EXISTS "public"."tenant_common_config"; CREATE TABLE "public"."tenant_common_config" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "config_key" varchar(64) COLLATE "pg_catalog"."default", "config_name" varchar(64) COLLATE "pg_catalog"."default", "config_value" varchar COLLATE "pg_catalog"."default", @@ -6035,7 +6035,7 @@ COMMENT ON TABLE "public"."thing_ts_kv_external" IS 'tsvk 外部数据，按规 -- ---------------------------- DROP TABLE IF EXISTS "public"."transport_extend"; CREATE TABLE "public"."transport_extend" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "type" varchar(25) COLLATE "pg_catalog"."default", "name" varchar(255) COLLATE "pg_catalog"."default", "configuration" varchar COLLATE "pg_catalog"."default", @@ -6068,7 +6068,7 @@ COMMENT ON TABLE "public"."transport_extend" IS '通讯配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."transport_extend_calculation"; CREATE TABLE "public"."transport_extend_calculation" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "config_id" int8, "configuration" varchar COLLATE "pg_catalog"."default", "remark" varchar(500) COLLATE "pg_catalog"."default", @@ -6101,7 +6101,7 @@ COMMENT ON TABLE "public"."transport_extend_calculation" IS '通讯配置关联 -- ---------------------------- DROP TABLE IF EXISTS "public"."transport_extend_msg"; CREATE TABLE "public"."transport_extend_msg" ( - "id" int8 NOT NULL, + "id" int8 NOT NULL primary key, "config_id" int8, "input_msg" varchar COLLATE "pg_catalog"."default", "output_msg" varchar COLLATE "pg_catalog"."default", From db26e6258cb9afd756777ffc90009da7ff089eb0 Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 7 Aug 2024 09:40:47 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=887=E6=97=A509:40:45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysisdata/service/impl/AnalysisDataServiceImpl.java | 1 + .../thing/dictRelation/param/IotThingDictRelationParamDTO.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java b/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java index f2913aa..739412b 100644 --- a/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java @@ -247,6 +247,7 @@ public class AnalysisDataServiceImpl implements AnalysisDataService { if(first.isPresent()){ IotThingSourceDTO iotThingSourceDTO = first.get(); relationDTO.setThingAttrUnit(iotThingSourceDTO.getThingAttrUnit()); + relationDTO.setDataDealConfig(iotThingSourceDTO.getDataDealConfig()); }}); viewSourceDTO.setDictList(relationDTOList); return viewSourceDTO; diff --git a/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java b/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java index d7c4a8d..49efc0d 100644 --- a/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java +++ b/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java @@ -77,6 +77,7 @@ public class IotThingDictRelationParamDTO implements Serializable { private String dataTreatingMark; @Schema(description = "映射子集(子数据列表)") private String childConfig; + private String dataDealConfig; @Schema(description = "是否是模板，1模板，0 非模板(默认)") private String templateMark; @Schema(description = "物实体ID集合(新增指标)") From 2571d447b6d986c5e3de3d392a9dc5d0b54ea4a5 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 09:43:22 +0800 Subject: [PATCH 5/9] =?UTF-8?q?Revert=20"=E5=BB=BA=E8=A1=A8=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=94=AE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b4fc9c2f08a157c763955be75a79d9055f41052c. --- help/sql/ddl_1.0.0.sql | 312 ++++++++++++++++++++--------------------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/help/sql/ddl_1.0.0.sql b/help/sql/ddl_1.0.0.sql index fc2f724..476c8e2 100644 --- a/help/sql/ddl_1.0.0.sql +++ b/help/sql/ddl_1.0.0.sql @@ -21,7 +21,7 @@ -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_config"; CREATE TABLE "public"."alarm_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8, "thing_code" varchar(255) COLLATE "pg_catalog"."default", "attr_id" int8, @@ -66,7 +66,7 @@ COMMENT ON TABLE "public"."alarm_config" IS '尖峰谷平，夜间用能告警 -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_dict"; CREATE TABLE "public"."alarm_dict" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "pid" int8, "dict_type" varchar(100) COLLATE "pg_catalog"."default", "dict_name" varchar(255) COLLATE "pg_catalog"."default", @@ -97,7 +97,7 @@ COMMENT ON TABLE "public"."alarm_dict" IS '告警字典管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_dispose_log"; CREATE TABLE "public"."alarm_dispose_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "alarm_log_id" int8, "describe" varchar COLLATE "pg_catalog"."default", "status" varchar(5) COLLATE "pg_catalog"."default", @@ -121,7 +121,7 @@ COMMENT ON TABLE "public"."alarm_dispose_log" IS '告警处理日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule"; CREATE TABLE "public"."alarm_rule" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(500) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "level" varchar(5) COLLATE "pg_catalog"."default", @@ -165,7 +165,7 @@ COMMENT ON TABLE "public"."alarm_rule" IS '告警规则'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_action"; CREATE TABLE "public"."alarm_rule_action" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "rule_id" int8, "action_type" varchar(5) COLLATE "pg_catalog"."default", "action_id" int8, @@ -196,7 +196,7 @@ COMMENT ON TABLE "public"."alarm_rule_action" IS '告警动作'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_entity"; CREATE TABLE "public"."alarm_rule_entity" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "rule_id" int8 NOT NULL, "thing_id" int8 NOT NULL, "thing_code" varchar(100) COLLATE "pg_catalog"."default", @@ -227,7 +227,7 @@ COMMENT ON TABLE "public"."alarm_rule_entity" IS '告警设备'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_log"; CREATE TABLE "public"."alarm_rule_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "rule_id" int8, "action_id" int8, "content" varchar COLLATE "pg_catalog"."default", @@ -259,7 +259,7 @@ COMMENT ON TABLE "public"."alarm_rule_log" IS '告警日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."alarm_rule_setting"; CREATE TABLE "public"."alarm_rule_setting" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "setting_type" varchar(255) COLLATE "pg_catalog"."default", "setting_ids" varchar COLLATE "pg_catalog"."default", "action_type" varchar(255) COLLATE "pg_catalog"."default", @@ -288,7 +288,7 @@ COMMENT ON TABLE "public"."alarm_rule_setting" IS '告警规则设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."calc_log"; CREATE TABLE "public"."calc_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "calc_target_config_id" int8 NOT NULL, "formula" varchar(255) COLLATE "pg_catalog"."default", "source_info" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -331,7 +331,7 @@ COMMENT ON TABLE "public"."calc_log" IS '物计算日志表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."calc_source_config"; CREATE TABLE "public"."calc_source_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "calc_target_config_id" int8 NOT NULL, "source_thing_name" varchar(100) COLLATE "pg_catalog"."default", "source_thing_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, @@ -368,7 +368,7 @@ COMMENT ON TABLE "public"."calc_source_config" IS '物计算（目标物）配 -- ---------------------------- DROP TABLE IF EXISTS "public"."calc_target_config"; CREATE TABLE "public"."calc_target_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "config_type" int4 NOT NULL, "target_thing_name" varchar(100) COLLATE "pg_catalog"."default", "target_thing_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, @@ -411,7 +411,7 @@ COMMENT ON TABLE "public"."calc_target_config" IS '物计算（目标物）配 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_energy_dict_relation"; CREATE TABLE "public"."carbon_energy_dict_relation" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "energy_variety_id" int8 NOT NULL, "attr_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, "attr_name" varchar(255) COLLATE "pg_catalog"."default", @@ -448,7 +448,7 @@ COMMENT ON TABLE "public"."carbon_energy_dict_relation" IS '能源属性关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_energy_price"; CREATE TABLE "public"."carbon_energy_price" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "attr_code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "attr_name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "energy_variety_id" int8, @@ -491,7 +491,7 @@ COMMENT ON TABLE "public"."carbon_energy_price" IS '能源价格'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_peak_config"; CREATE TABLE "public"."carbon_peak_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "year" varchar(255) COLLATE "pg_catalog"."default", "months" varchar(255) COLLATE "pg_catalog"."default", "start_time" int8, @@ -537,7 +537,7 @@ COMMENT ON TABLE "public"."carbon_peak_config" IS '尖峰谷平设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_certificate"; CREATE TABLE "public"."carbon_pub_certificate" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_id" int8, "product_name" varchar(500) COLLATE "pg_catalog"."default", "boundary_start" int8, @@ -584,7 +584,7 @@ COMMENT ON TABLE "public"."carbon_pub_certificate" IS '碳足迹证书'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_eng_eff"; CREATE TABLE "public"."carbon_pub_eng_eff" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_type" varchar(255) COLLATE "pg_catalog"."default", "product_name" varchar(255) COLLATE "pg_catalog"."default", "eff_kpi" varchar(255) COLLATE "pg_catalog"."default", @@ -673,7 +673,7 @@ COMMENT ON TABLE "public"."carbon_pub_material_factor" IS '原材料碳排因子 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_material_factor_use"; CREATE TABLE "public"."carbon_pub_material_factor_use" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "material_factor_id" varchar(100) COLLATE "pg_catalog"."default", "tenant_code" int8, "use_time" int8 @@ -689,7 +689,7 @@ COMMENT ON TABLE "public"."carbon_pub_material_factor_use" IS '原材料碳排 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_points_logs"; CREATE TABLE "public"."carbon_pub_points_logs" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "type" varchar(255) COLLATE "pg_catalog"."default", "points" int8, "tenant_code" int8, @@ -708,7 +708,7 @@ COMMENT ON TABLE "public"."carbon_pub_points_logs" IS '积分增减记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_points_rule"; CREATE TABLE "public"."carbon_pub_points_rule" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "model_shared_points" int4, "model_click_points" int4, "result_shared_points" int4, @@ -730,7 +730,7 @@ COMMENT ON TABLE "public"."carbon_pub_points_rule" IS '碳足迹积分规则'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_model"; CREATE TABLE "public"."carbon_pub_production_model" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_id" int8, "product_code" varchar(255) COLLATE "pg_catalog"."default", "product_name" varchar(500) COLLATE "pg_catalog"."default", @@ -786,7 +786,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_model" IS '产品工艺模型'; -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_report"; CREATE TABLE "public"."carbon_pub_production_report" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_id" int8, "config_id" int8, "boundary" varchar(4) COLLATE "pg_catalog"."default", @@ -834,7 +834,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_report" IS '产品碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_report_config"; CREATE TABLE "public"."carbon_pub_production_report_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "tenant_code" int8, "product_id" int8, "boundary_type" int4, @@ -857,7 +857,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_report_config" IS '碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_production_result"; CREATE TABLE "public"."carbon_pub_production_result" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_id" int8, "product_name" varchar(255) COLLATE "pg_catalog"."default", "product_code" varchar(255) COLLATE "pg_catalog"."default", @@ -950,7 +950,7 @@ COMMENT ON TABLE "public"."carbon_pub_production_result" IS '生产记录核算 -- ---------------------------- DROP TABLE IF EXISTS "public"."carbon_pub_supplier"; CREATE TABLE "public"."carbon_pub_supplier" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(200) COLLATE "pg_catalog"."default", "code" int8, "access_token" varchar(200) COLLATE "pg_catalog"."default", @@ -999,7 +999,7 @@ COMMENT ON TABLE "public"."carbon_ts_kv" IS '企业遥测数据缓存'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_attacment"; CREATE TABLE "public"."eq_attacment" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8, "creator" int8, "create_date" timestamp(6), @@ -1027,7 +1027,7 @@ COMMENT ON TABLE "public"."eq_attacment" IS '附件表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_bx"; CREATE TABLE "public"."eq_bx" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "fault_type" varchar(16) COLLATE "pg_catalog"."default", "wx_team" varchar(255) COLLATE "pg_catalog"."default", "urgent_level" varchar(16) COLLATE "pg_catalog"."default", @@ -1088,7 +1088,7 @@ COMMENT ON TABLE "public"."eq_bx" IS '设备报修'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by"; CREATE TABLE "public"."eq_by" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "by_team" varchar(255) COLLATE "pg_catalog"."default", "by_level" varchar(16) COLLATE "pg_catalog"."default", "shutdown" varchar(16) COLLATE "pg_catalog"."default" DEFAULT 0, @@ -1137,7 +1137,7 @@ COMMENT ON TABLE "public"."eq_by" IS '设备保养'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_detail"; CREATE TABLE "public"."eq_by_detail" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "by_id" int8, "name" varchar(255) COLLATE "pg_catalog"."default", "description" varchar(255) COLLATE "pg_catalog"."default", @@ -1169,7 +1169,7 @@ COMMENT ON TABLE "public"."eq_by_detail" IS '保养明细'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_plan"; CREATE TABLE "public"."eq_by_plan" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "by_team" varchar(255) COLLATE "pg_catalog"."default", "creator" int8, "create_date" timestamp(0), @@ -1228,7 +1228,7 @@ COMMENT ON TABLE "public"."eq_by_plan" IS '设备保养计划'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_plan_part"; CREATE TABLE "public"."eq_by_plan_part" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "use_count" varchar(16) COLLATE "pg_catalog"."default", "creator" int8, "create_date" timestamp(0), @@ -1253,7 +1253,7 @@ COMMENT ON TABLE "public"."eq_by_plan_part" IS '保养计划部件更换'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_template"; CREATE TABLE "public"."eq_by_template" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "by_tool" varchar(255) COLLATE "pg_catalog"."default", "by_purpose" varchar(16) COLLATE "pg_catalog"."default", @@ -1285,7 +1285,7 @@ COMMENT ON TABLE "public"."eq_by_template" IS '保养模板'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_by_template_detail"; CREATE TABLE "public"."eq_by_template_detail" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "by_template_id" int8, "name" varchar(255) COLLATE "pg_catalog"."default", "description" varchar(255) COLLATE "pg_catalog"."default", @@ -1311,7 +1311,7 @@ COMMENT ON TABLE "public"."eq_by_template_detail" IS '保养模板明细'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_result"; CREATE TABLE "public"."eq_check_result" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "check_record_id" int8, "type" varchar(5) COLLATE "pg_catalog"."default", "check_result" text COLLATE "pg_catalog"."default", @@ -1344,7 +1344,7 @@ COMMENT ON COLUMN "public"."eq_check_result"."check_plan_id" IS '巡检计划id' -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_setting"; CREATE TABLE "public"."eq_check_setting" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8, "standard_id" int8, "user_id" int8, @@ -1373,7 +1373,7 @@ COMMENT ON TABLE "public"."eq_check_setting" IS '设备检查设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_standard"; CREATE TABLE "public"."eq_check_standard" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "group_id" int8, "name" varchar(100) COLLATE "pg_catalog"."default", "check_tool" varchar(255) COLLATE "pg_catalog"."default", @@ -1406,7 +1406,7 @@ COMMENT ON TABLE "public"."eq_check_standard" IS '检查标准'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_check_standard_detail"; CREATE TABLE "public"."eq_check_standard_detail" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "standard_id" int8, "name" varchar(255) COLLATE "pg_catalog"."default", "reference_value" varchar(255) COLLATE "pg_catalog"."default", @@ -1442,7 +1442,7 @@ COMMENT ON TABLE "public"."eq_check_standard_detail" IS '检查标准明细'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_file_delete"; CREATE TABLE "public"."eq_file_delete" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "url" varchar(255) COLLATE "pg_catalog"."default" ) ; @@ -1454,7 +1454,7 @@ COMMENT ON COLUMN "public"."eq_file_delete"."url" IS '文件路径'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_file_manage"; CREATE TABLE "public"."eq_file_manage" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "file_name" varchar(255) COLLATE "pg_catalog"."default", "file_type" varchar(5) COLLATE "pg_catalog"."default", "file_suffix" varchar(255) COLLATE "pg_catalog"."default", @@ -1492,7 +1492,7 @@ COMMENT ON COLUMN "public"."eq_file_manage"."tenant_code" IS '租户code'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_part_record"; CREATE TABLE "public"."eq_part_record" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "use_count" varchar(16) COLLATE "pg_catalog"."default", "creator" int8, "create_date" timestamp(0), @@ -1523,7 +1523,7 @@ COMMENT ON TABLE "public"."eq_part_record" IS '部件使用记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_patrol_check_plan"; CREATE TABLE "public"."eq_patrol_check_plan" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1588,7 +1588,7 @@ COMMENT ON TABLE "public"."eq_patrol_check_plan" IS '设备巡检计划'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_patrol_check_record"; CREATE TABLE "public"."eq_patrol_check_record" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "patrol_check_plan_id" int8, "user_id" int8, "creator" int8, @@ -1629,7 +1629,7 @@ COMMENT ON TABLE "public"."eq_patrol_check_record" IS '设备巡检记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_plan_record"; CREATE TABLE "public"."eq_plan_record" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1672,7 +1672,7 @@ COMMENT ON TABLE "public"."eq_plan_record" IS '计划未执行记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_plan_remind_record"; CREATE TABLE "public"."eq_plan_remind_record" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1705,7 +1705,7 @@ COMMENT ON TABLE "public"."eq_plan_remind_record" IS '计划到期提醒记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_scrap"; CREATE TABLE "public"."eq_scrap" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "creator" int8, "create_date" timestamp(0), "updater" int8, @@ -1736,7 +1736,7 @@ COMMENT ON TABLE "public"."eq_scrap" IS '设备报废'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_spot_check_plan"; CREATE TABLE "public"."eq_spot_check_plan" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8, "last_check_time" timestamp(6), "use_id" varchar(255) COLLATE "pg_catalog"."default", @@ -1764,7 +1764,7 @@ COMMENT ON COLUMN "public"."eq_spot_check_plan"."tenant_code" IS '租户code'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_spot_check_record"; CREATE TABLE "public"."eq_spot_check_record" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8, "standard_id" int8, "user_id" int8, @@ -1803,7 +1803,7 @@ COMMENT ON TABLE "public"."eq_spot_check_record" IS '设备点检记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_user_group"; CREATE TABLE "public"."eq_user_group" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "user_id" varchar(255) COLLATE "pg_catalog"."default", "name" varchar(255) COLLATE "pg_catalog"."default", "creator" int8, @@ -1829,7 +1829,7 @@ COMMENT ON COLUMN "public"."eq_user_group"."tenant_code" IS '租户code'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_wx"; CREATE TABLE "public"."eq_wx" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "fault_reason" varchar(255) COLLATE "pg_catalog"."default", "wx_team" varchar(255) COLLATE "pg_catalog"."default", "urgent_level" varchar(16) COLLATE "pg_catalog"."default", @@ -1878,7 +1878,7 @@ COMMENT ON TABLE "public"."eq_wx" IS '设备维修'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_wx_plan"; CREATE TABLE "public"."eq_wx_plan" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "wx_team" varchar(255) COLLATE "pg_catalog"."default", "urgent_level" varchar(5) COLLATE "pg_catalog"."default", "creator" int8, @@ -1932,7 +1932,7 @@ COMMENT ON TABLE "public"."eq_wx_plan" IS '设备维修计划'; -- ---------------------------- DROP TABLE IF EXISTS "public"."eq_wx_replacement"; CREATE TABLE "public"."eq_wx_replacement" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "wx_plan_id" int8, "thing_id" int8, "use_count" int4 @@ -1947,7 +1947,7 @@ COMMENT ON COLUMN "public"."eq_wx_replacement"."use_count" IS '使用数量'; -- ---------------------------- DROP TABLE IF EXISTS "public"."filter_log"; CREATE TABLE "public"."filter_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "filter_rule_id" int8 NOT NULL, "formula" varchar(255) COLLATE "pg_catalog"."default", "source_info" text COLLATE "pg_catalog"."default" NOT NULL, @@ -1988,7 +1988,7 @@ COMMENT ON TABLE "public"."filter_log" IS '过滤日志表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."filter_rule"; CREATE TABLE "public"."filter_rule" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "formula" varchar(255) COLLATE "pg_catalog"."default", "formula_description" varchar(255) COLLATE "pg_catalog"."default", @@ -2023,7 +2023,7 @@ COMMENT ON TABLE "public"."filter_rule" IS '过滤规则表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gateway_component"; CREATE TABLE "public"."gateway_component" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(100) COLLATE "pg_catalog"."default", "type" varchar(255) COLLATE "pg_catalog"."default", "description" varchar(500) COLLATE "pg_catalog"."default" @@ -2040,7 +2040,7 @@ COMMENT ON TABLE "public"."gateway_component" IS '网关组件'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gateway_component_config"; CREATE TABLE "public"."gateway_component_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "cmpt_id" int8, "cmpt_cfg_name" varchar(255) COLLATE "pg_catalog"."default", "cmpt_cfg_context" text COLLATE "pg_catalog"."default", @@ -2061,7 +2061,7 @@ COMMENT ON TABLE "public"."gateway_component_config" IS '网关组件配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gateway_component_instance"; CREATE TABLE "public"."gateway_component_instance" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "cmpt_id" int8, "cmpt_type" varchar(255) COLLATE "pg_catalog"."default", "cmpt_cfg_id" int8, @@ -2088,7 +2088,7 @@ COMMENT ON TABLE "public"."gateway_component_instance" IS '网关组件实例'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_base_class"; CREATE TABLE "public"."gen_base_class" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "package_name" varchar(200) COLLATE "pg_catalog"."default", "code" varchar(200) COLLATE "pg_catalog"."default", "fields" varchar(200) COLLATE "pg_catalog"."default", @@ -2109,7 +2109,7 @@ COMMENT ON TABLE "public"."gen_base_class" IS '基类管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_datasource"; CREATE TABLE "public"."gen_datasource" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "db_type" varchar(200) COLLATE "pg_catalog"."default", "conn_name" varchar(200) COLLATE "pg_catalog"."default", "conn_url" varchar(500) COLLATE "pg_catalog"."default", @@ -2134,7 +2134,7 @@ COMMENT ON TABLE "public"."gen_datasource" IS '数据源管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_field_type"; CREATE TABLE "public"."gen_field_type" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "column_type" varchar(200) COLLATE "pg_catalog"."default", "attr_type" varchar(200) COLLATE "pg_catalog"."default", "package_name" varchar(200) COLLATE "pg_catalog"."default", @@ -2153,7 +2153,7 @@ COMMENT ON TABLE "public"."gen_field_type" IS '字段类型管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_table_field"; CREATE TABLE "public"."gen_table_field" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "table_id" int8, "table_name" varchar(200) COLLATE "pg_catalog"."default", "column_name" varchar(200) COLLATE "pg_catalog"."default", @@ -2200,7 +2200,7 @@ COMMENT ON TABLE "public"."gen_table_field" IS '代码生成表列'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_table_info"; CREATE TABLE "public"."gen_table_info" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "table_name" varchar(200) COLLATE "pg_catalog"."default", "class_name" varchar(200) COLLATE "pg_catalog"."default", "table_comment" varchar(200) COLLATE "pg_catalog"."default", @@ -2239,7 +2239,7 @@ COMMENT ON TABLE "public"."gen_table_info" IS '代码生成表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."gen_template"; CREATE TABLE "public"."gen_template" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(200) COLLATE "pg_catalog"."default", "file_name" varchar(200) COLLATE "pg_catalog"."default", "content" text COLLATE "pg_catalog"."default", @@ -2262,7 +2262,7 @@ COMMENT ON TABLE "public"."gen_template" IS '模板管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_board_manage"; CREATE TABLE "public"."iot_board_manage" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "type" varchar(255) COLLATE "pg_catalog"."default", "thumbnail_url" text COLLATE "pg_catalog"."default", @@ -2352,7 +2352,7 @@ COMMENT ON TABLE "public"."iot_carbon_bom" IS '产品bom信息'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_certificate"; CREATE TABLE "public"."iot_carbon_certificate" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_id" int8, "product_name" varchar(500) COLLATE "pg_catalog"."default", "boundary_start" int8, @@ -2401,7 +2401,7 @@ COMMENT ON TABLE "public"."iot_carbon_certificate" IS '碳足迹证书'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_energy_variety"; CREATE TABLE "public"."iot_carbon_energy_variety" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(128) COLLATE "pg_catalog"."default", "code" varchar(128) COLLATE "pg_catalog"."default", "type" varchar(24) COLLATE "pg_catalog"."default", @@ -2478,7 +2478,7 @@ COMMENT ON COLUMN "public"."iot_carbon_enterprise_auth"."opinion" IS '审核意 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_indirect_energy"; CREATE TABLE "public"."iot_carbon_indirect_energy" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "ie_code" varchar(255) COLLATE "pg_catalog"."default", "ie_name" varchar(500) COLLATE "pg_catalog"."default", "ev_id" int8, @@ -2513,7 +2513,7 @@ COMMENT ON TABLE "public"."iot_carbon_indirect_energy" IS '间接用能配置记 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_outbound_config"; CREATE TABLE "public"."iot_carbon_outbound_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "m_id" int8, "m_code" varchar(255) COLLATE "pg_catalog"."default", "m_name" varchar(255) COLLATE "pg_catalog"."default", @@ -2539,7 +2539,7 @@ COMMENT ON COLUMN "public"."iot_carbon_outbound_config"."outbound_time" IS '出 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_process_steps"; CREATE TABLE "public"."iot_carbon_process_steps" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "mid" int8, "order_num" int8, "process_code" varchar(255) COLLATE "pg_catalog"."default", @@ -2564,7 +2564,7 @@ COMMENT ON TABLE "public"."iot_carbon_process_steps" IS '产品工艺工序配 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_custom"; CREATE TABLE "public"."iot_carbon_production_custom" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "production_id" int8, "title" varchar(2550) COLLATE "pg_catalog"."default", "info" varchar(2550) COLLATE "pg_catalog"."default" @@ -2581,7 +2581,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_custom" IS '产品自定义信 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_process_variety"; CREATE TABLE "public"."iot_carbon_production_process_variety" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "pr_id" int8, "pr_code" varchar(500) COLLATE "pg_catalog"."default", "m_id" int8, @@ -2612,7 +2612,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_process_variety" IS '工单工 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_record"; CREATE TABLE "public"."iot_carbon_production_record" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "pr_code" varchar(255) COLLATE "pg_catalog"."default", "m_id" int8, "work_name" varchar(500) COLLATE "pg_catalog"."default", @@ -2671,7 +2671,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_record" IS '生产记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_report"; CREATE TABLE "public"."iot_carbon_production_report" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "product_id" int8, "config_id" int8, "boundary" varchar(4) COLLATE "pg_catalog"."default", @@ -2717,7 +2717,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_report" IS '产品碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_report_config"; CREATE TABLE "public"."iot_carbon_production_report_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "tenant_code" int8, "product_id" int8, "boundary_type" int4, @@ -2738,7 +2738,7 @@ COMMENT ON TABLE "public"."iot_carbon_production_report_config" IS '碳足迹报 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_result"; CREATE TABLE "public"."iot_carbon_production_result" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "m_id" int8, "pr_code" varchar(255) COLLATE "pg_catalog"."default", "num" int8, @@ -2820,7 +2820,7 @@ COMMENT ON COLUMN "public"."iot_carbon_production_result"."life" IS '产品使 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_sync"; CREATE TABLE "public"."iot_carbon_production_sync" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "m_id" int8, "type" varchar(4) COLLATE "pg_catalog"."default", "tenant_code" int8, @@ -2848,7 +2848,7 @@ COMMENT ON COLUMN "public"."iot_carbon_production_sync"."update_date" IS '更新 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_production_variety"; CREATE TABLE "public"."iot_carbon_production_variety" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "code" varchar(2550) COLLATE "pg_catalog"."default", "name" varchar(500) COLLATE "pg_catalog"."default", "model" varchar(2550) COLLATE "pg_catalog"."default", @@ -2956,7 +2956,7 @@ COMMENT ON TABLE "public"."iot_carbon_ratio" IS '折标煤碳排因子基本信 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_share"; CREATE TABLE "public"."iot_carbon_share" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(2550) COLLATE "pg_catalog"."default", "url" varchar(2550) COLLATE "pg_catalog"."default", "token" varchar(2550) COLLATE "pg_catalog"."default", @@ -2987,7 +2987,7 @@ COMMENT ON TABLE "public"."iot_carbon_share" IS '协议配置详情表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_share_details"; CREATE TABLE "public"."iot_carbon_share_details" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "type" varchar(255) COLLATE "pg_catalog"."default", "m_id" int8, "code" varchar(255) COLLATE "pg_catalog"."default", @@ -3029,7 +3029,7 @@ COMMENT ON COLUMN "public"."iot_carbon_share_details"."update_date" IS '更新 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_carbon_use_config"; CREATE TABLE "public"."iot_carbon_use_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "life" numeric(20,10), "m_id" int8, "ev_id" int8, @@ -3078,7 +3078,7 @@ COMMENT ON TABLE "public"."iot_carbon_use_config" IS '产品运输，使用， -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_configuration_design"; CREATE TABLE "public"."iot_configuration_design" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "board_manage_id" int8, "width" int4, "height" int4, @@ -3115,7 +3115,7 @@ COMMENT ON TABLE "public"."iot_configuration_design" IS '组态设计管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard"; CREATE TABLE "public"."iot_dashboard" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "dashboard_group_id" int8, "svg_url" varchar(500) COLLATE "pg_catalog"."default", "img_url" varchar(500) COLLATE "pg_catalog"."default", @@ -3164,7 +3164,7 @@ COMMENT ON TABLE "public"."iot_dashboard" IS '看板表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard_element"; CREATE TABLE "public"."iot_dashboard_element" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "dashboard_id" int8, "element_id" varchar(255) COLLATE "pg_catalog"."default", "element_name" varchar(255) COLLATE "pg_catalog"."default", @@ -3215,7 +3215,7 @@ COMMENT ON TABLE "public"."iot_dashboard_element" IS '看板元素表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard_group"; CREATE TABLE "public"."iot_dashboard_group" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(64) COLLATE "pg_catalog"."default", "preview_picture" varchar COLLATE "pg_catalog"."default", "exist_menu" varchar(10) COLLATE "pg_catalog"."default", @@ -3256,7 +3256,7 @@ COMMENT ON TABLE "public"."iot_dashboard_group" IS '看板管理表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_dashboard_svg"; CREATE TABLE "public"."iot_dashboard_svg" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "dashboard_id" int8, "svg_xml" xml, "creator" int8, @@ -3279,7 +3279,7 @@ COMMENT ON TABLE "public"."iot_dashboard_svg" IS '看板svg'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_data_entry"; CREATE TABLE "public"."iot_data_entry" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_code" varchar(255) COLLATE "pg_catalog"."default", "thing_name" varchar(255) COLLATE "pg_catalog"."default", "attr_code" varchar(255) COLLATE "pg_catalog"."default", @@ -3316,7 +3316,7 @@ COMMENT ON TABLE "public"."iot_data_entry" IS '数据报表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_device_control"; CREATE TABLE "public"."iot_device_control" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "thing_id" int8, "attr_code" varchar(20) COLLATE "pg_catalog"."default", @@ -3379,7 +3379,7 @@ COMMENT ON TABLE "public"."iot_device_control" IS '设备控制'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_device_control_log"; CREATE TABLE "public"."iot_device_control_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "control_id" int8, "in_msg" varchar COLLATE "pg_catalog"."default", "out_msg" varchar COLLATE "pg_catalog"."default", @@ -3406,7 +3406,7 @@ COMMENT ON TABLE "public"."iot_device_control_log" IS '设备控制日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_device_management"; CREATE TABLE "public"."iot_device_management" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_relation_id" int8, "thing_id" int8, "thing_code" varchar(255) COLLATE "pg_catalog"."default", @@ -3447,7 +3447,7 @@ COMMENT ON TABLE "public"."iot_device_management" IS '设备监控属性配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_enterprise_dashboard"; CREATE TABLE "public"."iot_enterprise_dashboard" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "tenant_code" int8, "company_id" int8, "dept_id" int8, @@ -3484,7 +3484,7 @@ COMMENT ON TABLE "public"."iot_enterprise_dashboard" IS '企业主页配置管 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_group_info"; CREATE TABLE "public"."iot_group_info" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL, "code" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -3525,7 +3525,7 @@ COMMENT ON TABLE "public"."iot_group_info" IS '物的组信息表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_group_relation"; CREATE TABLE "public"."iot_group_relation" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "group_id" int8 NOT NULL, "entity_id" int8 NOT NULL, "entity_type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL @@ -3542,7 +3542,7 @@ COMMENT ON TABLE "public"."iot_group_relation" IS '实体&组 的关系表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_section_detail"; CREATE TABLE "public"."iot_section_detail" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "alias_name" varchar(255) COLLATE "pg_catalog"."default", "group_id" int8, @@ -3599,7 +3599,7 @@ COMMENT ON TABLE "public"."iot_section_detail" IS '部件管理基本信息'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_source_material"; CREATE TABLE "public"."iot_source_material" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "type" varchar(255) COLLATE "pg_catalog"."default", "is_default" int4, @@ -3638,7 +3638,7 @@ COMMENT ON TABLE "public"."iot_source_material" IS '素材管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_task"; CREATE TABLE "public"."iot_task" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(100) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "time_type" varchar(10) COLLATE "pg_catalog"."default", @@ -3683,7 +3683,7 @@ COMMENT ON TABLE "public"."iot_task" IS '定时任务'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_api"; CREATE TABLE "public"."iot_thing_api" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "thing_condition" text COLLATE "pg_catalog"."default", "attr_condition" text COLLATE "pg_catalog"."default", @@ -3737,7 +3737,7 @@ COMMENT ON COLUMN "public"."iot_thing_api"."req_params" IS '请求参数'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_api_log"; CREATE TABLE "public"."iot_thing_api_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "api_id" int8 NOT NULL, "call_entity" text COLLATE "pg_catalog"."default" NOT NULL, "creator" int8, @@ -3765,7 +3765,7 @@ COMMENT ON COLUMN "public"."iot_thing_api_log"."ip" IS '调用ip'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_base_info"; CREATE TABLE "public"."iot_thing_base_info" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8, "standard" varchar(255) COLLATE "pg_catalog"."default", "image_url" varchar(255) COLLATE "pg_catalog"."default", @@ -3827,7 +3827,7 @@ COMMENT ON TABLE "public"."iot_thing_base_info" IS '设备属性信息'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_biz_config"; CREATE TABLE "public"."iot_thing_biz_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8 NOT NULL, "thing_code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "thing_name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, @@ -3860,7 +3860,7 @@ COMMENT ON TABLE "public"."iot_thing_biz_config" IS '设备业务配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_biz_config_item"; CREATE TABLE "public"."iot_thing_biz_config_item" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "config_id" int8 NOT NULL, "item_name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, "item_alias" varchar(100) COLLATE "pg_catalog"."default", @@ -3887,7 +3887,7 @@ COMMENT ON TABLE "public"."iot_thing_biz_config_item" IS '设备业务配置项' -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_dict"; CREATE TABLE "public"."iot_thing_dict" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "unit" varchar(50) COLLATE "pg_catalog"."default", @@ -3946,7 +3946,7 @@ COMMENT ON TABLE "public"."iot_thing_dict" IS '物字典信息表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_dict_relation"; CREATE TABLE "public"."iot_thing_dict_relation" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "group_name" varchar(255) COLLATE "pg_catalog"."default", "code" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, @@ -4017,7 +4017,7 @@ COMMENT ON TABLE "public"."iot_thing_dict_relation" IS '物指标信息表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_entity"; CREATE TABLE "public"."iot_thing_entity" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "code" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "real_type" varchar(2) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 1, @@ -4067,7 +4067,7 @@ COMMENT ON TABLE "public"."iot_thing_entity" IS '物实体表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_menu_config"; CREATE TABLE "public"."iot_thing_menu_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "menu_id" varchar(255) COLLATE "pg_catalog"."default", "menu_config" varchar COLLATE "pg_catalog"."default", "config_type" varchar(2) COLLATE "pg_catalog"."default", @@ -4100,7 +4100,7 @@ COMMENT ON TABLE "public"."iot_thing_menu_config" IS '物关系菜单配置表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_model"; CREATE TABLE "public"."iot_thing_model" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "code" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "token" varchar(128) COLLATE "pg_catalog"."default", "gateway" varchar(2) COLLATE "pg_catalog"."default" DEFAULT 0, @@ -4139,7 +4139,7 @@ COMMENT ON TABLE "public"."iot_thing_model" IS '物模型表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_relation_detail"; CREATE TABLE "public"."iot_thing_relation_detail" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "from_id" int8 NOT NULL, "from_code" varchar(255) COLLATE "pg_catalog"."default", "from_name" varchar(255) COLLATE "pg_catalog"."default", @@ -4190,7 +4190,7 @@ COMMENT ON TABLE "public"."iot_thing_relation_detail" IS '物关系详情信息 -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_relation_root"; CREATE TABLE "public"."iot_thing_relation_root" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "remark" varchar(2048) COLLATE "pg_catalog"."default", "url" varchar(2048) COLLATE "pg_catalog"."default", @@ -4231,7 +4231,7 @@ COMMENT ON TABLE "public"."iot_thing_relation_root" IS '物关系根表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."iot_thing_source"; CREATE TABLE "public"."iot_thing_source" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_id" int8 NOT NULL, "thing_name" varchar(255) COLLATE "pg_catalog"."default", "thing_code" varchar(255) COLLATE "pg_catalog"."default", @@ -4310,7 +4310,7 @@ COMMENT ON TABLE "public"."iot_thing_source" IS '监控分析、用量分析、 -- ---------------------------- DROP TABLE IF EXISTS "public"."mock_data_config"; CREATE TABLE "public"."mock_data_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "thing_name" varchar(100) COLLATE "pg_catalog"."default", "thing_code" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, "attr_name" varchar(100) COLLATE "pg_catalog"."default", @@ -4355,7 +4355,7 @@ COMMENT ON TABLE "public"."mock_data_config" IS '数据模拟配置表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."mock_data_log"; CREATE TABLE "public"."mock_data_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "mock_config_id" int8 NOT NULL, "formula" varchar(255) COLLATE "pg_catalog"."default", "time" int8, @@ -4419,7 +4419,7 @@ COMMENT ON TABLE "public"."mqtt_broker_connect" IS 'mqttBroker连接日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."mqtt_broker_msg"; CREATE TABLE "public"."mqtt_broker_msg" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "client_id" varchar(255) COLLATE "pg_catalog"."default", "user_name" varchar(255) COLLATE "pg_catalog"."default", "msg" varchar COLLATE "pg_catalog"."default", @@ -4447,7 +4447,7 @@ COMMENT ON TABLE "public"."mqtt_broker_msg" IS 'mqttBroker调试日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_cache"; CREATE TABLE "public"."msg_cache" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "cache_key" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "cache_key_type" varchar(255) COLLATE "pg_catalog"."default", "cache_value" varchar(255) COLLATE "pg_catalog"."default", @@ -4477,7 +4477,7 @@ COMMENT ON TABLE "public"."msg_cache" IS '消息缓存表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_his"; CREATE TABLE "public"."msg_his" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "publisher" varchar(100) COLLATE "pg_catalog"."default", "receiver" varchar(100) COLLATE "pg_catalog"."default", "his_msg" varchar(255) COLLATE "pg_catalog"."default", @@ -4525,7 +4525,7 @@ COMMENT ON TABLE "public"."msg_his" IS '消息历史表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_push"; CREATE TABLE "public"."msg_push" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "config_name" varchar(50) COLLATE "pg_catalog"."default", "config_type" varchar(5) COLLATE "pg_catalog"."default", "template_msg" varchar(255) COLLATE "pg_catalog"."default", @@ -4562,7 +4562,7 @@ COMMENT ON TABLE "public"."msg_push" IS '消息推送'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_push_setting"; CREATE TABLE "public"."msg_push_setting" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "push_ids" varchar(255) COLLATE "pg_catalog"."default", "template_id" int8, "receivers" varchar(255) COLLATE "pg_catalog"."default", @@ -4605,7 +4605,7 @@ COMMENT ON TABLE "public"."msg_push_setting" IS '消息推送设置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_template"; CREATE TABLE "public"."msg_template" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(100) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "subject" varchar(100) COLLATE "pg_catalog"."default", @@ -4637,7 +4637,7 @@ COMMENT ON TABLE "public"."msg_template" IS '消息模板'; -- ---------------------------- DROP TABLE IF EXISTS "public"."msg_user"; CREATE TABLE "public"."msg_user" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "user_id" int8, "email_username" varchar(255) COLLATE "pg_catalog"."default", "wx_open_id" varchar(255) COLLATE "pg_catalog"."default", @@ -4833,7 +4833,7 @@ CREATE TABLE "public"."qrtz_triggers" ( -- ---------------------------- DROP TABLE IF EXISTS "public"."queue_log"; CREATE TABLE "public"."queue_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "time" timestamp(6), "queue_num" varchar(25) COLLATE "pg_catalog"."default", "enter_num" varchar(25) COLLATE "pg_catalog"."default", @@ -4862,7 +4862,7 @@ COMMENT ON TABLE "public"."queue_log" IS '队列消息数量日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."queue_msg_log"; CREATE TABLE "public"."queue_msg_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "channel_name" varchar(30) COLLATE "pg_catalog"."default", "msg" varchar COLLATE "pg_catalog"."default", "time" int8, @@ -4886,7 +4886,7 @@ COMMENT ON TABLE "public"."queue_msg_log" IS '队列消息日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."schedule_job"; CREATE TABLE "public"."schedule_job" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "bean_name" varchar(200) COLLATE "pg_catalog"."default", "params" varchar(2000) COLLATE "pg_catalog"."default", "cron_expression" varchar(100) COLLATE "pg_catalog"."default", @@ -4915,7 +4915,7 @@ COMMENT ON TABLE "public"."schedule_job" IS '定时任务'; -- ---------------------------- DROP TABLE IF EXISTS "public"."schedule_job_log"; CREATE TABLE "public"."schedule_job_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "job_id" int8 NOT NULL, "bean_name" varchar(200) COLLATE "pg_catalog"."default", "params" varchar(2000) COLLATE "pg_catalog"."default", @@ -4940,7 +4940,7 @@ COMMENT ON TABLE "public"."schedule_job_log" IS '定时任务日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."script_info"; CREATE TABLE "public"."script_info" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default", "script_type" varchar(25) COLLATE "pg_catalog"."default", "script_body" varchar COLLATE "pg_catalog"."default", @@ -4980,7 +4980,7 @@ COMMENT ON TABLE "public"."script_info" IS '数据解析'; -- ---------------------------- DROP TABLE IF EXISTS "public"."script_log"; CREATE TABLE "public"."script_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "script_id" int8, "msg" varchar COLLATE "pg_catalog"."default", "creator" int8, @@ -5002,7 +5002,7 @@ COMMENT ON TABLE "public"."script_log" IS '数据解析日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_dept"; CREATE TABLE "public"."sys_dept" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "pid" int8, "pids" varchar(500) COLLATE "pg_catalog"."default", "name" varchar(50) COLLATE "pg_catalog"."default", @@ -5031,7 +5031,7 @@ COMMENT ON TABLE "public"."sys_dept" IS '部门管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_dict_data"; CREATE TABLE "public"."sys_dict_data" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "dict_type_id" int8 NOT NULL, "dict_label" varchar(255) COLLATE "pg_catalog"."default", "dict_value" varchar(255) COLLATE "pg_catalog"."default", @@ -5060,7 +5060,7 @@ COMMENT ON TABLE "public"."sys_dict_data" IS '字典数据'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_dict_type"; CREATE TABLE "public"."sys_dict_type" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "dict_type" varchar(100) COLLATE "pg_catalog"."default", "dict_name" varchar(255) COLLATE "pg_catalog"."default", "remark" varchar(255) COLLATE "pg_catalog"."default", @@ -5087,7 +5087,7 @@ COMMENT ON TABLE "public"."sys_dict_type" IS '字典类型'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_energy_check"; CREATE TABLE "public"."sys_energy_check" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "location" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "dept_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "check_time" date NOT NULL, @@ -5126,7 +5126,7 @@ COMMENT ON TABLE "public"."sys_energy_check" IS '能源检查'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_energy_people"; CREATE TABLE "public"."sys_energy_people" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "username" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "realname" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "dept_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -5153,7 +5153,7 @@ COMMENT ON TABLE "public"."sys_energy_people" IS '节能项目-用户关联'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_energy_project"; CREATE TABLE "public"."sys_energy_project" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "project_name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "department" varchar(125) COLLATE "pg_catalog"."default" NOT NULL, "people" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, @@ -5188,7 +5188,7 @@ COMMENT ON TABLE "public"."sys_energy_project" IS '节能项目'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_industry_type"; CREATE TABLE "public"."sys_industry_type" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "code" varchar(20) COLLATE "pg_catalog"."default", "parent_code" varchar(20) COLLATE "pg_catalog"."default", "name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL, @@ -5234,7 +5234,7 @@ COMMENT ON TABLE "public"."sys_language" IS '国际化'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_log_error"; CREATE TABLE "public"."sys_log_error" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "request_uri" varchar(200) COLLATE "pg_catalog"."default", "request_method" varchar(20) COLLATE "pg_catalog"."default", "request_params" text COLLATE "pg_catalog"."default", @@ -5261,7 +5261,7 @@ COMMENT ON TABLE "public"."sys_log_error" IS '异常日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_log_login"; CREATE TABLE "public"."sys_log_login" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "operation" int4, "status" int4, "user_agent" varchar(500) COLLATE "pg_catalog"."default", @@ -5288,7 +5288,7 @@ COMMENT ON TABLE "public"."sys_log_login" IS '登录日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_log_operation"; CREATE TABLE "public"."sys_log_operation" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "operation" varchar(50) COLLATE "pg_catalog"."default", "request_uri" varchar(200) COLLATE "pg_catalog"."default", "request_method" varchar(20) COLLATE "pg_catalog"."default", @@ -5323,7 +5323,7 @@ COMMENT ON TABLE "public"."sys_log_operation" IS '操作日志'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_mail_log"; CREATE TABLE "public"."sys_mail_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "template_id" int8 NOT NULL, "mail_from" varchar(200) COLLATE "pg_catalog"."default", "mail_to" varchar(400) COLLATE "pg_catalog"."default", @@ -5352,7 +5352,7 @@ COMMENT ON TABLE "public"."sys_mail_log" IS '邮件发送记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_mail_template"; CREATE TABLE "public"."sys_mail_template" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(100) COLLATE "pg_catalog"."default", "subject" varchar(200) COLLATE "pg_catalog"."default", "content" text COLLATE "pg_catalog"."default", @@ -5377,7 +5377,7 @@ COMMENT ON TABLE "public"."sys_mail_template" IS '邮件模板'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_menu"; CREATE TABLE "public"."sys_menu" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "pid" int8, "url" varchar(200) COLLATE "pg_catalog"."default", "permissions" varchar(500) COLLATE "pg_catalog"."default", @@ -5418,7 +5418,7 @@ COMMENT ON TABLE "public"."sys_menu" IS '菜单管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_notice"; CREATE TABLE "public"."sys_notice" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "type" int4 NOT NULL, "title" varchar(200) COLLATE "pg_catalog"."default", "content" text COLLATE "pg_catalog"."default", @@ -5466,7 +5466,7 @@ COMMENT ON TABLE "public"."sys_notice_user" IS '我的通知'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_oss"; CREATE TABLE "public"."sys_oss" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "url" varchar(200) COLLATE "pg_catalog"."default", "type" varchar(5) COLLATE "pg_catalog"."default", "single" bool, @@ -5485,7 +5485,7 @@ COMMENT ON TABLE "public"."sys_oss" IS '文件上传'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_params"; CREATE TABLE "public"."sys_params" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "param_code" varchar(32) COLLATE "pg_catalog"."default", "param_value" varchar(2000) COLLATE "pg_catalog"."default", "param_type" int4 NOT NULL DEFAULT 1, @@ -5511,7 +5511,7 @@ COMMENT ON TABLE "public"."sys_params" IS '参数管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_post"; CREATE TABLE "public"."sys_post" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "post_code" varchar(100) COLLATE "pg_catalog"."default", "post_name" varchar(100) COLLATE "pg_catalog"."default", "sort" int4, @@ -5540,7 +5540,7 @@ COMMENT ON TABLE "public"."sys_post" IS '岗位管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_region"; CREATE TABLE "public"."sys_region" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "pid" int8, "name" varchar(100) COLLATE "pg_catalog"."default", "tree_level" int4, @@ -5583,7 +5583,7 @@ COMMENT ON TABLE "public"."sys_region_weather" IS '区域对应天气编码'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role"; CREATE TABLE "public"."sys_role" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(50) COLLATE "pg_catalog"."default", "remark" varchar(100) COLLATE "pg_catalog"."default", "dept_id" int8, @@ -5616,7 +5616,7 @@ COMMENT ON TABLE "public"."sys_role" IS '角色管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role_data_scope"; CREATE TABLE "public"."sys_role_data_scope" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "role_id" int8, "dept_id" int8, "creator" int8, @@ -5634,7 +5634,7 @@ COMMENT ON TABLE "public"."sys_role_data_scope" IS '角色数据权限'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role_menu"; CREATE TABLE "public"."sys_role_menu" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "role_id" int8, "menu_id" int8, "creator" int8, @@ -5652,7 +5652,7 @@ COMMENT ON TABLE "public"."sys_role_menu" IS '角色菜单关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_role_user"; CREATE TABLE "public"."sys_role_user" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "role_id" int8, "user_id" int8, "creator" int8, @@ -5670,7 +5670,7 @@ COMMENT ON TABLE "public"."sys_role_user" IS '角色用户关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_sms"; CREATE TABLE "public"."sys_sms" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "sms_code" varchar(32) COLLATE "pg_catalog"."default", "platform" int4, "sms_config" varchar(2000) COLLATE "pg_catalog"."default", @@ -5697,7 +5697,7 @@ COMMENT ON TABLE "public"."sys_sms" IS '短信'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_sms_log"; CREATE TABLE "public"."sys_sms_log" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "sms_code" varchar(32) COLLATE "pg_catalog"."default", "platform" int4, "mobile" varchar(20) COLLATE "pg_catalog"."default", @@ -5728,7 +5728,7 @@ COMMENT ON TABLE "public"."sys_sms_log" IS '短信发送记录'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_tenant"; CREATE TABLE "public"."sys_tenant" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "tenant_code" int8, "tenant_name" varchar(50) COLLATE "pg_catalog"."default", "status" int4, @@ -5773,7 +5773,7 @@ COMMENT ON TABLE "public"."sys_tenant" IS '租户管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_tenant_detail"; CREATE TABLE "public"."sys_tenant_detail" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, "corporation_code" varchar(32) COLLATE "pg_catalog"."default", "industry_category" varchar(64) COLLATE "pg_catalog"."default", @@ -5822,7 +5822,7 @@ COMMENT ON TABLE "public"."sys_tenant_detail" IS '企业详情'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_tenant_group"; CREATE TABLE "public"."sys_tenant_group" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "parent_code" int8, "code" int8, "creator" int8, @@ -5840,7 +5840,7 @@ COMMENT ON TABLE "public"."sys_tenant_group" IS '租户组关系表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user"; CREATE TABLE "public"."sys_user" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "username" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "password" varchar(100) COLLATE "pg_catalog"."default", "real_name" varchar(50) COLLATE "pg_catalog"."default", @@ -5891,7 +5891,7 @@ COMMENT ON TABLE "public"."sys_user" IS '用户管理'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user_menu"; CREATE TABLE "public"."sys_user_menu" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "user_id" int8, "menu_id" int8, "url" varchar(255) COLLATE "pg_catalog"."default", @@ -5923,7 +5923,7 @@ COMMENT ON TABLE "public"."sys_user_menu" IS '用户菜单关系表'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user_post"; CREATE TABLE "public"."sys_user_post" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "post_id" int8, "user_id" int8, "creator" int8, @@ -5940,7 +5940,7 @@ COMMENT ON TABLE "public"."sys_user_post" IS '用户岗位关系'; -- ---------------------------- DROP TABLE IF EXISTS "public"."sys_user_token"; CREATE TABLE "public"."sys_user_token" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "user_id" int8, "token" varchar(100) COLLATE "pg_catalog"."default", "expire_date" timestamp(6), @@ -5961,7 +5961,7 @@ COMMENT ON TABLE "public"."sys_user_token" IS '系统用户Token'; -- ---------------------------- DROP TABLE IF EXISTS "public"."tenant_common_config"; CREATE TABLE "public"."tenant_common_config" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "config_key" varchar(64) COLLATE "pg_catalog"."default", "config_name" varchar(64) COLLATE "pg_catalog"."default", "config_value" varchar COLLATE "pg_catalog"."default", @@ -6035,7 +6035,7 @@ COMMENT ON TABLE "public"."thing_ts_kv_external" IS 'tsvk 外部数据，按规 -- ---------------------------- DROP TABLE IF EXISTS "public"."transport_extend"; CREATE TABLE "public"."transport_extend" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "type" varchar(25) COLLATE "pg_catalog"."default", "name" varchar(255) COLLATE "pg_catalog"."default", "configuration" varchar COLLATE "pg_catalog"."default", @@ -6068,7 +6068,7 @@ COMMENT ON TABLE "public"."transport_extend" IS '通讯配置'; -- ---------------------------- DROP TABLE IF EXISTS "public"."transport_extend_calculation"; CREATE TABLE "public"."transport_extend_calculation" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "config_id" int8, "configuration" varchar COLLATE "pg_catalog"."default", "remark" varchar(500) COLLATE "pg_catalog"."default", @@ -6101,7 +6101,7 @@ COMMENT ON TABLE "public"."transport_extend_calculation" IS '通讯配置关联 -- ---------------------------- DROP TABLE IF EXISTS "public"."transport_extend_msg"; CREATE TABLE "public"."transport_extend_msg" ( - "id" int8 NOT NULL primary key, + "id" int8 NOT NULL, "config_id" int8, "input_msg" varchar COLLATE "pg_catalog"."default", "output_msg" varchar COLLATE "pg_catalog"."default", From 3a5e9b340734f58e45baf57e411fa05b34517344 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 09:47:13 +0800 Subject: [PATCH 6/9] =?UTF-8?q?springboot=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/pom.xml | 14 ++++++++++++++ pom.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/application/pom.xml b/application/pom.xml index 84bc59f..0bc6af1 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -133,6 +133,13 @@ com.thing.modules filter-rule + + + + org.springframework.boot + spring-boot-starter-test + test + @@ -146,6 +153,13 @@ org.apache.maven.plugins maven-compiler-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + true + + diff --git a/pom.xml b/pom.xml index 9fccfb7..507b021 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.3.2 From fcd09215fe498216a798d9bff0a72276d6168526 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 10:07:10 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=8E=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/common/util/thread/TBExecutors.java | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 common/util/src/main/java/com/thing/common/util/thread/TBExecutors.java diff --git a/common/util/src/main/java/com/thing/common/util/thread/TBExecutors.java b/common/util/src/main/java/com/thing/common/util/thread/TBExecutors.java deleted file mode 100644 index 7534947..0000000 --- a/common/util/src/main/java/com/thing/common/util/thread/TBExecutors.java +++ /dev/null @@ -1,37 +0,0 @@ - -package com.thing.common.util.thread; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ForkJoinPool; - -public class TBExecutors { - - /** - *从ExecutorService分叉以提供线程轮询名称的方法 - * - * 创建一个线程池，保持足够的线程来支持 - * 给定的并行性级别，并且可能使用多个队列来 - * 减少争用。并行度级别对应于 - * 最大数量的线程积极参与，或可 - * 参与，任务处理。线程的实际数量可能 - * 动态增长和收缩。偷工作的人不会 - * 保证提交任务的顺序 - * 执行。 - * - * @param parallelism the targeted parallelism level - * @param namePrefix used to define thread name - * @return the newly created thread pool - * @throws IllegalArgumentException if {@code parallelism <= 0} - * @since 1.8 - */ - public static ExecutorService newWorkStealingPool(int parallelism, String namePrefix) { - return new ForkJoinPool(parallelism, - new ForkJoinWorkerThreadFactory(namePrefix), - null, true); - } - - public static ExecutorService newWorkStealingPool(int parallelism, Class clazz) { - return newWorkStealingPool(parallelism, clazz.getSimpleName()); - } - -} From 0946fa1bd76003078c293f8a2031e0ea3267969d Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 7 Aug 2024 10:51:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=86=E6=9E=90=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=887=E6=97=A510:51:20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IotThingMenuConfigController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java b/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java index f330eb7..dc79ffc 100644 --- a/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java +++ b/modules/thing/src/main/java/com/thing/device/menu/controller/IotThingMenuConfigController.java @@ -1,6 +1,7 @@ package com.thing.device.menu.controller; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; @@ -13,6 +14,8 @@ import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.device.menu.dto.IotThingMenuConfigDTO; import com.thing.device.menu.service.IotThingMenuConfigService; +import com.thing.thing.relation.root.dto.IotThingRelationRootDTO; +import com.thing.thing.relation.root.service.IotThingRelationRootService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -30,6 +33,7 @@ import java.util.Map; public class IotThingMenuConfigController { private final IotThingMenuConfigService iotThingMenuConfigService; + private final IotThingRelationRootService relationRootService; @GetMapping("page") @Operation(summary = "分页") @@ -70,6 +74,18 @@ public class IotThingMenuConfigController { } } } + if (ObjectUtil.isNotNull(data) && ObjectUtil.isNotNull(data.getMenuConfig())) { + JSONArray jsonArray = JSONArray.parseArray(data.getMenuConfig()); + if (jsonArray != null && !jsonArray.isEmpty()) { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonObject = jsonArray.getJSONObject(i); + Long id = jsonObject.getLong("id"); + IotThingRelationRootDTO relationRootDTO = relationRootService.findById(id); + jsonObject.put("name", relationRootDTO.getName()); + } + data.setMenuConfig(jsonArray.toString()); + } + } return new Result().ok(data); } From d102f858d70cfc356f4f3bb55cc7a3b3c3c894ab Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 7 Aug 2024 12:55:41 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B6=85=E7=BA=A7API=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B0=83=E7=94=A8=202024=E5=B9=B48=E6=9C=887=E6=97=A512:55:35?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/thing/thing/api/service/impl/IotThingApiServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java index 666e486..32f3297 100644 --- a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java @@ -319,6 +319,7 @@ public class IotThingApiServiceImpl extends BaseServiceImpl