[update] 修改绿波记录表结构

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

@@ -702,7 +702,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         List<BaseCrossPlanPO> baseCrossPlanPOList = baseCrossPlanMapper.selectAll();
 
         for (GreenwaveHistPO greenwaveHistPO : filteredList) {
-            Integer histGreenwaveId = greenwaveHistPO.getId();
+            Integer histGreenwaveId = greenwaveHistPO.getGreenId();
             Date histGreenwaveGmtModified = greenwaveHistPO.getGmtModified();
 
             for (GreenwaveCrossPO greenwaveCrossPO : greenwaveCrossPOList) {
@@ -712,7 +712,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                         histGreenwaveGmtModified, sectionId, baseCrossSectionPOList, baseCrossPlanPOList);
                 if (greenwaveInSectionDTO.isGreenwaveInSection()) {
                     String greenwaveName = greenwaveHistPO.getGreenwaveName();
-                    Integer greenwaveId = greenwaveHistPO.getId();
+                    Integer greenwaveId = greenwaveHistPO.getGreenId();
                     String planName = greenwaveInSectionDTO.getPlanName();
                     Integer planId = greenwaveInSectionDTO.getPlanId();
 
@@ -1881,7 +1881,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                 if (greenwaveHistPOList != null) {
                     for (GreenwaveHistPO greenwaveHistPO : greenwaveHistPOList) {
                         if (greenwaveHistPO != null &&
-                                Objects.equals(greenwaveHistPO.getId(), greenwaveId) &&
+                                Objects.equals(greenwaveHistPO.getGreenId(), greenwaveId) &&
                                 Objects.equals(greenwaveHistPO.getGmtModified(), gmtModified)) {
                             return key;
                         }

wj-databus/src/main/resources/mapper/GreenwaveHistMapper.xml

@@ -40,7 +40,7 @@
     </select>
 
     <select id="selectByTimeSection" resultType="net.wanji.databus.dao.entity.GreenwaveHistPO">
-        select t1.id,
+        select t1.green_id,
                t1.status,
                t1.type,
                t1.traffic_index,
@@ -69,7 +69,7 @@
         select
         <include refid="Base_Column_List"/>
         from t_greenwave_hist
-        where id = #{greenwaveId}
+        where green_id = #{greenwaveId}
         and gmt_modified <![CDATA[ <= ]]> #{endTimeStr}
         and gmt_modified <![CDATA[ >= ]]> #{startTimeStr}
     </select>

wj-databus/src/main/resources/mapper/GreenwaveRealtimeMapper.xml

@@ -32,7 +32,7 @@
         select
         <include refid="Base_Column_List"/>
         from t_greenwave_realtime
-        where id = #{id}
+        where green_id = #{id}
     </select>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.dao.entity.GreenwaveRealtimePO">