From e0579a1852a4ca269cea5c202a347b5994bf4924 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 19 Aug 2022 17:24:02 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8E=88=E6=9D=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc/commonbiz/api/entity/DataScreen.java | 52 +++++++++++++++++++ .../api/entity/DataScreenCategory.java | 32 ++++++++++++ .../commonbiz/api/entity/DatascreenMap.java | 37 +++++++++++++ .../src/main/resources/bootstrap.yml | 1 - 4 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreen.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DatascreenMap.java diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreen.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreen.java new file mode 100644 index 00000000..67f06a46 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreen.java @@ -0,0 +1,52 @@ +package com.cloud.kicc.commonbiz.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import java.io.Serializable; +import java.sql.Blob; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 大屏管理 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-08-04 + */ +@Data +@Accessors(chain = true) +@TableName("common_datascreen") +@ApiModel(value = "Datascreen对象", description = "大屏管理") +public class DataScreen extends CommonEntity { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("分类ID") + private String categoryId; + + @ApiModelProperty("组件") + private Blob component; + + @ApiModelProperty("详情") + private Blob detail; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("缩略图") + private String screenshot; + + @ApiModelProperty("缩略图") + private String backgroundUrl; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java new file mode 100644 index 00000000..422c5725 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java @@ -0,0 +1,32 @@ +package com.cloud.kicc.commonbiz.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import java.io.Serializable; + +import com.cloud.kicc.common.data.entity.TreeEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 大屏分类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-08-04 + */ +@Data +@Accessors(chain = true) +@TableName("common_datascreen_category") +@ApiModel(value = "DatascreenCategory对象", description = "大屏分类") +public class DataScreenCategory extends TreeEntity { + + @ApiModelProperty("所有父级编号") + private String parentIds; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DatascreenMap.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DatascreenMap.java new file mode 100644 index 00000000..19e652ec --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DatascreenMap.java @@ -0,0 +1,37 @@ +package com.cloud.kicc.commonbiz.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import java.io.Serializable; +import java.sql.Blob; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 地图 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-08-04 + */ +@Data +@Accessors(chain = true) +@TableName("common_datascreen_map") +@ApiModel(value = "DatascreenMap对象", description = "地图") +public class DatascreenMap extends CommonEntity { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("地图名称") + private String name; + + @ApiModelProperty("地图数据") + private Blob data; + +} diff --git a/kicc-register/src/main/resources/bootstrap.yml b/kicc-register/src/main/resources/bootstrap.yml index fc897b49..caf04a38 100644 --- a/kicc-register/src/main/resources/bootstrap.yml +++ b/kicc-register/src/main/resources/bootstrap.yml @@ -6,7 +6,6 @@ db: num: 1 user: ${MYSQL_USER:root} password: ${MYSQL_PWD:root} - #password: ${MYSQL_PWD:kanglai@2022} url: 0: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true #0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true