删除areacode

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/TlArea.java

@@ -1,155 +1,147 @@
 package com.ruoyi.qdtl.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 区域管理对象 tl_area
- * 
+ *
  * @author ruoyi
  * @date 2022-02-21
  */
-public class TlArea extends BaseEntity
-{
+public class TlArea extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /**
+     * id
+     */
     private Long id;
 
-    /** 父id */
+    /**
+     * 父id
+     */
     private Long parentId;
 
-    /** 编号 */
-    @Excel(name = "编号")
-    private String areaCode;
-
-    /** 名称 */
+    /**
+     * 名称
+     */
     @Excel(name = "名称")
     private String areaName;
 
-    /** 区域类型 */
+    /**
+     * 区域类型
+     */
     @Excel(name = "区域类型")
     private String areaType;
 
-    /** 区域描述 */
+    /**
+     * 区域描述
+     */
     @Excel(name = "区域描述")
     private String detail;
 
-    /** 电子围栏 */
+    /**
+     * 电子围栏
+     */
     private String fence;
 
-    /** 经纬度 */
+    /**
+     * 经纬度
+     */
     private String lnglat;
 
     private Integer deviceCount;
 
     private Integer locationCount;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setParentId(Long parentId) 
-    {
+
+    public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
-    public Long getParentId() 
-    {
+    public Long getParentId() {
         return parentId;
     }
-    public void setAreaCode(String areaCode) 
-    {
-        this.areaCode = areaCode;
-    }
 
-    public String getAreaCode() 
-    {
-        return areaCode;
-    }
-    public void setAreaName(String areaName) 
-    {
+    public void setAreaName(String areaName) {
         this.areaName = areaName;
     }
 
-    public String getAreaName() 
-    {
+    public String getAreaName() {
         return areaName;
     }
-    public void setAreaType(String areaType) 
-    {
+
+    public void setAreaType(String areaType) {
         this.areaType = areaType;
     }
 
-    public String getAreaType() 
-    {
+    public String getAreaType() {
         return areaType;
     }
-    public void setDetail(String detail) 
-    {
+
+    public void setDetail(String detail) {
         this.detail = detail;
     }
 
-    public String getDetail() 
-    {
+    public String getDetail() {
         return detail;
     }
-    public void setFence(String fence) 
-    {
+
+    public void setFence(String fence) {
         this.fence = fence;
     }
 
-    public String getFence() 
-    {
+    public String getFence() {
         return fence;
     }
-    public void setLnglat(String lnglat) 
-    {
+
+    public void setLnglat(String lnglat) {
         this.lnglat = lnglat;
     }
 
-    public String getLnglat() 
-    {
+    public String getLnglat() {
         return lnglat;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("parentId", getParentId())
-            .append("areaCode", getAreaCode())
-            .append("areaName", getAreaName())
-            .append("areaType", getAreaType())
-            .append("detail", getDetail())
-            .append("remark", getRemark())
-            .append("fence", getFence())
-            .append("lnglat", getLnglat())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("parentId", getParentId())
+                .append("areaName", getAreaName())
+                .append("areaType", getAreaType())
+                .append("detail", getDetail())
+                .append("remark", getRemark())
+                .append("fence", getFence())
+                .append("lnglat", getLnglat())
+                .append("delFlag", getDelFlag())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 
     public Integer getDeviceCount() {

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlAreaServiceImpl.java

@@ -72,15 +72,6 @@ public class TlAreaServiceImpl implements ITlAreaService {
         // 查询原有的数据
         TlArea old = selectTlAreaById(tlArea.getId());
         if (old != null) {
-            if (!old.getAreaCode().equals(tlArea.getAreaCode())) {
-                // 校验是否重复
-                TlArea check = new TlArea();
-                check.setAreaCode(tlArea.getAreaCode());
-                List<TlArea> tlAreas = tlAreaMapper.selectTlAreaList(check);
-                if (tlAreas.size() > 0) {
-                    throw new ServiceException("编号已存在，请更换");
-                }
-            }
             if (!old.getAreaName().equals(tlArea.getAreaName())) {
                 // 校验是否重复
                 TlArea check = new TlArea();

ruoyi-system/src/main/resources/mapper/qdtl/TlAreaMapper.xml

@@ -7,7 +7,6 @@
     <resultMap type="TlArea" id="TlAreaResult">
         <result property="id" column="id"/>
         <result property="parentId" column="parent_id"/>
-        <result property="areaCode" column="area_code"/>
         <result property="areaName" column="area_name"/>
         <result property="areaType" column="area_type"/>
         <result property="detail" column="detail"/>
@@ -24,7 +23,6 @@
     <sql id="selectTlAreaVo">
         select id,
                parent_id,
-               area_code,
                area_name,
                area_type,
                detail,
@@ -42,7 +40,6 @@
     <select id="selectTlAreaList" parameterType="TlArea" resultMap="TlAreaResult">
         <include refid="selectTlAreaVo"/>
         <where>
-            <if test="areaCode != null  and areaCode != ''">and area_code like concat('%', #{areaCode}, '%')</if>
             <if test="areaName != null  and areaName != ''">and area_name like concat('%', #{areaName}, '%')</if>
             <if test="areaType != null  and areaType != ''">and area_type = #{areaType}</if>
             and del_flag = '0'
@@ -59,8 +56,7 @@
     <select id="selectExist" resultType="java.lang.Integer">
         select count(1)
         from tl_area
-        where (area_code = #{areaCode}
-            or area_name = #{areaName})
+        where area_name = #{areaName}
           and del_flag = '0'
     </select>
 
@@ -74,7 +70,6 @@
         insert into tl_area
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="parentId != null">parent_id,</if>
-            <if test="areaCode != null and areaCode != ''">area_code,</if>
             <if test="areaName != null and areaName != ''">area_name,</if>
             <if test="areaType != null and areaType != ''">area_type,</if>
             <if test="detail != null">detail,</if>
@@ -89,7 +84,6 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null">#{parentId},</if>
-            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
             <if test="areaName != null and areaName != ''">#{areaName},</if>
             <if test="areaType != null and areaType != ''">#{areaType},</if>
             <if test="detail != null">#{detail},</if>
@@ -108,7 +102,6 @@
         update tl_area
         <trim prefix="SET" suffixOverrides=",">
             <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
             <if test="areaName != null and areaName != ''">area_name = #{areaName},</if>
             <if test="areaType != null and areaType != ''">area_type = #{areaType},</if>
             <if test="detail != null">detail = #{detail},</if>