重置密码，添加用户和修改密码是前端加密

游瑞烽
2 parents 27edb22b 5aff71c2
Showing 26 changed files with 491 additions and 146 deletions
src/main/java/com/bsth/controller/calc/CalcExportController.java
src/main/java/com/bsth/controller/calc/CalcMixController.java
src/main/java/com/bsth/controller/sys/RoleController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/CalcMixService.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/sys/RoleService.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/RoleServiceImpl.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/index.html
src/main/resources/static/pages/forms/calc/calcsingledata.html
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
@@ -158,10 +158,14 @@ public class CalcExportController {
 		if(map.get("fgsdmSing")!=null){
 			fgsdmSing=map.get("fgsdmSing").toString().trim();
 		}
+		String sfdc="";
+		if(map.get("sfdc")!=null){
+			sfdc=map.get("sfdc").toString().trim();
+		}
 		Map<String, Object> resMap = new HashMap<String, Object>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+		List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
 		Map<String, Object> temp = new HashMap<String, Object>();
 		temp.put("i", "序号");
@@ -81,7 +81,11 @@ public class CalcMixController {
 		if(map.get("fgsdmSing")!=null){
 			fgsdmSing=map.get("fgsdmSing").toString().trim();
 		}
-		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+		String sfdc="";
+		if(map.get("sfdc")!=null){
+			sfdc=map.get("sfdc").toString().trim();
+		}
+		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
 	}
 }
@@ -68,4 +68,14 @@ public class RoleController extends BaseController&lt;Role, Integer&gt;{
 	public Map<String, Object> roleInfo(@RequestParam Integer id){
 		return roleService.roleInfo(id);
 	}
+
+	/**
+	 * 检查操作合法性 操作的是否是下级角色
+	 * @param operationRoleId 下级角色Id
+	 * @return
+	 */
+	@RequestMapping(value = "/checkOperationLegality")
+	public boolean checkOperationLegality(@RequestParam Integer operationRoleId){
+		return roleService.checkOperationLegality(operationRoleId);
+	}
 }
@@ -260,6 +260,15 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
     public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
         SysUser sysUser = SecurityUtils.getCurrentUser();
         String msg = "";
+
+        //解密RSA
+        try{
+            oldPWD = (RSAUtils.decryptBase64(oldPWD));
+            newPWD = (RSAUtils.decryptBase64(newPWD));
+            cnewPWD = (RSAUtils.decryptBase64(cnewPWD));
+        }catch (RuntimeException e) {
+            return  "网络延迟，解密失败，请重新添加！";
+        }
         if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
             if (oldPWD.equals(newPWD)) {
                 msg = "新密码不能跟原始密码一样！";
@@ -282,8 +291,16 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return sysUserService.register(u);
     }
+    // 查询用户下所有下级角色
     @RequestMapping(value = "/all_distinct")
     public List<SysUser> findAll_distinct() {
         return sysUserService.findAll_distinct();
     }
+
+    // 重置密码
+    @RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
+    public Map<String, Object> resetPassword(@RequestParam Integer id) {
+        return sysUserService.resetPassword(id);
+    }
+
 }
@@ -2,6 +2,9 @@ package com.bsth.data;
 import com.bsth.data.gpsdata_v2.DataHandleProcess;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 /**
@@ -9,11 +12,15 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ThreadMonotor extends Thread{
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
     public void run() {
         //切换到备用的网关实时GPS对照数据
-        if(DataHandleProcess.isBlock())
-            GpsDataLoaderThread.setFlag(-1);
+        if(DataHandleProcess.isBlock()) {
+        	GpsDataLoaderThread.setFlag(-1);
+        	logger.error("切换到备用GPS数据源");
+        }
     }
 }
 \ No newline at end of file
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
+import com.bsth.email.SendEmailController;
+import com.bsth.email.entity.EmailBean;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -15,6 +17,8 @@ import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 /**
  * 实时信号数据处理
@@ -37,13 +41,27 @@ public class DataHandleProcess {
     ReverseRouteProcess reverseRouteProcess;
     @Autowired
     GpsRealData gpsRealData;
+    // 发送邮件
+ 	@Autowired
+ 	private SendEmailController sendEmailController;
     static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
     final static int POOL_SIZE = 20;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1, new ThreadFactory() {
+
+		@Override
+		public Thread newThread(Runnable r) {
+			// TODO Auto-generated method stub
+			Thread t = new Thread(r);
+			t.setName("GPSProcessor");
+			
+			return t;
+		}
+    	
+    });
     public static CountDownLatch count;
     static long lastTime;
@@ -51,7 +69,22 @@ public class DataHandleProcess {
     public static boolean isBlock() {
         return System.currentTimeMillis() - lastTime > 1000 * 30;
     }
-
+    
+    private void shutdownAndAwaitTermination(ExecutorService pool) {
+    	pool.shutdown();
+    	try {
+    		if (!pool.awaitTermination(500, TimeUnit.MILLISECONDS)) {
+    			pool.shutdownNow();
+    		}
+    		if (!pool.awaitTermination(500, TimeUnit.MILLISECONDS)) {
+    			logger.error("线程池无法正常终止");
+    		}
+    	} catch (InterruptedException e) {
+    		pool.shutdown();
+    		Thread.currentThread().interrupt();
+    	}
+    }
+    
     public void handle(List<GpsEntity> list) {
         try {
             if (list.size() == 0)
@@ -85,7 +118,32 @@ public class DataHandleProcess {
             //等待子线程结束
-            count.await();
+            boolean isNormal = count.await(5, TimeUnit.SECONDS);
+            if (!isNormal) {
+            	try {
+            		shutdownAndAwaitTermination(threadPool);
+            		threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1, new ThreadFactory() {
+
+            			@Override
+            			public Thread newThread(Runnable r) {
+            				// TODO Auto-generated method stub
+            				Thread t = new Thread(r);
+            				t.setName("GPSProcessor");
+            				
+            				return t;
+            			}
+            	    	
+            	    });
+    				//发送邮件
+    				EmailBean mail = new EmailBean();
+    				mail.setSubject("线调GPS处理");
+    				mail.setContent("GPS处理超时，检查线程栈文件信息<br/>");
+    				sendEmailController.sendMail("113252620@qq.com", mail);
+    				logger.info("DataHandlerProcess:邮件发送成功!");
+    			} catch (Exception e){
+    				logger.error("DataHandlerProcess:邮件发送失败!",e);
+    			}
+            }
             //加入实时gps对照
             for (GpsEntity gps : list)
@@ -115,6 +173,7 @@ public class DataHandleProcess {
                 Collections.sort(list, comp);
                 GpsEntity gps;
                 for(int i = 0,len = list.size(); i< len ;i ++){
+                	if (Thread.currentThread().isInterrupted()) break;
                     gps = list.get(i);
                     try {
@@ -75,7 +75,7 @@ public class GatewayHttpLoader implements ApplicationContextAware{
             while ((str = br.readLine()) != null)
                 sb.append(str);
-            logger.info("gps:" + sb.toString());
+            logger.debug("gps:" + sb.toString());
             list = JSON.parseArray(JSON.parseObject(sb.toString()).getString("data"), GpsEntity.class);
             //过滤掉无效的点位
             list = GpsDataUtils.clearInvalid(list);
@@ -66,7 +66,10 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and CONCAT(sGh,'/',sName) like %?6% order by c.xl")
 	List<CalcWaybill> scheduleBySpy(String line,String date,String date2,String gsdm,String fgsdm,String spy);
 	//按照时间段统计，公司下线路 (车辆自编号)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and cl like %?6% order by c.xl")
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.cl like %?6% order by c.xl")
 	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.cl like %?6%"
+			+ " and c.cl in (select s.carCode from Cars s where s.sfdc = ?7) order by c.xl")
+	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh,Boolean sfdc);
 }
@@ -10,6 +10,6 @@ public interface CalcMixService {
 	List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
-	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing);
+	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing, String sfdc);
 }
@@ -123,9 +123,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				 }
 			});
 		}else{
+			//统计信息中需要查询所有班次
+//			and djg_all >0
 			String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
 					+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
-					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D' and djg_all >0 ";
+					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D'  ";
 			if(line.equals("")){
 				if(fgs.equals("")){
 					sql +=" and gsbm = '"+gs+"'";
@@ -150,12 +152,12 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 m.put("id", rs.getInt("id"));
 					 int djgAll=rs.getInt("djgAll");
 					 int bcs=rs.getInt("bcs");
-					 //全日发生率 （大间隔次数/全日班次数）
+					 //万班次发生率 （大间隔次数/全日班次数*10000）
 					 if(bcs>0){
-						 double fsl=(djgAll*1.0)/(bcs*1.0)*100;
-						 m.put("fsl", df.format(fsl)+"%");
+						 double fsl=(djgAll*1.0)/(bcs*1.0)*10000;
+						 m.put("fsl", df.format(fsl));
 					 }else{
-						 m.put("fsl", "0.0%");
+						 m.put("fsl", "0.0");
 					 }
 					 m.put("djgAll", rs.getString("djgAll"));
 					 m.put("djgGf", rs.getString("djgGf"));
@@ -243,12 +245,12 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				m.put("djgDg", t.getDjgDg());
 				int djgAll=t.getDjgAll();
 				int bcs=t.getBcs();
-				//全日发生率 （大间隔次数/全日班次数）
+				//全日发生率 （大间隔次数/全日班次数*10000） 万班次发生率
 				if(bcs>0){
-					double fsl=(djgAll*1.0)/(bcs*1.0)*100;
-					m.put("fsl", df.format(fsl)+"%");
+					double fsl=(djgAll*1.0)/(bcs*1.0)*10000;
+					m.put("fsl", df.format(fsl));
 				}else{
-					m.put("fsl", "0.0%");
+					m.put("fsl", "0.0");
 				}
 				m.put("bcs", t.getBcs());
 				m.put("djgTime", t.getDjgTime());
@@ -160,7 +160,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 	public List<Map<String, Object>> singledatatj(String line,
 			String date, String date2,
 			String tjtype, String cont,
-			String gsdm, String fgsdm) {
+			String gsdm, String fgsdm, String sfdc) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<CalcWaybill> list = null;
@@ -174,7 +174,13 @@ public class CalcMixServiceImpl implements CalcMixService {
 			list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont);
 		} else if("车辆自编号".equals(tjtype)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
+			if("1".equals(sfdc)){
+				list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont, true);
+			} else if("0".equals(sfdc)){
+				list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont, false);
+			} else {
+				list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
+			}
 		}
 		List<CalcWaybill> calcList = new ArrayList<CalcWaybill>();
@@ -267,7 +273,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 				+ linesql
 				+ " union"
 				+ " SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
-				+ " WHERE rq >= '"+date2+"' and rq <= '"+date2+"'"
+				+ " WHERE rq >= '"+date+"' and rq <= '"+date2+"'"
 				+ linesql;
 		List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
 			@Override
@@ -13,6 +13,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
@@ -1173,7 +1174,7 @@ public class GpsServiceImpl implements GpsService {
             }
             //过滤数据
             for (SafeDriv sd : list) {
-                if (fieldEquals(fs, sd, map))
+                if (isSpecialLines(sd, map) && fieldEquals(fs, sd, map))
                     rs.add(sd);
             }
@@ -1294,6 +1295,20 @@ public class GpsServiceImpl implements GpsService {
             }
         });
     }
+    
+    /**
+     * 
+     * @param sd
+     * @param map
+     * @return
+     */
+    public boolean isSpecialLines(SafeDriv sd, Map<String, Object> map) {
+    	String lines = (String)map.get("lines");
+    	if (lines == null) lines = "";
+    	
+    	if (Arrays.asList(lines.split(",")).contains(sd.getXlbm())) return true;
+    	return false;
+    }
     public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
         try {
 package com.bsth.service.sys;
-import java.util.List;
-import java.util.Map;
-
 import com.bsth.entity.sys.Role;
-import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
 public interface RoleService extends BaseService<Role, Integer>{
 	Map<String, Object> findSubordinate();
@@ -18,4 +17,6 @@ public interface RoleService extends BaseService&lt;Role, Integer&gt;{
 	Map<String, Object> roleInfo(Integer id);
 	List<Role> findAllByIds(String ids);
+
+	boolean checkOperationLegality(Integer operationRoleId);
 }
@@ -2,6 +2,7 @@ package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
+import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
@@ -17,4 +18,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	Map<String,Object> register(SysUser u);
 	List<SysUser> findAll_distinct();
+
+	Map<String, Object> resetPassword(@RequestParam Integer id);
 }
@@ -96,8 +96,10 @@ public class RoleServiceImpl extends BaseServiceImpl&lt;Role, Integer&gt; implements
 //			ComparatorSysrole(rootlist);
 			map.put("list", rsRoleList);
 			map.put("status", ResponseCode.SUCCESS);
+			map.put("msg", "成功");
 		} catch (Exception e) {
 			map.put("status", ResponseCode.ERROR);
+			map.put("msg", e);
 			logger.error("error",e);
 		}
 		return map;
@@ -282,4 +284,12 @@ public class RoleServiceImpl extends BaseServiceImpl&lt;Role, Integer&gt; implements
 	public List<Role> findAllByIds(String ids) {
 		return roleRepository.findAllById(ids);
 	}
+
+	@Override
+	public boolean checkOperationLegality(Integer operationRoleId){
+		boolean isLegality = false;
+		Map<String, Object> roleMap = findSubordinate();
+		isLegality = (roleMap.get(operationRoleId) == null ? true:false );
+		return isLegality;
+	}
 }
 package com.bsth.service.sys.impl;
-import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
+import com.bsth.controller.sys.util.RSAUtils;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,20 +66,45 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	@Override
 	public Map<String, Object> register(SysUser u) {
 		Map<String, Object> rs = new HashMap();
-		try{
-			//检查用户名是否存在
-			if(findByUserName(u.getUserName()) != null){
+		boolean isLegality = false;
+		Iterator<Role> itRole = u.getRoles().iterator();
+		Role ro = new Role();
+		while(itRole.hasNext()){//判断是否有下一个
+			ro = itRole.next();
+			if(roleService.checkOperationLegality(ro.getId())){
+				isLegality = true;
+			} else {
 				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+				rs.put("msg", "用户权限不够，请联系管理员！");
+				return rs;
 			}
-			else{
-				u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
-				rs = super.save(u);
+		}
+		if(isLegality){
+			try{
+				//解密RSA
+				try{
+					u.setUserName(RSAUtils.decryptBase64(u.getUserName()));
+					u.setPassword(RSAUtils.decryptBase64(u.getPassword()));
+				}catch (RuntimeException e) {
+					rs.put("msg", "网络延迟，解密失败，请重新添加！");
+				}
+				//检查用户名是否存在
+				if(findByUserName(u.getUserName()) != null){
+					rs.put("status", ResponseCode.ERROR);
+					rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+				}
+				else{
+					u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+					rs = super.save(u);
+				}
+			}catch (Exception e){
+				logger.error("", e);
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", e.getMessage());
 			}
-		}catch (Exception e){
-			logger.error("", e);
+		}else {
 			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", e.getMessage());
+			rs.put("msg", "用户权限不够，请联系管理员！");
 		}
 		return rs;
 	}
@@ -122,8 +148,36 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		} catch (Exception e){
 			logger.error("error", e);
 		}
-
-
 		return rsList;
 	}
+
+	@Override
+	public Map<String, Object> resetPassword(@RequestParam Integer id){
+		Map<String, Object> rs = new HashMap();
+		try{
+			// 获取当前用户
+			SysUser user = SecurityUtils.getCurrentUser();
+			Iterator<Role> itRole = user.getRoles().iterator();
+			Role ro = new Role();
+			boolean Legality = false;
+			while(itRole.hasNext()){//判断是否有下一个
+				ro = itRole.next();
+				if(ro.getLevel() == 1)
+					Legality = true;
+			}
+			if(Legality){
+				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode("123456"));
+				rs.put("status", ResponseCode.SUCCESS);
+				rs.put("msg", "密码重置成功！");
+			}else {
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "您不是超级管理员无权限重置其他用户密码");
+			}
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
 }
@@ -630,9 +630,11 @@
 <script
 		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
 		data-exclude=1></script>
-<!-- echarts4 误删 -->
+<!-- echarts4 -->
 <script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
+<!-- RSA加密 -->
+<script src="/assets/plugins/jsencrypt.min.js"></script>
 </body>
 </html>
 \ No newline at end of file
@@ -40,6 +40,14 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
+					<div style="display: inline-block; margin-left: 18px;" id="sfdcDiv">
+                        <span class="item-label" style="width: 80px;">是否电车: </span>
+                        <select class="form-control form-filter " name="sfdc" id="sfdc">
+							<option value="">请选择...</option>
+							<option value="0">否</option>
+							<option value="1">是</option>
+						</select>
+                    </div>
 					<div style="margin-top: 10px"></div>
                     <div style="display: inline-block;margin-left: 3px;">
                         <span class="item-label" style="width: 140px;">开始时间: </span>
@@ -99,13 +107,10 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#startDate,#endDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
+
 		var d = new Date();
+		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -113,7 +118,20 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
+
 		var fage=false;
 		var xlList;
@@ -193,6 +211,8 @@
 			}
 		});
+		$("#sfdcDiv").hide();
+		
 		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
 		$("#tjtype").on("change",function(){
 			if(cont == "驾驶员"){
@@ -205,10 +225,13 @@
 			cont = $("#tjtype").val();
 			if($("#tjtype").val() == "驾驶员"){
 				$("#cont").val(cont1);
+				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "售票员"){
 				$("#cont").val(cont2);
+				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "车辆自编号"){
 				$("#cont").val(cont3);
+				$("#sfdcDiv").show();
 			}
 		});
@@ -229,9 +252,10 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
+		    var sfdc=$("#sfdc").val();
 		    var params = {};
 		    var i = layer.load(2);
-		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){		        
+		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){		        
 				layer.close(i);
 				var singledata = template('singledata',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -247,11 +271,12 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
+		    var sfdc=$("#sfdc").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdmSing option:selected').text();
 		    var i = layer.load(2);
-			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
+			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc,type:'export',lineName:lineName},function(result){
 				var dateTime = "";
 				if(startDate == endDate){
 					dateTime = moment(startDate).format("YYYYMMDD");
@@ -59,41 +59,13 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2019-04-11 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-03-12 更新说明 Changelog</h2>
     <br><br>
     <ul >
         <li class="sub_title"><h6>权限管理</h6></li>
-        <li><span class="label s_c_change">修复</span>1、编辑某一个员工，用户、角色和授权管理设置在同一界面。</li>
-        <li><span class="label s_c_change">新增</span>2、用户增加一项状态，显示主调、监控和作废。</li>
+        <li><span class="label s_c_change">修改</span>1、密码修改加入密码复杂度校验机制</li>
         <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">新增</span>1、少量班次对换完成用颜色标记为已换。</li>
-        <li><span class="label s_c_change">新增</span>2、子任务可最小化。</li>
-        <li><span class="label s_c_change">修复</span>3、修正子任务一个备注栏原因选择后其他子任务都会同步备注此原因。</li>
-        <li><span class="label s_c_change">修复</span>4、轨迹回放只显示当前一段时间内的gps走向，已轨迹回放的走向自动不显示（只显示当前上下行的gps走向）。</li>
-        <li><span class="label s_c_change">修复</span>5、轨迹回放播放速度添加更多倍速播放可选。</li>
-        <li><span class="label s_c_change">新增</span>6、"线路配置"分割成"线路配置"、"翻班与自动执行"，可独立授权。</li>
-        <li><span class="label s_c_change">新增</span>7、添加设置，选择是否显示应到实到误差时间。</li>
-        <li><span class="label s_c_change">修复</span>8、无发有到时间 为紫色完成状态，改为显眼颜色区分，用橙色区分。</li>
-        <li><span class="label s_c_change">修复</span>9、轨迹回放中根据时间点切换线路版本信息。</li>
-        <li><span class="label s_c_change">修复</span>10、路牌对调连续请求造成数据不一致，翻班时无法清楚前日的排班数据。</li>
-        <li class="sub_title"><h6>计划调度</h6></li>
-        <li><span class="label s_c_change">修复</span>1、车辆报废，释放设备编号后在设备管理里添加一条设备替换记录。</li>
-        <li><span class="label s_c_change">修复</span>2、线路值勤日报，修改班次时，跨线路修改班次车提示报警。</li>
-        <li><span class="label s_c_change">修复</span>3、增加公司，分公司查询条件，公司，分公司，线路都是跟登录用户权限的,导出的数据和查询条件一致。</li>
-        <li><span class="label s_c_change">修复</span>4、排班时，页面添加规则逻辑判定。</li>
-        <li><span class="label s_c_change">修复</span>5、车辆导出修正，导出内容和权限匹配，和搜索条件匹配。</li>
-        <li><span class="label s_c_change">新增</span>6、所有的页面搜索添加排序选项功能。</li>
-        <li><span class="label s_c_change">新增</span>7、新增计划排班预览功能。</li>
-        <li class="sub_title"><h6>统计报表</h6></li>
-        <li><span class="label s_c_change">新增</span>1、新增早高峰出车报表。</li>
-        <li><span class="label s_c_change">新增</span>2、新增调度日报（待发对比） 报表。</li>
-        <li><span class="label s_c_change">新增</span>3、新增路单数据统计报表。</li>
-        <li><span class="label s_c_change">修复</span>4、修正班次车辆人员日报表中的售票员统计。</li>
-        <li class="sub_title"><h6>基础信息</h6></li>
-        <li><span class="label s_c_change">修复</span>1、线路版本：待更新状态增加删除功能，历史版本取消修改功能。</li>
-        <li><span class="label s_c_change">修复</span>2、线路信息-站点详情列-详情页面-站点修改功能：站点修改多边形功能修改，站点中心点可以移动。</li>
-        <li class="sub_title"><h6>用油管理</h6></li>
-        <li><span class="label s_c_change">修复</span>1、修正加油人员不符保存后不在显示。</li>
+        <li><span class="label s_c_change">新增</span>1、线调页面新增维修上报功能</li>
     </ul>
 </div>
@@ -42,7 +42,7 @@
 					<label class="col-md-3 control-label">密码</label>
 					<div class="col-md-4">
 							<input type="password" class="form-control" id="password" name="password" >
-							<span class="help-block"> 请输入6位以上密码</span>
+							<!--<span class="help-block"> 请输入6位以上密码</span>-->
 					</div>
 				</div>
 				<div class="form-group">
@@ -100,18 +100,46 @@
 			});
 		});*/
-		// 查询下级角色
+        // 查询下级角色
         $.get('/role/findSubordinate', function (rs) {
             if(rs.status == "SUCCESS"){
+                if(rs.list.length < 1){
+                    loadPage('/pages/permission/role/add.html');
+                    layer.open({
+                        // type: 2,
+                        content: '用户需要有下级角色才能添加用户！',
+                        title: '请添加下级角色',
+                        shift: 5,
+                        scrollbar: false
+                    });
+                    return;
+                }
+
                 $.each(rs.list,function(i,obj){
                     $("#role").append("<option value='"+obj.id+"'>"+obj.roleName+"</option>");
                 });
+            }else {
+                loadPage('/pages/permission/role/list.html');
+                layer.open({
+                    // type: 2,
+                    content: rs.msg,
+                    title: "用户的下级角色有问题",
+                    shift: 5,
+                    scrollbar: false
+                });
 			}
         });
+
 		var form = $('#user_add_form');
 		var error = $('.alert-danger', form);
-		
+
+        $.validator.addMethod("passwordrule", function(value, element) {
+            //var userblank = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-]).{8,16}$/;
+            var userblank = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
+            return this.optional(element) ||(userblank.test(value));
+        }, "需包含字母、数字的8-16位字符");
+
 		//表单 validate
 		form.validate({
 			errorElement : 'span', 
@@ -128,13 +156,14 @@
 				},
 				'password' : {
 					required : true,
-					minlength: 6,
-					maxlength: 25
+                    minlength: 8,
+                    maxlength: 16,
+                    passwordrule: true
 				},
 				'cfmPassword' : {
-					equalTo: '#password'
+					equalTo: '#password',
 				},
-				'role' : {
+				'roles' : {
 					required : true,
 					minlength: 1
 				}
@@ -160,6 +189,21 @@
 				var params = form.serializeJSON();
 				error.hide();
+                var keys;
+                $.ajax({
+                    url: "/user/login/jCryptionKey?t="+Math.random(),
+                    type: "Get",
+                    async:false,
+                    data: null,
+                    success: function(data) {
+						keys = data.publickey;
+					}
+                });
+                //RSA加密
+                var encrypt = new JSEncrypt();
+                encrypt.setPublicKey(keys);
+                params.userName = encrypt.encrypt(params.userName);
+                params.password = encrypt.encrypt(params.password);
 				$.ajax({
 					url: '/user/register',
 					type: 'POST',
@@ -178,27 +222,6 @@
 						}
 					}
 				});
-				/*$get('/user/all', {userName_eq: params.userName}, function(list){
-					if(!list || list.length == 0){
-						console.log(params);
-						$.ajax({
-							url: '/user',
-							type: 'POST',
-							traditional: true,
-							data: params,
-							success: function(res){
-								layer.msg('添加用户成功.');
-								loadPage('list.html');
-							}
-						});
-						/!* $post('/user', params, function(res){
-							layer.msg('添加用户成功.');
-							loadPage('list.html');
-						}); *!/
-					}
-					else
-						layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
-				});*/
 			}
 		});
 	});
@@ -4,6 +4,9 @@
 <div class="portlet light portlet-fit portlet-form bordered">
 <div class="portlet-body">
 	<form class="form-horizontal" id="changePWDForm">
+		<div class="alert alert-danger display-hide">
+            <button class="close" data-close="alert"></button>您的输入有误，请检查下面的输入项
+        </div>
 		<div class="form-group" style="margin-top: 60px">
 		    <label class="control-label col-md-5">原始密码：
 		    </label>
@@ -19,7 +22,7 @@
 		    <div class="col-md-4">
 		        <div class="input-icon right">
 		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="newPWD" /> </div>
+		            <input type="password" class="form-control" name="newPWD" id="newPWD"/> </div>
 		    </div>
 		</div>
 		<div class="form-group">
@@ -34,7 +37,7 @@
 		<div class="form-actions">
 	        <div class="row">
 	            <div class="col-md-offset-5 col-md-7">
-	                <button type="button" id="confirm" class="btn green">确定</button>
+	                <button type="submit" id="confirm" class="btn green">确定</button>
 	                <button type="reset" class="btn default">取消</button>
 	            </div>
 	        </div>
@@ -47,11 +50,79 @@
 <script>
 $(function(){
-	$("#confirm").on("click",function(){
-		var data = $('#changePWDForm').serializeJSON();
-		$.post('/user/changePWD',data,function(msg){
-			layer.alert(msg);
-		});
-	});
+	var form = $('#changePWDForm');
+    //表单 validate
+    var error = $('.alert-danger', form);
+
+    $.validator.addMethod("passwordrule", function(value, element) {
+        //var userblank = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-]).{8,16}$/;
+        var userblank = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
+        return this.optional(element) ||(userblank.test(value));
+    }, "需包含字母、数字的8-16位字符");
+
+    //表单 validate
+    form.validate({
+        errorElement : 'span',
+        errorClass : 'help-block help-block-error',
+        focusInvalid : false,
+        rules : {
+            'newPWD' : {
+                required : true,
+                minlength: 8,
+                maxlength: 16,
+                passwordrule:true
+            },
+            'cnewPWD' : {
+                equalTo: '#newPWD'
+            }
+        },
+        invalidHandler : function(event, validator) {
+            error.show();
+            App.scrollTo(error, -200);
+        },
+
+        highlight : function(element) {
+            $(element).closest('.form-group').addClass('has-error');
+        },
+
+        unhighlight : function(element) {
+            $(element).closest('.form-group').removeClass('has-error');
+        },
+
+        success : function(label) {
+            label.closest('.form-group').removeClass('has-error');
+        },
+        
+        submitHandler : function(f) {
+            var params = form.serializeJSON();
+            error.hide();
+
+            var keys;
+            $.ajax({
+                url: "/user/login/jCryptionKey?t="+Math.random(),
+                type: "Get",
+                async:false,
+                data: null,
+                success: function(data) {
+                    keys = data.publickey;
+                }
+            });
+            //RSA加密
+            var encrypt = new JSEncrypt();
+            encrypt.setPublicKey(keys);
+            params.oldPWD = encrypt.encrypt(params.oldPWD);
+            params.newPWD = encrypt.encrypt(params.newPWD);
+            params.cnewPWD = encrypt.encrypt(params.cnewPWD);
+            $.ajax({
+                url: '/user/changePWD',
+                type: 'POST',
+                traditional: true,
+                data: params,
+                success: function(msg){
+                    layer.alert(msg);
+                }
+            });
+        }
+    });
 });
 </script>
 \ No newline at end of file
@@ -64,7 +64,7 @@
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
-                                                                
+
 									<button class="btn btn-sm red btn-outline filter-cancel">
                                                             <i class="fa fa-times"></i> 重置</button>
 								</td>
@@ -117,6 +117,9 @@
 			<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
 			<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
 		{{/if}}
+		{{if obj.isAdmin}}
+			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-pjax><i class="fa fa-undo"></i> 重置密码</a>
+		{{/if}}
 	</td>
 </tr>
 {{/each}}
@@ -130,15 +133,49 @@
 <script>
 $(function(){
 	var page = 0, initPagination;
-	var user;
+	var user,isAdmin = false;
 	var icheckOptions = {
 	    checkboxClass: 'icheckbox_flat-blue',
 	    increaseArea: '20%'
 	};
 	$.get('/user/getCurrentUser', function(data) {
         user = data;
+        var roles = user.roles;
+        $.each(roles,function () {
+            if(this.level == 1)
+                isAdmin = true;
+        })
+
     });
+
 	setTimeout(function () {
+        $(document).on('click', 'a.reset_password', function () {
+            var id = $(this).data('id');
+            var name = $(this).data('name');
+            swal({
+                    title: "重装密码",
+                    text: "将登录名为"+name+"的用户，密码重置为默认密码！",
+                    type: "warning",
+                    showCancelButton: true,
+                    confirmButtonColor: "#DD6B55",
+                    confirmButtonText: "重置",
+                    cancelButtonText: "取消",
+                    closeOnConfirm: false },
+                function(){
+                    $.post('/user/resetPassword',{'id':id},function(result){
+                        if(result.status=='SUCCESS') {
+                            // 弹出添加成功提示消息
+                            swal("登录名为"+name+"的用户密码重置成功！", "success");
+                        } else if(result.status=='ERROR') {
+                            // 弹出添加失败提示消息
+                            swal("重置失败！", result.msg+"，请联系开发人员！", "ERROR");
+                        }
+                        //				loadPage('list.html');
+                        // 发布后刷新页面
+                        jsDoQuery(getParams(), true);
+                    });
+                });
+        });
         jsDoQuery(null,true);
         //重置
@@ -147,45 +184,63 @@ $(function(){
             jsDoQuery(null, true);
         });
+		function getParams() {
+		 var cells = $('tr.filter')[0].cells
+			 ,params = {}
+			 ,name;
+		 $.each(cells, function(i, cell){
+			 var items = $('input,select', cell);
+			 for(var j = 0, item; item = items[j++];){
+				 name = $(item).attr('name');
+				 if(name){
+					 params[name] = $(item).val();
+				 }
+			 }
+		 });
+		 return params;
+		}
+
         //提交
         $('tr.filter .filter-submit').on('click', function(){
-            var cells = $('tr.filter')[0].cells
-                ,params = {}
-                ,name;
-            $.each(cells, function(i, cell){
-                var items = $('input,select', cell);
-                for(var j = 0, item; item = items[j++];){
-                    name = $(item).attr('name');
-                    if(name){
-                        params[name] = $(item).val();
-                    }
-                }
-            });
-            page = 0;
-            jsDoQuery(params, true);
+            jsDoQuery(getParams(), true);
         });
         /*
         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
         */
         function jsDoQuery(p, pagination){
+            var roles = new Map();
+            // 查询下级角色
+            $.ajax({
+                url: "/role/findSubordinate",
+                type: "Get",
+                async:false,
+                data: null,
+                success: function (rs) {
+                    if(rs.status == "SUCCESS"){
+                        $.each(rs.list,function(i,obj){
+                            roles[obj.id] = obj;
+                        });
+                    }
+                }
+            });
             var params = {};
             if(p)
                 params = p;
             //更新时间排序
             params['order'] = 'lastLoginDate';
             params['page'] = page;
-            params['roles[0].pic_ne'] = 1;
+            // params['id_eq'] = "1";
             var i = layer.load(2);
             $get('/user' ,params, function(data){
                 var list = data.content;
-                var errorList=[];
                 $.each(list, function(i, obj) {
-                    if(obj.roles[0].level > user.roles[0].level){
+                    if(roles[obj.roles[0].id] != null && roles[obj.roles[0].id] != undefined){
                         obj.isEdit = 0;
                     } else{
                         obj.isEdit = 1;
                     }
+                    obj.isAdmin = isAdmin;
                     obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
                 });
@@ -79,7 +79,7 @@
 								<td>晚高峰次数</td>
 								<td>低谷次数</td>
 								<td>全日班次数</td>
-								<td>全日发生率</td>
+								<td>万班次发生率</td>
 								<td>最大间隔时间</td>
 								<td>查看</td>
 							</tr>
@@ -125,7 +125,7 @@
 								<td>晚高峰次数</td>
 								<td>低谷次数</td>
 								<td>全日班次数</td>
-								<td>全日发生率</td>
+								<td>万班次发生率</td>
 								<td>最大间隔</td>
 								<td>查看</td>
 							</tr>
@@ -467,7 +467,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -521,7 +521,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -550,13 +550,9 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+	
 </script>
@@ -117,10 +117,16 @@
             var query = function() {
                 scanFlag = false;
                 var data = form.serializeJSON();
+                debugger;
+                var lines = new Array();
+                for (var i = 0;i < gb_data_basic.activeLines.length;i++) {
+                	lines.push(gb_data_basic.activeLines[i].lineCode);
+                }
+                data.lines = lines.join(',');
                 data.page = page;
                 data.size = pageSize;
-                gb_common.$get('/gps/safeDriv', data, function (rs) {
+                gb_common.$post('/gps/safeDriv', data, function (rs) {
                     //数据转换
                     var code2Name=gb_data_basic.lineCode2NameAll(), url,stm, p;
                     $.each(rs.list, function(){