潘钊 / bsth_control · Commits

Commit 751d4fb5ee3a9c45bf4d34c8c8493cab9ed0c7a4

Authored by 徐烜
2 parents e48fe9a1 6d8c8a5b
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 4 changed files with 16 additions and 9 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @751d4fb
... ... @@ -133,7 +133,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
133 133  
134 134 //去掉了 xlBm is not null
135 135 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
136   - @Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.dfsj, (s.lpName+1)")
  136 + @Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
137 137 List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
138 138  
139 139 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
... ...
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
  View file @751d4fb
... ... @@ -43,15 +43,16 @@ public class OfflineServiceImpl implements OfflineService {
43 43 String days_year=map.get("days_year").toString();
44 44 String line_id=map.get("line_id").toString();
45 45 String device_id=map.get("device_id").toString();
  46 + String ts=map.get("ts").toString();
46 47 String sql="SELECT t.line_id,t.device_id,MIN(ts) as ts,days_year FROM bsth_c_gps_info t "
47   - + " WHERE t.line_id='"+line_id+"' and t.device_id='"+device_id+"' and t.days_year='"+days_year+"' "
  48 + + " WHERE t.line_id='"+line_id+"' and t.device_id='"+device_id+"' and t.days_year='"+days_year+"' and t.ts>='"+ts+"' "
48 49 + " GROUP BY t.device_id,t.line_id ";
49   - sql +=" order by ts limit ?,?";
  50 + sql +=" order by ts ";
50 51 try {
51 52 conn = DBUtils_MS.getConnection();
52 53 ps = conn.prepareStatement(sql);
53   - ps.setInt(1,0*10); // O-最大条数 -- M-起始条数
54   - ps.setInt(2, 100000000); // O-最小条数 -- M-显示条数
  54 +// ps.setInt(1,0*10); // O-最大条数 -- M-起始条数
  55 +// ps.setInt(2, 1000000); // O-最小条数 -- M-显示条数
55 56 rs = ps.executeQuery();
56 57 list = resultSet(rs);
57 58 } catch (SQLException e) {
... ... @@ -258,6 +259,7 @@ public class OfflineServiceImpl implements OfflineService {
258 259 gpsmap.put("device_id",deviceid );
259 260 gpsmap.put("line_id", lineid);
260 261 gpsmap.put("days_year", str);
  262 + gpsmap.put("ts", d1);
261 263 List<Offline> gps=findGPS(gpsmap);
262 264 if(gps.size()>0){
263 265 Long ts= gps.get(0).getTs();
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @751d4fb
... ... @@ -968,13 +968,13 @@ public class FormsServiceImpl implements FormsService {
968 968 }
969 969  
970 970 String sql="select t.schedule_date_str,"
971   - + " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select r.schedule_date_str,r.xl_bm,r.xl_name,"
  971 + + " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select r.schedule_date_str,r.xl_bm,"
972 972 + " r.cl_zbh,r.j_gh,r.j_name from bsth_c_s_sp_info_real r WHERE "
973 973 + " r.xl_bm='" + map.get("line").toString() + "' "
974 974 + " and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"') "
975 975 + " and r.gs_bm like '%"+gsbm+"%' "
976 976 + " and r.fgs_bm like '%"+fgsbm+"%' "
977   - + " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name) t"
  977 + + " GROUP BY r.schedule_date_str,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name) t"
978 978 + " left join (select * from bsth_c_ylb y where "
979 979 + " to_days(y.rq)=to_days('"+map.get("date").toString()+"') "
980 980 + " and y.xlbm= '" + map.get("line").toString() + "'"
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @751d4fb
... ... @@ -1374,7 +1374,10 @@ public class ReportServiceImpl implements ReportService{
1374 1374 // TODO Auto-generated method stub
1375 1375 // 转大写
1376 1376 String nbbm =maps.get("nbbm").toString().toUpperCase();
1377   - String gsbm=maps.get("gsbm").toString().trim();
  1377 + String gsbm="";
  1378 +
  1379 + if(maps.get("gsbm")!=null)
  1380 + gsbm= maps.get("gsbm").toString().trim();
1378 1381 // String fgsbm=maps.get("fgsbm").toString().trim();
1379 1382 String xlbm=maps.get("xlbm").toString().trim();
1380 1383 List<Map<String, String>> list = new ArrayList<Map<String, String>>();
... ... @@ -1430,7 +1433,9 @@ public class ReportServiceImpl implements ReportService{
1430 1433 // TODO Auto-generated method stub
1431 1434 // 转大写
1432 1435 String jsy =maps.get("jsy").toString().toUpperCase();
1433   - String gsbm=maps.get("gsbm").toString().trim();
  1436 + String gsbm="";
  1437 + if(maps.get("gsbm")!=null)
  1438 + gsbm=maps.get("gsbm").toString().trim();
1434 1439 // String fgsbm=maps.get("fgsbm").toString().trim();
1435 1440 List<Map<String, String>> list = new ArrayList<Map<String, String>>();
1436 1441 Map<String, String> map;
... ...