[update] utc静态数据保存优化

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

@@ -399,6 +399,8 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                     crossLightsPO.setType(0);
                     if (wjPerson != 0) {
                         crossLightsPO.setType(3);
+                    } else if (wjPerson == 0 && wjLightsDir > 0) {
+                        crossLightsPO.setType(1);
                     }
                     crossLightsPO.setDir(wjLightsDir);
                     crossLightsPO.setTurn(wjLightsTurn);

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -135,8 +136,10 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
                     Integer id = crossPlanMapper.selectIdByNo(crossSectionPO.getCrossId(), crossSectionPO.getPlanId());
                     crossSectionPO.setPlanId(id);
                     CrossSchemePO baseCrossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeNo(crossId, crossSectionPO.getSchemeId());
+                    if (Objects.nonNull(baseCrossSchemePO)) {
                         crossSectionPO.setSchemeId(baseCrossSchemePO.getId());
                         crossSectionMapper.insertOne(crossSectionPO);
+                    }
                 });
             }
         }
@@ -162,8 +165,10 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
                     Integer planId = crossSchedulesPO.getPlanId();
                     Integer id = crossPlanMapper.selectIdByNo(crossId, planId);
                     crossSchedulesPO.setPlanId(id);
+                    if (Objects.nonNull(id)) {
+                        crossSchedulesMapper.insertBatch(Collections.singletonList(crossSchedulesPO));
+                    }
                 }
-                crossSchedulesMapper.insertBatch(content);
             }
         }
         return Result.success(content);

wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossPlanPO.java

 package net.wanji.databus.dao.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -25,8 +26,10 @@ public class CrossPlanPO {
     private String crossId ;
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间",notes = "")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtCreate ;
     /** 修改时间 */
     @ApiModelProperty(value = "修改时间",notes = "")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified ;
 }