[update] 路口管理，行政区划编号改为区域ID

signal-optimize-service/src/main/java/net/wanji/opt/bo/AddOrUpdateAreaBO.java

@@ -19,6 +19,7 @@ public class AddOrUpdateAreaBO {
     @ApiModelProperty(value = "子区名称")
     @Pattern(regexp = "^[\\u4E00-\\u9FA5\\w\\-]{0,20}$", message = "子区名称只能包含中文、英文、数字、下划线和中横线,0~20个字符")
     private String areaName;
+    @Pattern(regexp = "^[\\u4E00-\\u9FA5\\w\\-]{0,200}$", message = "子区名称只能包含中文、英文、数字、下划线和中横线,0~200个字符")
     @ApiModelProperty(value = "备注")
     private String remark;
     @ApiModelProperty(value = "路口ID数组")

signal-optimize-service/src/main/java/net/wanji/opt/controller/CrossController.java

@@ -53,7 +53,7 @@ public class CrossController {
             @ApiResponse(code = 200, message = "OK", response = JsonViewObject.class),
     })
     public JsonViewObject addOrUpdateArea(@RequestBody AddOrUpdateAreaBO addOrUpdateAreaBO) {
-//        crossManageService.addOrUpdateArea(addOrUpdateAreaBO);
+        crossManageService.addOrUpdateArea(addOrUpdateAreaBO);
         return JsonViewObject.newInstance().success();
     }
 

signal-optimize-service/src/main/java/net/wanji/opt/service/CrossManageService.java

 package net.wanji.opt.service;
 
+import net.wanji.opt.bo.AddOrUpdateAreaBO;
 import net.wanji.opt.bo.PolygonBO;
 import net.wanji.opt.vo.CrossIdAndNameVO;
 
@@ -12,4 +13,6 @@ public interface CrossManageService {
 
 
     List<CrossIdAndNameVO> selectCrossesByPolygon(PolygonBO polygonBO);
+
+    void addOrUpdateArea(AddOrUpdateAreaBO addOrUpdateAreaBO);
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossManageServiceImpl.java

 package net.wanji.opt.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.gts.GeometryUtil;
 import net.wanji.common.utils.tool.CrossUtil;
+import net.wanji.databus.dao.mapper.BaseAreaInfoMapper;
 import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.databus.po.BaseCrossInfoPO;
+import net.wanji.opt.bo.AddOrUpdateAreaBO;
 import net.wanji.opt.bo.PolygonBO;
 import net.wanji.opt.service.CrossManageService;
 import net.wanji.opt.vo.CrossIdAndNameVO;
 import org.locationtech.jts.geom.Geometry;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,9 +26,11 @@ import java.util.List;
 @Slf4j
 public class CrossManageServiceImpl implements CrossManageService {
     private final BaseCrossInfoMapper crossInfoMapper;
+    private final BaseAreaInfoMapper baseAreaInfoMapper;
 
-    public CrossManageServiceImpl(BaseCrossInfoMapper crossInfoMapper) {
+    public CrossManageServiceImpl(BaseCrossInfoMapper crossInfoMapper, BaseAreaInfoMapper baseAreaInfoMapper) {
         this.crossInfoMapper = crossInfoMapper;
+        this.baseAreaInfoMapper = baseAreaInfoMapper;
     }
 
     @Override
@@ -51,4 +57,23 @@ public class CrossManageServiceImpl implements CrossManageService {
 
         return res;
     }
+
+    @Override
+    @Transactional
+    public void addOrUpdateArea(AddOrUpdateAreaBO addOrUpdateAreaBO) {
+        Integer areaId = addOrUpdateAreaBO.getAreaId();
+        String areaName = addOrUpdateAreaBO.getAreaName();
+        String remark = addOrUpdateAreaBO.getRemark();
+        List<String> crossIdList = addOrUpdateAreaBO.getCrossIdList();
+
+        if (ObjectUtil.isNotEmpty(areaId)) {
+            // 修改
+            // 修改子区名称和备注
+            baseAreaInfoMapper.updateAreaNameAndRemark(areaName, remark, areaId);
+            // 修改子区关联路口
+
+        } else {
+            // 新增
+        }
+    }
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseAreaInfoMapper.java

+package net.wanji.databus.dao.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author hanbing
+ * @date 2023/1/12 13:24
+ * @desc CrossInfoMapper
+ */
+@Repository
+public interface BaseAreaInfoMapper {
+
+    void updateAreaNameAndRemark(String name, String remark, Integer id);
+}

wj-databus/src/main/resources/mapper/BaseAreaInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="net.wanji.databus.dao.mapper.BaseAreaInfoMapper">
+
+    <update id="updateAreaNameAndRemark">
+        update t_base_area_info
+        <set>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="remark != null and remark != ''">
+                remark = #{remark},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+</mapper>

wj-databus/src/main/resources/mapper/RidInfoMapper.xml

@@ -19,7 +19,7 @@
         <result property="sort" column="sort"/>
         <result property="trend" column="trend"/>
         <result property="level" column="level"/>
-        <result property="areaCode" column="area_id"/>
+        <result property="areaCode" column="area_code"/>
         <result property="length" column="length"/>
         <result property="width" column="width"/>
         <result property="isOneway" column="is_oneway"/>
@@ -34,7 +34,7 @@
 
     <sql id="Base_Column_List">
         id,name,road_id,road_name,road_dir_id,start_cross_id,end_cross_id,out_dir,in_dir,start_angle,end_angle,
-            direction,sort,trend,level,area_id,length,width,is_oneway,type,wkt,sc_id,sc_name,sc_sort,gmt_create,gmt_modified
+            direction,sort,trend,level,area_code,length,width,is_oneway,type,wkt,sc_id,sc_name,sc_sort,gmt_create,gmt_modified
     </sql>
 
     <select id="selectRoadLength" resultType="java.lang.Double">
@@ -71,7 +71,7 @@
 
     <select id="selectByEndInDir" resultType="net.wanji.databus.dao.entity.RidInfoEntity">
         SELECT t1.id,t1.name,t1.road_id,t1.road_name,t1.road_dir_id,t1.start_cross_id,t1.end_cross_id,t1.out_dir,
-               t1.in_dir,t1.start_angle,t1.end_angle,t1.direction,t1.sort,t1.trend,t1.level,t1.area_id,t1.length,
+               t1.in_dir,t1.start_angle,t1.end_angle,t1.direction,t1.sort,t1.trend,t1.level,t1.area_code,t1.length,
                t1.width,t1.is_oneway,t1.type,t1.wkt,t1.sc_id,t1.sc_name,t1.sc_sort,t1.gmt_create,t1.gmt_modified
         FROM t_base_rid_info t1 JOIN t_base_cross_info t2 ON t1.start_cross_id = t2.id
         WHERE t1.end_cross_id = #{endCrossId} and t1.in_dir = #{spilloverDirInt} and t2.is_signal = 1