java/IgoTravel.git

			@@ -79,6 +79,9 @@

			@Value("${spring.mail.template-path}")
			private String templatePath;

			@Autowired
			private RedisUtil redisUtil;



			@@ -105,7 +108,8 @@
			*/
			@RequestMapping("/tDriver_add")
			public String tDriverAdd(Model model) {
			List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
			List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
			.eq("state", 0).ne("flag", 3));
			model.addAttribute("companyList",companyList);

			Integer roleType = ShiroKit.getUser().getRoleType();
			@@ -184,17 +188,17 @@
			model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());

			if (1 == roleType){
			List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
			List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
			model.addAttribute("companyList",companyList);
			List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
			List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()).eq("state", 0).ne("flag", 3));
			model.addAttribute("franchiseeList",franchiseeList);
			}else if (2 == roleType){
			List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
			List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
			model.addAttribute("franchiseeList",franchiseeList);
			}

			//查询平台ID
			TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
			TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).eq("state", 0).ne("flag", 3));
			//判断是平台司机还是加盟司机
			if ((SinataUtil.isEmpty(tDriver.getCompanyId()) \|\| tDriver.getCompanyId() == 0 \|\| tDriver.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tDriver.getFranchiseeId()) \|\| tDriver.getFranchiseeId() == 0)){
			model.addAttribute("companyType",1);
			@@ -588,7 +592,6 @@
			type = 6;
			tDriver.setAuthState(4);
			}

			new Thread(new Runnable() {
			@Override
			public void run() {
			@@ -612,9 +615,9 @@
			driver_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
			Element driver_audit1_content = document.getElementById("driver_audit1_content");
			if(1 == authState){
			driver_audit1_content.text("You application has been approved.");
			driver_audit1_content.text("Your application has been approved.");
			}else{
			driver_audit1_content.text("I'm sorry, your application was rejected. Reason for rejection: Incomplete filling in personal information.");
			driver_audit1_content.text("We are sorry to inform you that your application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
			}
			EmailUtil.send(tDriver.getEmail(), 1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified", document.html());
			}catch (Exception e){
			@@ -766,9 +769,7 @@
			tDriverService.updateById(driver);
			return SUCCESS_TIP;
			}

			@Autowired
			private RedisUtil redisUtil;

			/**
			* 操作司机状态
			*/
			@@ -780,11 +781,10 @@
			if (1 == optType){ //解冻
			tDriver.setAuthState(2);
			}else if (2 == optType){ //冻结
			String key = redisUtil.getValue(tDriver.getPhone());
			redisUtil.remove(key);//删除个人信息数据
			String token = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
			redisUtil.remove(token);//删除个人信息数据
			redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
			redisUtil.remove("DRIVER_" + driverId);//清除存储的token
			redisUtil.remove("DEVICE_" + driverId);//清除车载端登录的标识
			tDriver.setAuthState(3);
			}
			tDriver.setRemark(remark);
			@@ -1892,8 +1892,8 @@
			}else{
			shellList.add("-");
			}
			if(SinataUtil.isNotEmpty(object.get("name"))){
			shellList.add(object.get("name").toString());
			if(SinataUtil.isNotEmpty(object.get("firstName"))){
			shellList.add(object.get("firstName").toString() + " " + object.get("lastName").toString());
			}else{
			shellList.add("-");
			}
			@@ -1903,7 +1903,7 @@
			shellList.add("-");
			}
			if(SinataUtil.isNotEmpty(object.get("sex"))){
			shellList.add(object.get("sex").toString() == "1"?"男":"女");
			shellList.add(object.get("sex").toString().equals("1")?"男":"女");
			}else{
			shellList.add("-");
			}
			@@ -1970,8 +1970,6 @@
			}
			if(SinataUtil.isNotEmpty(object.get("authState"))){
			shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));

			shellList.add(object.get("authState").toString());
			}else{
			shellList.add("-");
			}