From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
index db51681..abf4bc4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
@@ -7,7 +7,7 @@
<id column="id" jdbcType="BIGINT" property="id" />
<id column="supperId" jdbcType="BIGINT" property="supperId" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result column="num" jdbcType="TINYINT" property="num" />
+ <result column="num" jdbcType="VARCHAR" property="num" />
<result property="level" column="level" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.pipIrrGlobal.util.DistrictLevel"/>
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
@@ -30,7 +30,7 @@
select
<include refid="Base_Column_List" />
from ba_district
- where level = #{level,jdbcType=TINYINT}
+ where deleted != 1 and level = #{level,jdbcType=TINYINT}
</select>
<select id="selectBySupperId" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -38,16 +38,16 @@
select
<include refid="Base_Column_List" />
from ba_district
- where supperId = #{supperId,jdbcType=BIGINT}
+ where deleted != 1 and supperId = #{supperId,jdbcType=BIGINT}
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
<!--@mbg.generated-->
insert into ba_district (id, supperId, `name`, num, `level`, deleted)
values (#{id,jdbcType=BIGINT},
#{supperId,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR},
- #{num,jdbcType=TINYINT},
+ #{num,jdbcType=VARCHAR},
#{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
#{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
)
@@ -87,7 +87,7 @@
#{name,jdbcType=VARCHAR},
</if>
<if test="num != null">
- #{num,jdbcType=TINYINT},
+ #{num,jdbcType=VARCHAR},
</if>
<if test="level != null">
#{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -105,7 +105,7 @@
`name` = #{name,jdbcType=VARCHAR},
</if>
<if test="num != null">
- num = #{num,jdbcType=TINYINT},
+ num = #{num,jdbcType=VARCHAR},
</if>
<if test="supperId != null">
supperId = #{supperId,jdbcType=BIGINT},
@@ -124,7 +124,7 @@
update ba_district
set supperId = #{supperId,jdbcType=BIGINT},
`name` = #{name,jdbcType=VARCHAR},
- num = #{num,jdbcType=TINYINT},
+ num = #{num,jdbcType=VARCHAR},
`level` = #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
@@ -139,4 +139,46 @@
update ba_district set deleted = 1
where id = #{id,jdbcType=BIGINT}
</delete>
+
+ <!--鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�-->
+ <select id="getDistrictsByVillageId" resultType="java.util.Map">
+ SELECT
+ pro.id AS provinceId,
+ pro.num AS provinceNum,
+ pro.name AS provinceName,
+ cit.id AS cityId,
+ cit.num AS cityNum,
+ cit.name AS cityName,
+ con.id AS countryId,
+ con.num AS countyNum,
+ con.name AS countryName,
+ tow.id AS townId,
+ tow.num AS townNum,
+ tow.name AS townName,
+ vil.id AS villageId,
+ vil.num AS villageNum,
+ vil.name AS villageName
+ FROM ba_district vil
+ INNER JOIN ba_district tow ON vil.supperId = tow.id
+ INNER JOIN ba_district con ON tow.supperId = con.id
+ INNER JOIN ba_district cit ON con.supperId = cit.id
+ INNER JOIN ba_district pro ON cit.supperId = pro.id
+ WHERE vil.id = #{villageId}
+ </select>
+
+ <!--鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
+ <select id="getDistrictgsByLevel" resultType="java.util.Map">
+ SELECT
+ CAST(id AS char) AS id,
+ name
+ FROM ba_district WHERE `level` = #{level}
+ </select>
+
+ <!--鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
+ <select id="getDistrictsBySupperId" resultType="java.util.Map">
+ SELECT
+ CAST(id AS char) AS id,
+ name
+ FROM ba_district WHERE supperId = #{supperId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0