演示后需求更改

src/main/java/com/lqkj/info/controller/ParkInfoController.java

@@ -24,7 +24,7 @@ import com.github.pagehelper.PageInfo;
 
 /**
  * 园区对象Controller
- * 
+ *
  * @author lqkj
  * @date 2024-12-16
  */
@@ -39,9 +39,20 @@ public class ParkInfoController extends BaseController
     /**
      * 查询园区对象列表
      */
+    @ApiOperation("查询园区对象列表 排除健康城")
+
+    @GetMapping("/keyList")
+    public ResultUtil keyList() {
+        return ResultUtil.success(parkInfoService.selectParkInfoKeyList());
+    }
+
+
+    /**
+     * 查询园区对象列表
+     */
     @ApiOperation("查询园区对象列表")
-    @PreAuthorize("@ss.hasPermi('info:parkInfo:list')")
     @GetMapping("/list")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:list')")
     public ResultUtil list(ParkInfo parkInfo)
     {
         startPage( parkInfo);
@@ -49,6 +60,11 @@ public class ParkInfoController extends BaseController
         return ResultUtil.success(pageInfo);
     }
 
+
+
+
+
+
     /**
      * 导出园区对象列表
      */
@@ -109,4 +125,4 @@ public class ParkInfoController extends BaseController
     {
         return resultByRows(parkInfoService.deleteParkInfoByParkIds(parkIds));
     }
-}
+}

src/main/java/com/lqkj/info/entity/ParkInfo.java

@@ -8,7 +8,7 @@ import com.lqkj.common.core.model.BaseEntity;
 
 /**
  * 园区对象对象 park_info
- * 
+ *
  * @author lqkj
  * @date 2024-12-16
  */
@@ -25,45 +25,45 @@ public class ParkInfo extends BaseEntity
 
     /** 坐标 */
     @Excel(name = "坐标")
-    private Object location;
+    private String location;
 
     /** 备注 */
     @Excel(name = "备注")
     private String memo;
 
-    public void setParkId(Integer parkId) 
+    public void setParkId(Integer parkId)
     {
         this.parkId = parkId;
     }
 
-    public Integer getParkId() 
+    public Integer getParkId()
     {
         return parkId;
     }
-    public void setParkName(String parkName) 
+    public void setParkName(String parkName)
     {
         this.parkName = parkName;
     }
 
-    public String getParkName() 
+    public String getParkName()
     {
         return parkName;
     }
-    public void setLocation(Object location)
+    public void setLocation(String location)
     {
         this.location = location;
     }
 
-    public Object getLocation()
+    public String getLocation()
     {
         return location;
     }
-    public void setMemo(String memo) 
+    public void setMemo(String memo)
     {
         this.memo = memo;
     }
 
-    public String getMemo() 
+    public String getMemo()
     {
         return memo;
     }
@@ -77,4 +77,4 @@ public class ParkInfo extends BaseEntity
             .append("memo", getMemo())
             .toString();
     }
-}
+}

src/main/java/com/lqkj/info/mapper/ParkInfoMapper.java

@@ -6,16 +6,16 @@ import com.lqkj.info.entity.ParkInfo;
 
 /**
  * 园区对象Mapper接口
- * 
+ *
  * @author lqkj
  * @date 2024-12-16
  */
 @Mapper
-public interface ParkInfoMapper 
+public interface ParkInfoMapper
 {
     /**
      * 查询园区对象
-     * 
+     *
      * @param parkId 园区对象主键
      * @return 园区对象
      */
@@ -23,15 +23,22 @@ public interface ParkInfoMapper
 
     /**
      * 查询园区对象列表
-     * 
+     *
      * @param parkInfo 园区对象
      * @return 园区对象集合
      */
     public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
 
     /**
+     * 查询园区对象列表 排除健康城园区
+     *
+     * @return 园区对象集合
+     */
+    public List<ParkInfo> selectParkInfoKeyList();
+
+    /**
      * 新增园区对象
-     * 
+     *
      * @param parkInfo 园区对象
      * @return 结果
      */
@@ -39,7 +46,7 @@ public interface ParkInfoMapper
 
     /**
      * 修改园区对象
-     * 
+     *
      * @param parkInfo 园区对象
      * @return 结果
      */
@@ -47,7 +54,7 @@ public interface ParkInfoMapper
 
     /**
      * 删除园区对象
-     * 
+     *
      * @param parkId 园区对象主键
      * @return 结果
      */
@@ -55,9 +62,9 @@ public interface ParkInfoMapper
 
     /**
      * 批量删除园区对象
-     * 
+     *
      * @param parkIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteParkInfoByParkIds(Integer[] parkIds);
-}
+}

src/main/java/com/lqkj/info/service/ParkInfoService.java

@@ -8,7 +8,7 @@ import com.lqkj.info.entity.ParkInfo;
 import com.lqkj.common.utils.uuid.IdUtils;
 /**
  * 园区对象Service业务层处理
- * 
+ *
  * @author lqkj
  * @date 2024-12-16
  */
@@ -20,11 +20,11 @@ public class ParkInfoService
 
     /**
      * 查询园区对象
-     * 
+     *
      * @param parkId 园区对象主键
      * @return 园区对象
      */
-    
+
     public ParkInfo selectParkInfoByParkId(Integer parkId)
     {
         return parkInfoMapper.selectParkInfoByParkId(parkId);
@@ -32,7 +32,7 @@ public class ParkInfoService
 
     /**
      * 查询园区对象列表
-     * 
+     *
      * @param parkInfo 园区对象
      * @return 园区对象
      */
@@ -42,12 +42,22 @@ public class ParkInfoService
     }
 
     /**
+     * 查询园区对象列表 排除健康城
+     *
+     * @return 园区对象
+     */
+    public List<ParkInfo> selectParkInfoKeyList()
+    {
+        return parkInfoMapper.selectParkInfoKeyList();
+    }
+
+    /**
      * 新增园区对象
-     * 
+     *
      * @param parkInfo 园区对象
      * @return 结果
      */
-    
+
     public int insertParkInfo(ParkInfo parkInfo)
     {
         return parkInfoMapper.insertParkInfo(parkInfo);
@@ -55,11 +65,11 @@ public class ParkInfoService
 
     /**
      * 修改园区对象
-     * 
+     *
      * @param parkInfo 园区对象
      * @return 结果
      */
-    
+
     public int updateParkInfo(ParkInfo parkInfo)
     {
         return parkInfoMapper.updateParkInfo(parkInfo);
@@ -67,11 +77,11 @@ public class ParkInfoService
 
     /**
      * 批量删除园区对象
-     * 
+     *
      * @param parkIds 需要删除的园区对象主键
      * @return 结果
      */
-    
+
     public int deleteParkInfoByParkIds(Integer[] parkIds)
     {
         return parkInfoMapper.deleteParkInfoByParkIds(parkIds);
@@ -79,13 +89,13 @@ public class ParkInfoService
 
     /**
      * 删除园区对象信息
-     * 
+     *
      * @param parkId 园区对象主键
      * @return 结果
      */
-    
+
     public int deleteParkInfoByParkId(Integer parkId)
     {
         return parkInfoMapper.deleteParkInfoByParkId(parkId);
     }
-}
+}

src/main/java/com/lqkj/type/controller/PlanTypeController.java

@@ -24,7 +24,7 @@ import com.github.pagehelper.PageInfo;
 
 /**
  * 规划类型Controller
- * 
+ *
  * @author lqkj
  * @date 2024-11-11
  */
@@ -50,6 +50,18 @@ public class PlanTypeController extends BaseController
     }
 
     /**
+     * 查询规划类型列表  排除重点状态
+     */
+    @ApiOperation("查询规划类型列表")
+    @GetMapping("/planList")
+    public ResultUtil planList(PlanType planType)
+    {
+        startPage( planType);
+        PageInfo<PlanType> pageInfo = new PageInfo<>(planTypeService.planList(planType));
+        return ResultUtil.success(pageInfo);
+    }
+
+    /**
      * 导出规划类型列表
      */
     @ApiOperation("导出规划类型列表")
@@ -109,4 +121,4 @@ public class PlanTypeController extends BaseController
     {
         return resultByRows(planTypeService.deletePlanTypeByTypeIds(typeIds));
     }
-}
+}

src/main/java/com/lqkj/type/mapper/PlanTypeMapper.java

@@ -6,16 +6,16 @@ import com.lqkj.type.entity.PlanType;
 
 /**
  * 规划类型Mapper接口
- * 
+ *
  * @author lqkj
  * @date 2024-11-11
  */
 @Mapper
-public interface PlanTypeMapper 
+public interface PlanTypeMapper
 {
     /**
      * 查询规划类型
-     * 
+     *
      * @param typeId 规划类型主键
      * @return 规划类型
      */
@@ -23,15 +23,18 @@ public interface PlanTypeMapper
 
     /**
      * 查询规划类型列表
-     * 
+     *
      * @param planType 规划类型
      * @return 规划类型集合
      */
     public List<PlanType> selectPlanTypeList(PlanType planType);
 
+
+    public List<PlanType> planList(PlanType planType);
+
     /**
      * 新增规划类型
-     * 
+     *
      * @param planType 规划类型
      * @return 结果
      */
@@ -39,7 +42,7 @@ public interface PlanTypeMapper
 
     /**
      * 修改规划类型
-     * 
+     *
      * @param planType 规划类型
      * @return 结果
      */
@@ -47,7 +50,7 @@ public interface PlanTypeMapper
 
     /**
      * 删除规划类型
-     * 
+     *
      * @param typeId 规划类型主键
      * @return 结果
      */
@@ -55,9 +58,9 @@ public interface PlanTypeMapper
 
     /**
      * 批量删除规划类型
-     * 
+     *
      * @param typeIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deletePlanTypeByTypeIds(Integer[] typeIds);
-}
+}

src/main/java/com/lqkj/type/service/PlanTypeService.java

@@ -1,6 +1,8 @@
 package com.lqkj.type.service;
 
 import java.util.List;
+
+import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.lqkj.type.mapper.PlanTypeMapper;
@@ -8,7 +10,7 @@ import com.lqkj.type.entity.PlanType;
 import com.lqkj.common.utils.uuid.IdUtils;
 /**
  * 规划类型Service业务层处理
- * 
+ *
  * @author lqkj
  * @date 2024-11-11
  */
@@ -20,11 +22,11 @@ public class PlanTypeService
 
     /**
      * 查询规划类型
-     * 
+     *
      * @param typeId 规划类型主键
      * @return 规划类型
      */
-    
+
     public PlanType selectPlanTypeByTypeId(Integer typeId)
     {
         return planTypeMapper.selectPlanTypeByTypeId(typeId);
@@ -32,7 +34,7 @@ public class PlanTypeService
 
     /**
      * 查询规划类型列表
-     * 
+     *
      * @param planType 规划类型
      * @return 规划类型
      */
@@ -42,36 +44,48 @@ public class PlanTypeService
     }
 
     /**
+     * 查询规划类型列表
+     *
+     * @return 规划类型
+     */
+    public List<PlanType> planList(PlanType planType)
+    {
+        return planTypeMapper.planList(planType);
+    }
+
+    /**
      * 新增规划类型
-     * 
+     *
      * @param planType 规划类型
      * @return 结果
      */
-    
+
     public int insertPlanType(PlanType planType)
     {
+        planType.setMemo(StringEscapeUtils.unescapeHtml(planType.getMemo()));
         return planTypeMapper.insertPlanType(planType);
     }
 
     /**
      * 修改规划类型
-     * 
+     *
      * @param planType 规划类型
      * @return 结果
      */
-    
+
     public int updatePlanType(PlanType planType)
     {
+        planType.setMemo(StringEscapeUtils.unescapeHtml(planType.getMemo()));
         return planTypeMapper.updatePlanType(planType);
     }
 
     /**
      * 批量删除规划类型
-     * 
+     *
      * @param typeIds 需要删除的规划类型主键
      * @return 结果
      */
-    
+
     public int deletePlanTypeByTypeIds(Integer[] typeIds)
     {
         return planTypeMapper.deletePlanTypeByTypeIds(typeIds);
@@ -79,13 +93,13 @@ public class PlanTypeService
 
     /**
      * 删除规划类型信息
-     * 
+     *
      * @param typeId 规划类型主键
      * @return 结果
      */
-    
+
     public int deletePlanTypeByTypeId(Integer typeId)
     {
         return planTypeMapper.deletePlanTypeByTypeId(typeId);
     }
-}
+}

src/main/resources/db/migration/V1_15__20250329.sql

@@ -0,0 +1,10 @@
+INSERT INTO "public"."organization_type" ("parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES ( 0, '重点建筑', 't', 't', NULL, 0, NULL, NULL, '/profile/upload/2025/01/03/160e794f-782f-4e1c-a5df-a97c611fb659.png');
+
+ALTER TABLE park_info
+ALTER COLUMN location TYPE VARCHAR(255),
+ALTER COLUMN memo TYPE text;
+
+
+
+INSERT INTO "public"."plan_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (3, 0, '重点建筑', 't', 't', NULL, 0, NULL, NULL, NULL);
+

src/main/resources/mapper/info/ParkInfoMapper.xml

@@ -23,6 +23,12 @@
 		order by park_id
 
 	</select>
+	<select id="selectParkInfoKeyList"  resultMap="ParkInfoResult">
+		<include refid="selectParkInfoVo"/>
+		where park_id not in (1)
+		order by park_id
+	</select>
+
 
 	<select id="selectParkInfoByParkId" parameterType="Integer" resultMap="ParkInfoResult">
 		<include refid="selectParkInfoVo"/>
@@ -38,7 +44,8 @@
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="parkName != null and parkName != ''">#{parkName},</if>
-			<if test="location != null and location != ''">#{location, jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},</if>
+<!-- 			<if test="location != null and location != ''">#{location, jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},</if>-->
+			<if test="location != null and location != ''">#{location},</if>
 			<if test="memo != null and memo != ''">#{memo},</if>
 		</trim>
 	</insert>
@@ -47,7 +54,8 @@
 		update park_info
 		<trim prefix="SET" suffixOverrides=",">
 			park_name = #{parkName},
-			location = #{location, jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},
+ 			<!-- location = #{location, jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},-->
+			location = #{location},
 			memo = #{memo},
 		</trim>
 		where park_id = #{parkId}
@@ -63,4 +71,4 @@
 			#{parkId}
 		</foreach>
 	</delete>
-</mapper>
+</mapper>

src/main/resources/mapper/type/PlanTypeMapper.xml

@@ -34,7 +34,20 @@
 		where type_id = #{typeId}
 	</select>
 
-	<insert id="insertPlanType" parameterType="PlanType" useGeneratedKeys="true" keyProperty="typeId">
+    <select id="planList"  parameterType="PlanType" resultMap="PlanTypeResult">
+		<include refid="selectPlanTypeVo"/>
+		<where>
+			<if test="typeName != null and typeName != ''">
+				and type_name like concat('%', #{typeName}, '%')
+			</if>
+			<if test="typeName == null or typeName == ''">
+				and type_name not like concat('%','重点建筑', '%')
+			</if>
+		</where>
+		order by type_id
+	</select>
+
+    <insert id="insertPlanType" parameterType="PlanType" useGeneratedKeys="true" keyProperty="typeId">
 		insert into plan_type
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="parentId != null">parent_id,</if>
@@ -83,4 +96,4 @@
 			#{typeId}
 		</foreach>
 	</delete>
-</mapper>
+</mapper>