Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents 4f24b1f9 df0f514b
Showing 9 changed files with 124 additions and 1 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/repository/CarDeviceRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -229,6 +229,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return list;
 	}
  
+	@RequestMapping(value = "/checkDate",method = RequestMethod.GET)
+	public String checkDate(@RequestParam Map<String, Object> map){
+		String list=ylbService.checkDate(map);
+		return list;
+	}
+	
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
 	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=ylbService.sumYlb(map);
@@ -209,6 +209,12 @@ public class ReportController {
 		return service.historyMessageCount(line, date, code);
 	}
  
+	@RequestMapping(value = "/historyMessageList", method = RequestMethod.GET)
+	public List<Object[]> historyMessageList(@RequestParam String line, @RequestParam String date,
+			@RequestParam String code,@RequestParam String type) {
+		return service.historyMessageList(line, date, code, type);
+	}
+	
 	@RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET)
 	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) {
 		return service.tbodyTime1(line, ttinfo);
 package com.bsth.repository;
  
 import com.bsth.entity.CarDevice;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
 /**
@@ -8,4 +13,6 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
+	@Query(value="select s from CarDevice s where s.oldDeviceNo=?1 and s.qyrq>=?2 ")
+	List<CarDevice> findCarDevice(String device,Date date );
 }
@@ -58,6 +58,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " lp_name,xl_name,cl_zbh",nativeQuery=true)
 	List<Object[]> historyMessageCount(String line,String date,String code);
  
+	@Query(value="SELECT r.xl_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content "
+			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
+			+ " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
+			+ " r.schedule_date_str = ?2 and r.cl_zbh =?3 ",nativeQuery=true)
+	List<Object[]> historyMessageList(String line,String date,String code);
+	
 	@Query(value = "select max(id) from ScheduleRealInfo")
 	Long getMaxId();
  
@@ -19,6 +19,8 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
  
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
+	String checkDate(Map<String, Object> map);
+
 	List<Map<String, Object>> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
@@ -1442,6 +1442,35 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		}
 		return type;
 	}
+	
+	@Override
+	public String checkDate(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String type="1";
+		if(gsbm.equals("26")){
+			Date date=new Date();
+			Calendar aCalendar = Calendar.getInstance();
+			aCalendar.setTime(date);
+			int day1 = aCalendar.get(Calendar.DAY_OF_YEAR);
+			try {
+				aCalendar.setTime(sdf.parse(rq));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		    int day2 = aCalendar.get(Calendar.DAY_OF_YEAR);
+		    int days=day1-day2;
+		    if(days>3){
+		    	type="2";
+		    }
+		}
+		return type;
+	}
+	
+	
  
 	@Override
 	public Map<String, Object> saveYlb(Ylb t) {
@@ -21,6 +21,7 @@ import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.data.utils.CustomStringUtils;
+import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
@@ -39,6 +40,7 @@ import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.CarDeviceRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
@@ -153,6 +155,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
     @Autowired
     DirectiveService directiveService;
+    
+    @Autowired
+    CarDeviceRepository carDeviceRepository;
  
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
@@ -1097,6 +1102,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<Object[]> historyMessage(String line, String date, String code, String type) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        
         long d = 0;
         long t = 0;
         if (date.length() > 0) {
@@ -1116,7 +1122,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, device);
         for (Object[] obj : list) {
             if (obj != null) {
-            	obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString());
+            	
+            	if(BasicData.deviceId2NbbmMap.get(obj[0].toString())==null){
+            		List<CarDevice> carDeviceList=new ArrayList<CarDevice>();
+					try {
+						carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), sdf.parse(date + " 00:00:00"));
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+                	if(carDeviceList.size()>0){
+                    	obj[0] =carDeviceList.get(0).getClZbh();
+                	}else{
+                    	obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString());
+                	}
+            	}else{
+                	obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString());
+            	}
                 obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
                 obj[4] = BasicData.lineCode2NameMap.get(line);
             }
@@ -22,6 +22,8 @@ public interface ReportService {
 	List<Map<String, String>>  sreachZd(String line,int zdlx);
  
 	List<Object[]> historyMessageCount(String line, String date, String code);
+	List<Object[]> historyMessageList(String line, String date, String code,String type);
+
  
 	Map<String, Object> tbodyTime1(String line ,String ttinfo);
  
 package com.bsth.service.report.impl;
 import com.bsth.data.BasicData;
+import com.bsth.entity.CarDevice;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
@@ -278,6 +279,48 @@ public class ReportServiceImpl implements ReportService{
 		return list;
 	}
 	@Override
+	public List<Object[]> historyMessageList(String line, String date, String code,String type) {
+		// TODO Auto-generated method stub
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+		List<Object[]> list = scheduleRealInfoRepository.historyMessageList(line, date, code);
+		 for (Object[] obj : list) {
+	            if (obj != null) {
+	                obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+	            }
+	        }
+		 
+		 if (type != null && type.length() != 0 && type.equals("export_msg")) {
+	            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+	                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+	            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+	            Map<String, Object> m = new HashMap<String, Object>();
+	            ReportUtils ee = new ReportUtils();
+	            List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
+	            for (int i = 0; i < list.size(); i++) {
+	                Map<String, Object> map = new HashMap<String, Object>();
+	                Object[] obj = list.get(i);
+	                map.put("num", i + 1);
+	                map.put("line", obj[0]);
+	                map.put("clZbh", obj[1]);
+	                map.put("sender", obj[2]);
+	                map.put("date", obj[3]);
+	                map.put("text", obj[4]);
+	                newList.add(map);
+	            }
+	            try {
+	                listI.add(newList.iterator());
+	                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+	                ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls",
+	                        path + "export/调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+	            } catch (Exception e) {
+	                // TODO: handle exception
+	                e.printStackTrace();
+	            }
+	        }
+		return list;
+	}
+	@Override
 	public Map<String, Object> tbodyTime1(String line, String ttinfo) {
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub