[update] 优化xml路径

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.bo.CrossIdBO;
+import net.wanji.databus.vo.GreenwaveListVO;
 import net.wanji.opt.bo.*;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;
 import net.wanji.opt.dto.trend.EventAlarmDTO;

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

 package net.wanji.opt.service;
 
 import net.wanji.databus.bo.CrossIdBO;
+import net.wanji.databus.vo.GreenwaveListVO;
 import net.wanji.opt.bo.*;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;
 import net.wanji.opt.dto.trend.GreenwaveListDTO;

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

@@ -15,7 +15,7 @@ import net.wanji.databus.vo.CrossIdAndNameVO;
 import net.wanji.opt.bo.*;
 import net.wanji.opt.dao.mapper.strategy.SceneStrategyMapper;
 import net.wanji.opt.dao.mapper.strategy.StrategyMapper;
-import net.wanji.opt.dao.mapper.trend.GreenwaveInfoMapper;
+import net.wanji.databus.dao.mapper.GreenwaveInfoMapper;
 import net.wanji.opt.dto.GreenwaveInSectionDTO;
 import net.wanji.opt.dto.LineSchemeDTO;
 import net.wanji.opt.po.strategy.SceneStrategyPO;

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

@@ -11,6 +11,7 @@ import net.wanji.databus.dao.entity.*;
 import net.wanji.databus.dao.mapper.*;
 import net.wanji.databus.po.*;
 import net.wanji.databus.vo.AbnormalCrossListVO;
+import net.wanji.databus.vo.GreenwaveListVO;
 import net.wanji.opt.bo.*;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneMapper;
@@ -18,7 +19,7 @@ import net.wanji.opt.dao.mapper.strategy.SceneStrategyIdeaMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneStrategyMapper;
 import net.wanji.opt.dao.mapper.strategy.StrategyMapper;
 import net.wanji.opt.dao.mapper.trend.EventAlarmMapper;
-import net.wanji.opt.dao.mapper.trend.GreenwaveInfoMapper;
+import net.wanji.databus.dao.mapper.GreenwaveInfoMapper;
 import net.wanji.opt.dto.CrossLaneSnapshotDataDTO;
 import net.wanji.opt.dto.LineSchemeDTO;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.wanji.databus.vo.GreenwaveListVO;
 
 import java.util.List;
 

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/trend/GreenwaveInfoMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/GreenwaveInfoMapper.java

-package net.wanji.opt.dao.mapper.trend;
+package net.wanji.databus.dao.mapper;
 
 import net.wanji.databus.dao.entity.GreenwaveInfoPO;
-import net.wanji.opt.vo.GreenwaveListVO;
+import net.wanji.databus.vo.GreenwaveListVO;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

signal-optimize-service/src/main/java/net/wanji/opt/vo/GreenwaveListVO.java → wj-databus/src/main/java/net/wanji/databus/vo/GreenwaveListVO.java

-package net.wanji.opt.vo;
+package net.wanji.databus.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

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

@@ -43,7 +43,7 @@
 
     <insert id="insertBatch" parameterType="net.wanji.databus.dao.entity.GreenwaveHistPO">
         insert into t_greenwave_realtime
-        <include refid="baseColumnList"></include>
+        <include refid="Base_Column_List"></include>
         values
         <foreach collection="list" item="entity" separator="," open="(" close=")">
             (#{entity.id}, #{entity.status}, #{entity.type}, #{entity.trafficIndex},#{entity.speed},

signal-optimize-service/src/main/resources/mapper/trend/GreenwaveInfoMapper.xml → wj-databus/src/main/resources/mapper/GreenwaveInfoMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.wanji.opt.dao.mapper.trend.GreenwaveInfoMapper">
+<mapper namespace="net.wanji.databus.dao.mapper.GreenwaveInfoMapper">
 
-    <sql id="baseColumnList">
+    <sql id="Base_Column_List">
         id,name,length,width,dir,start_time,end_time,design_speed,design_cycly,section_id,status,wkt,gmt_create,gmt_modified
     </sql>
 
-    <select id="listGreenwave" resultType="net.wanji.opt.vo.GreenwaveListVO">
+    <select id="listGreenwave" resultType="net.wanji.databus.vo.GreenwaveListVO">
         select
             t1.id, t1.name, t1.status as infoStatus, t2.status as realtimeStatus,
             t2.traffic_index, t1.start_time, t1.end_time, t1.wkt
@@ -32,18 +32,18 @@
     </select>
 
     <select id="selectById" resultType="net.wanji.databus.dao.entity.GreenwaveInfoPO">
-        select <include refid="baseColumnList"></include>
+        select <include refid="Base_Column_List"></include>
         from t_greenwave_info
         where id = #{id}
     </select>
 
     <select id="selectAll" resultType="net.wanji.databus.dao.entity.GreenwaveInfoPO">
-        select <include refid="baseColumnList"></include>
+        select <include refid="Base_Column_List"></include>
         from t_greenwave_info
     </select>
 
     <select id="selectByName" resultType="net.wanji.databus.dao.entity.GreenwaveInfoPO">
-        select <include refid="baseColumnList"></include>
+        select <include refid="Base_Column_List"></include>
         from t_greenwave_info
         where name = #{greenwaveName}
     </select>