From 465eebda3263e034cdb880dfb8f8c2c70d382616 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 17 十一月 2023 10:41:42 +0800
Subject: [PATCH] 片区增加备注属性
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java | 7 +++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 16 ++++++++++++++--
pipIrr-platform/pipIrr-common/pom.xml | 12 ++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/pom.xml b/pipIrr-platform/pipIrr-common/pom.xml
index 19db807..1d13469 100644
--- a/pipIrr-platform/pipIrr-common/pom.xml
+++ b/pipIrr-platform/pipIrr-common/pom.xml
@@ -109,6 +109,18 @@
<artifactId>jdom2</artifactId>
</dependency>
+ <!-- apache mina -->
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-compression</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+
<!-- Hutool鏄竴涓皬鑰屽叏鐨凧ava宸ュ叿绫诲簱(https://github.com/dromara/hutool) -->
<dependency>
<groupId>cn.hutool</groupId>
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
index c3637fc..8197a98 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaBlock.java
@@ -70,6 +70,13 @@
public String color;
/**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 50)
+ public String remark;
+
+ /**
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
@Schema(description = "鐗囧尯鍒犻櫎鏍囧織锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 0fee717..4182d95 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -10,11 +10,12 @@
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="area" jdbcType="INTEGER" property="area" />
<result column="color" jdbcType="VARCHAR" property="color" />
+ <result column="remark" jdbcType="VARCHAR" property="remark" />
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, `header`, phone, area, color,deleted
+ id, `name`, `header`, phone, area, color, remark, deleted
</sql>
<sql id="part_Column_List">
<!--@mbg.generated-->
@@ -82,13 +83,14 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
<!--@mbg.generated-->
- insert into ba_block (id, `name`, `header`, phone, area, color, deleted)
+ insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
values (#{id,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR},
#{header,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR},
#{area,jdbcType=INTEGER},
#{color,jdbcType=VARCHAR},
+ #{remark,jdbcType=VARCHAR},
#{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
@@ -113,6 +115,9 @@
<if test="color != null">
color,
</if>
+ <if test="remark != null">
+ remark,
+ </if>
<if test="deleted != null">
deleted,
</if>
@@ -135,6 +140,9 @@
</if>
<if test="color != null">
#{color,jdbcType=VARCHAR},
+ </if>
+ <if test="remark != null">
+ #{remark,jdbcType=VARCHAR},
</if>
<if test="deleted != null">
#{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -160,6 +168,9 @@
<if test="color != null">
color = #{color,jdbcType=VARCHAR},
</if>
+ <if test="remark != null">
+ color = #{remark,jdbcType=VARCHAR},
+ </if>
<if test="deleted != null">
color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
@@ -174,6 +185,7 @@
phone = #{phone,jdbcType=VARCHAR},
area = #{area,jdbcType=INTEGER},
color = #{color,jdbcType=VARCHAR},
+ remark = #{remark,jdbcType=VARCHAR},
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0