fix:功能补充

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

@@ -37,6 +37,10 @@ public class TrafficInfo extends BaseEntity
     @Excel(name = "颜色")
     private String colour;
 
+
+    /** 坐标 */
+    private Object location;
+
     public void setTrafficId(Integer trafficId) 
     {
         this.trafficId = trafficId;
@@ -92,6 +96,16 @@ public class TrafficInfo extends BaseEntity
         return colour;
     }
 
+    public void setLocation(Object location)
+    {
+        this.location = location;
+    }
+
+    public Object getLocation()
+    {
+        return location;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -101,6 +115,7 @@ public class TrafficInfo extends BaseEntity
             .append("amount", getAmount())
             .append("memo", getMemo())
             .append("colour", getColour())
+            .append("location", getLocation())
             .toString();
     }
 }

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

@@ -60,7 +60,7 @@ public class AreaInfoService
     
     public int insertAreaInfo(AreaInfo areaInfo)
     {
-        areaInfo.setLocation(StringEscapeUtils.unescapeHtml(areaInfo.getLocation().toString()));
+//        areaInfo.setLocation(StringEscapeUtils.unescapeHtml(areaInfo.getLocation().toString()));
         areaInfo.setMemo(StringEscapeUtils.unescapeHtml(areaInfo.getMemo()));
         return areaInfoMapper.insertAreaInfo(areaInfo);
     }
@@ -74,7 +74,7 @@ public class AreaInfoService
     
     public int updateAreaInfo(AreaInfo areaInfo)
     {
-        areaInfo.setLocation(StringEscapeUtils.unescapeHtml(areaInfo.getLocation().toString()));
+//        areaInfo.setLocation(StringEscapeUtils.unescapeHtml(areaInfo.getLocation().toString()));
         areaInfo.setMemo(StringEscapeUtils.unescapeHtml(areaInfo.getMemo()));
         return areaInfoMapper.updateAreaInfo(areaInfo);
     }

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

@@ -1,6 +1,8 @@
 package com.lqkj.info.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.info.mapper.TrafficInfoMapper;
@@ -50,6 +52,7 @@ public class TrafficInfoService
     
     public int insertTrafficInfo(TrafficInfo trafficInfo)
     {
+//        trafficInfo.setLocation(StringEscapeUtils.unescapeHtml(trafficInfo.getLocation().toString()));
         return trafficInfoMapper.insertTrafficInfo(trafficInfo);
     }
 
@@ -62,6 +65,7 @@ public class TrafficInfoService
     
     public int updateTrafficInfo(TrafficInfo trafficInfo)
     {
+//        trafficInfo.setLocation(StringEscapeUtils.unescapeHtml(trafficInfo.getLocation().toString()));
         return trafficInfoMapper.updateTrafficInfo(trafficInfo);
     }
 

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

@@ -1,7 +1,12 @@
 package com.lqkj.ioc.controller;
 
 
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.ioc.service.TrafficSystemService;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,4 +15,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/ioc/trafficSystem")
 public class TrafficSystemController {
 
+    @Autowired
+    private TrafficSystemService trafficSystemService;
+
+    @ApiOperation("公共交通资源")
+    @GetMapping("/publicTransportRes")
+    public ResultUtil publicTransportRes() {
+        return ResultUtil.success(trafficSystemService.publicTransportRes());
+    }
+
 }

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

@@ -0,0 +1,19 @@
+package com.lqkj.ioc.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TrafficSystemMapper {
+
+    @Select("SELECT count(*) FROM traffic_info WHERE type_id =#{type_id}")
+    int countTrafficByTypeId(@Param("type_id") int type_id);
+
+
+    @Select("SELECT count(*) FROM traffic_info ti " +
+            "LEFT JOIN station_info si ON ti.traffic_id = si.traffic_id " +
+            "WHERE ti.type_id =#{type_id}"
+    )
+    int countStationByTypeId(@Param("type_id") int type_id);
+}

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

@@ -0,0 +1,25 @@
+package com.lqkj.ioc.service;
+
+
+import com.lqkj.ioc.mapper.TrafficSystemMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class TrafficSystemService {
+
+    @Autowired
+    private TrafficSystemMapper trafficSystemMapper;
+
+
+    public Map publicTransportRes() {
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("地铁线路", trafficSystemMapper.countTrafficByTypeId(1));
+        result.put("地铁站点", trafficSystemMapper.countStationByTypeId(1));
+        result.put("公交线路", trafficSystemMapper.countTrafficByTypeId(2));
+        return result;
+    }
+}

src/main/java/com/lqkj/system/entity/SysDictData.java

@@ -83,7 +83,7 @@ public class SysDictData extends BaseEntity
         this.dictLabel = dictLabel;
     }
 
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+    @Size(min = 0, max = 255, message = "字典键值长度不能超过100个字符")
     public String getDictValue()
     {
         return dictValue;

src/main/java/com/lqkj/type/entity/TrafficType.java

@@ -46,7 +46,18 @@ public class TrafficType extends BaseEntity
     @Excel(name = "颜色")
     private String colour;
 
-    public void setTypeId(Integer typeId) 
+    /** 图标 */
+    private String icon;
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public void setTypeId(Integer typeId)
     {
         this.typeId = typeId;
     }
@@ -130,16 +141,17 @@ public class TrafficType extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("typeId", getTypeId())
-            .append("parentId", getParentId())
-            .append("typeName", getTypeName())
-            .append("click", getClick())
-            .append("search", getSearch())
-            .append("description", getDescription())
-            .append("orderId", getOrderId())
-            .append("memo", getMemo())
-            .append("colour", getColour())
-            .toString();
+        return "TrafficType{" +
+                "typeId=" + typeId +
+                ", parentId=" + parentId +
+                ", typeName='" + typeName + '\'' +
+                ", click=" + click +
+                ", search=" + search +
+                ", description='" + description + '\'' +
+                ", orderId=" + orderId +
+                ", memo='" + memo + '\'' +
+                ", colour='" + colour + '\'' +
+                ", icon='" + icon + '\'' +
+                '}';
     }
 }

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

@@ -1,4 +1,4 @@
-update sys_config set config_value = '武侯区华西医美健康城管理系统' where config_key = 'sys.index.title';
+update sys_config set config_value = '武侯区悦湖新材料产业功能区管理系统' where config_key = 'sys.index.title';
 
 delete from cms_category;
 insert into cms_category values(1, 0, null, '新闻资讯', 0, null, 1, '超级管理员', now());

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

@@ -219,4 +219,192 @@ values('主体信息查询', (select * from temp_menu), '1',  '#', '', false, tr
     ('主体信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:organizationInfo:add',          '#', 'admin', now(), '', null, ''),
     ('主体信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:organizationInfo:edit',         '#', 'admin', now(), '', null, ''),
     ('主体信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:organizationInfo:remove',       '#', 'admin', now(), '', null, ''),
-    ('主体信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:organizationInfo:export',       '#', 'admin', now(), '', null, '');
+    ('主体信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:organizationInfo:export',       '#', 'admin', now(), '', 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', 'planInfo', 'info/planInfo/index', false, true, 'C', true, true, 'info:planInfo: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:planInfo:query',        '#', 'admin', now(), '', null, ''),
+('规划对象新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:planInfo:add',          '#', 'admin', now(), '', null, ''),
+('规划对象修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:planInfo:edit',         '#', 'admin', now(), '', null, ''),
+('规划对象删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:planInfo:remove',       '#', 'admin', now(), '', null, ''),
+('规划对象导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:planInfo:export',       '#', 'admin', now(), '', 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', 'policyInfo', 'info/policyInfo/index', false, true, 'C', true, true, 'info:policyInfo: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:policyInfo:query',        '#', 'admin', now(), '', null, ''),
+('政策信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:policyInfo:add',          '#', 'admin', now(), '', null, ''),
+('政策信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:policyInfo:edit',         '#', 'admin', now(), '', null, ''),
+('政策信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:policyInfo:remove',       '#', 'admin', now(), '', null, ''),
+('政策信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:policyInfo:export',       '#', 'admin', now(), '', 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', 'roomInfo', 'info/roomInfo/index', false, true, 'C', true, true, 'info:roomInfo: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:roomInfo:query',        '#', 'admin', now(), '', null, ''),
+('房间信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:roomInfo:add',          '#', 'admin', now(), '', null, ''),
+('房间信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:roomInfo:edit',         '#', 'admin', now(), '', null, ''),
+('房间信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:roomInfo:remove',       '#', 'admin', now(), '', null, ''),
+('房间信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:roomInfo:export',       '#', 'admin', now(), '', 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', 'stationInfo', 'info/stationInfo/index', false, true, 'C', true, true, 'info:stationInfo: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:stationInfo:query',        '#', 'admin', now(), '', null, ''),
+('站点信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:stationInfo:add',          '#', 'admin', now(), '', null, ''),
+('站点信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:stationInfo:edit',         '#', 'admin', now(), '', null, ''),
+('站点信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:stationInfo:remove',       '#', 'admin', now(), '', null, ''),
+('站点信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:stationInfo:export',       '#', 'admin', now(), '', 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', 'trafficInfo', 'info/trafficInfo/index', false, true, 'C', true, true, 'info:trafficInfo: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:trafficInfo:query',        '#', 'admin', now(), '', null, ''),
+('交通对象新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:trafficInfo:add',          '#', 'admin', now(), '', null, ''),
+('交通对象修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:trafficInfo:edit',         '#', 'admin', now(), '', null, ''),
+('交通对象删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:trafficInfo:remove',       '#', 'admin', now(), '', null, ''),
+('交通对象导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:trafficInfo:export',       '#', 'admin', now(), '', 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 (2279, '城市推荐', 0, 0, 'recommend', NULL, NULL, 'f', 't', 'M', 't', 't', NULL, 'validCode', '超级管理员', '2024-11-18 11:10:53.179662', NULL, NULL, 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('综合分析', '2279', '1', 'synthesisAnalyze', 'view/synthesisAnalyze/index', false, true, 'C', true, true, 'view:synthesisAnalyze: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, 'view:synthesisAnalyze:query',        '#', 'admin', now(), '', null, ''),
+('综合分析新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'view:synthesisAnalyze:add',          '#', 'admin', now(), '', null, ''),
+('综合分析修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'view:synthesisAnalyze:edit',         '#', 'admin', now(), '', null, ''),
+('综合分析删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'view:synthesisAnalyze:remove',       '#', 'admin', now(), '', null, ''),
+('综合分析导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'view:synthesisAnalyze:export',       '#', 'admin', now(), '', 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', 'modelInfo', 'info/modelInfo/index', false, true, 'C', true, true, 'info:modelInfo: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:modelInfo:query',        '#', 'admin', now(), '', null, ''),
+('模型信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:modelInfo:add',          '#', 'admin', now(), '', null, ''),
+('模型信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:modelInfo:edit',         '#', 'admin', now(), '', null, ''),
+('模型信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:modelInfo:remove',       '#', 'admin', now(), '', null, ''),
+('模型信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:modelInfo:export',       '#', 'admin', now(), '', null, '');
+
+SELECT setval('sys_menu_menu_id_seq', (SELECT MAX(menu_id) FROM sys_menu));
+
+ALTER TABLE organization_info ADD COLUMN audio varchar(255);
+comment on column organization_info.audio is '视频';
+
+
+
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (102, '运营体系', 'operation_system', 't', '超级管理员', '2024-11-26 13:50:37.402144', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (103, '服务体系', 'service_system', 't', '超级管理员', '2024-11-26 13:55:20.453367', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (104, '增长趋势', 'growth_trend', 't', '超级管理员', '2024-11-26 14:01:21.516976', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (105, '企业服务', 'enterprise_service', 't', '超级管理员', '2024-11-26 14:04:23.223561', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (106, '轨道路实时监测', 'railway_realTime_monitoring', 't', '超级管理员', '2024-11-26 14:08:52.391697', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (107, '重点区域配套设施', 'key_area_support_facilities', 't', '超级管理员', '2024-11-26 14:12:19.205583', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (108, '重点区域植被', 'key_area_vegetation', 't', '超级管理员', '2024-11-26 14:16:10.188997', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (109, '主要区域拥堵', 'main_area_congestion', 't', '超级管理员', '2024-11-26 14:18:26.133476', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (110, '建筑土地概况', 'building_land_overview', 't', '超级管理员', '2024-11-26 17:13:04.015269', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (111, '建筑土地统计', 'building_land_statistics', 't', '超级管理员', '2024-11-26 17:18:07.640768', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (112, '成本效益统计', 'cost_benefit_stat', 't', '超级管理员', '2024-11-27 14:09:53.336277', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (113, '成本效益分析', 'cost_benefit_analysis', 't', '超级管理员', '2024-11-27 18:41:59.075476', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (114, '主要区域车流量情况', 'main_area_traffic_flow', 't', '超级管理员', '2024-11-27 18:50:00.433443', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_type" ("dict_id", "dict_name", "dict_type", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (101, '道路实时路况监测', 'road-realtime-traffic', 't', '超级管理员', '2024-11-26 10:19:45.947831', '超级管理员', '2024-11-27 19:36:39.630993', NULL);
+
+SELECT setval('sys_dict_type_dict_id_seq', (SELECT MAX(dict_id) FROM sys_dict_type));
+
+
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (119, 1, '政策咨询', '385/个', 'enterprise_service', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:04:53.442761', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (120, 2, '工商服务', '25/个', 'enterprise_service', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:05:20.327122', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (121, 3, '法律服务', '128/个', 'enterprise_service', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:05:40.933106', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (122, 4, '财税服务', '235/个', 'enterprise_service', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:06:03.814214', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (123, 5, '行政服务', '25/个', 'enterprise_service', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:06:24.501192', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (124, 6, '人才服务', '125/个', 'enterprise_service', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:06:42.086761', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (125, 1, '客流量超限：', '30%', 'railway_realTime_monitoring', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:09:28.257169', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (126, 2, '范围故障', '1', 'railway_realTime_monitoring', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:09:44.849027', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (127, 4, '进出站超限：', '50%', 'railway_realTime_monitoring', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:10:03.912008', '超级管理员', '2024-11-27 19:41:07.646659', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (128, 1, '路灯', '65/盏', 'key_area_support_facilities', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:12:54.220285', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (129, 2, '信号灯', '65/盏', 'key_area_support_facilities', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:13:09.607786', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (130, 3, '摄像头', '44/个', 'key_area_support_facilities', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:13:26.696732', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (131, 4, '路灯状态正常率', '75%', 'key_area_support_facilities', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:13:54.044901', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (132, 5, '信号灯状态正常率', '80%', 'key_area_support_facilities', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:14:20.425779', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (133, 6, '摄像头状态正常率', '75%', 'key_area_support_facilities', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:14:45.635276', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (138, 1, '景区周边', '60', 'main_area_congestion', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:18:47.877352', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (139, 2, '高架桥', '30', 'main_area_congestion', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:18:58.578353', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (140, 3, '地铁周边', '20', 'main_area_congestion', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:19:15.167956', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (141, 4, '高铁站周边', '15', 'main_area_congestion', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:19:29.632493', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (142, 1, '土地总面积', '63165654㎡', 'building_land_overview', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 17:14:22.918916', '超级管理员', '2024-11-27 21:23:21.779921', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (143, 2, '实施规划总面积', '631654335㎡', 'building_land_overview', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 17:15:25.94592', '超级管理员', '2024-11-27 21:23:27.476002', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (144, 3, '总计人口', '165654人', 'building_land_overview', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 17:15:46.687935', '超级管理员', '2024-11-27 21:24:06.422606', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (145, 4, '实施面积', '23245614㎡', 'building_land_overview', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 17:16:11.405326', '超级管理员', '2024-11-27 21:23:31.425318', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (136, 3, '科创园', '750', 'key_area_vegetation', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:17:15.521613', '超级管理员', '2024-11-28 05:17:16.049961', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (137, 4, '金茂悦', '650', 'key_area_vegetation', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:17:27.688341', '超级管理员', '2024-11-28 05:17:34.241364', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (146, 5, '竣工面积', '1165654㎡', 'building_land_overview', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 17:16:29.858606', '超级管理员', '2024-11-27 21:23:34.872682', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (147, 6, '开发面积', '63165654㎡', 'building_land_overview', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 17:16:47.177077', '超级管理员', '2024-11-27 21:23:37.64406', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (154, 1, '成本', '820, 932, 901, 934', 'cost_benefit_stat', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 14:28:32.823209', '超级管理员', '2024-11-27 23:09:18.464354', '');
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (155, 2, '收益', '789, 889, 976, 994', 'cost_benefit_stat', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 16:35:41.823213', '超级管理员', '2024-11-27 23:22:21.2707', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (156, 3, '总占比', '60%', 'cost_benefit_stat', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 16:44:46.94886', '超级管理员', '2024-11-27 19:02:19.729605', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (157, 6, '建筑土地统计', '280,430,310,400,210,370', 'building_land_statistics', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 17:33:03.51135', '超级管理员', '2024-11-27 17:34:02.226899', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (158, 1, '市场风险', '35.17%', 'cost_benefit_analysis', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:43:03.282318', '超级管理员', '2024-11-27 18:43:07.420497', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (159, 2, '财务风险', '28.57%', 'cost_benefit_analysis', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:43:37.766606', '超级管理员', '2024-11-27 18:44:59.836162', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (160, 3, '操作风险', '21.43%', 'cost_benefit_analysis', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:44:18.368932', '超级管理员', '2024-11-27 18:45:05.257761', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (161, 4, '法律风险', '14.29%', 'cost_benefit_analysis', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:44:50.36676', '超级管理员', '2024-11-27 18:45:09.223132', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (162, 1, '今日', '20，33，42，33，53，61，45', 'main_area_traffic_flow', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:53:13.313762', '超级管理员', '2024-11-27 18:57:26.366458', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (163, 2, '昨日环比', '25，38，46，39，57，66，49', 'main_area_traffic_flow', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:57:21.112725', '超级管理员', '2024-11-27 18:57:30.133556', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (164, 0, '上周环比', '28，39，48，42，59，69，55', 'main_area_traffic_flow', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 18:58:00.279392', NULL, NULL, NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (165, 3, '市内三环内拥堵量：', '18km/h', 'road-realtime-traffic', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 19:38:28.100126', '超级管理员', '2024-11-27 19:39:57.127274', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (166, 4, '安全态势：', '0.8安全', 'road-realtime-traffic', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 19:39:07.919651', '超级管理员', '2024-11-27 19:40:01.828812', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (167, 3, '客流量超限：', '15%', 'railway_realTime_monitoring', NULL, 'default', 'f', 't', '超级管理员', '2024-11-27 19:41:03.178779', '超级管理员', '2024-11-27 19:41:11.238614', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (134, 1, '第八再升水公园', '2350', 'key_area_vegetation', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:16:42.06559', '超级管理员', '2024-11-28 05:16:42.70318', NULL);
+INSERT INTO "public"."sys_dict_data" ("dict_code", "dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (135, 2, '川西营小学', '1500', 'key_area_vegetation', NULL, 'default', 'f', 't', '超级管理员', '2024-11-26 14:16:56.963256', '超级管理员', '2024-11-28 05:16:58.467162', NULL);
+SELECT setval('sys_dict_data_dict_code_seq', (SELECT MAX(dict_code) FROM sys_dict_data));

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

@@ -0,0 +1,61 @@
+CREATE TABLE "public"."synthesis_analyze"(
+	id	 SERIAL	not null,
+	orientation	text	null,
+	bonus_policy text	null,
+	planning_layout varchar(255)	null,
+	audio_url	varchar(255)	null,
+	constraint PK_SYNTHESIS_ANALYZE primary key (id)
+);
+
+
+ALTER TABLE traffic_type ADD COLUMN icon varchar(255);
+comment on column traffic_type.icon is '图标';
+
+
+
+ALTER TABLE area_type ADD COLUMN icon varchar(255);
+comment on column area_type.icon is '图标';
+
+
+ALTER TABLE building_type ADD COLUMN icon varchar(255);
+comment on column building_type.icon is '图标';
+
+
+ALTER TABLE equipment_type ADD COLUMN icon varchar(255);
+comment on column equipment_type.icon is '图标';
+
+
+ALTER TABLE house_type ADD COLUMN icon varchar(255);
+comment on column house_type.icon is '图标';
+
+
+ALTER TABLE organization_type ADD COLUMN icon varchar(255);
+comment on column organization_type.icon is '图标';
+
+
+ALTER TABLE plan_type ADD COLUMN icon varchar(255);
+comment on column plan_type.icon is '图标';
+
+
+ALTER TABLE room_type ADD COLUMN icon varchar(255);
+comment on column room_type.icon is '图标';
+
+
+INSERT INTO "public"."traffic_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (2, 0, '公交', 't', 't', NULL, 0, NULL, '#0D4D69', NULL);
+INSERT INTO "public"."traffic_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '地铁', 't', 't', NULL, 1, NULL, '#1B8C2C', null);
+SELECT setval('traffic_type_type_id_seq', (SELECT MAX(type_id) FROM traffic_type));
+
+
+ALTER TABLE traffic_info add COLUMN "location" jsonb;
+comment on column traffic_info.location is '坐标';
+
+ALTER TABLE area_info ALTER COLUMN memo TYPE VARCHAR(9999);
+
+ALTER TABLE model_info add COLUMN "plan_id" INT;
+comment on column model_info.plan_id is '方案id';
+
+
+ALTER TABLE sys_dict_data ALTER COLUMN dict_value TYPE VARCHAR(255);
+
+ALTER TABLE area_info
+ALTER COLUMN location SET DEFAULT '{"type": "Polygon", "coordinates": [[]]}';

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

@@ -11,10 +11,11 @@
 		<result property="amount"    column="amount"    />
 		<result property="memo"    column="memo"    />
 		<result property="colour"    column="colour"    />
+		<result property="location"    column="location"    />
 	</resultMap>
 
 	<sql id="selectTrafficInfoVo">
-		select traffic_id, type_id, traffic_name, amount, memo, colour from traffic_info
+		select traffic_id, type_id, traffic_name, amount, memo, colour, location from traffic_info
 	</sql>
 
 	<select id="selectTrafficInfoList" parameterType="TrafficInfo" resultMap="TrafficInfoResult">
@@ -39,6 +40,7 @@
 			<if test="amount != null">amount,</if>
 			<if test="memo != null and memo != ''">memo,</if>
 			<if test="colour != null and colour != ''">colour,</if>
+		    <if test="location != null and location != ''">location,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="typeId != null">#{typeId},</if>
@@ -46,6 +48,7 @@
 			<if test="amount != null">#{amount},</if>
 			<if test="memo != null and memo != ''">#{memo},</if>
 			<if test="colour != null and colour != ''">#{colour},</if>
+		    <if test="location != null and location != ''">#{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},</if>
 		</trim>
 	</insert>
 
@@ -57,6 +60,7 @@
 			amount = #{amount},
 			memo = #{memo},
 			colour = #{colour},
+		    location = #{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},
 		</trim>
 		where traffic_id = #{trafficId}
 	</update>

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

@@ -14,10 +14,11 @@
 		<result property="orderId"    column="order_id"    />
 		<result property="memo"    column="memo"    />
 		<result property="colour"    column="colour"    />
+		<result property="icon"    column="icon"    />
 	</resultMap>
 
 	<sql id="selectTrafficTypeVo">
-		select type_id, parent_id, type_name, click, search, description, order_id, memo, colour from traffic_type
+		select type_id, parent_id, type_name, click, search, description, order_id, memo, colour, icon from traffic_type
 	</sql>
 
 	<select id="selectTrafficTypeList" parameterType="TrafficType" resultMap="TrafficTypeResult">
@@ -45,6 +46,7 @@
 			<if test="orderId != null">order_id,</if>
 			<if test="memo != null and memo != ''">memo,</if>
 			<if test="colour != null and colour != ''">colour,</if>
+		    <if test="icon != null and icon != ''">icon,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="parentId != null">#{parentId},</if>
@@ -55,6 +57,7 @@
 			<if test="orderId != null">#{orderId},</if>
 			<if test="memo != null and memo != ''">#{memo},</if>
 			<if test="colour != null and colour != ''">#{colour},</if>
+		    <if test="icon != null and icon != ''">#{icon},</if>
 		</trim>
 	</insert>
 
@@ -69,6 +72,7 @@
 			order_id = #{orderId},
 			memo = #{memo},
 			colour = #{colour},
+		    icon = #{icon},
 		</trim>
 		where type_id = #{typeId}
 	</update>