Merge branch 'master' of http://106.120.201.126:14725/signal/traffic-signal-platform

signal-optimize-service/src/main/java/net/wanji/opt/common/enums/CrossOptStrategyEnum.java → signal-optimize-service/src/main/java/net/wanji/opt/common/enums/CrossOptResultStrategyEnum.java

@@ -9,8 +9,9 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum CrossOptStrategyEnum {
-    ZERO(0, "无策略"),
+public enum CrossOptResultStrategyEnum {
+    // 优化策略
+    ZERO(0, "均衡调控"),
     ONE(1, "绿灯空放"),
     TWO(2, "失衡"),
     THREE(3, "溢出");
@@ -19,11 +20,11 @@ public enum CrossOptStrategyEnum {
     private String desc;
 
     public static String getDesc(int code) {
-        for (CrossOptStrategyEnum value : CrossOptStrategyEnum.values()) {
+        for (CrossOptResultStrategyEnum value : CrossOptResultStrategyEnum.values()) {
             if (code == value.code) {
                 return value.getDesc();
             }
         }
-        return "无策略";
+        return CrossOptResultStrategyEnum.ZERO.getDesc();
     }
 }

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.ws.rs.core.MediaType;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -153,6 +154,45 @@ public class InduceSendController {
                     .body("程序查询错误请联系管理员".getBytes(StandardCharsets.UTF_8));
         }
     }
+
+
+    @ApiOperation(value = "根据设备编号和发布时间获取诱导发布图片", notes = "根据设备编号和发布时间获取诱导发布图片")
+    @GetMapping(value = "/fileCodeHist")
+    public ResponseEntity<byte[]> ftpFileByCodeAndTime(@RequestParam("equipCode") String equipCode, @RequestParam("date") Date date) {
+        LambdaQueryWrapper<InduceHist> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(InduceHist::getEquipCode, equipCode);
+        queryWrapper.le(InduceHist::getCreateTime, date);
+        queryWrapper.orderByDesc(InduceHist::getCreateTime);
+        queryWrapper.last("limit 1");
+        InduceHist pictureFile = this.induceHistService.getOne(queryWrapper,false);
+        if (Objects.isNull(pictureFile) || pictureFile.getFilePath() == null) {
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body("无效的文件ID".getBytes(StandardCharsets.UTF_8));
+        }
+        try {
+            // 获取ftp服务器图片
+            byte[] imageBytes = this.induceSendService.downloadImage(pictureFile.getFilePath());
+            if (imageBytes != null && imageBytes.length > 0) {
+                // 设置响应头
+                HttpHeaders headers = new HttpHeaders();
+                // 图片类型
+                headers.set("Content-Type", "image/jpeg");
+                // 设置内容长度
+                headers.set("Content-Length", String.valueOf(imageBytes.length));
+                // 设置文件名
+                headers.set("Content-Disposition", "inline; filename=\"" + pictureFile.getSourceId() + ".bmp\"");
+                // 返回响应
+                return new ResponseEntity<>(imageBytes, headers, HttpStatus.OK);
+            } else {
+                return ResponseEntity.status(HttpStatus.OK)
+                        .body("未查询到对应文件".getBytes(StandardCharsets.UTF_8));
+            }
+        } catch (IOException e) {
+            log.error("ftp文件下载失败: ", e.getMessage());
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body("程序查询错误请联系管理员".getBytes(StandardCharsets.UTF_8));
+        }
+    }
     /**
      * 获取ftp图片
      */

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

@@ -10,7 +10,7 @@ import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
 import net.wanji.databus.dao.mapper.CrossDirDataHistMapper;
 import net.wanji.databus.dao.mapper.CrossDirDataRealtimeMapper;
 import net.wanji.databus.po.*;
-import net.wanji.opt.common.enums.CrossOptStrategyEnum;
+import net.wanji.opt.common.enums.CrossOptResultStrategyEnum;
 import net.wanji.opt.common.enums.OptStatusEnum;
 import net.wanji.opt.common.enums.StrategyControlEnum;
 import net.wanji.opt.dao.mapper.HoloEventMapper;
@@ -95,7 +95,6 @@ public class CrossIndexServiceImpl implements CrossIndexService {
             for (StrategyCrossResultEntity entity : list) {
                 CrossOptResult crossOptResult = new CrossOptResult();
                 Date date = entity.getIssueTime();
-                //Date date = DateUtil.parse(entity.getIssueTime(), "yyyy-MM-dd HH:mm:ss");
                 crossOptResult.setTimeStamp(date);
                 Integer countDown = entity.getCountDown();
                 if (entity.getCurrentAlgo() == 2) {
@@ -104,7 +103,7 @@ public class CrossIndexServiceImpl implements CrossIndexService {
                 crossOptResult.setCountDown(countDown);
                 Integer currentAlgo = entity.getCurrentAlgo();
                 crossOptResult.setStrategy(currentAlgo);
-                crossOptResult.setStrategyName(CrossOptStrategyEnum.getDesc(currentAlgo));
+                crossOptResult.setStrategyName(CrossOptResultStrategyEnum.getDesc(currentAlgo));
                 crossOptResults.add(crossOptResult);
             }
         }
@@ -172,13 +171,13 @@ public class CrossIndexServiceImpl implements CrossIndexService {
             for (Map.Entry<Integer, List<StrategyCrossResultEntity>> entry : listMap.entrySet()) {
                 Integer currentAlgo = entry.getKey();
                 List<StrategyCrossResultEntity> value = entry.getValue();
-                if (Objects.equals(currentAlgo, CrossOptStrategyEnum.ONE.getCode())) {
+                if (Objects.equals(currentAlgo, CrossOptResultStrategyEnum.ONE.getCode())) {
                     crossStatusCountVO.setPhaseEmptyCount(value.size());
                 }
-                if (Objects.equals(currentAlgo, CrossOptStrategyEnum.TWO.getCode())) {
+                if (Objects.equals(currentAlgo, CrossOptResultStrategyEnum.TWO.getCode())) {
                     crossStatusCountVO.setUnbalanceCount(value.size());
                 }
-                if (Objects.equals(currentAlgo, CrossOptStrategyEnum.THREE.getCode())) {
+                if (Objects.equals(currentAlgo, CrossOptResultStrategyEnum.THREE.getCode())) {
                     crossStatusCountVO.setOverFlowCount(value.size());
                 }
             }

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

@@ -138,11 +138,12 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
                         detail.setStartTime(dirDataHistPO.getStartTime());
                         detail.setGreenTimeRatio(greenTimeRatio);
                         for (GreenBeltKeyCrossFlowTimeVO.Detail optResult : optResults) {
-                            Integer curDir = GreenBeltDirEnum.getInDir(optResult.getDir());
-                            if (StringUtils.equalsIgnoreCase("cancel", optResult.getDir()) && Objects.equals(curDir, dirType)
+
+                            if (StringUtils.equalsIgnoreCase("cancel", optResult.getDir())
                                     && dirDataHistPO.getStartTime().getTime() == optResult.getStartTime().getTime()) {
                                 greenTimeRatio = 0.0;
                             }
+                            Integer curDir = GreenBeltDirEnum.getInDir(optResult.getDir());
                             if (StringUtils.equalsIgnoreCase(crossId, optResult.getCrossId()) && Objects.equals(curDir, dirType)
                                     && dirDataHistPO.getStartTime().getTime() == optResult.getStartTime().getTime()) {
                                 detail.setGreenTimeRatio(optResult.getGreenTimeRatio() * 100);
@@ -262,7 +263,6 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
             LambdaQueryWrapper<StrategyGreenOptHistEntity> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(StrategyGreenOptHistEntity::getGreenId, greenId);
             queryWrapper.ge(StrategyGreenOptHistEntity::getControlTime, startOfDay);
-            queryWrapper.ge(StrategyGreenOptHistEntity::getControlMethod, 1);
             List<StrategyGreenOptHistEntity> entities = strategyGreenOptHistMapper.selectList(queryWrapper);
             if (!CollectionUtils.isEmpty(greenwaveHistPOS)) {
                 Map<String, List<GreenwaveHistPO>> greenDirMap = greenwaveHistPOS.stream().collect(Collectors.groupingBy(GreenwaveHistPO::getRoadDirection));
@@ -289,7 +289,7 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
                                     && minuteDate.getTime() == startTimeminuteDate.getTime()) {
                                 greenWidthTime = entity.getGreenWidthTime();
                             }
-                            if (entity.getControlMethod() <= 0) {
+                            if (entity.getControlMethod() < 0  && minuteDate.getTime() == startTimeminuteDate.getTime()) {
                                 greenWidthTime = 0.0;
                             }
                         }

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

@@ -259,6 +259,9 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                     StrategyControlDataEntity strategyControlDataEntity = strategyList.get(0);
                     histVO.setStrategy(strategyControlDataEntity.getStrategy());
                     histVO.setStrategyName("绿波带");
+                } else {
+                    histVO.setStrategy(0);
+                    histVO.setStrategyName("绿波带");
                 }
                 histVO.setOptTime(entity.getControlTime());
                 histVO.setResult(Objects.equals(1, entity.getControlMethod()) ? "失败" : "成功");
@@ -313,6 +316,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                         }
                         strategyControlDataEntity.setCrossName(greenwaveInfoPO.getName());
                         strategyControlDataEntity.setWkt(greenwaveInfoPO.getWkt());
+                        strategyControlDataEntity.setOptMethod("效率提升");
                         results.add(strategyControlDataEntity);
                     }
                 }
@@ -366,8 +370,6 @@ public class StrategyControlServiceImpl implements StrategyControlService {
         queryWrapper.eq(StrategyControlDataEntity::getBizType, type);
         queryWrapper.le(StrategyControlDataEntity::getScheduleStart, current);
         queryWrapper.ge(StrategyControlDataEntity::getScheduleEnd, current);
-        //queryWrapper.ge(StrategyControlDataEntity::getScheduleStart, current);
-        //queryWrapper.le(StrategyControlDataEntity::getScheduleEnd, current);
         List<StrategyControlDataEntity> entities = strategyControlInfoMapper.selectList(queryWrapper);
         List<StrategyControlDataEntity> results = new ArrayList<>(entities.size());
         for (StrategyControlDataEntity entity : entities) {

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

 package net.wanji.opt.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.wanji.opt.config.Double2TwoDecimalPlacesSerializer;
 
 /**
  * @author Kent HAN
@@ -20,6 +22,7 @@ public class MainlineEvaluateBottomCurveVO {
     private String scopeName;
 
     @ApiModelProperty(value = "数值")
+    @JsonSerialize(using = Double2TwoDecimalPlacesSerializer.class)
     private Double value;
 
     @ApiModelProperty(value = "指标时间戳")

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/ControlCommandServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -235,9 +236,9 @@ public class ControlCommandServiceImpl implements ControlCommandService {
 
 //                                boolean isOk = true;
                                 if (isOk) {
-                                    return jsonViewObject.fail("第 "+i+1+" 次相位步进失败，取消步进成功，路口号： " + code);
+                                    return jsonViewObject.fail("第 "+ (i+1) +" 次相位步进失败，取消步进成功，路口号： " + code);
                                 } else {
-                                    return jsonViewObject.fail("第 "+i+1+" 次相位步进失败，取消步进失败，路口号： " + code);
+                                    return jsonViewObject.fail("第 "+ (i+1) +" 次相位步进失败，取消步进失败，路口号： " + code);
                                 }
                             }
                             //停顿10ms
@@ -252,9 +253,9 @@ public class ControlCommandServiceImpl implements ControlCommandService {
 
 //                            boolean isOk = true;
                             if (isOk) {
-                                return jsonViewObject.fail("第 "+i+1+" 次相位步进失败，但取消步进成功，路口号： " + code);
+                                return jsonViewObject.fail("第 "+(i+1)+" 次相位步进失败，但取消步进成功，路口号： " + code);
                             } else {
-                                return jsonViewObject.fail("第 "+i+1+" 次相位步进失败，取消步进失败，路口号： " + code);
+                                return jsonViewObject.fail("第 "+(i+1)+" 次相位步进失败，取消步进失败，路口号： " + code);
                             }
                         }
 

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

@@ -262,24 +262,29 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
 
     @Override
     public JsonViewObject stepControlStrategy(String crossId, Integer command, Integer stepNum) throws Exception {
-        String now = LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER);
         JsonViewObject jsonViewObject;
         try {
-            String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
-            if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
-                jsonViewObject = hkControlCommandService.stepControl(crossId, command, stepNum);
-            } else {
-                jsonViewObject = wanJiControlCommandService.stepControl(crossId, command, stepNum);
+            String now = LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER);
+            try {
+                String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
+                if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
+                    jsonViewObject = hkControlCommandService.stepControl(crossId, command, stepNum);
+                } else {
+                    jsonViewObject = wanJiControlCommandService.stepControl(crossId, command, stepNum);
+                }
+            } catch (Exception e) {
+                jsonViewObject = JsonViewObject.newInstance().fail(e.getMessage());
             }
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("crossId",crossId);
+            jsonObject.put("command",command);
+            jsonObject.put("stepNum",stepNum);
+            //插入命令操作日志
+            insertCommandLog(now,jsonViewObject, jsonObject,1);
         } catch (Exception e) {
-            jsonViewObject = JsonViewObject.newInstance().fail(e.getMessage());
+            log.error("stepControlStrategy步进控制远程服务调用异常：", e);
+            jsonViewObject =  JsonViewObject.newInstance().fail("步进控制远程服务调用异常");
         }
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("crossId",crossId);
-        jsonObject.put("command",command);
-        jsonObject.put("stepNum",stepNum);
-        //插入命令操作日志
-        insertCommandLog(now,jsonViewObject, jsonObject,1);
         return jsonViewObject;
     }
 
@@ -290,61 +295,84 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
     * @Param jsonObject     参数
     * @return void
     **/
-    public void insertCommandLog(String queryTime,JsonViewObject jsonViewObject, JSONObject jsonObject,int commandType){
-        SignalCommandLogPO signalCommandLogPO = new SignalCommandLogPO();
-        signalCommandLogPO.setCrossId(jsonObject.getString("crossId"));
-        signalCommandLogPO.setDataInfo(jsonObject.toJSONString());
-        signalCommandLogPO.setCommandType(commandType);
-        signalCommandLogPO.setQueryTime(queryTime);
-        Integer code = jsonViewObject.getCode();
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        String ip = IpAddressUtil.getIpAddress(request);
-        signalCommandLogPO.setIp(ip);
-        int commandResult = 0;
-        if (code == 200){
-            commandResult = 1;
-        }else {
-            commandResult = 2;
-        }
-        signalCommandLogPO.setCommandResult(commandResult);
-        signalCommandLogPO.setResultMessage(jsonViewObject.getMessage());
-
-        ConcurrentHashMap<String, List<LightsStatusVO2>> produceListMap = SignalStatusTask.produceListMap;
-        if (!produceListMap.isEmpty()) {
-            List<LightsStatusVO2> list = produceListMap.get(jsonObject.get("crossId"));
-            if (ObjectUtil.isNotEmpty(list)){
-                LightsStatusVO2 lightsStatusVO2 = list.get(0);
-                String runMode = lightsStatusVO2.getRunMode();
-                String lampTime = lightsStatusVO2.getTimeStamp();
-                //时间转换
-//                lampTime = LocalDateTimeUtil.formatTimeStamp(Long.valueOf(lampTime), LocalDateTimeUtil.TIMEFORMATTER);
-                signalCommandLogPO.setRunMode(runMode);
-                signalCommandLogPO.setLampTime(lampTime);
+    public void insertCommandLog(String queryTime,JsonViewObject jsonViewObject, JSONObject jsonObject,int commandType) throws Exception{
+        try {
+            SignalCommandLogPO signalCommandLogPO = new SignalCommandLogPO();
+            signalCommandLogPO.setCrossId(jsonObject.getString("crossId"));
+            signalCommandLogPO.setDataInfo(jsonObject.toJSONString());
+            signalCommandLogPO.setCommandType(commandType);
+            signalCommandLogPO.setQueryTime(queryTime);
+            Integer code = jsonViewObject.getCode();
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String ip = IpAddressUtil.getIpAddress(request);
+            signalCommandLogPO.setIp(ip);
+            log.info("insertCommandLog服务器请求返回 信息jsonViewObject:{}",jsonViewObject);
+            int commandResult = 0;
+            if (code == 200){
+                commandResult = 1;
+            }else {
+                commandResult = 2;
+            }
+            signalCommandLogPO.setCommandResult(commandResult);
+            signalCommandLogPO.setResultMessage(jsonViewObject.getMessage());
+
+            ConcurrentHashMap<String, List<LightsStatusVO2>> produceListMap = SignalStatusTask.produceListMap;
+            if (!produceListMap.isEmpty()) {
+                List<LightsStatusVO2> list = produceListMap.get(jsonObject.get("crossId"));
+                if (ObjectUtil.isNotEmpty(list)){
+                    LightsStatusVO2 lightsStatusVO2 = list.get(0);
+                    String runMode = lightsStatusVO2.getRunMode();
+                    String lampTime = lightsStatusVO2.getTimeStamp();
+                    signalCommandLogPO.setRunMode(runMode);
+                    signalCommandLogPO.setLampTime(lampTime);
+                }
+            }
+            int insert = signalCommandLogPOMapper.insert(signalCommandLogPO);
+            if (insert > 0) {
+                log.info("定时任务 插入t_signal_command_log成功,crossId = {},commandType = {},time = {},insert = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER),insert);
+            }else {
+                log.info("定时任务 插入t_signal_command_log失败,crossId = {},commandType = {},time = {},insert = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER),insert);
+            }
+            //排除查询环图接口
+            if (commandType != 10){
+                LambdaQueryWrapper<SignalCommandPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(SignalCommandPO::getCrossId,jsonObject.getString("crossId"));
+                List<SignalCommandPO> signalCommandPOS = signalCommandPOMapper.selectList(lambdaQueryWrapper);
+                if (ObjectUtil.isEmpty(signalCommandPOS)){
+                    //插入
+                    SignalCommandPO signalCommandPO = new SignalCommandPO();
+                    BeanUtil.copyProperties(signalCommandLogPO,signalCommandPO);
+                    int insert1 = signalCommandPOMapper.insert(signalCommandPO);
+                    if (insert1 > 0) {
+                        log.info("定时任务 插入t_signal_command成功,crossId = {},commandType = {},time = {},insert = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER),insert1);
+                    }else {
+                        log.info("定时任务 插入t_signal_command失败,crossId = {},commandType = {},time = {},insert = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER),insert1);
+                    }
+                } else {
+                    //更新
+                    SignalCommandPO signalCommandPO = signalCommandPOS.get(0);
+                    signalCommandPO.setDataInfo(jsonObject.toJSONString());
+                    signalCommandPO.setCommandType(commandType);
+                    signalCommandPO.setCommandResult(commandResult);
+                    signalCommandPO.setResultMessage(jsonViewObject.getMessage());
+                    signalCommandPO.setIp(ip);
+                    signalCommandPO.setQueryTime(queryTime);
+                    signalCommandPO.setUpdateCount(0);
+                    int update = signalCommandPOMapper.update(signalCommandPO, lambdaQueryWrapper);
+                    if (update > 0) {
+                        log.info("定时任务 更新t_signal_command成功,crossId = {},commandType = {},time = {},update = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER),update);
+                    }else {
+                        log.info("定时任务 更新t_signal_command失败,crossId = {},commandType = {},time = {},update = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER),update);
+                    }
+                }
             }
-        }
-        signalCommandLogPOMapper.insert(signalCommandLogPO);
-        //排除查询环图接口
-        if (commandType != 10){
             LambdaQueryWrapper<SignalCommandPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(SignalCommandPO::getCrossId,jsonObject.getString("crossId"));
             List<SignalCommandPO> signalCommandPOS = signalCommandPOMapper.selectList(lambdaQueryWrapper);
-            if (ObjectUtil.isEmpty(signalCommandPOS)){
-                //插入
-                SignalCommandPO signalCommandPO = new SignalCommandPO();
-                BeanUtil.copyProperties(signalCommandLogPO,signalCommandPO);
-                signalCommandPOMapper.insert(signalCommandPO);
-            }else {
-                //更新
-                SignalCommandPO signalCommandPO = signalCommandPOS.get(0);
-                signalCommandPO.setDataInfo(jsonObject.toJSONString());
-                signalCommandPO.setCommandType(commandType);
-                signalCommandPO.setCommandResult(commandResult);
-                signalCommandPO.setResultMessage(jsonViewObject.getMessage());
-                signalCommandPO.setIp(ip);
-                signalCommandPO.setQueryTime(queryTime);
-                signalCommandPO.setUpdateCount(0);
-                signalCommandPOMapper.update(signalCommandPO,lambdaQueryWrapper);
-            }
+            log.error("更新t_signal_command成功,数据库中查询结果集：{}", signalCommandPOS);
+        } catch (Exception e) {
+            log.error("insertCommandLog命令日志插入失败：", e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -367,11 +395,15 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
         if (StringUtils.isBlank(crossId)) {
             return jsonViewObject.fail("路口编号不能为空");
         }
-        String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
-        if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
-            jsonViewObject = hkControlCommandService.recoverSchedule(crossId);
-        } else {
-            jsonViewObject = wanJiControlCommandService.recoverSchedule(crossId);
+        try {
+            String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
+            if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
+                jsonViewObject = hkControlCommandService.recoverSchedule(crossId);
+            } else {
+                jsonViewObject = wanJiControlCommandService.recoverSchedule(crossId);
+            }
+        } catch (Exception e) {
+            jsonViewObject = JsonViewObject.newInstance().fail(e.getMessage());
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("crossId",crossId);

signal-utc-service/src/main/java/net/wanji/utc/task/CommandFaildTask.java

@@ -19,8 +19,6 @@ import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.service.control.ControlCommandService;
 import net.wanji.utc.service.control.ControlCommandStrategyService;
 import net.wanji.utc.util.StringUtils;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -36,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @Component
 @Slf4j
-@EnableAsync
 @SuppressWarnings("all")
 public class CommandFaildTask {
     @Resource
@@ -53,29 +50,34 @@ public class CommandFaildTask {
     @Resource
     private SignalCommandLogPOMapper signalCommandLogPOMapper;
 
-    @Scheduled(cron = "0/5 * * * * ?")
-    @Async
+    @Scheduled(fixedRate = 5 * 1000, initialDelay = 10 * 1000)
     public void commandFaildTask() throws Exception {
-        LambdaQueryWrapper<SignalCommandPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SignalCommandPO::getCommandResult, 2);
-        List<SignalCommandPO> crossInfoPOList = signalCommandPOMapper.selectList(lambdaQueryWrapper);
-        if (ObjectUtil.isNotEmpty(crossInfoPOList)) {
-            for (SignalCommandPO signalCommandPO : crossInfoPOList) {
-                String crossId = signalCommandPO.getCrossId();
-                Integer commandType = signalCommandPO.getCommandType();
-                Integer updateCount = signalCommandPO.getUpdateCount();
-                if (ObjectUtil.isNull(updateCount)){
-                    updateCount = 0;
-                }
-                try {
-                    //处理数据
-                    handlerCommand(crossId, commandType,updateCount);
-                    log.info("定时任务自动恢复执行成功(不保证恢复成功),crossId={},commandType={},updateCount={}",crossId,commandType,updateCount);
-                } catch (Exception e) {
-                    log.error("定时任务自动恢复报错,crossId={},commandType={},updateCount={}",crossId,commandType,updateCount);
-                    throw new RuntimeException(e);
+        try {
+            LambdaQueryWrapper<SignalCommandPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(SignalCommandPO::getCommandResult, 2);
+            List<SignalCommandPO> crossInfoPOList = signalCommandPOMapper.selectList(lambdaQueryWrapper);
+            log.info("定时任务恢复控制指令，需要执行恢复路口集合size:{}, crossInfoPOList = {}", crossInfoPOList.size(), crossInfoPOList);
+            if (ObjectUtil.isNotEmpty(crossInfoPOList)) {
+                for (SignalCommandPO signalCommandPO : crossInfoPOList) {
+                    String crossId = signalCommandPO.getCrossId();
+                    Integer commandType = signalCommandPO.getCommandType();
+                    Integer updateCount = signalCommandPO.getUpdateCount();
+                    if (ObjectUtil.isNull(updateCount)) {
+                        updateCount = 0;
+                    }
+                    try {
+                        log.info("定时任务自动恢复开始执行(不保证恢复成功),crossId={},commandType={},updateCount={}", crossId, commandType, updateCount);
+                        //处理数据
+                        handlerCommand(crossId, commandType, updateCount);
+                    } catch (Exception e) {
+                        log.error("定时任务自动恢复报错,crossId={},commandType={},updateCount={}", crossId, commandType, updateCount);
+                        throw new Exception(e);
+                    }
                 }
             }
+        } catch (Exception e) {
+            log.error("commandFaildTask定时任务执行异常：", e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -85,24 +87,24 @@ public class CommandFaildTask {
      * @Param crossId        路口编号
      * @Param commandType    控制模式
      **/
-    private void handlerCommand(String crossId, Integer commandType,int updateCount) {
+    private void handlerCommand(String crossId, Integer commandType, int updateCount) {
         switch (commandType) {
             //1-步进控制/恢复(公用);2-恢复时间表(公用);3-相位锁定/解锁(公用);4-临时方案下发(公用);5-下发命令失败，程序下发恢复指令；10-查询环图失败记录',
             case 1:
                 //恢复步进
-                recoverStepControlStrategy(crossId,updateCount,commandType);
+                recoverStepControlStrategy(crossId, updateCount, commandType);
                 break;
             case 2:
                 //恢复时间表
-                recoverScheduleStrategy(crossId,updateCount,commandType);
+                recoverScheduleStrategy(crossId, updateCount, commandType);
                 break;
             case 3:
                 //相位解锁
-                recoverLockControlStrategy(crossId,updateCount,commandType);
+                recoverLockControlStrategy(crossId, updateCount, commandType);
                 break;
             case 4:
                 //恢复 临时方案下发
-                recoverScheduleStrategy(crossId, updateCount,commandType);
+                recoverScheduleStrategy(crossId, updateCount, commandType);
                 break;
             default:
                 log.error("commandType有误,crossId={},commandType={}", crossId, commandType);
@@ -116,9 +118,13 @@ public class CommandFaildTask {
      * @Description 恢复步进
      * @Param crossId
      **/
-    private void recoverStepControlStrategy(String crossId,int updateCount,int commandType) {
+    private void recoverStepControlStrategy(String crossId, int updateCount, int commandType) {
         String now = LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER);
         JsonViewObject jsonViewObject;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("crossId", crossId);
+        jsonObject.put("command", 0);
+        jsonObject.put("stepNum", 0);
         try {
             String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
             if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
@@ -127,14 +133,11 @@ public class CommandFaildTask {
                 jsonViewObject = wanJiControlCommandService.stepControl(crossId, 0, 0);
             }
         } catch (Exception e) {
+            log.error("定时任务 恢复步进出错,crossId={}", crossId);
             jsonViewObject = JsonViewObject.newInstance().fail(e.getMessage());
         }
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("crossId", crossId);
-        jsonObject.put("command", 0);
-        jsonObject.put("stepNum", 0);
         //插入命令操作日志
-        insertCommandLog(now, jsonViewObject, jsonObject,commandType,updateCount);
+        insertCommandLog(now, jsonViewObject, jsonObject, commandType, updateCount);
     }
 
     /**
@@ -143,24 +146,24 @@ public class CommandFaildTask {
      * @Param crossId
      **/
 
-    private void recoverScheduleStrategy(String crossId,int updateCount,int commandType) {
+    private void recoverScheduleStrategy(String crossId, int updateCount, int commandType) {
+        String now = LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER);
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("crossId", crossId);
         try {
-            String now = LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER);
-            JsonViewObject jsonViewObject = JsonViewObject.newInstance();
             String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
             if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
                 jsonViewObject = hkControlCommandService.recoverSchedule(crossId);
             } else {
                 jsonViewObject = wanJiControlCommandService.recoverSchedule(crossId);
             }
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("crossId",crossId);
-            //插入命令操作日志
-            insertCommandLog(now,jsonViewObject, jsonObject,commandType,updateCount);
         } catch (Exception e) {
-            log.error("定时任务 恢复时间表出错,crossId={}",crossId);
-            throw new RuntimeException(e);
+            log.error("定时任务 恢复时间表出错,crossId={}", crossId);
+            jsonViewObject = JsonViewObject.newInstance().fail(e.getMessage());
         }
+        //插入命令操作日志
+        insertCommandLog(now, jsonViewObject, jsonObject, commandType, updateCount);
     }
 
     /**
@@ -169,13 +172,15 @@ public class CommandFaildTask {
      * @Param crossId
      **/
 
-    private void recoverLockControlStrategy(String crossId,int updateCount,int commandType) {
+    private void recoverLockControlStrategy(String crossId, int updateCount, int commandType) {
         String now = LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER);
         JsonViewObject jsonViewObject;
         ControlCommandVO commandVO = new ControlCommandVO();
         commandVO.setCrossCode(crossId);
         commandVO.setCommand(0);
         commandVO.setDuration(0);
+        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(commandVO));
+        jsonObject.put("crossId", commandVO.getCrossCode());
         try {
             String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(commandVO.getCrossCode());
             if (StringUtils.equals(BasicEnum.ManufacturerEnum.HK.getCode(), manufacturerIdCode)) {
@@ -185,11 +190,10 @@ public class CommandFaildTask {
             }
         } catch (Exception e) {
             jsonViewObject = JsonViewObject.newInstance().fail(e.getMessage());
+            log.error("定时任务 恢复临时方案下发出错,crossId={}", crossId);
         }
-        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(commandVO));
-        jsonObject.put("crossId",commandVO.getCrossCode());
         //插入命令操作日志
-        insertCommandLog(now,jsonViewObject, jsonObject,commandType,updateCount);
+        insertCommandLog(now, jsonViewObject, jsonObject, commandType, updateCount);
     }
 
     /**
@@ -199,8 +203,8 @@ public class CommandFaildTask {
      * @Param jsonViewObject 操作结果
      * @Param jsonObject     参数
      **/
-    public void insertCommandLog(String queryTime, JsonViewObject jsonViewObject, JSONObject jsonObject, int commandType,int updateCount) {
-        updateCount = updateCount+1;
+    public void insertCommandLog(String queryTime, JsonViewObject jsonViewObject, JSONObject jsonObject, int commandType, int updateCount) {
+        updateCount = updateCount + 1;
         SignalCommandLogPO signalCommandLogPO = new SignalCommandLogPO();
         signalCommandLogPO.setCrossId(jsonObject.getString("crossId"));
         signalCommandLogPO.setDataInfo(jsonObject.toJSONString());
@@ -210,20 +214,20 @@ public class CommandFaildTask {
         Integer code = jsonViewObject.getCode();
         String ip = "localhost";
         signalCommandLogPO.setIp(ip);
+        log.info("定时任务返回 信息jsonViewObject:{}", jsonViewObject);
         if (code == 200) {
             signalCommandLogPO.setCommandResult(1);
             signalCommandLogPO.setUpdateCount(0);
         } else {
-            if (updateCount >= 24){
+            if (updateCount >= 24) {
                 //如果两分钟更新失败，则将状态设置为3
                 signalCommandLogPO.setCommandResult(3);
-            }else {
+                signalCommandLogPO.setUpdateCount(0);
+            } else {
                 signalCommandLogPO.setCommandResult(2);
-
             }
         }
         signalCommandLogPO.setResultMessage(jsonViewObject.getMessage());
-
         ConcurrentHashMap<String, List<LightsStatusVO2>> produceListMap = SignalStatusTask.produceListMap;
         if (!produceListMap.isEmpty()) {
             List<LightsStatusVO2> list = produceListMap.get(jsonObject.get("crossId"));
@@ -238,14 +242,26 @@ public class CommandFaildTask {
             }
         }
         //插入日志表
-        signalCommandLogPOMapper.insert(signalCommandLogPO);
+        int insert = signalCommandLogPOMapper.insert(signalCommandLogPO);
+        if (insert > 0) {
+            log.info("定时任务 插入t_signal_command_log成功,crossId = {},commandType = {},time = {},insert = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER), insert);
+        } else {
+            log.info("定时任务 插入t_signal_command_log失败,crossId = {},commandType = {},time = {},insert = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER), insert);
+        }
         SignalCommandPO signalCommandPO = new SignalCommandPO();
         BeanUtil.copyProperties(signalCommandLogPO, signalCommandPO);
         signalCommandPO.setCommandType(commandType);
         //更新状态表
         LambdaQueryWrapper<SignalCommandPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SignalCommandPO::getCrossId,jsonObject.getString("crossId"));
-        signalCommandPOMapper.update(signalCommandPO,lambdaQueryWrapper);
+        lambdaQueryWrapper.eq(SignalCommandPO::getCrossId, jsonObject.getString("crossId"));
+        int update = signalCommandPOMapper.update(signalCommandPO, lambdaQueryWrapper);
+        if (update > 0) {
+            log.info("定时任务 更新t_signal_command成功,crossId = {},commandType = {},time = {},update = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER), update);
+        } else {
+            log.info("定时任务 更新t_signal_command失败,crossId = {},commandType = {},time = {},update = {}", jsonObject.getString("crossId"), commandType, LocalDateTimeUtil.formatNow(LocalDateTimeUtil.TIMEFORMATTER), update);
+        }
+        List<SignalCommandPO> signalCommandPOS = signalCommandPOMapper.selectList(lambdaQueryWrapper);
+        log.error("定时任务 更新t_signal_command成功,数据库中查询结果集：{}", signalCommandPOS);
     }
 
 }

signal-utc-service/src/main/java/net/wanji/utc/task/SignalCommandSyncTask.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -89,19 +90,7 @@ public class SignalCommandSyncTask {
                         log.error("路口在线状态控制模式更新失败，路口编号信息：{}", entry, e);
                     }
                 }
-                if (!CollectionUtils.isEmpty(insertList)) {
-                    signalCommandPOMapper.insertBatch(insertList);
-                    List<SignalCommandLogPO> signalCommandLogPOS = new ArrayList<>(insertList.size());
-                    BeanListUtils.populateList(insertList, signalCommandLogPOS, SignalCommandLogPO.class);
-                    signalCommandLogPOMapper.insertBatch(signalCommandLogPOS);
-                }
-                if (!CollectionUtils.isEmpty(updateList)) {
-                    signalCommandPOMapper.updateBatch(updateList);
-                    List<SignalCommandLogPO> signalCommandLogPOS = new ArrayList<>(updateList.size());
-                    BeanListUtils.populateList(updateList, signalCommandLogPOS, SignalCommandLogPO.class);
-                    signalCommandLogPOMapper.insertBatch(signalCommandLogPOS);
-                    log.info("路口状态控制模式变动，数据库更新成功：{}", updateList);
-                }
+                saveAndUpdate(insertList, updateList);
                 List<SignalCommandPO> sendList = new ArrayList<>();
                 sendList.addAll(insertList);
                 sendList.addAll(updateList);
@@ -116,13 +105,33 @@ public class SignalCommandSyncTask {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void saveAndUpdate(List<SignalCommandPO> insertList, List<SignalCommandPO> updateList) {
+        try {
+            if (!CollectionUtils.isEmpty(insertList)) {
+                signalCommandPOMapper.insertBatch(insertList);
+                List<SignalCommandLogPO> signalCommandLogPOS = new ArrayList<>(insertList.size());
+                BeanListUtils.populateList(insertList, signalCommandLogPOS, SignalCommandLogPO.class);
+                signalCommandLogPOMapper.insertBatch(signalCommandLogPOS);
+            }
+            if (!CollectionUtils.isEmpty(updateList)) {
+                signalCommandPOMapper.updateBatch(updateList);
+                List<SignalCommandLogPO> signalCommandLogPOS = new ArrayList<>(updateList.size());
+                BeanListUtils.populateList(updateList, signalCommandLogPOS, SignalCommandLogPO.class);
+                signalCommandLogPOMapper.insertBatch(signalCommandLogPOS);
+                log.info("路口状态控制模式变动，数据库更新成功：{}", updateList);
+            }
+        } catch (Exception e) {
+            log.error("路口状态控制模式变动，数据库更新失败：", e);
+            throw new RuntimeException(e);
+        }
+    }
+
     private static SignalCommandPO insertSignalCommandPO(String crossId, Integer statusCache, String runModeCache, String lampTime) {
         SignalCommandPO insertPO = new SignalCommandPO();
         insertPO.setCrossId(crossId);
         insertPO.setStatus(statusCache);
         insertPO.setRunMode(runModeCache);
-        insertPO.setCommandResult(1);
-        insertPO.setUpdateCount(0);
         insertPO.setInsertTime(new Date());
         insertPO.setLampTime(lampTime);
         return insertPO;