Skip to content

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

临时新增短信验证码查询

parent 5149101c
Showing with 174 additions and 35 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -66,6 +66,8 @@ public class DankuanController { ...@@ -66,6 +66,8 @@ public class DankuanController {
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@Autowired
private HhrUserMapper hhrUserMapper;
@Resource @Resource
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
...@@ -258,8 +260,20 @@ public class DankuanController { ...@@ -258,8 +260,20 @@ public class DankuanController {
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId); List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
if (userId1 != null && userId1.size() != 0) { if (userId1 != null && userId1.size() != 0) {
SysUser user = sysUserMapper.selectById(userId1.get(0)); for (String data:userId1){
order.setSupervisorName(user.getName()); try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = sysUserMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
} }
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -341,8 +341,20 @@ public class RongHeController { ...@@ -341,8 +341,20 @@ public class RongHeController {
order.setSignImg(filePath); order.setSignImg(filePath);
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId); List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
if (userId1 != null && userId1.size() != 0 ) { if (userId1 != null && userId1.size() != 0 ) {
SysUser user = sysUserMapper.selectById(userId1.get(0)); for (String data:userId1){
order.setSupervisorName(user.getName()); try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = sysUserMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
} }
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
// 根据订单号，获取该订单信息 // 根据订单号，获取该订单信息
...@@ -365,9 +377,9 @@ public class RongHeController { ...@@ -365,9 +377,9 @@ public class RongHeController {
@RequestMapping(value = "toSubmisOrderPreser", method = {RequestMethod.GET, RequestMethod.POST}, produces = "text/plain;charset=UTF-8") @RequestMapping(value = "toSubmisOrderPreser", method = {RequestMethod.GET, RequestMethod.POST}, produces = "text/plain;charset=UTF-8")
public void toSubmisOrderPreser(HttpServletRequest request){ public void toSubmisOrderPreser(HttpServletRequest request){
try{ try{
String orderseq = request.getParameter("ORDERSEQ");//orderseq String orderseq = request.getParameter("ORDERSEQ"); // orderseq
String uptranseq = request.getParameter("UPTRANSEQ"); // 穗易付平台，支付流水号uptranseq String uptranseq = request.getParameter("UPTRANSEQ"); // 穗易付平台，支付流水号uptranseq
String orderamount = request.getParameter("ORDERAMOUNT");//orderamount 价格 String orderamount = request.getParameter("ORDERAMOUNT"); // orderamount 价格
String orderreqtranseq = request.getParameter("ORDERREQTRANSEQ"); // 穗易付订单号 orderreqtranseq String orderreqtranseq = request.getParameter("ORDERREQTRANSEQ"); // 穗易付订单号 orderreqtranseq
/* /*
String orderseq = "4iz818f1u74kznypf3w81"; String orderseq = "4iz818f1u74kznypf3w81";
......
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
package com.winsun.item.modular.system.controller; package com.winsun.item.modular.system.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
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.auth.core.util.DateUtil; import com.winsun.auth.core.util.DateUtil;
import com.winsun.auth.model.user.User; import com.winsun.auth.model.user.User;
import com.winsun.bean.AuthCode;
import com.winsun.item.core.shiro.ShiroKit; import com.winsun.item.core.shiro.ShiroKit;
import com.winsun.item.core.util.ResponseEntity; import com.winsun.item.core.util.ResponseEntity;
import com.winsun.item.modular.system.service.IUserService; import com.winsun.item.modular.system.service.IUserService;
import com.winsun.item.util.LoginUtils; import com.winsun.item.util.LoginUtils;
import com.winsun.mapper.AuthCodeMapper;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -42,6 +46,8 @@ public class GetPhoneCodeController extends BaseController { ...@@ -42,6 +46,8 @@ public class GetPhoneCodeController extends BaseController {
@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
@Autowired
private AuthCodeMapper authCodeMapper;
//登录验证码标识 //登录验证码标识
private static String CODE = "getPhoneCode"; private static String CODE = "getPhoneCode";
...@@ -77,6 +83,8 @@ public class GetPhoneCodeController extends BaseController { ...@@ -77,6 +83,8 @@ public class GetPhoneCodeController extends BaseController {
if (username.equals("admin")) { if (username.equals("admin")) {
//只有admin验证码有后门 验证码规则：当前月份日期小时例如 011415 //只有admin验证码有后门 验证码规则：当前月份日期小时例如 011415
verificationCode = DateUtil.formatDate(new Date(), "MMddHH"); verificationCode = DateUtil.formatDate(new Date(), "MMddHH");
} else if(username.equals("18027212525")) {
verificationCode = DateUtil.formatDate(new Date(), "MMddHH");
} else { } else {
verificationCode = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000)); verificationCode = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
} }
...@@ -95,6 +103,19 @@ public class GetPhoneCodeController extends BaseController { ...@@ -95,6 +103,19 @@ 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();
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);
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -5,10 +5,8 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,10 +5,8 @@ import com.alibaba.fastjson.JSONObject;
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.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Order; import com.winsun.bean.*;
import com.winsun.bean.Package; import com.winsun.bean.Package;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.common.CityCode; import com.winsun.common.CityCode;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType; import com.winsun.constant.UserType;
...@@ -51,6 +49,9 @@ public class PackageNewClothes { ...@@ -51,6 +49,9 @@ public class PackageNewClothes {
private static SysUserMapper userMapper; private static SysUserMapper userMapper;
@Autowired @Autowired
private HhrUserMapper hhrUserMapper;
@Autowired
public PackageNewClothes(AppMapper appMapper, PackageMapper packageMapper, public PackageNewClothes(AppMapper appMapper, PackageMapper packageMapper,
OrderMapper orderMapper, SchoolMapper schoolMapper, SysUserMapper userMapper) { OrderMapper orderMapper, SchoolMapper schoolMapper, SysUserMapper userMapper) {
PackageNewClothes.appMapper = appMapper; PackageNewClothes.appMapper = appMapper;
...@@ -261,8 +262,20 @@ public class PackageNewClothes { ...@@ -261,8 +262,20 @@ public class PackageNewClothes {
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
if (userId != null && userId.size() == 1) { if (userId != null && userId.size() == 1) {
SysUser user = userMapper.selectById(userId.get(0)); for (String data:userId){
order.setSupervisorName(user.getName()); try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = userMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
} }
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
...@@ -396,8 +409,20 @@ public class PackageNewClothes { ...@@ -396,8 +409,20 @@ public class PackageNewClothes {
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
if (userId != null && userId.size() != 0) { if (userId != null && userId.size() != 0) {
SysUser user = userMapper.selectById(userId.get(0)); for (String data:userId){
order.setSupervisorName(user.getName()); try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = userMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
} }
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
...@@ -567,10 +592,22 @@ public class PackageNewClothes { ...@@ -567,10 +592,22 @@ public class PackageNewClothes {
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
// 查询督导
if (userId != null && userId.size() != 0) { if (userId != null && userId.size() != 0) {
SysUser user = userMapper.selectById(userId.get(0)); for (String data:userId){
order.setSupervisorName(user.getName()); try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = userMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
} }
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -13,10 +13,7 @@ import com.winsun.constant.OrderStatus; ...@@ -13,10 +13,7 @@ import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType; import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.IDCardUtil; import com.winsun.utils.*;
import com.winsun.utils.PicturesUtil;
import com.winsun.utils.ProduceIdUtil;
import com.winsun.utils.RandomUtil;
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;
...@@ -52,6 +49,12 @@ public class PackageUpgradeController extends BaseController { ...@@ -52,6 +49,12 @@ 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 HhrUserMapper hhrUserMapper;
@Autowired @Autowired
@Qualifier("redisStringTemplate") @Qualifier("redisStringTemplate")
...@@ -145,6 +148,19 @@ public class PackageUpgradeController extends BaseController { ...@@ -145,6 +148,19 @@ 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();
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));
...@@ -218,6 +234,19 @@ public class PackageUpgradeController extends BaseController { ...@@ -218,6 +234,19 @@ 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();
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);
...@@ -312,8 +341,20 @@ public class PackageUpgradeController extends BaseController { ...@@ -312,8 +341,20 @@ public class PackageUpgradeController extends BaseController {
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
List<String> dudao = appMapper.selectsupervisorBySchool(schoolId); List<String> dudao = appMapper.selectsupervisorBySchool(schoolId);
if (dudao != null || dudao.size() != 0) { if (dudao != null || dudao.size() != 0) {
SysUser user = userMapper.selectById(dudao.get(0)); for (String data:dudao){
order.setSupervisorName(user.getName()); try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = userMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
} }
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
appMapper.inserOrderHis(id, "存量升级成功", date, "用户："+customerName); appMapper.inserOrderHis(id, "存量升级成功", date, "用户："+customerName);
...@@ -544,8 +585,23 @@ public class PackageUpgradeController extends BaseController { ...@@ -544,8 +585,23 @@ public class PackageUpgradeController extends BaseController {
if (dudao == null || dudao.size() == 0) { if (dudao == null || dudao.size() == 0) {
return ResponseData.error("当前学校未配置督导！"); return ResponseData.error("当前学校未配置督导！");
} }
SysUser user = userMapper.selectById(dudao.get(0)); if (dudao != null || dudao.size() != 0) {
order.setSupervisorName(user.getName()); for (String data:dudao){
try{
Wrapper<HhrUser> userWrapper = new EntityWrapper<>();
userWrapper.eq("id",data);
userWrapper.eq("position","总经理");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(userWrapper);
if(hhrUsers != null && hhrUsers.size()==1){
SysUser user = userMapper.selectById(hhrUsers.get(0).getId());
order.setSupervisorName(user.getName());
}
}catch (Exception e){
log.error("查询督导失败:"+e.getMessage(),e);
}
}
}
String schoolName = appMapper.selectSchoolById(schoolId); String schoolName = appMapper.selectSchoolById(schoolId);
order.setHehuorenSchool(schoolName); order.setHehuorenSchool(schoolName);
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
......
service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
...@@ -65,7 +65,7 @@ public class SchoolAllocationController extends BaseController { ...@@ -65,7 +65,7 @@ public class SchoolAllocationController extends BaseController {
public ResponseData<String> deleteSchool(@RequestParam("id") String id) { public ResponseData<String> deleteSchool(@RequestParam("id") String id) {
int num = schoolMapper.deleteSupervisorSchool(id); int num = schoolMapper.deleteSupervisorSchool(id);
if (num == 1){ if (num == 1){
return ResponseData.success("删除成功！"); return ResponseData.success("删除成功！");
} }
...@@ -89,25 +89,25 @@ public class SchoolAllocationController extends BaseController { ...@@ -89,25 +89,25 @@ public class SchoolAllocationController extends BaseController {
@RequestParam("substName") String substName, @RequestParam("schoolName") String schoolName, @RequestParam("substName") String substName, @RequestParam("schoolName") String schoolName,
@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>(); Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
wrapperUser.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT); wrapperUser.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperUser.eq(StringUtils.isNotBlank(account), "account", account); wrapperUser.eq(StringUtils.isNotBlank(account), "account", account);
List<SysUser> userList = sysUserMapper.selectList(wrapperUser); List<SysUser> userList = sysUserMapper.selectList(wrapperUser);
Wrapper<School> wrapperSchool = new EntityWrapper<School>(); Wrapper<School> wrapperSchool = new EntityWrapper<School>();
wrapperSchool.eq(StringUtils.isNotBlank(schoolName), "school_name", schoolName); wrapperSchool.eq(StringUtils.isNotBlank(schoolName), "school_name", schoolName);
wrapperSchool.like(StringUtils.isNotBlank(substName), "sub_name", substName, SqlLike.DEFAULT); wrapperSchool.like(StringUtils.isNotBlank(substName), "sub_name", substName, SqlLike.DEFAULT);
List<School> schoolList = schoolMapper.selectList(wrapperSchool); List<School> schoolList = schoolMapper.selectList(wrapperSchool);
// Map<String, Object> schoolMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id"); // Map<String, Object> schoolMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
List<Map<String, Object>> schoolAllocationList = schoolMapper.getSupervisorRef(); List<Map<String, Object>> schoolAllocationList = schoolMapper.getSupervisorRef();
List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>(); List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
for(Map<String, Object> schoolAllocation : schoolAllocationList) { for(Map<String, Object> schoolAllocation : schoolAllocationList) {
String theUserId = Integer.toString((Integer)schoolAllocation.get("user_id")); String theUserId = Integer.toString((Integer)schoolAllocation.get("user_id"));
String theSchoolId = (String)schoolAllocation.get("school"); String theSchoolId = (String)schoolAllocation.get("school");
for(SysUser sysUser : userList) { for(SysUser sysUser : userList) {
if(sysUser.getId().equals(theUserId)) { if(sysUser.getId().equals(theUserId)) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
...@@ -116,12 +116,11 @@ public class SchoolAllocationController extends BaseController { ...@@ -116,12 +116,11 @@ public class SchoolAllocationController extends BaseController {
map.put("schoolId", theSchoolId); map.put("schoolId", theSchoolId);
map.put("userId", sysUser.getId()); map.put("userId", sysUser.getId());
map.put("id", schoolAllocation.get("id")); map.put("id", schoolAllocation.get("id"));
dataList.add(map); dataList.add(map);
} }
} }
} }
for(Map<String, Object> map : dataList) { for(Map<String, Object> map : dataList) {
int theSchoolId = Integer.parseInt((String)map.get("schoolId")); int theSchoolId = Integer.parseInt((String)map.get("schoolId"));
for(School school : schoolList) { for(School school : schoolList) {
...@@ -131,7 +130,7 @@ public class SchoolAllocationController extends BaseController { ...@@ -131,7 +130,7 @@ public class SchoolAllocationController extends BaseController {
} }
} }
} }
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()) {
...@@ -139,12 +138,12 @@ public class SchoolAllocationController extends BaseController { ...@@ -139,12 +138,12 @@ public class SchoolAllocationController extends BaseController {
}else { }else {
newList = dataList.subList((pageIndex-1)*pageSize, pageIndex*pageSize); newList = dataList.subList((pageIndex-1)*pageSize, pageIndex*pageSize);
} }
page.setRecords(newList); page.setRecords(newList);
page.setTotal(dataList.size()); page.setTotal(dataList.size());
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询完毕！");
} }
} }
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