[update] 特勤详情增加路线字段

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

@@ -47,11 +47,11 @@ public interface SpecialServiceCrossMapper {
 
     Integer selectSpecialServiceIdByCrossId(String crossId);
 
-    void updateGroupName(String crossId, String groupName);
+    void updateGroupName(String crossId, String groupName, Integer specialServiceId);
 
     void deleteGroup(Integer specialServiceId, String groupName);
 
-    void updateAutoUnlock(String crossId, Integer autoUnlock);
+    void updateAutoUnlock(String crossId, Integer autoUnlock, Integer specialServiceId);
 
     List<SpecialServiceCrossPO> selectByAutoUnlock();
 }

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

@@ -35,4 +35,6 @@ public interface SpecialServiceMapper {
     SpecialServicePO selectById(Integer specialServiceId);
 
     void updateOne(SpecialServicePO specialServicePO);
+
+    SpecialServicePO selectByName(String specialServiceName);
 }

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

@@ -476,6 +476,15 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
 
         List<SpecialServiceDetailVO.CrossListElement> crossList = buildCrossList(specialServiceId);
         specialServiceDetailVO.setCrossList(crossList);
+
+        List<BaseCrossInfoPO> baseCrossInfoPOList = new ArrayList<>();
+        for (CrossListElement crossListElement : crossList) {
+            String crossId = crossListElement.getCrossId();
+            BaseCrossInfoPO baseCrossInfoPO = baseCrossInfoMapper.selectById(crossId);
+            baseCrossInfoPOList.add(baseCrossInfoPO);
+        }
+        List<RouteElementVO> route = buildRoute(baseCrossInfoPOList);
+        specialServiceDetailVO.setRoute(route);
         return specialServiceDetailVO;
     }
 
@@ -628,6 +637,10 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
     @Override
     @Transactional
     public void updateGroup(GroupListVO groupListVO) {
+        String specialServiceName = groupListVO.getSpecialServiceName();
+        SpecialServicePO specialServicePO = specialServiceMapper.selectByName(specialServiceName);
+        Integer specialServiceId = specialServicePO.getId();
+
         List<GroupListVO.GroupListElement> groupList = groupListVO.getGroupList();
         for (GroupListVO.GroupListElement groupListElement : groupList) {
             String groupName = groupListElement.getGroupName();
@@ -635,7 +648,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
                 List<CrossListElement> crossList = groupListElement.getCrossList();
                 for (CrossListElement crossListElement : crossList) {
                     String crossId = crossListElement.getCrossId();
-                    specialServiceCrossMapper.updateGroupName(crossId, groupName);
+                    specialServiceCrossMapper.updateGroupName(crossId, groupName, specialServiceId);
                 }
             }
         }
@@ -651,13 +664,17 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
 
     @Override
     public void autoUnlock(GroupListVO groupListVO) {
+        String specialServiceName = groupListVO.getSpecialServiceName();
+        SpecialServicePO specialServicePO = specialServiceMapper.selectByName(specialServiceName);
+        Integer specialServiceId = specialServicePO.getId();
+
         List<GroupListVO.GroupListElement> groupList = groupListVO.getGroupList();
         for (GroupListVO.GroupListElement groupListElement : groupList) {
             List<CrossListElement> crossList = groupListElement.getCrossList();
             for (CrossListElement crossListElement : crossList) {
                 String crossId = crossListElement.getCrossId();
                 Integer autoUnlock = crossListElement.getAutoUnlock();
-                specialServiceCrossMapper.updateAutoUnlock(crossId, autoUnlock);
+                specialServiceCrossMapper.updateAutoUnlock(crossId, autoUnlock, specialServiceId);
             }
         }
     }
@@ -720,7 +737,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
 
             Integer sort = currentCrossElement.getSort();
             if (sort == 1) {
-                crossListElement.setRouteStart("");
+                crossListElement.setRouteStart("起点");
                 SpecialServiceCrossPO nextCross = specialServiceCrossList.get(sort);
                 String nextCrossId = nextCross.getCrossId();
                 // 构建路名+方向
@@ -742,7 +759,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
                 Integer inDir = ridInfoEntity.getInDir();
                 String inDirMsg = CrossDirEnum.getMsgByCode(inDir);
                 crossListElement.setRouteStart(streetName + inDirMsg);
-                crossListElement.setRouteEnd("");
+                crossListElement.setRouteEnd("终点");
             } else { // 中间路口
                 SpecialServiceCrossPO preCross = specialServiceCrossList.get(sort - 2);
                 SpecialServiceCrossPO nextCross = specialServiceCrossList.get(sort);
@@ -805,7 +822,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
 
     private void setElementStartEnd(List<SpecialServiceCrossPO> specialServiceCrossList, int i, String currentCrossId, CrossListElement crossListElement) {
         if (i == 0) { // 开始路口
-            crossListElement.setRouteStart("");
+            crossListElement.setRouteStart("起点");
             SpecialServiceCrossPO nextCross = specialServiceCrossList.get(i + 1);
             String nextCrossId = nextCross.getCrossId();
             // 构建路名+方向
@@ -817,7 +834,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
             String ourDirMsg = CrossDirEnum.getMsgByCode(outDir);
             crossListElement.setRouteEnd(streetName + ourDirMsg);
         } else if (i == specialServiceCrossList.size() - 1) { // 结束路口
-            crossListElement.setRouteEnd("");
+            crossListElement.setRouteEnd("终点");
             SpecialServiceCrossPO preCross = specialServiceCrossList.get(i - 1);
             String preCrossId = preCross.getCrossId();
             // 构建路名+方向

signal-control-service/src/main/java/net/wanji/web/vo/specialService/SpecialServiceDetailVO.java

@@ -19,6 +19,8 @@ public class SpecialServiceDetailVO {
     private String name;
     @ApiModelProperty(value = "路口列表")
     private List<CrossListElement> crossList;
+    @ApiModelProperty(value = "特勤路线")
+    private List<RouteElementVO> route;
 
     @NoArgsConstructor
     @Data

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

@@ -59,13 +59,13 @@
     <update id="updateGroupName">
         update t_special_service_cross
         set group_name = #{groupName}
-        where cross_id = #{crossId}
+        where cross_id = #{crossId} and special_service_id = #{specialServiceId}
     </update>
 
     <update id="updateAutoUnlock">
         update t_special_service_cross
         set auto_unlock = #{autoUnlock}
-        where cross_id = #{crossId}
+        where cross_id = #{crossId} and special_service_id = #{specialServiceId}
     </update>
 
     <delete id="deleteCross">

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

@@ -121,4 +121,10 @@
         where id = #{specialServiceId}
     </select>
 
+    <select id="selectByName" resultType="net.wanji.web.po.SpecialServicePO">
+        select <include refid="Base_Column_List"></include>
+        from t_special_service_info
+        where name = #{specialServiceName}
+    </select>
+
 </mapper>