增加模型保存位置信息

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

@@ -33,6 +33,9 @@ public class ModelInfo extends BaseEntity
     @Excel(name = "方案id")
     private Integer planId;
 
+    /** 位置信息 */
+    private Object trans;
+
     public void setModelId(Integer modelId) 
     {
         this.modelId = modelId;
@@ -79,6 +82,14 @@ public class ModelInfo extends BaseEntity
         return planId;
     }
 
+    public Object getTrans() {
+        return trans;
+    }
+
+    public void setTrans(Object trans) {
+        this.trans = trans;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -87,6 +98,7 @@ public class ModelInfo extends BaseEntity
             .append("originalPath", getOriginalPath())
             .append("modelIcon", getModelIcon())
             .append("planId", getPlanId())
+            .append("trans", getTrans())
             .toString();
     }
 }

src/main/java/com/lqkj/ioc/controller/SmartParkController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,15 +21,15 @@ public class SmartParkController {
 
 
     @ApiOperation("智慧园区-园区新增入驻情况")
-    @GetMapping("/addParkNewTenant")
-    public ResultUtil addParkNewTenant(){
-        return ResultUtil.success(smartParkService.addParkNewTenant());
+    @GetMapping("/addParkNewTenant/{parkId}")
+    public ResultUtil addParkNewTenant(@PathVariable("parkId") Integer parkId){
+        return ResultUtil.success(smartParkService.addParkNewTenant(parkId));
     }
 
 
     @ApiOperation("智慧园区-园区消防")
-    @GetMapping("/getParkFireProtectionInfo")
-    public ResultUtil getParkFireProtectionInfo(){
-        return ResultUtil.success(smartParkService.getParkFireProtectionInfo());
+    @GetMapping("/getParkFireProtectionInfo/{parkId}")
+    public ResultUtil getParkFireProtectionInfo(@PathVariable("parkId") Integer parkId){
+        return ResultUtil.success(smartParkService.getParkFireProtectionInfo(parkId));
     }
 }

src/main/java/com/lqkj/ioc/mapper/SmartParkMapper.java

@@ -2,6 +2,7 @@ package com.lqkj.ioc.mapper;
 
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -29,9 +30,10 @@ public interface SmartParkMapper {
             "LEFT JOIN organization_info C  " +
             "    ON EXTRACT(YEAR FROM C.enter_time) = EXTRACT(YEAR FROM M.MONTH) " +
             "    AND EXTRACT(MONTH FROM C.enter_time) = EXTRACT(MONTH FROM M.MONTH) " +
+            "    AND C.park_id = #{parkId} " +
             "GROUP BY YEAR, MONTH " +
             "ORDER BY YEAR DESC, MONTH;")
-    List<Map<String, Object>> addParkNewTenant();
+    List<Map<String, Object>> addParkNewTenant(@Param("parkId") Integer parkId);
 
 
     @Select("WITH months AS ( SELECT generate_series(date_trunc('year', CURRENT_DATE), " +
@@ -45,6 +47,7 @@ public interface SmartParkMapper {
             "LEFT JOIN forewarning_info r " +
             "ON EXTRACT(MONTH FROM r.create_time) = EXTRACT(MONTH FROM m.month) " +
             "AND EXTRACT(YEAR FROM r.create_time) = EXTRACT(YEAR FROM CURRENT_DATE)  " +
+            "AND r.park_id = #{parkId} " +
             "GROUP BY m.month ORDER BY month;")
-    List<Map<String, Object>> getParkFireProtectionInfo();
+    List<Map<String, Object>> getParkFireProtectionInfo(@Param("parkId") Integer parkId);
 }

src/main/java/com/lqkj/ioc/service/SmartParkService.java

@@ -15,11 +15,11 @@ public class SmartParkService {
     private SmartParkMapper smartParkMapper;
 
 
-    public List<Map<String,Object>> addParkNewTenant() {
-        return smartParkMapper.addParkNewTenant();
+    public List<Map<String,Object>> addParkNewTenant(Integer parkId) {
+        return smartParkMapper.addParkNewTenant(parkId);
     }
 
-    public List<Map<String,Object>> getParkFireProtectionInfo() {
-        return smartParkMapper.getParkFireProtectionInfo();
+    public List<Map<String,Object>> getParkFireProtectionInfo(Integer parkId) {
+        return smartParkMapper.getParkFireProtectionInfo(parkId);
     }
 }

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

@@ -14,13 +14,18 @@ ALTER TABLE developments
     add COLUMN if not exists create_time TIMESTAMP;
 comment on column developments.create_time is '创建时间';
 
-INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2286, '发展定位', 2200, 1, 'development', 'info/development/index', NULL, 'f', 't', 'C', 't', 't', 'info:development:list', 'operation', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '发展定位菜单');
-INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2287, '发展定位查询', 2286, 1, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:query', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
-INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2288, '发展定位新增', 2286, 2, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:add', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
-INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2289, '发展定位修改', 2286, 3, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:edit', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
-INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2290, '发展定位删除', 2286, 4, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:remove', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
-INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2291, '发展定位导出', 2286, 5, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:export', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
-
+-- 菜单 SQL
+with temp_menu as (
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('发展定位', '2200', '1', 'development', 'info/development/index', false, true, 'C', true, true, 'info:development:list', 'operation', 'admin', now(), '', null, '发展定位菜单') returning menu_id
+    )
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('发展定位查询', (select * from temp_menu), '1',  '#', '', false, true, 'F', true, true, 'info:development:query',        '#', 'admin', now(), '', null, ''),
+    ('发展定位新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:development:add',          '#', 'admin', now(), '', null, ''),
+    ('发展定位修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:development:edit',         '#', 'admin', now(), '', null, ''),
+    ('发展定位删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:development:remove',       '#', 'admin', now(), '', null, ''),
+    ('发展定位导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:development:export',       '#', 'admin', now(), '', null, '');
 
 -- 菜单 SQL
 with temp_menu as (
@@ -70,3 +75,7 @@ comment on column equipment_info.park_id is '园区id';
 ALTER TABLE sys_dict_data
     add COLUMN if not exists park_id int;
 comment on column sys_dict_data.park_id is '园区id';
+
+ALTER TABLE model_info
+    add COLUMN if not exists trans jsonb;
+comment on column model_info.trans is '园区id';

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

@@ -10,10 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="originalPath"    column="original_path"    />
         <result property="modelIcon"    column="model_icon"    />
         <result property="planId"    column="plan_id"    />
+        <result property="trans" column="trans" />
     </resultMap>
 
     <sql id="selectModelInfoVo">
-        select model_id, model_name, original_path, model_icon, plan_id from model_info
+        select model_id, model_name, original_path, model_icon, plan_id, trans from model_info
     </sql>
 
     <select id="selectModelInfoList" parameterType="ModelInfo" resultMap="ModelInfoResult">
@@ -38,12 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="originalPath != null and originalPath != ''">original_path,</if>
             <if test="modelIcon != null and modelIcon != ''">model_icon,</if>
             <if test="planId != null">plan_id,</if>
+            <if test="trans != null">trans,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="modelName != null and modelName != ''">#{modelName},</if>
             <if test="originalPath != null and originalPath != ''">#{originalPath},</if>
             <if test="modelIcon != null and modelIcon != ''">#{modelIcon},</if>
             <if test="planId != null">#{planId},</if>
+            <if test="trans != null">#{trans,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},</if>
          </trim>
     </insert>
 
@@ -54,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             original_path = #{originalPath},
             model_icon = #{modelIcon},
             plan_id = #{planId},
+            trans = #{trans,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},
         </trim>
         where model_id = #{modelId}
     </update>

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

@@ -128,7 +128,7 @@
 		    audio = #{audio},
 		    industry_type = #{industryType},
 		    floor = #{floor},
-		    house_type_id = #{houseTypeId}
+		    house_type_id = #{houseTypeId},
 		    park_id = #{parkId}
 		</trim>
 		where organization_id = #{organizationId}