修订绿波下发接口1、增加分方向 2、添加历史记录推荐速度字段

pom.xml

@@ -69,6 +69,38 @@
         <elastic-data-version>2.6.3</elastic-data-version>
     </properties>
 
+
+    <!--部署私服配置-->
+    <distributionManagement>
+        <repository>
+            <id>releases</id>
+            <url>http://106.120.201.126:14729/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <url>http://106.120.201.126:14729/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <!--maven仓库配置-->
+    <repositories>
+        <repository>
+            <id>releases</id>
+            <url>http://106.120.201.126:14729/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </releases>
+        </repository>
+        <repository>
+            <id>snapshots</id>
+            <url>http://106.120.201.126:14729/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </releases>
+        </repository>
+    </repositories>
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>

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

@@ -63,7 +63,7 @@ public class InduceSendController {
                     param.setEndTime(greenwaveInducesHistList.get(0).getControlOptTimes().split("\\|")[1]);
                 } else {
                     param.setStartTime(DateUtil.format(new Date(), Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND));
-                    param.setEndTime(DateUtil.format(System.currentTimeMillis() + 1000 * 30, Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND));
+                    param.setEndTime(DateUtil.format(System.currentTimeMillis() + 1000 * 60, Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND));
                 }
             }
             induceSendService.send(param);

signal-optimize-service/src/main/java/net/wanji/opt/dto/induce/GreenwaveDirDTO.java

+package net.wanji.opt.dto.induce;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class GreenwaveDirDTO {
+
+    @ApiModelProperty(name = "当前策略")
+    private Integer strategyId;
+
+    @ApiModelProperty(name = "策略名称")
+    private String strategyName;
+
+    @ApiModelProperty(name = "绿波方向:1 南向北 2 西向东 3 北向南 4 东向西")
+    private Integer dir;
+
+    @ApiModelProperty(name = "推荐最小速度")
+    private Double minSpeed;
+
+    @ApiModelProperty(name = "推荐最大速度")
+    private Double maxSpeed;
+
+    @ApiModelProperty(name = "执行时段")
+    private String controlOptTimes;
+
+    @ApiModelProperty(name = "诱导屏列表")
+    private List<InduceDTO> induceList;
+
+}

signal-optimize-service/src/main/java/net/wanji/opt/dto/induce/GreenwaveInducesDTO.java

@@ -25,26 +25,8 @@ public class GreenwaveInducesDTO {
     @ApiModelProperty(name = "发布状态")
     private Integer status ;
 
-    @ApiModelProperty(name = "当前策略")
-    private Integer strategyId;
-
-    @ApiModelProperty(name = "策略名称")
-    private String strategyName;
-
-    @ApiModelProperty(name = "绿波方向:1 南向北 2 西向东 3 北向南 4 东向西")
-    private Integer dir;
-
-    @ApiModelProperty(name = "推荐最小速度")
-    private Double minSpeed;
-
-    @ApiModelProperty(name = "推荐最大速度")
-    private Double maxSpeed;
-
-    @ApiModelProperty(name = "执行时段")
-    private String controlOptTimes;
-
-    @ApiModelProperty(name = "诱导屏列表")
-    private List<InduceDTO> induceList;
+    @ApiModelProperty(name="绿波方向")
+    private List<GreenwaveDirDTO> greenwaveDirList;
 
     @ApiModelProperty(name = "绿波带坐标")
     private String wkt;

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

@@ -54,6 +54,12 @@ public class InduceHist implements Serializable {
     @TableField("file_path")
     private String filePath;
 
+    /**
+     * 建议速度
+     */
+    @TableField("induce_speed")
+    private String induceSpeed;
+
     /**
      * 创建时间
      */

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

@@ -113,6 +113,9 @@ public class InduceSendServiceImpl implements InduceSendService {
                 String filePath = uploadFile(image,dirName, fileName);
                 param.setFtpPath(filePath);
                 induceHist.setFilePath(PATH + dirName+"/"+fileName);
+                if(Objects.nonNull(param.getContents()) && param.getContents().length>0) {
+                    induceHist.setInduceSpeed(param.getContents()[0]);
+                }
                 if(Objects.nonNull(greenwaveinduces)) {
                     greenwaveinduces.setSourceId(PATH + dirName + "/" + fileName);
                 }
@@ -146,7 +149,8 @@ public class InduceSendServiceImpl implements InduceSendService {
 //            messageProperties.setContentType("text/plain"); // 设置内容类型为text/plain
             // 创建Message并设置内容
 //            Message messageSend = new Message(message.getBytes(), messageProperties);
-            if(sending) {
+            if(sending)
+            {
                 rabbitTemplate.convertAndSend("", queueName, message);
             }
             log.info("mqtt发送信息-topic:{},queueName:{},message:{}", queueName, message);

wj-databus/src/main/java/net/wanji/databus/dao/mapper/GreenwaveInfoMapper.java

@@ -5,6 +5,7 @@ import net.wanji.databus.vo.GreenwaveListVO;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 态势监测-绿波基础信息
@@ -23,4 +24,6 @@ public interface GreenwaveInfoMapper {
     List<GreenwaveInfoPO> selectAll();
 
     GreenwaveInfoPO selectByName(String greenwaveName);
+
+    List<GreenwaveInfoPO> findByMap(Map params);
 }

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

@@ -48,4 +48,13 @@
         where name = #{greenwaveName}
     </select>
 
+
+    <select id="findByMap" resultType="net.wanji.databus.dao.entity.GreenwaveInfoPO" parameterType="java.util.Map">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM t_greenwave_info WHERE 1=1
+        <if test="keyword != null and keyword != ''">
+            AND ( locate(#{keyword,jdbcType=VARCHAR}, `name`)>0 )
+        </if>
+    </select>
+
 </mapper>