Skip to content

G
gdtel-gztel-school-center
Commit 35758ab4 by 陈浩建
Options

短信验证码临时存表优化代码+优化院校分配

parent bd35b27b
Showing with 111 additions and 101 deletions
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -9,6 +9,7 @@ import com.winsun.smsUtils.SendSmsAndMail; ...@@ -9,6 +9,7 @@ import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.PicturesUtil; import com.winsun.utils.PicturesUtil;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import com.winsun.utils.SaveAuthCodeUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -66,6 +67,8 @@ public class codeManagerController { ...@@ -66,6 +67,8 @@ public class codeManagerController {
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@Autowired
private SaveAuthCodeUtil saveAuthCodeUtil;
private static String PATH1 = "StudentCard1"; private static String PATH1 = "StudentCard1";
private static String PATH2 = "StudentCard2"; private static String PATH2 = "StudentCard2";
...@@ -111,20 +114,7 @@ public class codeManagerController { ...@@ -111,20 +114,7 @@ public class codeManagerController {
// MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。"); // MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
// 新框架短信验证码保存在Redis，但由于业务需要使用原来方式，存在数据库里 // 新框架短信验证码保存在Redis，但由于业务需要使用原来方式，存在数据库里
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
AuthCode authCode = new AuthCode(); saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库
authCode.setId(phone);
authCode.setUserAuthCode(veCode);
Wrapper<AuthCode> authCodeWrapper = new EntityWrapper<>();
authCodeWrapper.eq("id",phone);
Map<String,Object> map2 = new HashMap<>();
map2.put("user_authcode",veCode);
List<AuthCode> auth = authCodeMapper.queryAuthCode(phone);
if(auth.size()>0){
authCodeMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map2),authCodeWrapper);
}else{
authCodeMapper.insert(authCode);
}
SendSmsAndMail.sendSms(phone,veCode + "","7"); SendSmsAndMail.sendSms(phone,veCode + "","7");
log.info("验证码:" + veCode); log.info("验证码:" + veCode);
map.put("code",1); map.put("code",1);
......
common/src/main/java/com/winsun/mapper/SysUserMapper.java
...@@ -24,4 +24,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> { ...@@ -24,4 +24,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
"and hus.school_id = hs.id\n" + "and hus.school_id = hs.id\n" +
"and s.id = #{id} ") "and s.id = #{id} ")
List<Map<String,Object>> findPartnerById(@Param("id")String id); List<Map<String,Object>> findPartnerById(@Param("id")String id);
List<Map<String,Object>> schoolAllocationList(@Param("account")String account,@Param("name")String name,@Param("substName")String substName,@Param("schoolName")String schoolName);
} }
common/src/main/java/com/winsun/utils/SaveAuthCodeUtil.java 0 → 100644
package com.winsun.utils;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.AuthCode;
import com.winsun.mapper.AuthCodeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
public class SaveAuthCodeUtil {
@Autowired
private AuthCodeMapper authCodeMapper;
public void saveAuthCode(String phone, String code){
AuthCode authCode = new AuthCode();
authCode.setId(phone);
authCode.setUserAuthCode(Integer.parseInt(code));
Wrapper<AuthCode> authCodeWrapper = new EntityWrapper<>();
authCodeWrapper.eq("id",phone);
Map<String,Object> map2 = new HashMap<>();
map2.put("user_authcode",code);
List<AuthCode> auth = authCodeMapper.queryAuthCode(phone);
if(auth.size()>0){
authCodeMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map2),authCodeWrapper);
}else{
authCodeMapper.insert(authCode);
}
}
}
common/src/main/resources/com/winsun/mapper/mapping/SysUserMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.winsun.mapper.SysUserMapper">
<select id="schoolAllocationList" resultType="HashMap" parameterType="String">
select a.account,a.name,c.id as schoolId, b.id, a.id as userId,
c.sub_name as substName, c.school_name as schoolName
from sys_user a,hhr_supervisor_school b,hhr_school c
where a.id = b.user_id
and b.school = c.id
<if test="account != null and account != ''">
AND a.account = #{account}
</if>
<if test="name != null and name != ''">
AND a.name = #{name}
</if>
<if test="substName != null and substName != ''">
AND c.sub_name = #{substName}
</if>
<if test="schoolName != null and schoolName != ''">
AND c.school_name = #{schoolName}
</if>
</select>
</mapper>
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
...@@ -15,6 +15,7 @@ import com.winsun.mapper.AuthCodeMapper; ...@@ -15,6 +15,7 @@ import com.winsun.mapper.AuthCodeMapper;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import com.winsun.utils.SaveAuthCodeUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
...@@ -47,7 +48,8 @@ public class GetPhoneCodeController extends BaseController { ...@@ -47,7 +48,8 @@ public class GetPhoneCodeController extends BaseController {
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
@Autowired @Autowired
private AuthCodeMapper authCodeMapper; private SaveAuthCodeUtil saveAuthCodeUtil;
//登录验证码标识 //登录验证码标识
private static String CODE = "getPhoneCode"; private static String CODE = "getPhoneCode";
...@@ -71,7 +73,7 @@ public class GetPhoneCodeController extends BaseController { ...@@ -71,7 +73,7 @@ public class GetPhoneCodeController extends BaseController {
username = usernameDecrypt.getData(); username = usernameDecrypt.getData();
EntityWrapper<User> userwrapper = new EntityWrapper<>(); EntityWrapper<User> userwrapper = new EntityWrapper<>();
userwrapper.eq("account", username); userwrapper.eq("account", username);
userwrapper.eq("status", "1");; userwrapper.eq("status", "1");
List<User> users = userService.selectList(userwrapper); List<User> users = userService.selectList(userwrapper);
if (CollectionUtils.isEmpty(users)) { if (CollectionUtils.isEmpty(users)) {
return ResponseEntity.newJSON("code", 400, "message", "密码或者账号错误！"); return ResponseEntity.newJSON("code", 400, "message", "密码或者账号错误！");
...@@ -103,19 +105,7 @@ public class GetPhoneCodeController extends BaseController { ...@@ -103,19 +105,7 @@ public class GetPhoneCodeController extends BaseController {
sent.put("code", 200); sent.put("code", 200);
} else { } else {
if (user.getPhone().length() == 11) { if (user.getPhone().length() == 11) {
AuthCode authCode = new AuthCode(); saveAuthCodeUtil.saveAuthCode(user.getPhone(), verificationCode); //临时保存数据库
authCode.setId(user.getPhone());
authCode.setUserAuthCode(Integer.parseInt(verificationCode));
Wrapper<AuthCode> authCodeWrapper = new EntityWrapper<>();
authCodeWrapper.eq("id",user.getPhone());
Map<String,Object> map2 = new HashMap<>();
map2.put("user_authcode",verificationCode);
List<AuthCode> auth = authCodeMapper.queryAuthCode(user.getPhone());
if(auth.size()>0){
authCodeMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map2),authCodeWrapper);
}else{
authCodeMapper.insert(authCode);
}
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7"); SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
sent.put("message", "发送成功"); sent.put("message", "发送成功");
sent.put("code", 200); sent.put("code", 200);
...@@ -135,6 +125,7 @@ public class GetPhoneCodeController extends BaseController { ...@@ -135,6 +125,7 @@ public class GetPhoneCodeController extends BaseController {
public Object phoneLoginCodeY(@RequestParam("username") String username) { public Object phoneLoginCodeY(@RequestParam("username") String username) {
EntityWrapper<User> userwrapper = new EntityWrapper<>(); EntityWrapper<User> userwrapper = new EntityWrapper<>();
userwrapper.eq("account", username); userwrapper.eq("account", username);
userwrapper.eq("status", "1");
List<User> users = userService.selectList(userwrapper); List<User> users = userService.selectList(userwrapper);
if (CollectionUtils.isEmpty(users)) { if (CollectionUtils.isEmpty(users)) {
return ResponseEntity.newJSON("code", 400, "message", "账号错误！"); return ResponseEntity.newJSON("code", 400, "message", "账号错误！");
...@@ -164,6 +155,7 @@ public class GetPhoneCodeController extends BaseController { ...@@ -164,6 +155,7 @@ public class GetPhoneCodeController extends BaseController {
sent.put("code", 200); sent.put("code", 200);
} else { } else {
if (user.getPhone().length() == 11) { if (user.getPhone().length() == 11) {
saveAuthCodeUtil.saveAuthCode(user.getPhone(), verificationCode); // 临时保存数据库
SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7"); SendSmsAndMail.sendSms(user.getPhone(), verificationCode, "7");
sent.put("message", "发送成功"); sent.put("message", "发送成功");
sent.put("code", 200); sent.put("code", 200);
......
new-user/src/main/java/com/winsun/controller/StartSelectController.java
...@@ -9,6 +9,7 @@ import com.winsun.smsUtils.SendSmsAndMail; ...@@ -9,6 +9,7 @@ import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MD5Utils; import com.winsun.utils.MD5Utils;
import com.winsun.utils.ProduceIdUtil; import com.winsun.utils.ProduceIdUtil;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import com.winsun.utils.SaveAuthCodeUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -69,6 +70,9 @@ public class StartSelectController { ...@@ -69,6 +70,9 @@ public class StartSelectController {
@Autowired @Autowired
private OrderViewMapper orderViewMapper; private OrderViewMapper orderViewMapper;
@Autowired
private SaveAuthCodeUtil saveAuthCodeUtil;
/** /**
* 查询学校信息 * 查询学校信息
*/ */
...@@ -98,6 +102,7 @@ public class StartSelectController { ...@@ -98,6 +102,7 @@ public class StartSelectController {
// 生成6位随机数 // 生成6位随机数
int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000); int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000);
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
saveAuthCodeUtil.saveAuthCode(phone,veCode+"");
SendSmsAndMail.sendSms(phone,veCode + "","7"); SendSmsAndMail.sendSms(phone,veCode + "","7");
log.info("验证码:" + veCode); log.info("验证码:" + veCode);
map.put("code",1); map.put("code",1);
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -3,8 +3,6 @@ package com.winsun.controller; ...@@ -3,8 +3,6 @@ package com.winsun.controller;
import com.baomidou.mybatisplus.enums.SqlLike; import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Package; import com.winsun.bean.Package;
...@@ -49,9 +47,9 @@ public class PackageUpgradeController extends BaseController { ...@@ -49,9 +47,9 @@ public class PackageUpgradeController extends BaseController {
private static OrderMapper orderMapper; private static OrderMapper orderMapper;
private static SysUserMapper userMapper; private static SysUserMapper userMapper;
@Autowired
private AuthCodeMapper authCodeMapper;
@Autowired
private SaveAuthCodeUtil saveAuthCodeUtil;
@Autowired @Autowired
private HhrUserMapper hhrUserMapper; private HhrUserMapper hhrUserMapper;
...@@ -148,19 +146,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -148,19 +146,7 @@ public class PackageUpgradeController extends BaseController {
} }
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000)); String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
log.info("验证码:" + s); log.info("验证码:" + s);
AuthCode authCode = new AuthCode(); saveAuthCodeUtil.saveAuthCode(selectOrder, s); // 临时保存数据库
authCode.setId(selectOrder);
authCode.setUserAuthCode(Integer.parseInt(s));
Wrapper<AuthCode> authCodeWrapper = new EntityWrapper<>();
authCodeWrapper.eq("id",selectOrder);
Map<String,Object> map2 = new HashMap<>();
map2.put("user_authcode",s);
List<AuthCode> auth = authCodeMapper.queryAuthCode(selectOrder);
if(auth.size()>0){
authCodeMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map2),authCodeWrapper);
}else{
authCodeMapper.insert(authCode);
}
SendSmsAndMail.sendSms(selectOrder,s,"7"); SendSmsAndMail.sendSms(selectOrder,s,"7");
redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
return ResponseData.success(objMap, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11)); return ResponseData.success(objMap, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
...@@ -234,19 +220,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -234,19 +220,7 @@ public class PackageUpgradeController extends BaseController {
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000)); String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
log.info("验证码:" + s); log.info("验证码:" + s);
AuthCode authCode = new AuthCode(); saveAuthCodeUtil.saveAuthCode(acc_nbr, s); // 临时保存数据库
authCode.setId(acc_nbr);
authCode.setUserAuthCode(Integer.parseInt(s));
Wrapper<AuthCode> authCodeWrapper = new EntityWrapper<>();
authCodeWrapper.eq("id",acc_nbr);
Map<String,Object> map2 = new HashMap<>();
map2.put("user_authcode",s);
List<AuthCode> auth = authCodeMapper.queryAuthCode(acc_nbr);
if(auth.size()>0){
authCodeMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map2),authCodeWrapper);
}else{
authCodeMapper.insert(authCode);
}
SendSmsAndMail.sendSms(acc_nbr,s,"7"); SendSmsAndMail.sendSms(acc_nbr,s,"7");
redisTemplate.opsForValue().set(acc_nbr, s, 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(acc_nbr, s, 30, TimeUnit.MINUTES);
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -450,11 +450,13 @@ public class OrderController extends BaseController { ...@@ -450,11 +450,13 @@ public class OrderController extends BaseController {
* @return * @return
*/ */
@Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
public Map<String,Object> listOrder( public Map<String,Object> listOrder(//kuaidi_timeStart
@RequestParam(name = "createTimeStart", required = false) String createTimeStart, @RequestParam(name = "createTimeStart", required = false) String createTimeStart,
@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
@RequestParam(name = "successTimeStart", required = false) String successTimeStart, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd,
@RequestParam(name = "kuaidiTimeStart", required = false) String kuaidiTimeStart,
@RequestParam(name = "kuaidiTimeEnd", required = false) String kuaidiTimeEnd,
@RequestParam("userType") String userType, @RequestParam("userType") String userType,
@RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "orderNumber", required = false) String orderNumber,
@RequestParam(name = "kapin", required = false) String kapin, @RequestParam(name = "kapin", required = false) String kapin,
...@@ -493,6 +495,8 @@ public class OrderController extends BaseController { ...@@ -493,6 +495,8 @@ public class OrderController extends BaseController {
wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd); wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
wrapper.ge(StringUtils.isNotBlank(successTimeStart), "success_time", successTimeStart); wrapper.ge(StringUtils.isNotBlank(successTimeStart), "success_time", successTimeStart);
wrapper.le(StringUtils.isNotBlank(successTimeEnd), "success_time", successTimeEnd); wrapper.le(StringUtils.isNotBlank(successTimeEnd), "success_time", successTimeEnd);
wrapper.ge(StringUtils.isNotBlank(kuaidiTimeStart), "kuaidi_time", kuaidiTimeStart);
wrapper.le(StringUtils.isNotBlank(kuaidiTimeEnd), "kuaidi_time", kuaidiTimeEnd);
wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType); wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber); wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
wrapper.eq(StringUtils.isNotBlank(orderId),"order_id", orderId); wrapper.eq(StringUtils.isNotBlank(orderId),"order_id", orderId);
...@@ -700,12 +704,15 @@ public class OrderController extends BaseController { ...@@ -700,12 +704,15 @@ public class OrderController extends BaseController {
@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
@RequestParam(name = "successTimeStart", required = false) String successTimeStart, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd,
@RequestParam(name = "kuaidi_timeStart", required = false) String kuaidiTimeStart,
@RequestParam(name = "kuaidi_timeEnd", required = false) String kuaidiTimeEnd,
@RequestParam("userType") String userType, @RequestParam("userType") String userType,
@RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "orderNumber", required = false) String orderNumber,
@RequestParam(name = "kapin", required = false) String kapin, @RequestParam(name = "kapin", required = false) String kapin,
@RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "businessNumber", required = false) String businessNumber,
@RequestParam(name = "contactNumber", required = false) String contactNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool,
@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea,
@RequestParam(name = "hehuorenName", required = false) String hehuorenName, @RequestParam(name = "hehuorenName", required = false) String hehuorenName,
@RequestParam(name = "orderStatus", required = false) String orderStatus, @RequestParam(name = "orderStatus", required = false) String orderStatus,
@RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "customerName", required = false) String customerName,
...@@ -769,6 +776,8 @@ public class OrderController extends BaseController { ...@@ -769,6 +776,8 @@ public class OrderController extends BaseController {
map.put("orderStatus", "待配送"); map.put("orderStatus", "待配送");
map.put("hehuorenArea", "本部"); map.put("hehuorenArea", "本部");
map.put("isDelivery", 2); map.put("isDelivery", 2);
}else{
map.put("hehuorenArea", hehuorenArea);
} }
try { try {
...@@ -797,6 +806,14 @@ public class OrderController extends BaseController { ...@@ -797,6 +806,14 @@ public class OrderController extends BaseController {
if(map.containsKey("successTimeEnd")){ if(map.containsKey("successTimeEnd")){
successTimeEnd = map.get("successTimeEnd").toString(); successTimeEnd = map.get("successTimeEnd").toString();
} }
String kuaidiTimeStart = "";
if(map.containsKey("kuaidiTimeStart")){
kuaidiTimeStart = map.get("kuaidiTimeStart").toString();
}
String kuaidiTimeEnd = "";
if(map.containsKey("kuaidiTimeEnd")) {
kuaidiTimeEnd = map.get("kuaidiTimeEnd").toString();
}
String userType = ""; String userType = "";
if(map.containsKey("userType")){ if(map.containsKey("userType")){
userType = map.get("userType").toString(); userType = map.get("userType").toString();
...@@ -857,6 +874,8 @@ public class OrderController extends BaseController { ...@@ -857,6 +874,8 @@ public class OrderController extends BaseController {
wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd); wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
wrapper.ge(StringUtils.isNotBlank(successTimeStart), "success_time", successTimeStart); wrapper.ge(StringUtils.isNotBlank(successTimeStart), "success_time", successTimeStart);
wrapper.le(StringUtils.isNotBlank(successTimeEnd), "success_time", successTimeEnd); wrapper.le(StringUtils.isNotBlank(successTimeEnd), "success_time", successTimeEnd);
wrapper.ge(StringUtils.isNotBlank(kuaidiTimeStart), "kuaidi_time", kuaidiTimeStart);
wrapper.le(StringUtils.isNotBlank(kuaidiTimeEnd), "kuaidi_time", kuaidiTimeEnd);
wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType); wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber); wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
//wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin); //wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
......
service-manager/src/main/java/com/winsun/controller/SalesListMobileController.java
...@@ -7,6 +7,7 @@ import com.winsun.mapper.SalesListMapper; ...@@ -7,6 +7,7 @@ import com.winsun.mapper.SalesListMapper;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MapUtil; import com.winsun.utils.MapUtil;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import com.winsun.utils.SaveAuthCodeUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -40,6 +41,10 @@ public class SalesListMobileController extends BaseController { ...@@ -40,6 +41,10 @@ public class SalesListMobileController extends BaseController {
@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
@Autowired
private SaveAuthCodeUtil saveAuthCodeUtil;
public SalesListMobileController(SalesListMapper salesListMapper) { public SalesListMobileController(SalesListMapper salesListMapper) {
this.salesListMapper = salesListMapper; this.salesListMapper = salesListMapper;
} }
...@@ -107,6 +112,7 @@ public class SalesListMobileController extends BaseController { ...@@ -107,6 +112,7 @@ public class SalesListMobileController extends BaseController {
try { try {
if (phone.length() == 11){ if (phone.length() == 11){
saveAuthCodeUtil.saveAuthCode(phone,verificationCode); // 临时保存数据库
SendSmsAndMail.sendSms(phone, verificationCode, "7"); SendSmsAndMail.sendSms(phone, verificationCode, "7");
sent.put("message", "发送成功"); sent.put("message", "发送成功");
sent.put("code", 200); sent.put("code", 200);
......
service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
...@@ -90,47 +90,7 @@ public class SchoolAllocationController extends BaseController { ...@@ -90,47 +90,7 @@ public class SchoolAllocationController extends BaseController {
@RequestParam(name = "pageNo", required = false) int pageIndex, @RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) { @RequestParam(name = "pageSize", required = false) int pageSize) {
Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>(); List<Map<String, Object>> dataList = sysUserMapper.schoolAllocationList(account,name,substName,schoolName);
wrapperUser.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperUser.eq(StringUtils.isNotBlank(account), "account", account);
List<SysUser> userList = sysUserMapper.selectList(wrapperUser);
Wrapper<School> wrapperSchool = new EntityWrapper<School>();
wrapperSchool.eq(StringUtils.isNotBlank(schoolName), "school_name", schoolName);
wrapperSchool.like(StringUtils.isNotBlank(substName), "sub_name", substName, SqlLike.DEFAULT);
List<School> schoolList = schoolMapper.selectList(wrapperSchool);
// Map<String, Object> schoolMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
List<Map<String, Object>> schoolAllocationList = schoolMapper.getSupervisorRef();
List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
for(Map<String, Object> schoolAllocation : schoolAllocationList) {
String theUserId = Integer.toString((Integer)schoolAllocation.get("user_id"));
String theSchoolId = (String)schoolAllocation.get("school");
for(SysUser sysUser : userList) {
if(sysUser.getId().equals(theUserId)) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("account", sysUser.getAccount());
map.put("name", sysUser.getName());
map.put("schoolId", theSchoolId);
map.put("userId", sysUser.getId());
map.put("id", schoolAllocation.get("id"));
dataList.add(map);
}
}
}
for(Map<String, Object> map : dataList) {
int theSchoolId = Integer.parseInt((String)map.get("schoolId"));
for(School school : schoolList) {
if(school.getId() == theSchoolId) {
map.put("substName", school.getSubName());
map.put("schoolName", school.getSchoolName());
}
}
}
Page<Map<String, Object>> page = new Page<>(pageIndex, pageSize); Page<Map<String, Object>> page = new Page<>(pageIndex, pageSize);
List<Map<String, Object>> newList = new ArrayList<Map<String,Object>>(); List<Map<String, Object>> newList = new ArrayList<Map<String,Object>>();
if(pageIndex*pageSize > dataList.size()) { if(pageIndex*pageSize > dataList.size()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment