[add] 代码逻辑优化0104

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

@@ -370,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-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,6 +90,24 @@ public class SignalCommandSyncTask {
                         log.error("路口在线状态控制模式更新失败，路口编号信息：{}", entry, e);
                     }
                 }
+                saveAndUpdate(insertList, updateList);
+                List<SignalCommandPO> sendList = new ArrayList<>();
+                sendList.addAll(insertList);
+                sendList.addAll(updateList);
+                if (!CollectionUtils.isEmpty(sendList)) {
+                    sendAlarmKafka(sendList);
+                }
+            } else {
+                log.error("从路口灯态缓存获取控制模式在线离线状态为空：{}", crossLightsStatusMap);
+            }
+        } catch (Exception e) {
+            log.error("信号机状态同步异常：", e);
+        }
+    }
+
+    @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());
@@ -102,17 +121,9 @@ public class SignalCommandSyncTask {
                 signalCommandLogPOMapper.insertBatch(signalCommandLogPOS);
                 log.info("路口状态控制模式变动，数据库更新成功：{}", updateList);
             }
-                List<SignalCommandPO> sendList = new ArrayList<>();
-                sendList.addAll(insertList);
-                sendList.addAll(updateList);
-                if (!CollectionUtils.isEmpty(sendList)) {
-                    sendAlarmKafka(sendList);
-                }
-            } else {
-                log.error("从路口灯态缓存获取控制模式在线离线状态为空：{}", crossLightsStatusMap);
-            }
         } catch (Exception e) {
-            log.error("信号机状态同步异常：", e);
+            log.error("路口状态控制模式变动，数据库更新失败：", e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -121,8 +132,6 @@ public class SignalCommandSyncTask {
         insertPO.setCrossId(crossId);
         insertPO.setStatus(statusCache);
         insertPO.setRunMode(runModeCache);
-        insertPO.setCommandResult(1);
-        insertPO.setUpdateCount(0);
         insertPO.setInsertTime(new Date());
         insertPO.setLampTime(lampTime);
         return insertPO;