Commit cfb18788a62fe385635ebbf97ae2112d2093b56b

Authored by 潘钊
1 parent cee12c6e

update...

src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
@@ -2,12 +2,14 @@ package com.bsth.server_rs.schedule.real; @@ -2,12 +2,14 @@ package com.bsth.server_rs.schedule.real;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.bsth.common.BasicData; 4 import com.bsth.common.BasicData;
  5 +import com.bsth.entity.ScheduleRealInfo;
5 import com.bsth.redis.ScheduleRedisService; 6 import com.bsth.redis.ScheduleRedisService;
6 import com.bsth.server_rs.base_info.line.Line; 7 import com.bsth.server_rs.base_info.line.Line;
7 import com.bsth.server_rs.base_info.line.buffer.LineBufferData; 8 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
8 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig; 9 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
9 import com.bsth.server_rs.schedule.dto.ScheduleInOut; 10 import com.bsth.server_rs.schedule.dto.ScheduleInOut;
10 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK; 11 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
  12 +import com.google.common.base.Splitter;
11 import org.slf4j.Logger; 13 import org.slf4j.Logger;
12 import org.slf4j.LoggerFactory; 14 import org.slf4j.LoggerFactory;
13 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,4 +109,29 @@ public class ScheduleRealService { @@ -107,4 +109,29 @@ public class ScheduleRealService {
107 } 109 }
108 return all; 110 return all;
109 } 111 }
  112 +
  113 + /**
  114 + * 读取指定日期的redis 数据,计算程序调用
  115 + * @param rqs
  116 + * @return
  117 + */
  118 + @GET
  119 + @Path("/pz_vip/read/{rqs}")
  120 + public List<ScheduleRealInfo> read(@PathParam("rqs") String rqs){
  121 + List<ScheduleRealInfo> all = new ArrayList<>(), rs = new ArrayList<>();
  122 + List<Line> lines = LineBufferData.findAll();
  123 + List<String> rqArray = Splitter.on(",").splitToList(rqs);
  124 +
  125 + for(Line line : lines){
  126 + for(String rq : rqArray)
  127 + all.addAll(redisService.read(rq, line.getLineCode()));
  128 + }
  129 +
  130 + for(ScheduleRealInfo sch : all){
  131 + if(sch.getStatus() != -1 && (sch.getcTasks()==null || sch.getcTasks().size()==0))
  132 + continue;
  133 + rs.add(sch);
  134 + }
  135 + return rs;
  136 + }
110 } 137 }