[add] 路口管理，删除区域

signal-control-service/src/main/java/net/wanji/web/bo/AreaIdBO.java

+package net.wanji.web.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Kent HAN
+ * @date 2022/11/9 17:21
+ */
+@Data
+@ApiModel(value = "AreaIdBO")
+public class AreaIdBO {
+    @ApiModelProperty( value = "区域ID",notes = "")
+    private Integer areaId ;
+}

signal-control-service/src/main/java/net/wanji/web/controller/CrossManageController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.web.bo.AddOrUpdateAreaBO;
+import net.wanji.web.bo.AreaIdBO;
 import net.wanji.web.bo.PolygonBO;
 import net.wanji.web.bo.SpecialServiceRouteBO;
 import net.wanji.web.service.impl.CrossManageServiceImpl;
@@ -71,4 +72,16 @@ public class CrossManageController {
         return JsonViewObject.newInstance().success();
     }
 
+    @ApiOperation(value = "删除区域", notes = "删除区域", response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @PostMapping(value = "/deleteArea",
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = JsonViewObject.class),
+    })
+    public JsonViewObject deleteArea(@RequestBody AreaIdBO areaIdBO) {
+        crossManageService.deleteArea(areaIdBO);
+        return JsonViewObject.newInstance().success();
+    }
+
 }
\ No newline at end of file

signal-control-service/src/main/java/net/wanji/web/mapper/TBaseAreaCrossMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import net.wanji.web.entity.TBaseAreaCross;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author duanruiming
  * @date 2023/02/06 15:01
@@ -12,4 +14,6 @@ import org.springframework.stereotype.Repository;
 public interface TBaseAreaCrossMapper extends BaseMapper<TBaseAreaCross> {
     void deleteByAreaId(Integer areaId);
     void insertOne(String crossId, Integer areaId);
+
+    void deleteByAreaIds(List<Integer> ids);
 }

signal-control-service/src/main/java/net/wanji/web/service/CrossManageService.java

 package net.wanji.web.service;
 
 import net.wanji.web.bo.AddOrUpdateAreaBO;
+import net.wanji.web.bo.AreaIdBO;
 import net.wanji.web.bo.PolygonBO;
 import net.wanji.web.bo.SpecialServiceRouteBO;
 import net.wanji.web.vo.CrossIdAndNameVO;
@@ -19,4 +20,6 @@ public interface CrossManageService {
     void addOrUpdateArea(AddOrUpdateAreaBO addOrUpdateAreaBO);
 
     SelectCrossesByStartEndVO selectCrossesByStartEnd(SpecialServiceRouteBO specialServiceRouteBO);
+
+    void deleteArea(AreaIdBO areaIdBO);
 }

signal-control-service/src/main/java/net/wanji/web/service/impl/CrossManageServiceImpl.java

@@ -9,6 +9,7 @@ import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.databus.po.BaseAreaInfoPO;
 import net.wanji.databus.po.BaseCrossInfoPO;
 import net.wanji.web.bo.AddOrUpdateAreaBO;
+import net.wanji.web.bo.AreaIdBO;
 import net.wanji.web.bo.PolygonBO;
 import net.wanji.web.bo.SpecialServiceRouteBO;
 import net.wanji.web.mapper.TBaseAreaCrossMapper;
@@ -93,7 +94,11 @@ public class CrossManageServiceImpl implements CrossManageService {
             // 新增
             if (2 == type) { // 交警辖区
                 BaseAreaInfoPO baseAreaInfoPO = new BaseAreaInfoPO();
-                baseAreaInfoPO.setParentCode(parentCode);
+                if (parentCode != null) {
+                    baseAreaInfoPO.setParentCode(parentCode);
+                } else {
+                    baseAreaInfoPO.setParentCode(0);
+                }
                 baseAreaInfoPO.setRoadName("");
                 handleAreaInfoPO(type, areaName, remark, crossIdList, wkt, baseAreaInfoPO);
             } else if (6 == type) { // 道路
@@ -154,4 +159,16 @@ public class CrossManageServiceImpl implements CrossManageService {
         selectCrossesByStartEndVO.setCrossIdAndNameVOList(crossIdAndNameVOList);
         return selectCrossesByStartEndVO;
     }
+
+    @Override
+    @Transactional
+    public void deleteArea(AreaIdBO areaIdBO) {
+        Integer areaId = areaIdBO.getAreaId();
+        // 删除区域路口关系
+        List<Integer> areaIds = baseAreaInfoMapper.selectIdsByParentCode(areaId);
+        areaIds.add(areaId);
+        areaCrossMapper.deleteByAreaIds(areaIds);
+        // 删除区域基础信息
+        baseAreaInfoMapper.deleteById(areaId);
+    }
 }

signal-control-service/src/main/resources/mapper/TBaseAreaCrossMapper.xml

@@ -18,4 +18,12 @@
         delete from t_base_area_cross
         where area_id = #{areaId}
     </delete>
+
+    <delete id="deleteByAreaIds">
+        delete from t_base_area_cross
+        where area_id in
+            <foreach collection="ids" item="id" separator="," open="(" close=")">
+                #{id}
+            </foreach>
+    </delete>
 </mapper>
\ No newline at end of file

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

@@ -3,6 +3,8 @@ package net.wanji.databus.dao.mapper;
 import net.wanji.databus.po.BaseAreaInfoPO;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author hanbing
  * @date 2023/1/12 13:24
@@ -14,4 +16,10 @@ public interface BaseAreaInfoMapper {
     void updateAreaNameAndRemark(String name, String remark, Integer id, String roadName, Integer parentCode);
 
     void insertOne(BaseAreaInfoPO baseAreaInfoPO);
+
+    BaseAreaInfoPO selectById(Integer id);
+
+    void deleteById(Integer areaId);
+
+    List<Integer> selectIdsByParentCode(Integer parentCode);
 }

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

@@ -30,4 +30,21 @@
         where id = #{id}
     </update>
 
+    <delete id="deleteById">
+        delete from t_base_area_info
+        where id = #{areaId} or parent_code = #{areaId}
+    </delete>
+
+    <select id="selectById" resultType="net.wanji.databus.po.BaseAreaInfoPO">
+        select <include refid="baseColumnList"/>
+        from t_base_area_info
+        where id = #{id}
+    </select>
+
+    <select id="selectIdsByParentCode" resultType="java.lang.Integer">
+        select id
+        from t_base_area_info
+        where parent_code = #{parentCode}
+    </select>
+
 </mapper>