java/QianYunTong.git

			@@ -12,11 +12,10 @@
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.*;
			import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
			import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.EditStaffNodeRequest;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.GetStaffNodeRequest;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.StaffNodeInfo;
			import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo;
			import com.stylefeng.guns.modular.system.util.qianyuntong.model.SendSmsRequest;
			import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
			import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
			import com.stylefeng.guns.modular.system.warpper.LoginWarpper;
			@@ -85,8 +84,8 @@
			@Resource
			private DriverOrdersMapper driverOrdersMapper;

			@Autowired
			private RedisTemplate redisTemplate;
			@Resource
			private RedisTemplate<String, Object> redisTemplate;

			@Autowired
			private ALiSendSms aLiSendSms;
			@@ -152,25 +151,23 @@
			sb.append((int) (random.nextDouble() * 10));
			}
			String authCode = sb.toString();
			String sms = "短信验证码【" + authCode + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!";

			//发送验证码短信
			redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
			String templateCode = "";
			switch (type) {
			case 1:
			templateCode = "SMS_154775435";//身份验证
			break;
			case 2:
			templateCode = "SMS_154775434";//登录确认
			break;
			case 3:
			templateCode = "SMS_154775432";//用户注册
			break;
			case 4:
			templateCode = "SMS_154775431";//修改密码
			break;
			}
			// //发送验证码短信
			// redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
			// String templateCode = "";
			// switch (type) {
			// case 1:
			// templateCode = "SMS_154775435";//身份验证
			// break;
			// case 2:
			// templateCode = "SMS_154775434";//登录确认
			// break;
			// case 3:
			// templateCode = "SMS_154775432";//用户注册
			// break;
			// case 4:
			// templateCode = "SMS_154775431";//修改密码
			// break;
			// }
			// String sData = aLiSendSms.sendSms(phone, "SMS_229715276", "{\"code\":\"" + authCode + "\"}");
			// JSONObject jsonObject = JSON.parseObject(sData);
			// String message = jsonObject.getString("Message");
			@@ -178,7 +175,16 @@
			// return ResultUtil.error("");
			// }
			// System.out.println(sms);
			SMSUtil.sendVerifyCode(phone);
			SendSmsRequest request = new SendSmsRequest();
			request.setDestAddress(phone);
			request.setTemplateId("TPL202410290001");
			Map<String, String> templateParams = new HashMap<>();
			templateParams.put("code", authCode);
			request.setTemplateParams(templateParams);
			request.setCode("code");
			request.setSpId("T8d5hdfg");
			SMSUtil.sendSms(request);
			redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
			return ResultUtil.success();
			}

			@@ -465,13 +471,10 @@
			if (null == driver) {
			return ResultUtil.error("账号未注册");
			}
			Company company = companyMapper.selectById(driver.getCompanyId());
			//查询中台员工数据
			GetStaffNodeRequest request = new GetStaffNodeRequest();
			request.setEmpId(driver.getEmpId());
			request.setEntercode(driver.getEntercode());
			request.setMobile(driver.getPhone());
			StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
			if (null == staffNode \|\| staffNode.getIsValid().equals("0")) {
			List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), company.getEnterCode());
			if (null == userInfoByPhone \|\| userInfoByPhone.size() == 0) {
			return ResultUtil.error("账号未注册");
			}

			@@ -781,31 +784,10 @@
			return ResultUtil.error("验证码无效");
			}
			Driver driver1 = this.selectById(uid);
			GetStaffNodeRequest request = new GetStaffNodeRequest();
			request.setEmpId(driver1.getEmpId());
			request.setEntercode(driver1.getEntercode());
			request.setMobile(driver1.getPhone());
			StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
			if ("0".equals(staffNode.getIsValid())) {
			return ResultUtil.error("无效的司机账号");
			}
			EditStaffNodeRequest editStaffNodeRequest = new EditStaffNodeRequest();
			editStaffNodeRequest.setEmpId(staffNode.getEmpId());
			editStaffNodeRequest.setMobile(staffNode.getMphone());
			editStaffNodeRequest.setEntercode(staffNode.getEnterNum());
			editStaffNodeRequest.setEnterId(staffNode.getEnterId());
			editStaffNodeRequest.setEmpName(staffNode.getEmpName());
			editStaffNodeRequest.setEmpNickname(staffNode.getEmpNickname());
			editStaffNodeRequest.setLoginNo(staffNode.getLoginNo());
			editStaffNodeRequest.setMphone(phone);
			editStaffNodeRequest.setEmail(staffNode.getEmail());
			editStaffNodeRequest.setDeptId(staffNode.getDeptId());
			editStaffNodeRequest.setPositionId(1);
			editStaffNodeRequest.setSuperLevel(0);
			editStaffNodeRequest.setHideMobile(0);
			Boolean editStaffNode = EmployeeUtil.editStaffNode(editStaffNodeRequest);
			if (!editStaffNode) {
			return ResultUtil.error("修改手机号码失败");
			Company company = companyMapper.selectById(driver1.getCompanyId());
			List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
			if (null == userInfoByPhone \|\| userInfoByPhone.size() == 0) {
			return ResultUtil.error("账号未注册");
			}

			driver1.setAccount(phone);
			@@ -1571,7 +1553,9 @@
			//开始清除redis中无效的数据
			Driver driver = driverMapper.selectById(id);
			String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
			redisTemplate.delete(key);//删除个人信息数据
			if(ToolUtil.isNotEmpty(key)){
			redisTemplate.delete(key);//删除个人信息数据
			}
			redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
			redisTemplate.delete("DRIVER_" + id);//清除存储的token
			}