java/ZhaoYangChuXing.git

			@@ -11,14 +11,13 @@
			import com.stylefeng.guns.core.log.LogObjectHolder;
			import com.stylefeng.guns.core.shiro.ShiroKit;
			import com.stylefeng.guns.core.util.*;
			import com.stylefeng.guns.core.util.DateUtil;
			import com.stylefeng.guns.core.util.WoUtil;
			import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
			import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
			import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
			import com.stylefeng.guns.modular.system.util.PushURL;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.util.*;
			import org.apache.poi.ss.usermodel.Cell;
			import org.apache.poi.ss.usermodel.Row;
			import org.apache.poi.ss.usermodel.Sheet;
			@@ -76,6 +75,9 @@

			@Resource
			private DriverPunishMapper driverPunishMapper;

			@Autowired
			private RedisUtil redisUtil;

			@Value("${pushMinistryOfTransport}")
			private boolean pushMinistryOfTransport;
			@@ -806,6 +808,11 @@
			}).start();
			}else if (2 == optType){ //冻结
			tDriver.setAuthState(3);
			redisUtil.remove("DRIVER_" + tDriver.getId());
			String value1 = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
			redisUtil.remove(value1);
			redisUtil.remove("DRIVER_" + tDriver.getPhone());

			new Thread(new Runnable() {
			@Override
			public void run() {
			@@ -831,7 +838,8 @@
			TDriver obj = tDriverService.selectById(tDriver.getId());
			if (!obj.getPhone().equals(tDriver.getPhone())){
			//判断登录账户是否重复
			int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3"));
			int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone())
			.in("authState", "1,2,3").ne("flag", 3));
			if (count > 0){
			return "error";
			}