[update] 快速特勤，删除分组时修改分组序号

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

@@ -54,4 +54,8 @@ public interface SpecialServiceCrossMapper {
     void updateAutoUnlock(String crossId, Integer autoUnlock, Integer specialServiceId, Integer status);
 
     List<SpecialServiceCrossPO> selectByAutoUnlock();
+
+    List<SpecialServiceCrossPO> selectNoGroup(Integer specialServiceId, String groupName);
+
+    void deleteGroupChangeSort(Integer specialServiceId, String groupName, Integer sort);
 }

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

@@ -707,8 +707,16 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
     public void deleteGroup(GroupNameBO groupNameBO) {
         Integer specialServiceId = groupNameBO.getSpecialServiceId();
         String groupName = groupNameBO.getGroupName();
+        // 如果删除分组之后还有未分组路口，则更改分组序号
+        List<SpecialServiceCrossPO> specialServiceCrossPOList =
+                specialServiceCrossMapper.selectNoGroup(specialServiceId, "未分组路口");
+        if (CollectionUtil.isNotEmpty(specialServiceCrossPOList)) {
+            Integer sort = specialServiceCrossPOList.get(0).getSort();
+            specialServiceCrossMapper.deleteGroupChangeSort(specialServiceId, groupName, sort);
+        } else {
             specialServiceCrossMapper.deleteGroup(specialServiceId, groupName);
         }
+    }
 
     @Override
     @Transactional

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

@@ -85,6 +85,12 @@
         where special_service_id = #{specialServiceId} and group_name = #{groupName}
     </delete>
 
+    <delete id="deleteGroupChangeSort">
+        update t_special_service_cross
+        set group_name = '未分组路口', group_sort = #{sort}
+        where special_service_id = #{specialServiceId} and group_name = #{groupName}
+    </delete>
+
     <select id="getMaxSort" resultType="java.lang.Integer">
         select max(sort)
         from t_special_service_cross
@@ -122,4 +128,10 @@
         where auto_unlock = 1
     </select>
 
+    <select id="selectNoGroup" resultType="net.wanji.web.po.SpecialServiceCrossPO">
+        select <include refid="Base_Column_List"></include>
+        from t_special_service_cross
+        where special_service_id = #{specialServiceId} and group_name = #{groupName}
+    </select>
+
 </mapper>