驾驶员请求台账sql修改

廖磊
1 parent b19309b3
Showing 3 changed files with 64 additions and 27 deletions
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -39,6 +39,6 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	public Line findByLineCode(String string);
-	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 }
@@ -81,7 +81,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code like %?3%",nativeQuery=true)
+	@Query(value="SELECT request_code,FROM_UNIXTIME(TIMESTAMP / 1000,'%Y-%m-%d %T') as TIMESTAMP ,device_id  FROM bsth_v_report_80 WHERE FROM_UNIXTIME( TIMESTAMP / 1000,'%Y-%m-%d') = ?2 AND line_id = ?1 and device_id like %?3%",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
@@ -1687,45 +1687,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> accountPx(String line, String date,
                                              String code, String xlName, String px) {
 //        List<Object[]> lsitObj = scheduleRealInfoRepository.accountPx(line, date, code,px);
+    	if(!code.trim().equals("")){
+    		code=BasicData.deviceId2NbbmMap.inverse().get(code);
+    	}
+    	String fgs="";
+    	List<Line> lineList= lineRepository.findLineBygsBm("", "", line);
+    	if(lineList.size()>0){
+    		Line l=lineList.get(0);
+    		fgs=BasicData.businessFgsCodeNameMap.get(l.getBrancheCompany()+"_"+l.getCompany());
+    	}
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-       String sql= "SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') as date,"
-		+ "c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c "
-		+ "ON c.equipment_code = r.device_id where "
-		+ "FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = '"+date +"'"
-		+ "and r.line_id = "+line+" and c.inside_code like '%"+code+"%'"
-				+ "  order by c.inside_code "+px;
+       String sql= "SELECT request_code,FROM_UNIXTIME(TIMESTAMP / 1000,'%Y-%m-%d %T') as TIMESTAMP ,"
+       		+ " device_id  FROM bsth_v_report_80 WHERE "
+       		+ " FROM_UNIXTIME( TIMESTAMP / 1000,'%Y-%m-%d') = '"+date+"' AND"
+       		+ " line_id = '"+line+"' and device_id like '%"+code+"%'";
         Map<String, Object> map;
         List<Object[]> lsitObj = jdbcTemplate.query(sql,
                 new RowMapper<Object[]>() {
                     @Override
                     public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException {
-                    	Object[] t = new Object[4];
-                    	t[0]=rs.getString("company");
-                    	t[1]=rs.getString("request_code");
-                    	t[2]=rs.getString("date");
-                    	t[3]=rs.getString("inside_code");
+                    	Object[] t = new Object[3];
+                    	t[0]=rs.getString("request_code");
+                    	t[1]=rs.getString("TIMESTAMP");
+                    	t[2]=rs.getString("device_id");
                         return t;
                     }
                 });
         int i = 1;
         for (Object[] obj : lsitObj) {
             if (obj != null) {
-                map = new HashMap<String, Object>();
-                map.put("num", i++);
-                map.put("xlName", xlName);
-                map.put("clZbh", obj[3]);
-                map.put("company", obj[0]);
-                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1] + "")).toUpperCase());
-                map.put("requestTime", obj[2]);
-                listMap.add(map);
+            	 map = new HashMap<String, Object>();
+                 map.put("num", i++);
+                 map.put("xlName", xlName);
+                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2]));
+                 map.put("company",fgs);
+                 map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[0] + "")).toUpperCase());
+                 map.put("requestTime", obj[1]);
+                 listMap.add(map);
             }
         }
-
+        if(listMap.size()>1){
+	        if(px.equals("asc")){
+	        	 Collections.sort(listMap,new AccountMap());
+	        }else{
+	        	 Collections.sort(listMap,new AccountMap2());
+	        }
+        }
         return listMap;
     }
     @Override
     public List<Map<String, Object>> account(String line, String date,
                                              String code, String xlName, String type) {
+    	if(!code.trim().equals("")){
+    		code=BasicData.deviceId2NbbmMap.inverse().get(code);
+    	}
+    	String fgs="";
+    	List<Line> lineList= lineRepository.findLineBygsBm("", "", line);
+    	if(lineList.size()>0){
+    		Line l=lineList.get(0);
+    		fgs=BasicData.businessFgsCodeNameMap.get(l.getBrancheCompany()+"_"+l.getCompany());
+    	}
         List<Object[]> lsitObj = scheduleRealInfoRepository.account(line, date, code);
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
         Map<String, Object> map;
@@ -1735,10 +1756,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 map = new HashMap<String, Object>();
                 map.put("num", i++);
                 map.put("xlName", xlName);
-                map.put("clZbh", obj[3]);
-                map.put("company", obj[0]);
-                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1] + "")).toUpperCase());
-                map.put("requestTime", obj[2]);
+                map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2]));
+                map.put("company",fgs);
+                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[0] + "")).toUpperCase());
+                map.put("requestTime", obj[1]);
                 listMap.add(map);
             }
         }
@@ -4199,4 +4220,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return rs;
     }
-}
 \ No newline at end of file
+}
+
+class AccountMap implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  o1.get("clZbh").toString().compareTo(o2.get("clZbh").toString());
+		}
+}
+
+class AccountMap2 implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  o2.get("clZbh").toString().compareTo(o1.get("clZbh").toString());
+		}
+}