From 87d116dc3277ae2c8c04e919677d158e352918b1 Mon Sep 17 00:00:00 2001 From: mzh820631607 Date: Tue, 20 Oct 2020 18:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msdw/tms/api/StudentControllerApi.java | 3 + .../tms/controller/StudentController.java | 6 +- .../controller/SystemSettingController.java | 30 ++++ .../com/msdw/tms/dao/SystemSetttingDao.java | 17 +++ .../java/com/msdw/tms/dao/UserInfoDao.java | 9 +- .../java/com/msdw/tms/entity/StaffEntity.java | 35 +++++ .../java/com/msdw/tms/entity/vo/StaffVo.java | 55 ++++++++ .../tms/entity/vo/StudentImportFailureVo.java | 40 ++++++ .../com/msdw/tms/service/StudentService.java | 5 +- .../tms/service/SystemSetttingService.java | 11 ++ .../tms/service/impl/StudentServiceImpl.java | 131 +++++++++++++++--- .../impl/SystemSettingServiceImpl.java | 55 ++++++++ src/main/resources/application.yml | 2 +- .../学生导入失败数据导出模板.xlsx | Bin 0 -> 9368 bytes .../resources/mapper/tms/SystemSetting.xml | 13 ++ src/main/resources/mapper/tms/UserInfoDao.xml | 21 +-- 16 files changed, 392 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/msdw/tms/controller/SystemSettingController.java create mode 100644 src/main/java/com/msdw/tms/dao/SystemSetttingDao.java create mode 100644 src/main/java/com/msdw/tms/entity/StaffEntity.java create mode 100644 src/main/java/com/msdw/tms/entity/vo/StaffVo.java create mode 100644 src/main/java/com/msdw/tms/entity/vo/StudentImportFailureVo.java create mode 100644 src/main/java/com/msdw/tms/service/SystemSetttingService.java create mode 100644 src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java create mode 100644 src/main/resources/excel-template/学生导入失败数据导出模板.xlsx create mode 100644 src/main/resources/mapper/tms/SystemSetting.xml diff --git a/src/main/java/com/msdw/tms/api/StudentControllerApi.java b/src/main/java/com/msdw/tms/api/StudentControllerApi.java index faac6bd..9efac77 100644 --- a/src/main/java/com/msdw/tms/api/StudentControllerApi.java +++ b/src/main/java/com/msdw/tms/api/StudentControllerApi.java @@ -38,4 +38,7 @@ public interface StudentControllerApi { @ApiOperation(value = "批量导入学生信息",notes = "批量导入学生信息") public R uploadFile(MultipartFile file) throws IOException; + + @ApiOperation(value = "导入学生失败原因导出",notes = "导入学生失败原因导出") + public void exportFailureRecord(HttpServletResponse response, String token) throws Exception; } diff --git a/src/main/java/com/msdw/tms/controller/StudentController.java b/src/main/java/com/msdw/tms/controller/StudentController.java index 6e21cf6..299bf14 100644 --- a/src/main/java/com/msdw/tms/controller/StudentController.java +++ b/src/main/java/com/msdw/tms/controller/StudentController.java @@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 学生管理 @@ -196,11 +197,12 @@ public class StudentController implements StudentControllerApi{ @PostMapping("/uploadFile") public R uploadFile(MultipartFile file) throws IOException{ Integer schoolId = ConstantUtils.Keda_schoolId; - HashMap upload = studentService.upload(file,schoolId); + Map upload = studentService.upload(file,schoolId); return R.ok().put("data",upload); } - @PostMapping("/export_failure") + @Override + @GetMapping("/export_failure") public void exportFailureRecord(HttpServletResponse response, String token) throws Exception{ studentService.exportFailureRecord(response,token); diff --git a/src/main/java/com/msdw/tms/controller/SystemSettingController.java b/src/main/java/com/msdw/tms/controller/SystemSettingController.java new file mode 100644 index 0000000..99aadbd --- /dev/null +++ b/src/main/java/com/msdw/tms/controller/SystemSettingController.java @@ -0,0 +1,30 @@ +package com.msdw.tms.controller; + +import com.msdw.tms.common.utils.PageUtils; +import com.msdw.tms.common.utils.R; +import com.msdw.tms.entity.vo.StaffVo; +import com.msdw.tms.service.SystemSetttingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 系统设置 + */ +@RestController +@RequestMapping("/tms/system") +public class SystemSettingController { + @Autowired + private SystemSetttingService systemSetttingService; + + @PostMapping("/addStaff") + public R addStaff(@RequestBody StaffVo staffVo){ + systemSetttingService.addStaff(staffVo); + return R.ok(); + } + + @PostMapping("/queryStaff") + public R queryStaff(@RequestBody StaffVo staffVo){ + PageUtils query = systemSetttingService.queryStaff(staffVo); + return R.ok().put("data",query); + } +} diff --git a/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java b/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java new file mode 100644 index 0000000..c057a88 --- /dev/null +++ b/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java @@ -0,0 +1,17 @@ +package com.msdw.tms.dao; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.msdw.tms.entity.vo.StaffVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.poi.ss.formula.functions.T; + +import java.util.List; + +@Mapper +public interface SystemSetttingDao { + + boolean addStaff(StaffVo staffVo); + + IPage queryStaff(Page tPage, String searchContent, StaffVo staffVo); +} diff --git a/src/main/java/com/msdw/tms/dao/UserInfoDao.java b/src/main/java/com/msdw/tms/dao/UserInfoDao.java index c5e8b6f..8fece8a 100644 --- a/src/main/java/com/msdw/tms/dao/UserInfoDao.java +++ b/src/main/java/com/msdw/tms/dao/UserInfoDao.java @@ -1,14 +1,10 @@ package com.msdw.tms.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.StudentEntity; -import com.msdw.tms.entity.UserEntity; import com.msdw.tms.entity.UserInfoEntity; import com.msdw.tms.entity.vo.StudentVo; -import com.msdw.tms.entity.vo.UserEntityVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,12 +23,13 @@ public interface UserInfoDao extends BaseMapper { Integer disableAccount(StudentVo studentIds); - List queryStudentAccount(String account,Integer schoolId); + List queryStudentAccount(String account, Integer schoolId); - List queryStudentPhone(String phone,Integer schoolId); + List queryStudentPhone(String phone, Integer schoolId); int bacthAddStudents(List students); int batchSaveUserInfo(StudentVo studentVo); + Integer addUserinfo(UserInfoEntity userInfo); } diff --git a/src/main/java/com/msdw/tms/entity/StaffEntity.java b/src/main/java/com/msdw/tms/entity/StaffEntity.java new file mode 100644 index 0000000..490f295 --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/StaffEntity.java @@ -0,0 +1,35 @@ +package com.msdw.tms.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +@TableName("staff") +public class StaffEntity { + + //员工主键id + private Integer staffId; + //员工工号 + private String workNumber; + //绑定年级id + private Integer staffGradeId; + //绑定专业id + private Integer staffProfessionalArchitectureId; + //绑定年级名称 + private String staffGradeName; + //绑定专业名称 + private String staffProfessionalArchitectureName; + //角色id + private Integer roleId; + //绑定学校id + private Integer schoolId; + //绑定用户id + private Integer userId; + //是否删除 + private Integer isdel; + //绑定平台 + private Integer platformId; +} diff --git a/src/main/java/com/msdw/tms/entity/vo/StaffVo.java b/src/main/java/com/msdw/tms/entity/vo/StaffVo.java new file mode 100644 index 0000000..3ab5a0b --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/vo/StaffVo.java @@ -0,0 +1,55 @@ +package com.msdw.tms.entity.vo; + +import com.msdw.tms.entity.UserInfoEntity; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 员工管理 + */ +@Data +@Accessors(chain = true) +public class StaffVo extends UserInfoEntity { + +//---------------------------------员工信息staff（未完全） + //员工主键id + private Integer staffId; + //员工工号 + private String workNumber; + //绑定年级id + private Integer staffGradeId; + //绑定专业id + private Integer staffProfessionalArchitectureId; + //绑定年级名称 + private String staffGradeName; + //绑定专业名称 + private String staffProfessionalArchitectureName; + //绑定平台 + private Integer platformId; + +//----------------------------------分页 + //第几页 + private Integer page; + //每页数据量 + private Integer size; + //搜索内容 + private String searchContent; + +//----------------------------------员工年级staff_grade + //员工年级表主键id +// private Integer staffGradeId; + //员工年纪表名称 +// private String staffGradeName; + //绑定员工专业组织架构id +// private Integer staffProfessionalArchitectureId; +// private Integer isdel; + +//----------------------------------员工组织关系staff_professional_architecture + //员工组织架构主键 +// private Integer staffProfessionalArchitectureId; + //员工组织架构名称 +// private String staffProfessionalArchitectureName; + //绑定学校id +// private Integer schoolId; + // private Integer isdel; +} diff --git a/src/main/java/com/msdw/tms/entity/vo/StudentImportFailureVo.java b/src/main/java/com/msdw/tms/entity/vo/StudentImportFailureVo.java new file mode 100644 index 0000000..9c4429c --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/vo/StudentImportFailureVo.java @@ -0,0 +1,40 @@ +package com.msdw.tms.entity.vo; + +import com.msdw.tms.common.utils.poi.ExcelAttribute; +import lombok.Data; +import lombok.ToString; +import lombok.experimental.Accessors; + +@Data +@ToString +@Accessors(chain = true) +public class StudentImportFailureVo { + + //第几行 + private Long index; + //用户姓名 + @ExcelAttribute(sort = 0) + private String userName; + //所属院校 + @ExcelAttribute(sort = 1) + private String schoolAppellationName; + //账号 + @ExcelAttribute(sort = 2) + private String account; + //学号 + @ExcelAttribute(sort = 3) + private String workNumber; + //手机号码 + @ExcelAttribute(sort = 4) + private String phone; + //邮箱 + @ExcelAttribute(sort = 5) + private String email; + //失败原因 + @ExcelAttribute(sort = 6) + private String failureMsg; + // +// @ExcelAttribute(sort = 7) +// private String message; + +} diff --git a/src/main/java/com/msdw/tms/service/StudentService.java b/src/main/java/com/msdw/tms/service/StudentService.java index d26d8f4..58259c6 100644 --- a/src/main/java/com/msdw/tms/service/StudentService.java +++ b/src/main/java/com/msdw/tms/service/StudentService.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; +import java.util.Map; public interface StudentService extends IService{ @@ -31,7 +32,7 @@ public interface StudentService extends IService{ void downloadFiles(HttpServletResponse response) throws IOException; - HashMap upload(MultipartFile file, Integer schoolId) throws IOException; + Map upload(MultipartFile file, Integer schoolId) throws IOException; - void exportFailureRecord(HttpServletResponse response,String token); + void exportFailureRecord(HttpServletResponse response,String token) throws Exception; } diff --git a/src/main/java/com/msdw/tms/service/SystemSetttingService.java b/src/main/java/com/msdw/tms/service/SystemSetttingService.java new file mode 100644 index 0000000..3199b68 --- /dev/null +++ b/src/main/java/com/msdw/tms/service/SystemSetttingService.java @@ -0,0 +1,11 @@ +package com.msdw.tms.service; + +import com.msdw.tms.common.utils.PageUtils; +import com.msdw.tms.entity.vo.StaffVo; + +public interface SystemSetttingService { + + boolean addStaff(StaffVo staffVo); + + PageUtils queryStaff(StaffVo staffVo); +} diff --git a/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java index 72d6084..930378f 100644 --- a/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java @@ -1,16 +1,21 @@ package com.msdw.tms.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.msdw.tms.common.exception.ExceptionCast; import com.msdw.tms.common.utils.*; +import com.msdw.tms.common.utils.poi.ExcelExportUtil; import com.msdw.tms.dao.StudentDao; import com.msdw.tms.dao.UserInfoDao; import com.msdw.tms.entity.StudentEntity; import com.msdw.tms.entity.UserInfoEntity; import com.msdw.tms.entity.XlsxTemplateEntity; import com.msdw.tms.entity.response.CommonCode; +import com.msdw.tms.entity.vo.QuestionsImportFailureVO; +import com.msdw.tms.entity.vo.StudentImportFailureVo; import com.msdw.tms.entity.vo.StudentVo; import com.msdw.tms.service.AliyunOssService; import com.msdw.tms.service.StudentService; @@ -18,6 +23,9 @@ import com.msdw.tms.service.XlsxTemplateService; import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -25,9 +33,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import java.io.InputStream; +import java.util.*; +import java.util.concurrent.TimeUnit; @Service("studentService") public class StudentServiceImpl extends ServiceImpl implements StudentService { @@ -44,6 +52,9 @@ public class StudentServiceImpl extends ServiceImpl im @Autowired private UserInfoDao userInfoDao; + @Resource + StringRedisTemplate stringRedisTemplate; + @Override public Integer queryStudentIdNumber(String workNumber,Integer schoolId) { List result = studentDao.queryStudentIdNumber(workNumber,schoolId); @@ -88,7 +99,7 @@ public class StudentServiceImpl extends ServiceImpl im public boolean updateStudent(StudentVo studentVo) { try { Integer update = studentDao.updateStudent(studentVo); - return true; + return true; }catch (RuntimeException e){ e.printStackTrace(); return false; @@ -105,14 +116,14 @@ public class StudentServiceImpl extends ServiceImpl im R r = new R(); boolean result = studentDao.addStudentInfo(userInfoEntity); if (result==false){ - r.put("code",300); - r.put("errmessage","注册失败！"); - return r; - }else{ - r.put("code",200); - r.put("errmessage","注册成功！"); - return r; - } + r.put("code",300); + r.put("errmessage","注册失败！"); + return r; + }else{ + r.put("code",200); + r.put("errmessage","注册成功！"); + return r; + } } @Override @@ -123,30 +134,40 @@ public class StudentServiceImpl extends ServiceImpl im @Transactional @Override - public HashMap upload(MultipartFile file, Integer schoolId) throws IOException{ + public Map upload(MultipartFile file, Integer schoolId) throws IOException{ List students = ExcelImportHelper.readStudent(file); - + List failVo1 = new ArrayList<>(); // 参数合法性校验，只能上传.xlsx后缀的文件 if (StringUtils.isBlank(file.getOriginalFilename()) || !file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")).equals(Constant.EXCEL_SUFFIX)) { ExceptionCast.cast(CommonCode.EXCEL_FILE_INVALID); } - - HashMap map = new HashMap<>(); + int size = students.size(); + Map map = new HashMap<>(); + Long ii = 1L;//用于记录序列号 try { for (int i = 0;i result1 = studentDao.queryStudentIdNumber(workNumber,schoolId); + List result4 = userInfoDao.queryStudentAccount(account, schoolId); String email = student.getEmail(); if (phone!=null&&phone!=""){ List result2 = userInfoDao.queryStudentPhone(phone, schoolId); if (result2.size()==1){ log.error("该号码已被使用"); - map.put("被占用电话号码序列："+System.currentTimeMillis(),"电话号码："+phone); + StudentImportFailureVo vo = new StudentImportFailureVo(); + ++ii; + vo.setIndex(ii).setUserName(student.getUserName()).setSchoolAppellationName(student.getSchoolAppellationName()) + .setAccount(student.getAccount()).setWorkNumber(student.getWorkNumber()).setPhone(student.getPhone()+" (重复的号码)").setEmail(student.getEmail()) + ; +// .setFailureMsg("重复的号码"); + failVo1.add(vo); +// map.put("被占用电话号码序列："+System.currentTimeMillis(),"电话号码："+phone); students.remove(i); i--; continue; @@ -161,22 +182,50 @@ public class StudentServiceImpl extends ServiceImpl im studentVo.setUniqueIdentificationAccount(String.valueOf(System.currentTimeMillis())). setPassword(ConstantUtils.INITIAL_PASSWORD) .setSchoolId(ConstantUtils.Keda_schoolId).setRoleId(ConstantUtils.STUDENT_ROLE) - ; + ; studentVo.setAccount(student.getAccount()).setSchoolAppellationName(schoolAppellationName).setUserName(student.getUserName()).setIsdel(Constant.IsDel.NOT_DEL.getType()); if (result1.size()==1){ log.error("该学号已存在"); - map.put("学号已存在序列："+System.currentTimeMillis(),"学号："+workNumber); + StudentImportFailureVo vo = new StudentImportFailureVo(); + ++ii; + vo.setIndex(ii).setUserName(student.getUserName()).setSchoolAppellationName(student.getSchoolAppellationName()) + .setAccount(student.getAccount()).setWorkNumber(student.getWorkNumber()+" (重复的学号)").setPhone(student.getPhone()).setEmail(student.getEmail()) + ; +// .setFailureMsg("重复的学号"); + failVo1.add(vo); +// map.put("学号已存在序列："+System.currentTimeMillis(),"学号："+workNumber); + students.remove(i); + i--; + continue; + }else if(result4.size()==1){ + log.error("账号已存在"); + StudentImportFailureVo vo = new StudentImportFailureVo(); + ++ii; + vo.setIndex(ii).setUserName(student.getUserName()).setSchoolAppellationName(student.getSchoolAppellationName()) + .setAccount(student.getAccount()+" (重复的账号)").setWorkNumber(student.getWorkNumber()).setPhone(student.getPhone()).setEmail(student.getEmail()) + ; +// .setFailureMsg("重复的账号"); + failVo1.add(vo); +// map.put("学号已存在序列："+System.currentTimeMillis(),"学号："+workNumber); students.remove(i); i--; continue; - }else if(result3.size()!=1){ + } + else if(result3.size()!=1){ log.error("不存在该院校"); - map.put("错误的学校名称序列："+System.currentTimeMillis(),"学校名称："+schoolAppellationName); + StudentImportFailureVo vo = new StudentImportFailureVo(); + ++ii; + vo.setIndex(ii).setUserName(student.getUserName()).setSchoolAppellationName(student.getSchoolAppellationName()) + .setAccount(student.getAccount()).setWorkNumber(student.getWorkNumber()).setPhone(student.getPhone()).setEmail(student.getEmail()) + .setFailureMsg("不存在的院校"); + failVo1.add(vo); +// map.put("错误的学校名称序列："+System.currentTimeMillis(),"学校名称："+schoolAppellationName); students.remove(i); i--; continue; } + ++ii; if (!students.isEmpty()&&students.size()>0){ userInfoDao.batchSaveUserInfo(studentVo); student.setUserId(studentVo.getUserId()).setIsdel(Constant.IsDel.NOT_DEL.getType()).setPlatformId(ConstantUtils.PLATFORMID); @@ -185,18 +234,56 @@ public class StudentServiceImpl extends ServiceImpl im throw new RuntimeException(); } } + + } }catch (RuntimeException e){ log.error(e.getMessage()); + map.put("failura","添加失败"); throw new RuntimeException(); } + String token = ""; + + // 有导入失败的数据，才会存入redis + if (failVo1.size() > 0) { + //生成token + token = "FAILURE_IMPORT" + UUID.randomUUID().toString().replace("-", ""); + + ValueOperations ops = stringRedisTemplate.opsForValue(); + String failureVOJson = JSON.toJSONString(failVo1); + + ops.set(token, failureVOJson, 30 * 60, TimeUnit.SECONDS); + } + map.put("token", token); + map.put("successNum", (size-failVo1.size())+""); + map.put("failureNum", failVo1.size()+""); return map; } @Override - public void exportFailureRecord(HttpServletResponse response,String token) { + public void exportFailureRecord(HttpServletResponse response,String token) throws Exception{ + if (StringUtils.isEmpty(token)) { + return; + } + ValueOperations ops = stringRedisTemplate.opsForValue(); + //获取数据 + String record = ops.get(token); + if (StringUtils.isEmpty(record)) { + return; + } + List parse = JSON.parseObject(record, new TypeReference>() { + }); + + parse.sort(Comparator.comparing(StudentImportFailureVo::getIndex)); + + //2.加载模板流数据 + org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/学生导入失败数据导出模板.xlsx"); + InputStream inputStream = resource.getInputStream(); + //3、通过工具类下载文件 + new ExcelExportUtil(StudentImportFailureVo.class, Constant.ROW_INDEX, Constant.STYLE_INDEX). + export(response, inputStream, parse, "学生信息导入失败表.xlsx"); } // public HashMap readStudent(Integer schoolId, MultipartFile file) { diff --git a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java new file mode 100644 index 0000000..f3a2556 --- /dev/null +++ b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java @@ -0,0 +1,55 @@ +package com.msdw.tms.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.msdw.tms.common.utils.Constant; +import com.msdw.tms.common.utils.ConstantUtils; +import com.msdw.tms.common.utils.PageUtils; +import com.msdw.tms.dao.SystemSetttingDao; +import com.msdw.tms.dao.UserInfoDao; +import com.msdw.tms.entity.UserInfoEntity; +import com.msdw.tms.entity.vo.StaffVo; +import com.msdw.tms.entity.vo.StudentVo; +import com.msdw.tms.service.SystemSetttingService; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; + +@Service("systemSetttingService") +public class SystemSettingServiceImpl implements SystemSetttingService { + + @Autowired + private SystemSetttingDao systemSetttingDao; + + @Autowired + private UserInfoDao userInfoDao; + + @Override + @Transactional + public boolean addStaff(StaffVo staffVo) { +// UserInfoEntity userInfo = new UserInfoEntity(); + staffVo.setPlatformId(ConstantUtils.PLATFORMID).setUniqueIdentificationAccount(String.valueOf(System.currentTimeMillis())).setIsdel(Constant.IsDel.NOT_DEL.getType()) + .setSchoolId(ConstantUtils.Keda_schoolId); + Integer userId = userInfoDao.addUserinfo(staffVo); + boolean result = systemSetttingDao.addStaff(staffVo); + if (!result){ + throw new RuntimeException(); + } + return result; + } + + @Override + public PageUtils queryStaff(StaffVo staffVo) { + Page tPage = new Page<>(staffVo.getPage(),staffVo.getSize()); +// IPage saveStudent = studentDao.queryStudent(tPage,searchContent,schoolId); + IPage staff = systemSetttingDao.queryStaff(tPage,staffVo.getSearchContent(),staffVo); + PageUtils pageUtils = new PageUtils(staff); + return pageUtils; + } + + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5537c11..5660afe 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,7 +17,7 @@ spring: # port: 6379 # password: huoran redis: - host: 192.168.31.125 + host: 127.0.0.1 port: 6379 password: mybatis-plus: diff --git a/src/main/resources/excel-template/学生导入失败数据导出模板.xlsx b/src/main/resources/excel-template/学生导入失败数据导出模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d0cb19815a07977a71c73625bc6b9936d15e92d7 GIT binary patch literal 9368 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/mapper/tms/SystemSetting.xml b/src/main/resources/mapper/tms/SystemSetting.xml new file mode 100644 index 0000000..292943f --- /dev/null +++ b/src/main/resources/mapper/tms/SystemSetting.xml @@ -0,0 +1,13 @@ + + + + + + INSERT INTO staff (userId,schoolId,workNumber,staffGradeId,staffProfessionalArchitectureId,staffGradeName,staffProfessionalArchitectureName,platformId,roleId) + VALUES + (#{userId},#{schoolId},#{workNumber},#{staffGradeId},#{staffProfessionalArchitectureId},#{staffGradeName},#{staffProfessionalArchitectureName},#{platformId},#{roleId}) + + + \ No newline at end of file diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml index 79c66ca..2804ae8 100644 --- a/src/main/resources/mapper/tms/UserInfoDao.xml +++ b/src/main/resources/mapper/tms/UserInfoDao.xml @@ -6,10 +6,10 @@ insert into hr_user_info( userName, uniqueIdentificationAccount, provinceId, - cityId, schoolId, phone,account,password,roleId,schoolAppellationId) + cityId, schoolId, phone,account,password,roleId,schoolAppellationId,creationTime) values( #{userName}, #{uniqueIdentificationAccount}, #{provinceId}, - #{cityId}, #{schoolId},#{phone}, #{account},#{password},#{roleId},#{schoolAppellationId}) + #{cityId}, #{schoolId},#{phone}, #{account},#{password},#{roleId},#{schoolAppellationId},now()) @@ -81,27 +81,32 @@ - INSERT INTO hr_user_info ( userName,email,phone,uniqueIdentificationAccount, schoolId, account,password, roleId,isdel,schoolAppellationId) + INSERT INTO hr_user_info ( userName,email,phone,uniqueIdentificationAccount, schoolId, account,password, roleId,isdel,schoolAppellationId,creationTime) VALUES - ( #{userName},#{email},#{phone},#{uniqueIdentificationAccount}, #{schoolId}, #{account}, #{password}, 4 ,0,#{schoolAppellationId}) + ( #{userName},#{email},#{phone},#{uniqueIdentificationAccount}, #{schoolId}, #{account}, #{password}, 4 ,0,#{schoolAppellationId},now()) insert into hr_user_info( - userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId) + userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId,creationTime) values (#{studentVo.userName}, #{studentVo.uniqueIdentificationAccount},#{studentVo.schoolId}, #{studentVo.phone}, #{studentVo.account},#{studentVo.password},#{studentVo.roleId}, - (SELECT schoolId FROM school WHERE schoolName = #{studentVo.schoolAppellationName})) + (SELECT schoolId FROM school WHERE schoolName = #{studentVo.schoolAppellationName}),now()) insert into hr_user_info( - userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId) + userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId,creationTime) values (#{userName}, #{uniqueIdentificationAccount},#{schoolId}, #{phone}, #{account},#{password},#{roleId}, - (SELECT schoolId FROM school WHERE schoolName = #{schoolAppellationName})) + (SELECT schoolId FROM school WHERE schoolName = #{schoolAppellationName}),now()) + + + INSERT INTO hr_user_info ( account, userName, roleId, phone, email, uniqueIdentificationAccount, schoolId,creationTime) + VALUES + (#{account},#{userName},#{roleId},#{phone},#{email},#{uniqueIdentificationAccount},#{schoolId},now())