[update] 校时 临时方案接口

signal-feign-service/src/main/java/net/wanji/feign/service/common/UtcFeignCommon.java

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Date;
+
 /**
  * @author duanruiming
  * @date 2023/05/19 15:48
@@ -96,4 +98,14 @@ public interface UtcFeignCommon {
 
     @PostMapping("/crossInfo/selectById")
     JsonViewObject selectCrossInfoById(CrossIdDTO crossIdDTO);
+
+    // 查询信号机时间
+    @PostMapping("/signalTime")
+    JsonViewObject signalTime(@RequestParam String crossId);
+    // 信号机校时
+    @PostMapping("/signalTiming")
+    JsonViewObject signalTiming(@RequestParam String crossCode, @RequestParam Date date);
+    // 临时方案
+    @PostMapping("/tempScheme")
+    JsonViewObject tempScheme(@RequestParam String crossCode, @RequestParam Integer schemeNo);
 }

signal-utc-service/src/main/java/net/wanji/utc/controller/ControlCommandController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
+import java.util.Date;
+
 import static net.wanji.utc.common.constant.Constants.*;
 
 /**
@@ -192,4 +194,18 @@ public class ControlCommandController {
     public JsonViewObject delBaseConfig(@RequestBody @Validated DelBaseConfigVO delBaseConfigVO) throws Exception {
         return controlCommandStrategyService.delBaseConfig(delBaseConfigVO);
     }
+
+    @AspectLog(description = "信号机校时", operationType = BaseEnum.OperationTypeEnum.UPDATE)
+    @ApiOperation(value = "信号机校时", notes = "信号机校时")
+    @PostMapping("/signalTiming")
+    public JsonViewObject signalTiming(@RequestParam String crossCode, @RequestParam Date date) throws Exception {
+        return controlCommandStrategyService.timing(crossCode, date);
+    }
+
+    @AspectLog(description = "临时方案", operationType = BaseEnum.OperationTypeEnum.UPDATE)
+    @ApiOperation(value = "临时方案", notes = "临时方案")
+    @PostMapping("/tempScheme")
+    public JsonViewObject tempScheme(@RequestParam String crossCode, @RequestParam Integer schemeNo) throws Exception {
+        return controlCommandStrategyService.tempScheme(crossCode, schemeNo);
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/controller/StaticInfoController.java

@@ -18,10 +18,7 @@ import net.wanji.databus.vo.SchemePhaseLightsVO;
 import net.wanji.utc.service.staticinfo.StaticInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.ws.rs.core.MediaType;
 import java.util.List;
@@ -118,4 +115,13 @@ public class StaticInfoController {
 
         return jsonViewObject.success(crossSchedulesPOList);
     }
+
+    @AspectLog(description = "查询信号机时间", operationType = BaseEnum.OperationTypeEnum.QUERY)
+    @PostMapping(value = "/signalTime", produces = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = CrossSchedulesPO.class)
+    })
+    public JsonViewObject signalTime(@RequestParam String crossId) throws Exception {
+        return staticInfoService.signalTime(crossId);
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/control/ControlCommandService.java

@@ -4,6 +4,8 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.vo.*;
 import net.wanji.utc.po.hk.request.DelBaseConfigPO;
 
+import java.util.Date;
+
 /**
  * 控制指令 service
  *
@@ -93,4 +95,7 @@ public interface ControlCommandService {
      * @return
      */
     JsonViewObject delBaseConfig(DelBaseConfigPO delBaseConfigPO) throws Exception;
+
+    JsonViewObject timing(String crossCode, Date date) throws Exception;
+    JsonViewObject tempScheme(String crossCode, Integer schemeNo) throws Exception;
 }

signal-utc-service/src/main/java/net/wanji/utc/service/control/ControlCommandStrategyService.java

@@ -3,6 +3,8 @@ package net.wanji.utc.service.control;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.vo.*;
 
+import java.util.Date;
+
 /**
  * @author duanruiming
  * @date 2023/01/12 9:44
@@ -90,4 +92,8 @@ public interface ControlCommandStrategyService {
      * @throws Exception
      */
     JsonViewObject delBaseConfig(DelBaseConfigVO delBaseConfigVO) throws Exception;
+
+    JsonViewObject timing(String crossCode, Date date) throws Exception;
+
+    JsonViewObject tempScheme(String crossCode, Integer schemeNo) throws Exception;
 }

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java

@@ -20,6 +20,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -288,4 +289,26 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
         }
         return jsonViewObject;
     }
+
+    @Override
+    public JsonViewObject timing(String crossCode, Date date) throws Exception {
+        String manufacturerCode = crossInfoCache.getManufacturerCodeByCrossId(crossCode);
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerCode)) {
+        } else {
+            jsonViewObject = wanJiControlCommandService.timing(crossCode, date);
+        }
+        return jsonViewObject;
+    }
+
+    @Override
+    public JsonViewObject tempScheme(String crossCode, Integer schemeNo) throws Exception {
+        String manufacturerCode = crossInfoCache.getManufacturerCodeByCrossId(crossCode);
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerCode)) {
+        } else {
+            jsonViewObject = wanJiControlCommandService.tempScheme(crossCode, schemeNo);
+        }
+        return jsonViewObject;
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/WanJiControlCommandServiceImpl.java

@@ -14,6 +14,7 @@ import net.wanji.utc.util.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -155,4 +156,24 @@ public class WanJiControlCommandServiceImpl implements ControlCommandService {
     public JsonViewObject delBaseConfig(DelBaseConfigPO delBaseConfigPO) {
         return null;
     }
+
+    @Override
+    public JsonViewObject timing(String crossCode, Date date) throws Exception {
+        String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossCode);
+        JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).signalTiming(crossCode, date);
+        if (StringUtils.endsWithIgnoreCase("success", jsonViewObject.getStatus())) {
+            return jsonViewObject.success("万集标准协议校时成功!");
+        }
+        return jsonViewObject.fail("万集标准协议校时失败!");
+    }
+
+    @Override
+    public JsonViewObject tempScheme(String crossCode, Integer schemeNo) throws Exception {
+        String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossCode);
+        JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).tempScheme(crossCode, schemeNo);
+        if (StringUtils.endsWithIgnoreCase("success", jsonViewObject.getStatus())) {
+            return jsonViewObject.success("万集标准协议下发临时方案成功!");
+        }
+        return jsonViewObject.fail("万集标准协议校时失败!");
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/StaticInfoService.java

 package net.wanji.utc.service.staticinfo;
 
+import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.databus.dto.CrossInfoDTO;
 import net.wanji.databus.dto.CrossSchedulesDTO;
@@ -28,4 +29,6 @@ public interface StaticInfoService {
     PlanSectionVO buildPlanSectionResponse(String crossId, Integer planNo);
 
     List<CrossSchedulesPO> buildCrossSchedulesResponse(List<String> crossIdList);
+
+    JsonViewObject signalTime(String crossId) throws Exception;
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/WanJiCommonStaticInfoService.java

 package net.wanji.utc.service.staticinfo;
 
+import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.utc.common.Result;
+
 import java.util.List;
 
 /**
@@ -35,4 +37,6 @@ public interface WanJiCommonStaticInfoService {
      * @return
      */
     Result<List<CrossSchedulesPO>> schedules(String crossId, String signalId) throws Exception;
+
+    JsonViewObject signalTime(String crossId) throws Exception;
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/StaticInfoServiceImpl.java

 package net.wanji.utc.service.staticinfo.impl;
 
 import lombok.RequiredArgsConstructor;
+import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.*;
 import net.wanji.databus.dao.mapper.*;
 import net.wanji.databus.dto.CrossInfoDTO;
@@ -9,6 +10,9 @@ import net.wanji.databus.dto.PlanSectionDTO;
 import net.wanji.databus.dto.SchemePhaseLightsDTO;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.ManufacturerInfoPO;
+import net.wanji.databus.vo.PlanSectionVO;
+import net.wanji.databus.vo.SchemePhaseLightsVO;
+import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.service.staticinfo.*;
 import org.springframework.stereotype.Service;
@@ -40,6 +44,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
     private final CrossSectionMapper crossSectionMapper;
     private final CrossSchedulesMapper crossSchedulesMapper;
     private final WanJiCommonStaticInfoService wanjiCommonStaticInfoService;
+    private final CrossInfoCache crossInfoCache;
 
     @Override
     @Transactional
@@ -142,7 +147,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
     }
 
     @Override
-    public net.wanji.databus.vo.SchemePhaseLightsVO buildSchemePhaseLightsResponse(SchemePhaseLightsDTO schemePhaseLightsDTO) {
+    public SchemePhaseLightsVO buildSchemePhaseLightsResponse(SchemePhaseLightsDTO schemePhaseLightsDTO) {
         String crossId = schemePhaseLightsDTO.getCrossId();
         List<CrossSchemePO> CrossSchemePOList = crossSchemeMapper.selectByCrossId(crossId);
         List<CrossPhasePO> crossPhasePOList = crossPhaseMapper.selectByCrossId(crossId);
@@ -164,7 +169,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         List<CrossPlanPO> crossPlanPOList = crossPlanMapper.selectByCrossId(crossId);
         List<CrossSectionPO> crossSectionPOList = crossSectionMapper.selectByCrossId(crossId);
 
-        net.wanji.databus.vo.PlanSectionVO planSectionVO = new net.wanji.databus.vo.PlanSectionVO();
+        PlanSectionVO planSectionVO = new PlanSectionVO();
         planSectionVO.setCrossPlanPOList(crossPlanPOList);
         planSectionVO.setCrossSectionPOList(crossSectionPOList);
 
@@ -189,4 +194,15 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         List<CrossSchedulesPO> crossSchedulesPOList = crossSchedulesMapper.selectByCrossIds(crossIdList);
         return crossSchedulesPOList;
     }
+
+    @Override
+    public JsonViewObject signalTime(String crossId) throws Exception {
+        String manufacturerCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        if (Objects.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerCode)) {
+        } else {
+            jsonViewObject = wanjiCommonStaticInfoService.signalTime(crossId);
+        }
+        return null;
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/WanJiCommonStaticInfoServiceImpl.java

@@ -165,11 +165,14 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
         return Result.success(content);
     }
 
-    public static Map<String, String> getCommonParamMap(String crossId, String signalId) {
-        Map<String, String> paramMap = new HashMap<>();
-        paramMap.put("crossId", crossId);
-        paramMap.put("signalId", signalId);
-        return paramMap;
+    @Override
+    public JsonViewObject signalTime(String crossId) throws Exception {
+        String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
+        JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).signalTime(crossId);
+        if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
+            throw new Exception("获取信号机时间远程服务调用异常，异常信息" + jsonViewObject.getMessage());
+        }
+        return jsonViewObject;
     }
 
 }