绿波下发增加过滤条件逻辑优化，修订部分字段赋值错误

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

@@ -102,7 +102,7 @@ public class GreenwaveInducesHistController {
                     greenwaveDirDTO.setStrategyName(o.getStrategyName());
 
                     greenwaveDirDTO.setMinSpeed(o.getMinSpeed());
-                    greenwaveDirDTO.setMinSpeed(o.getMaxSpeed());
+                    greenwaveDirDTO.setMaxSpeed(o.getMaxSpeed());
                     if (Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length > 0) {
                         try {
                             String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
@@ -117,13 +117,13 @@ public class GreenwaveInducesHistController {
                     }
                     //获取诱导屏列表
                     List<InduceDTO> induceDTOList = new ArrayList<>();
-                    greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId())).forEach(n -> {
+                    greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId()) && Objects.nonNull(l.getDir()) && l.getDir().equals(o.getDir())).forEach(n -> {
                         InduceDTO induceDTO = new InduceDTO();
                         induceDTO.setId(n.getId());
                         induceDTO.setEquipCode(n.getEquipCode());
                         induceDTO.setStatus(o.getStatus());
                         //获取屏幕的设备信息
-                        List<DeviceInduces> deviceInduces = deviceInducesList.stream().filter(m -> Objects.nonNull(m.getEquipCode()) && m.getEquipCode().equals(n.getEquipCode())).collect(Collectors.toList());// 过滤条件// 收集结果
+                        List<DeviceInduces> deviceInduces = deviceInducesList.stream().filter(m -> Objects.nonNull(m.getEquipCode()) && m.getEquipCode().equals(n.getEquipCode()) ).collect(Collectors.toList());// 过滤条件// 收集结果
                         if (Objects.nonNull(deviceInduces) && deviceInduces.size() > 0) {
                             induceDTO.setEquipName(deviceInduces.get(0).getEquipName());
                             induceDTO.setRidDir(n.getDir());//
@@ -195,7 +195,7 @@ public class GreenwaveInducesHistController {
                     greenwaveDirDTO.setStrategyId(o.getStrategyId());
                     greenwaveDirDTO.setStrategyName(o.getStrategyName());
                     greenwaveDirDTO.setMinSpeed(o.getMinSpeed());
-                    greenwaveDirDTO.setMinSpeed(o.getMaxSpeed());
+                    greenwaveDirDTO.setMaxSpeed(o.getMaxSpeed());
                     if (Objects.nonNull(o.getControlOptTimes()) && o.getControlOptTimes().split("\\|").length > 0) {
                         try {
                             String startTime = DateUtil.format(DateUtil.parse(o.getControlOptTimes().split("\\|")[0], Constants.DATE_FORMAT.E_DATE_FORMAT_SECOND), Constants.DATE_FORMAT.E_DATE_FORMAT_TIME);
@@ -210,7 +210,7 @@ public class GreenwaveInducesHistController {
                     }
                     //获取诱导屏列表
                     List<InduceDTO> induceDTOList = new ArrayList<>();
-                    greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId())).forEach(n -> {
+                    greenwaveInducesList.stream().filter(l -> Objects.nonNull(l.getGreenId()) && l.getGreenId().equals(o.getGreenId()) && Objects.nonNull(l.getDir()) && l.getDir().equals(o.getDir())).forEach(n -> {
                         InduceDTO induceDTO = new InduceDTO();
                         induceDTO.setId(n.getId());
                         induceDTO.setEquipCode(n.getEquipCode());

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

 package net.wanji.opt.task;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -95,25 +96,27 @@ public class InducesMonitorTask {
      * #绿波调度计划扫描周期
      * 5 分钟 300000
      */
-    @Scheduled(fixedRate = 300000)
+    @Scheduled(fixedRate = 30000)
     public void refresh() throws Exception {
         long start = System.currentTimeMillis();
         AtomicLong synCount = new AtomicLong();
         try {
             log.info("每5分钟刷新绿波优化下发数据...................");
             List<GreenwaveInfoPO> greenwaveInfoPOList=greenwaveInfoMapper.selectAll();
+            List<GreenwaveInducesHist> greenwaveInducesHistss = greenwaveInducesHistService.list();
+
             for(GreenwaveInfoPO greenwaveInfoPO :greenwaveInfoPOList) {
                 AtomicBoolean flag = new AtomicBoolean(false);//是否已发布优化
                 AtomicReference<Integer> strategyId=new AtomicReference<Integer>(0);
                 //1、查询所有绿波带路口信息，获取路口下的绿波策略计划
                 List<GreenwaveCrossPO> greenwaveCrossList = greenwaveCrossMapper.selectByGreenwaveId(greenwaveInfoPO.getId());
                 greenwaveCrossList.stream().forEach(o -> {
-                    //System.out.println("绿波路口--->"+o.getGreenwaveName()+"=="+o.getCrossId());
+                    //System.out.println("绿波路口--->"+greenwaveInfoPO.getId()+"=="+o.getCrossId());
                     //创建路口策略列表
                     List<StrategyPlanInfoEntity> strategyPlanInfoEntityList = strategyPlanInfoMapper.selectByCrossId(o.getCrossId());
                     //strategyPlanInfoEntityList.stream().filter(x->Objects.nonNull(x.getCrossId()) && x.getCrossId().equals(o.getCrossId()) ).forEach(x->
                     for (StrategyPlanInfoEntity strategyPlanInfoEntity : strategyPlanInfoEntityList) {
-                        //System.out.println("策略计划--->"+x.getCrossId()+"=="+x.getPlanDetails());
+                        System.out.println("策略计划--->"+greenwaveInfoPO.getId()+"=="+strategyPlanInfoEntity.getPlanDetails());
                         //2、检查绿波时段，判断是否在绿波时段内，如果不在，则判断是否执行过上屏操作，如果执行过，则调用下屏服务（此出屏幕自动处理，无需逻辑）
                         //[{"dailyPlanId":1,"weeks":[1,2,3,4,5]}]
                         List<StrategyControlDetailList.ExecutePlan.PlanDetail> planDetails = new ArrayList<>();
@@ -151,8 +154,7 @@ public class InducesMonitorTask {
                                                 // 判断当前时间是否在范围内
                                                 if (LocalTime.now().isAfter(startTime) && LocalTime.now().isBefore(endTime)) {
                                                     System.out.println("当前时间在范围内: " + LocalTime.now());
-                                                    //3、如果在绿波时段内，未上屏，则获取固定配时绿波信息
-                                                    //4、获取优化绿波方案，如果不存在，则执行固定绿波方案
+                                                    //System.out.println("绿波路口--->"+greenwaveInfoPO.getId()+"=="+o.getCrossId());
                                                     flag.set(true);
                                                     strategyId.set(p.getDailyPlanId());
                                                 }
@@ -164,19 +166,21 @@ public class InducesMonitorTask {
                         }
                     }
                 });
+                //3、如果在绿波时段内，未上屏，则获取固定配时绿波信息
+                //4、获取优化绿波方案，如果不存在，则执行固定绿波方案
                 //如果在绿波时段内，未上屏，则获取固定配时绿波信息
                 if (flag.get()) {
                     List<StrategyGreenOptHistEntity> strategyGreenOptHistEntitiesList = strategyGreenOptHistMapper.selectByGreenId(String.valueOf(greenwaveInfoPO.getId())).stream().distinct().collect(Collectors.toList());
                     if (Objects.nonNull(strategyGreenOptHistEntitiesList)) {
                         for (StrategyGreenOptHistEntity greenOptHistEntity : strategyGreenOptHistEntitiesList) {
-                            LambdaQueryWrapper<GreenwaveInducesHist> greenwaveInducesHistQueryWrapper = new LambdaQueryWrapper<>();
-                            greenwaveInducesHistQueryWrapper.eq(GreenwaveInducesHist::getGreenId, greenwaveInfoPO.getId());
-                            greenwaveInducesHistQueryWrapper.eq(GreenwaveInducesHist::getDir, getDir(greenOptHistEntity.getDir()));
-                            List<GreenwaveInducesHist> greenwaveInducesHistList = greenwaveInducesHistService.list(greenwaveInducesHistQueryWrapper);
+//                            LambdaQueryWrapper<GreenwaveInducesHist> greenwaveInducesHistQueryWrapper = new LambdaQueryWrapper<>();
+//                            greenwaveInducesHistQueryWrapper.eq(GreenwaveInducesHist::getGreenId, greenwaveInfoPO.getId());
+//                            greenwaveInducesHistQueryWrapper.eq(GreenwaveInducesHist::getDir, getDir(greenOptHistEntity.getDir()));
+                            List<GreenwaveInducesHist> greenwaveInducesHistList=greenwaveInducesHistss.stream().filter(g->g.getGreenId().equals(greenwaveInfoPO.getId()) && g.getDir().equals(getDir(greenOptHistEntity.getDir()))).collect(Collectors.toList());
                             GreenwaveInducesHist greenwaveInducesHist=null;
                             if (Objects.isNull(greenwaveInducesHistList) || greenwaveInducesHistList.size()<1) {
                                 greenwaveInducesHist = new GreenwaveInducesHist();
-                                greenwaveInducesHist.setCreateTime(new Date());
+                                greenwaveInducesHist.setCreateTime(greenOptHistEntity.getCreateTime());
                                 greenwaveInducesHist.setGreenId(greenwaveInfoPO.getId());
                                 greenwaveInducesHist.setDir(getDir(greenOptHistEntity.getDir()));
                             }else{
@@ -232,21 +236,21 @@ public class InducesMonitorTask {
                                         }
                                     }
                                     greenwaveInducesHist.setStatus(1);
+                                    greenwaveInducesHist.setModifyTime(greenOptHistEntity.getCreateTime());
                                 }
                             } catch (IOException e) {
                                 e.printStackTrace();
                             } catch (TemplateException e) {
                                 log.info("发送上屏信息异常" + e.getMessage());
                             }
-                            greenwaveInducesHist.setModifyTime(greenOptHistEntity.getCreateTime());
                             greenwaveInducesHistService.saveOrUpdate(greenwaveInducesHist);
                             synCount.getAndIncrement();
-                            log.info("同步绿波状态信息成功->" + greenwaveInfoPO.getName()+greenOptHistEntity.getDir());
+                            log.info("同步绿波状态信息成功->" + greenwaveInfoPO.getName()+greenwaveInducesHist.getDir());
                         }
                     }
                 }
                 //如果没有绿波方案则调用下屏服务
-                if (!flag.get()) {
+                else{
                     LambdaQueryWrapper<GreenwaveInducesHist> greenwaveInducesHistQueryWrapper = new LambdaQueryWrapper<>();
                     greenwaveInducesHistQueryWrapper.eq(GreenwaveInducesHist::getGreenId, greenwaveInfoPO.getId());
                     List<GreenwaveInducesHist> greenwaveInducesHistList = greenwaveInducesHistService.list(greenwaveInducesHistQueryWrapper);
@@ -281,7 +285,7 @@ public class InducesMonitorTask {
                         n.setStatus(0);
                         n.setModifyTime(new Date());
                         greenwaveInducesHistService.saveOrUpdate(n);
-                        log.info("同步绿波状态信息(下屏)->" + greenwaveInfoPO.getName());
+                        log.info("同步绿波状态信息(下屏)->" + greenwaveInfoPO.getName()+"####"+n.getDir());
                         synCount.getAndIncrement();
                     });
                 }

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

@@ -52,9 +52,16 @@
     <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
+        <include refid="sql_query"/>
         <if test="keyword != null and keyword != ''">
             AND ( locate(#{keyword,jdbcType=VARCHAR}, `name`)>0 )
         </if>
     </select>
 
+    <sql id="sql_query">
+        <if test="greenId != null ">
+            <![CDATA[ and `id` = #{greenId} ]]>
+        </if>
+    </sql>
+
 </mapper>