Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

徐烜
2 parents 0072904c 5993bf24
Showing 38 changed files with 241 additions and 66 deletions
src/main/java/com/bsth/controller/DictionaryController.java → src/main/java/com/bsth/controller/sys/DictionaryController.java
src/main/java/com/bsth/controller/ModuleController.java → src/main/java/com/bsth/controller/sys/ModuleController.java
src/main/java/com/bsth/controller/ResourceController.java → src/main/java/com/bsth/controller/sys/ResourceController.java
src/main/java/com/bsth/controller/RoleController.java → src/main/java/com/bsth/controller/sys/RoleController.java
src/main/java/com/bsth/controller/UserController.java → src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/DirectiveData.java
src/main/java/com/bsth/data/GpsRealData.java
src/main/java/com/bsth/data/ScheduleData.java
src/main/java/com/bsth/entity/realcontrol/ShiftTimeConfig.java
src/main/java/com/bsth/entity/sys/SessionLog.java
src/main/java/com/bsth/entity/sys/SignControl.java
src/main/java/com/bsth/repository/DictionaryRepository.java → src/main/java/com/bsth/repository/sys/DictionaryRepository.java
src/main/java/com/bsth/repository/ModuleRepository.java → src/main/java/com/bsth/repository/sys/ModuleRepository.java
src/main/java/com/bsth/repository/ResourceRepository.java → src/main/java/com/bsth/repository/sys/ResourceRepository.java
src/main/java/com/bsth/repository/RoleRepository.java → src/main/java/com/bsth/repository/sys/RoleRepository.java
src/main/java/com/bsth/repository/sys/SessionLogRepository.java
src/main/java/com/bsth/repository/SysUserRepository.java → src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/security/LoginSuccessHandler.java
src/main/java/com/bsth/security/SecurityMetadataSourceService.java
-package com.bsth.controller;
+package com.bsth.controller.sys;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.Dictionary;
 @RestController
-package com.bsth.controller;
+package com.bsth.controller.sys;
 import java.util.List;
@@ -7,8 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.Module;
-import com.bsth.service.ModuleService;
+import com.bsth.service.sys.ModuleService;
 @RestController
 @RequestMapping("module")
-package com.bsth.controller;
+package com.bsth.controller.sys;
 import java.util.Map;
@@ -9,8 +9,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.Resource;
-import com.bsth.service.ResourceService;
+import com.bsth.service.sys.ResourceService;
 @RestController
 @RequestMapping("resource")
-package com.bsth.controller;
+package com.bsth.controller.sys;
 import java.util.Map;
@@ -8,8 +8,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.Role;
-import com.bsth.service.RoleService;
+import com.bsth.service.sys.RoleService;
 @RestController
 @RequestMapping("role")
-package com.bsth.controller;
+package com.bsth.controller.sys;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
+package com.bsth.data;
+
+/**
+ * 
+ * @ClassName: BasicData 
+ * @Description: TODO(基础的映射数据) 
+ * @author PanZhao
+ * @date 2016年8月10日 下午3:27:45 
+ *
+ */
+public class BasicData {
+	
+}
+package com.bsth.data;
+
+/**
+ * 
+ * @ClassName: DirectiveData 
+ * @Description: TODO(指令数据) 
+ * @author PanZhao
+ * @date 2016年8月10日 下午3:50:05 
+ *
+ */
+public class DirectiveData {
+
+}
+package com.bsth.data;
+
+/**
+ * 
+ * @ClassName: GpsRealData 
+ * @Description: TODO(GPS实时数据) 
+ * @author PanZhao
+ * @date 2016年8月10日 下午3:41:47 
+ *
+ */
+public class GpsRealData {
+	
+}
+package com.bsth.data;
+
+/**
+ * 
+ * @ClassName: ScheduleData 
+ * @Description: TODO(排班数据) 
+ * @author PanZhao
+ * @date 2016年8月10日 下午3:42:31 
+ *
+ */
+public class ScheduleData {
+
+}
+package com.bsth.entity.realcontrol;
+
+/**
+ * 
+ * @ClassName: ShiftTimeConfig 
+ * @Description: TODO(翻班时间配置) 
+ * @author PanZhao
+ * @date 2016年8月10日 下午5:05:23 
+ *
+ */
+public class ShiftTimeConfig {
+	
+}
@@ -40,6 +40,9 @@ public class SessionLog {
 	/** 登出方式 0：主动登出， -1：其他 */
 	private int logoutType;
+	
+	/** 登录IP  */
+	private String ip;
 	public Integer getId() {
 		return id;
@@ -88,4 +91,12 @@ public class SessionLog {
 	public void setLogoutType(int logoutType) {
 		this.logoutType = logoutType;
 	}
+
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
 }
@@ -11,10 +11,10 @@ import javax.persistence.Table;
 /**
  * 
- * @ClassName: SignControl 
- * @Description: TODO(进出线调记录) 
+ * @ClassName: SignControl
+ * @Description: TODO(进出线调记录)
  * @author PanZhao
- * @date 2016年7月20日 下午4:50:50 
+ * @date 2016年7月20日 下午4:50:50
  *
  */
 @Entity
@@ -24,11 +24,67 @@ public class SignControl {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
-	
-	/** 登入线调时间 */
-	private Date signDate;
-	
+
 	@ManyToOne
 	private SessionLog session;
+
+	/** 登出线调时间 */
+	private Date outDate;
+
+	/** 在线时长 */
+	private Long onLineTimel;
+
+	/** 0: 主调模式， 1：监控模式 */
+	private int signType;
+	/** 用户名 */
+	private String userName;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public SessionLog getSession() {
+		return session;
+	}
+
+	public void setSession(SessionLog session) {
+		this.session = session;
+	}
+
+	public Date getOutDate() {
+		return outDate;
+	}
+
+	public void setOutDate(Date outDate) {
+		this.outDate = outDate;
+	}
+
+	public Long getOnLineTimel() {
+		return onLineTimel;
+	}
+
+	public void setOnLineTimel(Long onLineTimel) {
+		this.onLineTimel = onLineTimel;
+	}
+
+	public int getSignType() {
+		return signType;
+	}
+
+	public void setSignType(int signType) {
+		this.signType = signType;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
 }
-package com.bsth.repository;
+package com.bsth.repository.sys;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.sys.Dictionary;
+import com.bsth.repository.BaseRepository;
 @Repository
 public interface DictionaryRepository extends BaseRepository<Dictionary, Integer>{
-package com.bsth.repository;
+package com.bsth.repository.sys;
 import java.util.List;
 import java.util.Set;
@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.sys.Module;
+import com.bsth.repository.BaseRepository;
 @Repository
 public interface ModuleRepository extends BaseRepository<Module, Integer>{
-package com.bsth.repository;
+package com.bsth.repository.sys;
 import java.util.List;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.sys.Resource;
+import com.bsth.repository.BaseRepository;
 @Repository
 public interface ResourceRepository extends BaseRepository<Resource, Integer> {
-package com.bsth.repository;
+package com.bsth.repository.sys;
 import javax.transaction.Transactional;
@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.sys.Role;
+import com.bsth.repository.BaseRepository;
 @Repository
 public interface RoleRepository extends BaseRepository<Role, Integer>{
+package com.bsth.repository.sys;
+
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.sys.SessionLog;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface SessionLogRepository extends BaseRepository<SessionLog, Integer>{
+
+}
-package com.bsth.repository;
+package com.bsth.repository.sys;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.BaseRepository;
 @Repository
 public interface SysUserRepository extends BaseRepository<SysUser, Integer>{
 package com.bsth.security;
 import java.io.IOException;
+import java.util.Date;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,6 +11,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import com.bsth.common.Constants;
+import com.bsth.entity.sys.SessionLog;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.util.IpUtils;
@@ -20,8 +23,11 @@ public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessH
 		SysUser user = (SysUser) authentication.getPrincipal();
-		System.out.println("管理员 " + user.getUserName() + " 登录");
-		System.out.println("IP :"+IpUtils.getIpAddr(request));
+		//日志
+		SessionLog sLog = new SessionLog();
+		sLog.setLoginDate(new Date());
+		sLog.setUser(user);
+		sLog.setIp(IpUtils.getIpAddr(request));
 		//session里写入用户名
 		request.getSession().setAttribute(Constants.SESSION_USERNAME, user.getUserName());
@@ -16,8 +16,8 @@ import org.springframework.util.PathMatcher;
 import com.bsth.entity.sys.Resource;
 import com.bsth.entity.sys.Role;
-import com.bsth.service.ResourceService;
-import com.bsth.service.RoleService;
+import com.bsth.service.sys.ResourceService;
+import com.bsth.service.sys.RoleService;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import com.bsth.entity.sys.SecurityUser;
 import com.bsth.entity.sys.SysUser;
-import com.bsth.service.SysUserService;
+import com.bsth.service.sys.SysUserService;
 @Component
 public class UserDetailServiceImpl implements UserDetailsService{
@@ -726,8 +726,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					//清除下一班次起点到达时间
 					ScheduleRealInfo next = ScheduleBuffer.getNext(sch);
-					next.setQdzArrDateSJ(null);
-					ts.add(next);
+					if(null != next){
+						next.setQdzArrDateSJ(null);
+						ts.add(next);
+					}
 				}
 				sch.setRemarks(remarks);
-package com.bsth.service;
+package com.bsth.service.sys;
 import com.bsth.entity.sys.Dictionary;
+import com.bsth.service.BaseService;
 public interface DictionaryService extends BaseService<Dictionary, Integer>{
-package com.bsth.service;
+package com.bsth.service.sys;
 import java.util.List;
 import com.bsth.entity.sys.Module;
+import com.bsth.service.BaseService;
 public interface ModuleService extends BaseService<Module, Integer>{
-package com.bsth.service;
+package com.bsth.service.sys;
 import java.util.List;
 import java.util.Map;
 import com.bsth.entity.sys.Resource;
+import com.bsth.service.BaseService;
 public interface ResourceService extends BaseService<Resource, Integer> {
-package com.bsth.service;
+package com.bsth.service.sys;
 import java.util.Map;
 import com.bsth.entity.sys.Role;
+import com.bsth.service.BaseService;
 public interface RoleService extends BaseService<Role, Integer>{
-package com.bsth.service;
+package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
 public interface SysUserService extends BaseService<SysUser, Integer>{
-package com.bsth.service.impl;
+package com.bsth.service.sys.impl;
 import org.springframework.stereotype.Service;
 import com.bsth.entity.sys.Dictionary;
-import com.bsth.service.DictionaryService;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.DictionaryService;
 @Service
 public class DictionaryServiceImpl extends BaseServiceImpl<Dictionary, Integer> implements DictionaryService{
-package com.bsth.service.impl;
+package com.bsth.service.sys.impl;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,9 +14,10 @@ import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.Module;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.ModuleRepository;
+import com.bsth.repository.sys.ModuleRepository;
 import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.ModuleService;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.ModuleService;
 @Service
 public class ModuleServiceImpl extends BaseServiceImpl<Module, Integer> implements ModuleService{
-package com.bsth.service.impl;
+package com.bsth.service.sys.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.Resource;
-import com.bsth.repository.ResourceRepository;
-import com.bsth.service.ResourceService;
+import com.bsth.repository.sys.ResourceRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.ResourceService;
 @Service
 public class ResourceServiceImpl extends BaseServiceImpl<Resource, Integer> implements ResourceService{
@@ -18,6 +21,8 @@ public class ResourceServiceImpl extends BaseServiceImpl&lt;Resource, Integer&gt; impl
 	@Autowired
 	ResourceRepository resourceRepository;
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
 	@Override
 	public Map<String, Object> saveList(List<Resource> array) {
 		Map<String, Object> map = new HashMap<>();
-package com.bsth.service.impl;
+package com.bsth.service.sys.impl;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,9 +14,10 @@ import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.Module;
 import com.bsth.entity.sys.Role;
-import com.bsth.repository.ModuleRepository;
-import com.bsth.repository.RoleRepository;
-import com.bsth.service.RoleService;
+import com.bsth.repository.sys.ModuleRepository;
+import com.bsth.repository.sys.RoleRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.RoleService;
 @Service
 public class RoleServiceImpl extends BaseServiceImpl<Role, Integer> implements
-package com.bsth.service.impl;
+package com.bsth.service.sys.impl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.SysUserRepository;
-import com.bsth.service.SysUserService;
+import com.bsth.repository.sys.SysUserRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.SysUserService;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
@@ -25,7 +25,7 @@ public class ThreadPoolTask implements Runnable {
 		for(ScheduleRealInfo sch : allList){
 			//停车场即起点站的进出场班次不参与匹配，烂班也不参与
-			if(!sch.isParkIsFirstStation() && sch.isDestroy())
+			if(!sch.isParkIsFirstStation() && !sch.isDestroy())
 				alMap.put(sch.getClZbh(), sch);
 		}
@@ -2,7 +2,7 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
-spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
@@ -24,7 +24,8 @@ spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
 ##
+#222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.201:8080/transport_server/rtgps/
+http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:8080/transport_server/message/
+http.send.directive = http://192.168.168.192:8080/transport_server/message/
 \ No newline at end of file
+ms.mysql.driver= com.mysql.jdbc.Driver
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
+ms.mysql.password= panzhao
+
 #ms.mysql.driver= com.mysql.jdbc.Driver
 #ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
 #ms.mysql.username= root
-#ms.mysql.password= root2jsp
-
-ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://222.66.0.204:3306/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= 123456
 \ No newline at end of file
+#ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -99,7 +99,7 @@
     color: white;
 }
-/*.load-anim .loader{
+.load-anim .loader{
     margin: auto !important;
     position: absolute;
     top: 0;
@@ -109,7 +109,7 @@
 }
- .load8 .loader {
+/* .load8 .loader {
   font-size: 10px;
   text-indent: -9999em;
   border-top: 1.1em solid rgba(255, 255, 255, 0.2);
@@ -146,7 +146,7 @@
   }
 }
-
+ */
 label {
 	max-width: none;
 }
@@ -157,7 +157,7 @@ label {
     transform: translate(-50%);
     font-size: 14px;
     font-family: 仿宋;
-} */
+}
 body{
 	overflow: hidden;
 }
@@ -130,7 +130,7 @@ var _data = (function(){
 					if(sch.fcsjT > t)
 						break;
-					if(sch.fcsjActual == null && sch.fcsjActualTime == null)
+					if(sch.fcsjActual == null && sch.fcsjActualTime == null && sch.status != -1)
 						num ++;
 				}
 			}
@@ -87,13 +87,13 @@ var _home = (function() {
 			setTimeout(function() {
 				// 提示文本
-				var promptFlag = storage.getItem('promptFlag_0810');
+				var promptFlag = storage.getItem('promptFlag_0811');
 				if (!promptFlag) {
-					layer.alert('1、取消的下发调度指令的时间限制<br>2、驾驶员收到的指令显示为待发时间', {
+					layer.alert('1、烂班不再匹配实发实达时间<br>2、调整待发后，计达时间也会相应调整', {
 						title: '更新信息',
 						shift : 5
 					});
-					storage.setItem('promptFlag_0810', 1);
+					storage.setItem('promptFlag_0811', 1);
 				}
 			}, 1500);