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

徐烜
2 parents d0f27f74 f1a53c28
Showing 9 changed files with 201 additions and 162 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/security/util/SecurityUtils.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -20,7 +20,7 @@ public class Constants {
 	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
-	
+
 	/**
 	 * 线调部分子页面不做拦截，便于浏览器缓存
 	 */
@@ -29,7 +29,7 @@ public class Constants {
 	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
 	//车载网关上行接口
-	public static final String UPSTREAM_URL = "/control/upstream";
+	public static final String UPSTREAM_URL = "/control/upstream/";
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
@@ -238,11 +238,11 @@ public class GeoCacheData {
     private void loadSpeedLimit(){
         //加载线路限速信息
-        String sql = "select l.LINE_CODE,i.SPEED_LIMIT from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
+        String sql = "select l.LINE_CODE,i.SPEEDING from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
         List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
         Map<String, Double> speedTempMap = new HashMap<>();
         for (Map<String, Object> tMap : speedMap) {
-            speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEED_LIMIT").toString()));
+            speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
         }
         speedLimitMap = speedTempMap;
     }
@@ -87,6 +87,10 @@ public class ScheduleRealInfo {
 	private Integer bcs;
 	/** 计划里程 */
 	private Double jhlc;
+	
+	/** 实际里程 */
+	@Transient
+	private String sjlc;
 	/** 班次历时 */
 	private Integer bcsj;
@@ -447,6 +451,14 @@ public class ScheduleRealInfo {
 	public void setJhlc(Double jhlc) {
 		this.jhlc = jhlc;
 	}
+	
+	public String getSjlc() {
+		return sjlc;
+	}
+
+	public void setSjlc(String sjlc) {
+		this.sjlc = sjlc;
+	}
 	public Integer getBcsj() {
 		return bcsj;
 package com.bsth.filter;
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.bsth.common.Constants;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
-import com.bsth.common.Constants;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 public abstract class BaseFilter implements Filter {
@@ -82,13 +82,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " and clZbh like %?5% order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsjActual")
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsjActual")
+	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsjActual")
+	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
@@ -110,7 +110,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	void deleteByLineCodeAndDate(String xlBm, String schDate);
 	//去掉了 xlBm is not null 
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlBm")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
@@ -22,69 +22,69 @@ import com.bsth.security.filter.LoginInterceptor;
 @EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-	@Autowired
-	UserDetailServiceImpl customUserDetailService;
+    @Autowired
+    UserDetailServiceImpl customUserDetailService;
-	@Autowired
-	CustomAccessDecisionManager customAccessDecisionManager;
+    @Autowired
+    CustomAccessDecisionManager customAccessDecisionManager;
-	@Autowired
-	SecurityMetadataSourceService securityMetadataSourceService;
+    @Autowired
+    SecurityMetadataSourceService securityMetadataSourceService;
+
+
+    @Override
+    public void configure(WebSecurity web) throws Exception {
+        // 白名单
+        web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
+                Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
+    }
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth)
+            throws Exception {
+        auth.userDetailsService(customUserDetailService).passwordEncoder(
+                new BCryptPasswordEncoder(4));
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests().antMatchers("/").permitAll().anyRequest()
+                .authenticated().and()
+                .formLogin()
+                //指定登录页
+                .loginPage(Constants.LOGIN_PAGE)
+                .loginProcessingUrl(Constants.LOGIN).permitAll()
+                //.failureUrl(Constants.LOGIN_PAGE + "?error=true")登录失败跳转的链接
+                //.successHandler(loginSuccessHandler())登录成功后处理
+                .and().logout()
+                //.addLogoutHandler(logoutHandler())
+                //禁用CXRF
+                .and().csrf().disable()
+                //禁用匿名用户功能
+                .anonymous().disable();
+
+        // 同时只保持一个回话
+        http.sessionManagement().maximumSessions(1)
+                .expiredUrl(Constants.LOGIN_PAGE + "?error=true")
+                .maxSessionsPreventsLogin(false)//让之前的登录过期
+                .sessionRegistry(sessionRegistry());
+
+        http.addFilterBefore(new LoginInterceptor(), FilterSecurityInterceptor.class);
+        http.addFilter(filterSecurityInterceptor());
+    }
+
+    private FilterSecurityInterceptor filterSecurityInterceptor()
+            throws Exception {
+        FilterSecurityInterceptor filterSecurityInterceptor = new FilterSecurityInterceptor();
+        filterSecurityInterceptor
+                .setAccessDecisionManager(customAccessDecisionManager);
+        filterSecurityInterceptor
+                .setSecurityMetadataSource(securityMetadataSourceService);
+        filterSecurityInterceptor
+                .setAuthenticationManager(authenticationManager());
+        return filterSecurityInterceptor;
+    }
-	
-	@Override
-	public void configure(WebSecurity web) throws Exception {
-		// 白名单
-		web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-				Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES);
-	}
-
-	@Override
-	protected void configure(AuthenticationManagerBuilder auth)
-			throws Exception {
-		auth.userDetailsService(customUserDetailService).passwordEncoder(
-				new BCryptPasswordEncoder(4));
-	}
-
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
-		http.authorizeRequests().antMatchers("/").permitAll().anyRequest()
-				.authenticated().and()
-				.formLogin()
-				 //指定登录页
-				.loginPage(Constants.LOGIN_PAGE)
-				.loginProcessingUrl(Constants.LOGIN).permitAll()
-				//.failureUrl(Constants.LOGIN_PAGE + "?error=true")登录失败跳转的链接
-				//.successHandler(loginSuccessHandler())登录成功后处理
-				.and().logout()
-				//.addLogoutHandler(logoutHandler())
-				 //禁用CXRF
-				.and().csrf().disable() 
-				 //禁用匿名用户功能
-				.anonymous().disable();
-
-		// 同时只保持一个回话
-		http.sessionManagement().maximumSessions(1)
-				.expiredUrl(Constants.LOGIN_PAGE + "?error=true")
-				.maxSessionsPreventsLogin(false)//让之前的登录过期
-				.sessionRegistry(sessionRegistry());
-		
-		http.addFilterBefore(new LoginInterceptor(), FilterSecurityInterceptor.class);
-		http.addFilter(filterSecurityInterceptor());
-	}
-
-	private FilterSecurityInterceptor filterSecurityInterceptor()
-			throws Exception {
-		FilterSecurityInterceptor filterSecurityInterceptor = new FilterSecurityInterceptor();
-		filterSecurityInterceptor
-				.setAccessDecisionManager(customAccessDecisionManager);
-		filterSecurityInterceptor
-				.setSecurityMetadataSource(securityMetadataSourceService);
-		filterSecurityInterceptor
-				.setAuthenticationManager(authenticationManager());
-		return filterSecurityInterceptor;
-	}
-	
 /*	@Bean
 	public LoginSuccessHandler loginSuccessHandler(){
 		return new LoginSuccessHandler();
@@ -95,15 +95,15 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 		return new CustomLogoutHandler();
 	}*/
-	@Bean
-	public SessionRegistry sessionRegistry() {
-		SessionRegistry sessionRegistry = new SessionRegistryImpl();
-		return sessionRegistry;
-	}
-	
-	@Bean
-	public static ServletListenerRegistrationBean<HttpSessionEventPublisher> httpSessionEventPublisher() {
-		return new ServletListenerRegistrationBean<HttpSessionEventPublisher>(
-				new HttpSessionEventPublisher());
-	}
+    @Bean
+    public SessionRegistry sessionRegistry() {
+        SessionRegistry sessionRegistry = new SessionRegistryImpl();
+        return sessionRegistry;
+    }
+
+    @Bean
+    public static ServletListenerRegistrationBean<HttpSessionEventPublisher> httpSessionEventPublisher() {
+        return new ServletListenerRegistrationBean<HttpSessionEventPublisher>(
+                new HttpSessionEventPublisher());
+    }
 }
 package com.bsth.security.filter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.filter.BaseFilter;
+import com.bsth.util.RequestUtils;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.access.SecurityMetadataSource;
-import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.common.Constants;
-import com.bsth.common.ResponseCode;
-import com.bsth.util.RequestUtils;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -31,7 +26,7 @@ import com.bsth.util.RequestUtils;
  * @date 2016年3月24日 上午11:49:20 
  *
  */
-public class LoginInterceptor extends AbstractSecurityInterceptor implements Filter{
+public class LoginInterceptor extends BaseFilter{
 	@Override
 	public void destroy() {
@@ -63,22 +58,4 @@ public class LoginInterceptor extends AbstractSecurityInterceptor implements Fil
 		arg2.doFilter(arg0, arg1);
 	}
-
-	@Override
-	public void init(FilterConfig arg0) throws ServletException {
-		
-	}
-
-	@Override
-	public Class<?> getSecureObjectClass() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public SecurityMetadataSource obtainSecurityMetadataSource() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 }
 package com.bsth.security.util;
-import javax.servlet.http.HttpServletRequest;
-
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SecurityUser;
+import com.bsth.entity.sys.SysUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
-import com.bsth.entity.sys.SecurityUser;
-import com.bsth.entity.sys.SysUser;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 /**
- * 
- * @ClassName: SecurityUtils 
- * @author PanZhao 
- * @date 2016年3月30日 上午11:28:24 
- *
+ * @author PanZhao
+ * @ClassName: SecurityUtils
+ * @date 2016年3月30日 上午11:28:24
  */
 public class SecurityUtils {
-	
-	static Logger logger = LoggerFactory.getLogger(SecurityUtils.class);
-	
-	/**
-	 * 
-	 * @Title: getCurrentUser 
-	 * @Description: TODO(获取当前用户) 
-	 * @return SysUser    返回类型 
-	 * @throws
-	 */
-	public static SysUser getCurrentUser(){
-		SysUser user = null;
-		try{
-			user = (SysUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-		}catch(Exception e){
-			logger.error("", e);
-		}
-		return user;
-	}
-	
-	public static void login(SysUser user, HttpServletRequest request){
-		SecurityUser securityUser = new SecurityUser(user);
-		SecurityContext sContext = SecurityContextHolder.getContext();
-		sContext.setAuthentication(
-				new UsernamePasswordAuthenticationToken(securityUser, securityUser.getAuthorities()));
-		request.getSession(true).setAttribute("SPRING_SECURITY_CONTEXT", sContext);
-	}
+
+    static Logger logger = LoggerFactory.getLogger(SecurityUtils.class);
+
+    /**
+     * @return SysUser    返回类型
+     * @throws
+     * @Title: getCurrentUser
+     * @Description: TODO(获取当前用户)
+     */
+    public static SysUser getCurrentUser() {
+        SysUser user = null;
+        try {
+            user = (SysUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return user;
+    }
+
+    public static void login(SysUser user, HttpServletRequest request) {
+        SecurityUser securityUser = new SecurityUser(user);
+        SecurityContext sContext = SecurityContextHolder.getContext();
+
+        List<GrantedAuthority> grantedAuths = new ArrayList<>();
+        Set<Role> set = user.getRoles();
+        for(Role r : set){
+            grantedAuths.add(new SimpleGrantedAuthority(r.getCodeName()));
+        }
+
+        sContext.setAuthentication(new UsernamePasswordAuthenticationToken(securityUser, securityUser.getAuthorities(), grantedAuths));
+        request.getSession(true).setAttribute("SPRING_SECURITY_CONTEXT", sContext);
+    }
 }
@@ -1866,7 +1866,45 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 			}
 		}*/
-        return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+    	List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+    	String lpName="lpName";
+    	String zdsj="";
+    	String zdsjActual="";
+    	String zdsj1="";
+    	String zdsjActual1="";
+    	List<ScheduleRealInfo> listInfo=scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+    	for (int i = 0; i < listInfo.size(); i++) {
+    		ScheduleRealInfo t=listInfo.get(i);
+    		if(!lpName.equals(t.getLpName())){
+    			zdsjActual=t.getZdsjActual();
+    			zdsj=t.getZdsj();
+    			t.setZdsjActual("");
+    			t.setZdsj("");
+    		}else{
+    			zdsj1=t.getZdsj();
+    			zdsjActual1=t.getZdsjActual();
+    			t.setZdsjActual(zdsjActual);
+    			t.setZdsj(zdsj);
+    			zdsj=zdsj1;
+    			zdsjActual=zdsjActual1;
+    		}
+    		/*if(i<listInfo.size()-1){
+    			if(s.getLpName().equals(listInfo.get(i+1).getLpName())){
+    				zdsj=s.getZdsj();
+    	    		zdsjActual=s.getZdsjActual();
+    			}else{
+    				zdsj="";
+    		    	zdsjActual="";
+    			}
+    		}else{
+    			zdsj=s.getZdsj();
+	    		zdsjActual=s.getZdsjActual();
+    		}*/
+    		
+    		lpName=t.getLpName();
+    		list.add(t);
+		}
+        return list;
     }
@@ -2576,6 +2614,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybillQp(String clZbh, String date, String line) {
 		// TODO Auto-generated method stub
+		DecimalFormat format = new DecimalFormat("0.00");
 		List <ScheduleRealInfo> list=null;
 		list= scheduleRealInfoRepository.queryListWaybill2(clZbh,date,line);
 	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
@@ -2583,6 +2622,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		ScheduleRealInfo s=list.get(i);
 		if(!(s.getBcType().equals("in")||s.getBcType().equals("out"))){
 			String remarks="";
+			Double sjlc=0.0;
 			if(s.getRemarks()!=null){
 				remarks +=s.getRemarks();
 			}
@@ -2595,8 +2635,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						remarks += c.getRemarks();
 					}
+						if(!c.isDestroy()){
+							sjlc += c.getMileage()==null?0:c.getMileage();
+						}
+					
+				}
+			}else{
+				if(s.getStatus() != -1){
+					sjlc =s.getJhlc();
 				}
 			}
+			s.setSjlc(format.format(sjlc));
 			s.setRemarks(remarks);
 			newList.add(s);
 		}