Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,7 @@ public interface PushStrategyControlService {
     * @return
     * @throws Exception
     */
-   Result StartegyPriorityPlanPush(StrategyPriorityPlanPush  req) throws Exception;
+   Result StartegyPriorityPlanPush(List<StrategyPriorityPlanPush>  req) throws Exception;
 
    /**
     * 策略管理参数配置推送
@@ -52,6 +52,6 @@ public interface PushStrategyControlService {
     * @return
     * @throws Exception
     */
-   Result StartegyPriorityParameterPush(StrategyParameterPush req) throws Exception;
+   Result StartegyPriorityParameterPush(List<StrategyParameterPush> req) throws Exception;
 }
 

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

@@ -101,13 +101,13 @@ public class PushStrategyControlServiceImpl implements PushStrategyControlServic
      * 日计划配置推送
      * */
     @Override
-    public Result StartegyPriorityPlanPush(StrategyPriorityPlanPush req) throws Exception {
+    public Result StartegyPriorityPlanPush(List<StrategyPriorityPlanPush> req) throws Exception {
         try {
             ObjectMapper mapper = JacksonUtils.getInstance();
-            System.out.println("req~~"+req);
             // 序列化请求参数
             String jsonReq = mapper.writeValueAsString(req);
-            String resultStr = RestTemplateTool.post(switchUrl, jsonReq);
+            System.out.println("req~~"+jsonReq);
+            String resultStr = RestTemplateTool.postList(switchUrl, jsonReq);
             if (StringUtils.isNotBlank(resultStr)) {
                 log.info("下发神思策略管理日计划配置推送成功，内容： {}", req);
                 Result result = mapper.readValue(resultStr, Result.class);
@@ -129,13 +129,13 @@ public class PushStrategyControlServiceImpl implements PushStrategyControlServic
      * @throws Exception
      */
     @Override
-    public Result StartegyPriorityParameterPush(StrategyParameterPush req) throws Exception {
+    public Result StartegyPriorityParameterPush(List<StrategyParameterPush> req) throws Exception {
         try {
             ObjectMapper mapper = JacksonUtils.getInstance();
-            System.out.println("req~~"+req);
             // 序列化请求参数
             String jsonReq = mapper.writeValueAsString(req);
-            String resultStr = RestTemplateTool.post(switchUrl, jsonReq);
+            System.out.println("req~~"+jsonReq);
+            String resultStr = RestTemplateTool.postList(switchUrl, jsonReq);
             if (StringUtils.isNotBlank(resultStr)) {
                 log.info("下发神思策略管理参数配置推送成功，内容： {}", req);
                 Result result = mapper.readValue(resultStr, Result.class);

signal-optimize-service/src/main/resources/mapper/judgeanalysis/AnalysisProblemGreenHourMapper.xml

@@ -285,11 +285,13 @@
         JOIN t_base_rid_info t3
         ON sub_t2.cross_id=t3.end_cross_id
         AND sub_t2.dir_type=t3.in_dir
+        AND t1.in_dir=t3.in_dir
         WHERE
             1=1
             <if test="greenId!=null and greenId!=''">
                 AND t1.green_id=#{greenId}
             </if>
+        and t1.sort!=1
         ORDER BY
          sub_t2.traffic_index DESC
           limit 1

signal-optimize-service/src/main/resources/mapper/report/CrossProblemMapper.xml

@@ -52,7 +52,7 @@
             and year_week = #{yearWeek}
         </if>
         <if test="crossIdList != null">
-            and t4.cross_id in
+            and cross_id in
             <foreach collection="crossIdList" item="crossId" open="(" close=")" separator=",">
                 #{crossId}
             </foreach>