潘钊 / bsth_control · Commits

Commit c16fba6e83e8ea8d0f63faf4980c7a16aeb9c690

Authored by 娄高锋
1 parent f06e882a

指令状态分析

Inline Side-by-side
Showing 2 changed files with 101 additions and 24 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @c16fba6
@@ -1924,13 +1924,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1924,13 +1924,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1924 }else{ 1924 }else{
1925 sql_ += " and xl_bm = '"+line+"'"; 1925 sql_ += " and xl_bm = '"+line+"'";
1926 } 1926 }
1927 -  
1928 1927
1929 - String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,"  
1930 - + " r.fcsj,d. TIMESTAMP,d.reply46,d.reply47,d.reply46time,d.reply47time,"  
1931 - + " r.gs_name,r.fgs_name,CONCAT(r.xl_bm,'_',r.id) as line_sch FROM ("+sql_+") "  
1932 - + " AS r LEFT JOIN bsth_v_directive_60 AS d ON r.id = d.sch AND d.is_dispatch = 1"  
1933 - + " order by r.xl_name,r.id,d.timestamp desc "; 1928 +
  1929 + String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.fcsj,"
  1930 + + " r.gs_name,r.fgs_name,CONCAT(r.xl_bm,'_',r.id) as line_sch FROM ("+sql_+") AS r"
  1931 + + " order by r.xl_name,r.id ";
1934 1932
1935 List<Map<String, Object>> list = jdbcTemplate.query(sql, 1933 List<Map<String, Object>> list = jdbcTemplate.query(sql,
1936 new RowMapper<Map<String, Object>>(){ 1934 new RowMapper<Map<String, Object>>(){
@@ -1945,17 +1943,59 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1945,17 +1943,59 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1945 map.put("jGh", rs.getString("j_gh")); 1943 map.put("jGh", rs.getString("j_gh"));
1946 map.put("jName", rs.getString("j_name")); 1944 map.put("jName", rs.getString("j_name"));
1947 map.put("fcsj", rs.getString("fcsj")); 1945 map.put("fcsj", rs.getString("fcsj"));
1948 - map.put("timestamp", rs.getString("timestamp")); 1946 + map.put("company", rs.getObject("gs_name"));
  1947 + map.put("subCompany", rs.getObject("fgs_name"));
  1948 + map.put("lineSch", rs.getString("line_sch"));
  1949 + return map;
  1950 + }
  1951 + });
  1952 +
  1953 +
  1954 + Date dateTime = new Date();
  1955 + try {
  1956 + dateTime = new SimpleDateFormat("yyyy-MM-dd").parse(date);
  1957 + } catch (ParseException e) {
  1958 + // TODO Auto-generated catch block
  1959 + e.printStackTrace();
  1960 + }
  1961 +
  1962 + sql="SELECT sch,TIMESTAMP,reply46,reply47,reply46time,reply47time"
  1963 + + " FROM bsth_v_directive_60 WHERE is_dispatch = 1 AND sch is not null"
  1964 + + " AND TIMESTAMP >= "+(dateTime.getTime())
  1965 + + " AND TIMESTAMP < "+(dateTime.getTime() + 1000*60*60*24);
  1966 +
  1967 + List<Map<String, Object>> list2 = jdbcTemplate.query(sql,
  1968 + new RowMapper<Map<String, Object>>(){
  1969 + @Override
  1970 + public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
  1971 + Map<String, Object> map = new HashMap<String, Object>();
  1972 + map.put("sch", rs.getString("sch"));
  1973 + map.put("TIMESTAMP", rs.getString("TIMESTAMP"));
1949 map.put("reply46", rs.getString("reply46")); 1974 map.put("reply46", rs.getString("reply46"));
1950 map.put("reply47", rs.getString("reply47")); 1975 map.put("reply47", rs.getString("reply47"));
1951 map.put("reply46time", rs.getObject("reply46time")); 1976 map.put("reply46time", rs.getObject("reply46time"));
1952 map.put("reply47time", rs.getObject("reply47time")); 1977 map.put("reply47time", rs.getObject("reply47time"));
1953 - map.put("company", rs.getObject("gs_name"));  
1954 - map.put("subCompany", rs.getObject("fgs_name"));  
1955 - map.put("lineSch", rs.getString("line_sch")); 1978 +
1956 return map; 1979 return map;
1957 } 1980 }
1958 }); 1981 });
  1982 +
  1983 + Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String,Object>>();
  1984 + for(Map<String, Object> m : list2){
  1985 + keyMap.put(m.get("sch").toString(), m);
  1986 + }
  1987 + for(Map<String, Object> m : list){
  1988 + String id = m.get("id").toString();
  1989 + if(keyMap.containsKey(id)){
  1990 + Map<String, Object> map2 = keyMap.get(id);
  1991 + m.put("TIMESTAMP", map2.get("TIMESTAMP"));
  1992 + m.put("reply46", map2.get("reply46"));
  1993 + m.put("reply47", map2.get("reply47"));
  1994 + m.put("reply46time", map2.get("reply46time"));
  1995 + m.put("reply47time", map2.get("reply47time"));
  1996 + }
  1997 + }
  1998 +
1959 List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>(); 1999 List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>();
1960 int jhs = 0,sjs=0,wqr=0; 2000 int jhs = 0,sjs=0,wqr=0;
1961 Map<String, Object> m_; 2001 Map<String, Object> m_;
@@ -2063,15 +2103,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -2063,15 +2103,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
2063 String type = map.get("type").toString(); 2103 String type = map.get("type").toString();
2064 2104
2065 String sql_="select * from bsth_c_s_sp_info_real " 2105 String sql_="select * from bsth_c_s_sp_info_real "
2066 - + " WHERE schedule_date_str = '"+date+"' and xl_bm = '"+line+"'"; 2106 + + " WHERE schedule_date_str = '"+date+"' and xl_bm = '"+line+"'";
2067 2107
2068 -  
2069 - String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,"  
2070 - + " r.fcsj,d. TIMESTAMP,d.reply46,d.reply47,d.reply46time,d.reply47time,"  
2071 - + " r.gs_name,r.fgs_name,CONCAT(r.j_gh,'_',r.id) as gh_sch FROM ("+sql_+") "  
2072 - + " AS r LEFT JOIN bsth_v_directive_60 AS d ON r.id = d.sch AND d.is_dispatch = 1"  
2073 - + " order by r.j_gh,r.cl_zbh,r.id,d.timestamp desc ";  
2074 - 2108 + String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.fcsj,"
  2109 + + " r.gs_name,r.fgs_name,CONCAT(r.xl_bm,'_',r.id) as gh_sch FROM ("+sql_+") AS r"
  2110 + + " order by r.xl_name,r.id ";
2075 2111
2076 List<Map<String, Object>> list = jdbcTemplate.query(sql, 2112 List<Map<String, Object>> list = jdbcTemplate.query(sql,
2077 new RowMapper<Map<String, Object>>(){ 2113 new RowMapper<Map<String, Object>>(){
@@ -2086,17 +2122,58 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -2086,17 +2122,58 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
2086 map.put("jGh", rs.getString("j_gh")); 2122 map.put("jGh", rs.getString("j_gh"));
2087 map.put("jName", rs.getString("j_name")); 2123 map.put("jName", rs.getString("j_name"));
2088 map.put("fcsj", rs.getString("fcsj")); 2124 map.put("fcsj", rs.getString("fcsj"));
2089 - map.put("timestamp", rs.getString("timestamp")); 2125 + map.put("company", rs.getObject("gs_name"));
  2126 + map.put("subCompany", rs.getObject("fgs_name"));
  2127 + map.put("ghSch", rs.getString("gh_sch"));
  2128 + return map;
  2129 + }
  2130 + });
  2131 +
  2132 +
  2133 + Date dateTime = new Date();
  2134 + try {
  2135 + dateTime = new SimpleDateFormat("yyyy-MM-dd").parse(date);
  2136 + } catch (ParseException e) {
  2137 + // TODO Auto-generated catch block
  2138 + e.printStackTrace();
  2139 + }
  2140 +
  2141 + sql="SELECT sch,TIMESTAMP,reply46,reply47,reply46time,reply47time"
  2142 + + " FROM bsth_v_directive_60 WHERE is_dispatch = 1 AND sch is not null"
  2143 + + " AND TIMESTAMP >= "+(dateTime.getTime())
  2144 + + " AND TIMESTAMP < "+(dateTime.getTime() + 1000*60*60*24);
  2145 +
  2146 + List<Map<String, Object>> list2 = jdbcTemplate.query(sql,
  2147 + new RowMapper<Map<String, Object>>(){
  2148 + @Override
  2149 + public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
  2150 + Map<String, Object> map = new HashMap<String, Object>();
  2151 + map.put("sch", rs.getString("sch"));
  2152 + map.put("TIMESTAMP", rs.getString("TIMESTAMP"));
2090 map.put("reply46", rs.getString("reply46")); 2153 map.put("reply46", rs.getString("reply46"));
2091 map.put("reply47", rs.getString("reply47")); 2154 map.put("reply47", rs.getString("reply47"));
2092 map.put("reply46time", rs.getObject("reply46time")); 2155 map.put("reply46time", rs.getObject("reply46time"));
2093 map.put("reply47time", rs.getObject("reply47time")); 2156 map.put("reply47time", rs.getObject("reply47time"));
2094 - map.put("company", rs.getObject("gs_name"));  
2095 - map.put("subCompany", rs.getObject("fgs_name"));  
2096 - map.put("ghSch", rs.getString("gh_sch")); 2157 +
2097 return map; 2158 return map;
2098 } 2159 }
2099 }); 2160 });
  2161 +
  2162 + Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String,Object>>();
  2163 + for(Map<String, Object> m : list2){
  2164 + keyMap.put(m.get("sch").toString(), m);
  2165 + }
  2166 + for(Map<String, Object> m : list){
  2167 + String id = m.get("id").toString();
  2168 + if(keyMap.containsKey(id)){
  2169 + Map<String, Object> map2 = keyMap.get(id);
  2170 + m.put("TIMESTAMP", map2.get("TIMESTAMP"));
  2171 + m.put("reply46", map2.get("reply46"));
  2172 + m.put("reply47", map2.get("reply47"));
  2173 + m.put("reply46time", map2.get("reply46time"));
  2174 + m.put("reply47time", map2.get("reply47time"));
  2175 + }
  2176 + }
2100 2177
2101 List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>(); 2178 List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>();
2102 int jhs = 0,sjs=0,wqr=0; 2179 int jhs = 0,sjs=0,wqr=0;
src/main/resources/static/pages/forms/statement/commandState.html
  View file @c16fba6
@@ -41,8 +41,8 @@ @@ -41,8 +41,8 @@
41 <select class="form-control" name="line" id="line" style="width: 180px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
42 </div> 42 </div>
43 43
44 - <div style="display: inline-block;margin-left: 15px;">  
45 - <span class="item-label" style="width: 80px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;时间: </span> 44 + <div style="display: inline-block;margin-left: 36px;">
  45 + <span class="item-label" style="width: 80px;">时间: </span>
46 <input class="form-control" type="text" id="date" style="width: 180px;"/> 46 <input class="form-control" type="text" id="date" style="width: 180px;"/>
47 </div> 47 </div>
48 <div style="display:none;margin-left: 8px"> 48 <div style="display:none;margin-left: 8px">