Merge remote-tracking branch 'origin/master'

master
river 4 years ago
commit 1d4faeda52
  1. 21
      src/main/java/com/yipin/liuwanr/controller/CustomerController.java
  2. 4
      src/main/java/com/yipin/liuwanr/controller/ExperimentalClassController.java
  3. 3
      src/main/java/com/yipin/liuwanr/controller/OrderController.java
  4. 473
      src/main/java/com/yipin/liuwanr/controller/UserInfoController.java
  5. 19
      src/main/java/com/yipin/liuwanr/entity/ExperimentalClass.java
  6. 402
      src/main/java/com/yipin/liuwanr/entity/UserInfo.java
  7. 7
      src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java
  8. 6
      src/main/java/com/yipin/liuwanr/mapper/ExperimentallearningMapper.java
  9. 5
      src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java
  10. 5
      src/main/java/com/yipin/liuwanr/mapper/ServiceConfigMapper.java
  11. 17
      src/main/java/com/yipin/liuwanr/mapper/UserMapper.java
  12. 36
      src/main/java/com/yipin/liuwanr/service/ExperimentalClassService.java
  13. 6
      src/main/java/com/yipin/liuwanr/service/ExperimentallearningService.java
  14. 25
      src/main/java/com/yipin/liuwanr/service/OrderService.java
  15. 11
      src/main/java/com/yipin/liuwanr/service/PracticeService.java
  16. 13
      src/main/java/com/yipin/liuwanr/service/ServiceConfigService.java
  17. 31
      src/main/java/com/yipin/liuwanr/service/UserService.java
  18. 6
      src/main/java/com/yipin/liuwanr/vo/OrderVo.java
  19. 28
      src/test/java/com/yipin/liuwanr/AliyunOssServiceTest.java
  20. 42
      src/test/java/com/yipin/liuwanr/ExperimentalClassServiceTest.java
  21. 217
      src/test/java/com/yipin/liuwanr/OrderServiceTest.java
  22. 83
      src/test/java/com/yipin/liuwanr/ServiceConfigServiceTest.java

@ -1,22 +1,15 @@
package com.yipin.liuwanr.controller; package com.yipin.liuwanr.controller;
import java.util.HashMap;
import com.yipin.liuwanr.entity.School;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.yipin.liuwanr.entity.Customer; import com.yipin.liuwanr.entity.Customer;
import com.yipin.liuwanr.entity.Response; import com.yipin.liuwanr.entity.Response;
import com.yipin.liuwanr.entity.School;
import com.yipin.liuwanr.entity.UserM; import com.yipin.liuwanr.entity.UserM;
import com.yipin.liuwanr.helper.RedisHelper; import com.yipin.liuwanr.helper.RedisHelper;
import com.yipin.liuwanr.service.CustomerService; import com.yipin.liuwanr.service.CustomerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@RestController @RestController
@RequestMapping("/customer") @RequestMapping("/customer")
@ -54,7 +47,8 @@ public class CustomerController {
if (email == null || email == "") { if (email == null || email == "") {
resp.setStatus(300); resp.setStatus(300);
resp.setErrmessage("邮箱不能为空!"); resp.setErrmessage("邮箱不能为空!");
}if (phone==null||phone==""){ }
if (phone == null || phone == "") {
resp.setStatus(300); resp.setStatus(300);
resp.setErrmessage("电话不能为空!"); resp.setErrmessage("电话不能为空!");
} else if (name == null || name == "") { } else if (name == null || name == "") {
@ -206,6 +200,7 @@ public class CustomerController {
} }
return resp; return resp;
} }
/** /**
* 查询行业类 * 查询行业类
*/ */

@ -297,7 +297,7 @@ public class ExperimentalClassController {
Integer schoolId = experimentalClass.getSchoolId(); Integer schoolId = experimentalClass.getSchoolId();
if (schoolId==null) { if (schoolId==null) {
resp.setStatus(300); resp.setStatus(300);
resp.setErrmessage("Parameter Invalid"); resp.setErrmessage("学校为空,新增失败!");
}else { }else {
HashMap<String, Object> ret = classService.addExperimentalClass(experimentalClass); HashMap<String, Object> ret = classService.addExperimentalClass(experimentalClass);
Integer experimentalClassId = experimentalClass.getExperimentalClassId(); Integer experimentalClassId = experimentalClass.getExperimentalClassId();
@ -336,7 +336,7 @@ public class ExperimentalClassController {
Integer experimentalClassId = experimentalClass.getExperimentalClassId(); Integer experimentalClassId = experimentalClass.getExperimentalClassId();
if (experimentalClassId==null) { if (experimentalClassId==null) {
resp.setStatus(300); resp.setStatus(300);
resp.setErrmessage("Parameter cannot be empty"); resp.setErrmessage("实验班级为空,删除失败!");
}else { }else {
HashMap<String, Object> ret = classService.deleteExperimentalClass(experimentalClassId); HashMap<String, Object> ret = classService.deleteExperimentalClass(experimentalClassId);
int status = (int) ret.get("retcode"); int status = (int) ret.get("retcode");

@ -1,6 +1,5 @@
package com.yipin.liuwanr.controller; package com.yipin.liuwanr.controller;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.yipin.liuwanr.entity.ContractInformation; import com.yipin.liuwanr.entity.ContractInformation;
import com.yipin.liuwanr.entity.CoursePermissions; import com.yipin.liuwanr.entity.CoursePermissions;
import com.yipin.liuwanr.entity.Order; import com.yipin.liuwanr.entity.Order;
import com.yipin.liuwanr.entity.OrderVo; import com.yipin.liuwanr.vo.OrderVo;
import com.yipin.liuwanr.entity.Response; import com.yipin.liuwanr.entity.Response;
import com.yipin.liuwanr.helper.RedisHelper; import com.yipin.liuwanr.helper.RedisHelper;
import com.yipin.liuwanr.service.OrderService; import com.yipin.liuwanr.service.OrderService;

@ -0,0 +1,473 @@
package com.yipin.liuwanr.controller;
import com.yipin.liuwanr.entity.Staff;
import com.yipin.liuwanr.entity.Student;
import com.yipin.liuwanr.entity.UserInfo;
import com.yipin.liuwanr.entity.UserM;
import com.yipin.liuwanr.helper.RedisHelper;
import com.yipin.liuwanr.service.StaffService;
import com.yipin.liuwanr.service.StudentService;
import com.yipin.liuwanr.service.UserService;
import com.yipin.liuwanr.vo.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
@RestController
@RequestMapping("/userInfo")
public class UserInfoController {
@Autowired
private UserService userService;
@Autowired
private StudentService studentService;
@Autowired
private StaffService staffService;
@Autowired
RedisHelper redisHelper;
/**
* 添加用户
*/
@Transactional
@PostMapping("/addUser")
Response addUser(@RequestBody UserVO vo) {
Response resp = new Response();
//用户实体
UserM user = vo.getUser();
//学生实体
Student student = vo.getStudent();
//员工实体
Staff staff = vo.getStaff();
//用户手机号
String phone = user.getPhone();
//用户名称
String name = user.getName();
//省份id
Integer provinceId = user.getProvinceId();
//用户角色id
Integer accountRole = user.getAccountRole();
//城市id
Integer cityId = user.getCityId();
//学校id
Integer schoolId = user.getSchoolId();
if (phone==null||phone=="") {
resp.setStatus(300);
resp.setErrmessage("电话不能为空!");
}else if(name==null||name==""){
resp.setStatus(300);
resp.setErrmessage("姓名不能为空!");
}else if(provinceId==null){
resp.setStatus(300);
resp.setErrmessage("省份不能为空!");
}else if(accountRole==null){
resp.setStatus(300);
resp.setErrmessage("用户角色不能为空!");
}else if(cityId==null){
resp.setStatus(300);
resp.setErrmessage("城市不能为空!");
}else if(schoolId==null){
resp.setStatus(300);
resp.setErrmessage("学校不能为空!");
}else {
HashMap<String, Object> ret = userService.addUser(user);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
if (accountRole == 4){
HashMap<String, Object> stu = studentService.addStudent(student);
int stuStatus = (int) stu.get("retcode");
if (stuStatus == 200){
resp.setStatus(stuStatus);
resp.setMessage(stu.get("retvalue"));
}else {
resp.setStatus(stuStatus);
resp.setErrmessage(stu.get("retvalue").toString());
throw new RuntimeException();
}
}
if(accountRole == 3||accountRole==2){
HashMap<String, Object> sta = staffService.addStaff(staff);
int staStatus = (int) sta.get("retcode");
if (staStatus == 200){
resp.setStatus(staStatus);
resp.setMessage(sta.get("retvalue"));
}else {
resp.setStatus(staStatus);
resp.setErrmessage(sta.get("retvalue").toString());
throw new RuntimeException();
}
}
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
throw new RuntimeException();
}
}
return resp;
}
/**
* 查询用户(根据国家省份城市)
*/
@GetMapping("/queryUserInfo")
Response queryUserInfo(@RequestParam String countries, Integer provinceId, Integer cityId, Integer pageNo, Integer pageSize, Integer schoolId, Integer roleId, String searchContent, Integer month, String creationTime, String endTime) {
Response resp = new Response();
UserInfo userInfo = new UserInfo();
//设置国家
if (countries != null&&countries!="") {
userInfo.setCountries(countries);
}
//设置省份
if(provinceId!=null) {
userInfo.setProvinceId(provinceId);
}
//设置城市
if(cityId!=null) {
userInfo.setCityId(cityId);
}
//学校
if (schoolId!=null) {
userInfo.setSchoolId(schoolId);
}
//角色
if (roleId!=null) {
userInfo.setRoleId(roleId);
}
//搜索内容
if (searchContent!=null&&searchContent!="") {
userInfo.setSearchContent(searchContent);
}
//月份
if (month!=null) {
userInfo.setMonth(month);;
}
//创建时间
if (creationTime!=null&&creationTime!="") {
userInfo.setCreationTime(creationTime);
}
//结束时间
if (endTime!=null&&endTime!="") {
userInfo.setEndTime(endTime);
}
HashMap<String, Object> ret = userService.queryUserInfo(userInfo,pageNo,pageSize);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
return resp;
}
/**
* 删除用户(根据ID修改isdel状态,0可见 1不可见)
*/
@Transactional
@PostMapping("/deleteUserInfo")
Response deleteUser(@RequestBody List<UserM> userList) {
Response resp = new Response();
int size = userList.size();
for(int i=0;i<size;i++){
UserM user = userList.get(i);
Integer userId = user.getUserId();
Integer roleId = user.getAccountRole();
String phone = user.getPhone();
if (userId==null) {
resp.setStatus(300);
resp.setErrmessage("用户id为空,删除用户失败!");
}else if (phone==null||phone==""){
resp.setStatus(300);
resp.setErrmessage("用户电话为空,删除用户失败!");
}else if (roleId==null){
resp.setStatus(300);
resp.setErrmessage("用户角色为空,删除用户失败!");
} else {
HashMap<String, Object> ret = userService.deleteUser(userId);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
if (roleId==3||roleId==2){
HashMap<String, Object> sta = userService.deleteStaff(user);
int staStatus = (int) ret.get("retcode");
if (200 == staStatus) {
resp.setStatus(staStatus);
resp.setMessage(sta.get("retvalue"));
}else{
resp.setStatus(staStatus);
resp.setErrmessage(sta.get("retvalue").toString());
throw new RuntimeException();
}
}
if (roleId==4){
HashMap<String, Object> stu = userService.deleteStudent(user);
int stuStatus = (int) stu.get("retcode");
if (200 == stuStatus) {
resp.setStatus(stuStatus);
resp.setMessage(stu.get("retvalue"));
}else{
resp.setStatus(stuStatus);
resp.setErrmessage(stu.get("retvalue").toString());
throw new RuntimeException();
}
}
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
throw new RuntimeException();
}
}
}
return resp;
}
/**
* 更新用户
*/
@Transactional
@PostMapping("/updateUser")
Response updateUser(@RequestBody UserVO vo) {
Response resp = new Response();
UserM user = vo.getUser();
Staff staff = vo.getStaff();
Student student = vo.getStudent();
Integer userId = user.getUserId();
Integer roleId = user.getAccountRole();
if (userId==null) {
resp.setStatus(300);
resp.setErrmessage("用户ID为空,修改用户失败!");
}else if (roleId==null){
resp.setStatus(300);
resp.setErrmessage("角色ID为空,修改用户失败!");
}
else {
HashMap<String, Object> ret = userService.updateUser(user);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
if (roleId ==3||roleId==2){
HashMap<String, Object> sta = userService.updateStaff(staff);
int staStatus = (int) sta.get("retcode");
if (200 == status) {
resp.setStatus(staStatus);
resp.setMessage(sta.get("retvalue"));
}else{
resp.setStatus(staStatus);
resp.setErrmessage(sta.get("retvalue").toString());
throw new RuntimeException("修改员工失败!");
}
}
if (roleId ==4){
HashMap<String, Object> stu = userService.updateStudent(student);
int stuStatus = (int) stu.get("retcode");
if (200 == status) {
resp.setStatus(stuStatus);
resp.setMessage(stu.get("retvalue"));
}else{
resp.setStatus(stuStatus);
resp.setErrmessage(stu.get("retvalue").toString());
throw new RuntimeException("修改学生失败!");
}
}
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
throw new RuntimeException("修改用户失败!");
}
}
return resp;
}
/**
* 登陆(前台传来的key必须是phonepassword)
*/
@GetMapping("/logins")
Response logins(@RequestParam("phone") String phone, @RequestParam("password") String password,
HttpServletRequest req, HttpServletResponse res) {
Response resp = new Response();
UserM user = new UserM();
if (phone != null) {
user.setPhone(phone);
}if(password!=null) {
user.setPassword(password);
}
HashMap<String, Object> ret = userService.logins(user);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
return resp;
}
/**
* 查询用户详情(ID)
*/
@GetMapping("/queryUserDetails")
Response queryUserDetails(@RequestParam Integer userId, Integer roleId) {
Response resp = new Response();
if (roleId == null){
resp.setStatus(300);
resp.setErrmessage("用户角色id为空!查询失败!");
}else if (userId==null) {
resp.setStatus(300);
resp.setErrmessage("用户id为空!查询失败!");
}else {
HashMap<String, Object> ret = userService.queryUserDetails(userId,roleId);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
}
return resp;
}
@PostMapping("/uploadUserAvatars")
Response uploadUserAvatars(MultipartFile file, Integer userId) {
Response resp = new Response();
if (userId==null) {//前台传来的值是否为空
resp.setStatus(300);
resp.setErrmessage("Parameter Invalid");
}else {
HashMap<String, Object> ret = userService.uploadUserAvatars(file,userId);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
}
return resp;
}
/**
* 更新登录次数和时间
*/
@PostMapping("/updateLogInNumber")
Response updateLogInNumber(@RequestBody UserM user) {
Response resp = new Response();
Integer userId = user.getUserId();
String phone = user.getPhone();
Integer accountRole = user.getAccountRole();
if (userId==null) {
resp.setStatus(300);
resp.setErrmessage("用户id不能为空!");
}else if(phone==null||phone==""){
resp.setStatus(300);
resp.setErrmessage("用户电话不能为空!");
} else if(accountRole==null){
resp.setStatus(300);
resp.setErrmessage("用户角色不能为空!");
} else {
HashMap<String, Object> ret = userService.updateLogInNumber(user);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
}
return resp;
}
/**
* 用户模块查询客户
*/
@GetMapping("/queryCustomer")
Response queryCustomer(@RequestParam Integer cityId, Integer provinceId) {
Response resp = new Response();
if(provinceId == null){
resp.setStatus(300);
resp.setErrmessage("省份id为空!查询失败!");
}else if (cityId==null) {
resp.setStatus(300);
resp.setErrmessage("城市id为空!查询失败!");
}else {
HashMap<String, Object> ret = userService.queryCustomer(cityId,provinceId);
resp.setStatus(200);
resp.setErrmessage("查询成功!");
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
}
return resp;
}
/**
* 查询账号是否存在
*/
@GetMapping("/queryAccountIsExist")
Response queryAccountIsExist(@RequestParam String userAccount) {
Response resp = new Response();
if (userAccount==null) {
resp.setStatus(300);
resp.setErrmessage("账号为空!");
}else {
HashMap<String, Object> ret = userService.queryAccountIsExist(userAccount);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
}
return resp;
}
/**
* 查询学号工号是否存在
*/
@GetMapping("/queryWorkNumberIsExist")
Response queryWorkNumberIsExist(@RequestParam String workNumber) {
Response resp = new Response();
if (workNumber==null) {
resp.setStatus(300);
resp.setErrmessage("账号为空!");
}else {
HashMap<String, Object> ret = userService.queryWorkNumberIsExist(workNumber);
int status = (int) ret.get("retcode");
if (200 == status) {
resp.setStatus(status);
resp.setMessage(ret.get("retvalue"));
} else {
resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString());
}
}
return resp;
}
}

@ -6,7 +6,6 @@ import java.util.List;
* 实验班级信息 * 实验班级信息
* *
* @author 全承珠 * @author 全承珠
*
*/ */
public class ExperimentalClass { public class ExperimentalClass {
@ -130,4 +129,22 @@ public class ExperimentalClass {
public void setCourseId(Integer courseId) { public void setCourseId(Integer courseId) {
this.courseId = courseId; this.courseId = courseId;
} }
@Override
public String toString() {
return "ExperimentalClass{" +
"experimentalClassId=" + experimentalClassId +
", experimentalClassName='" + experimentalClassName + '\'' +
", classSize=" + classSize +
", practiceNumber=" + practiceNumber +
", inspectionNumber=" + inspectionNumber +
", courseSchedule='" + courseSchedule + '\'' +
", creationTime='" + creationTime + '\'' +
", founder='" + founder + '\'' +
", courseId=" + courseId +
", schoolId=" + schoolId +
", userId=" + userId +
", students=" + students +
'}';
}
} }

@ -0,0 +1,402 @@
package com.yipin.liuwanr.entity;
import java.util.List;
/**
* 用户信息实体
*
* @author Ning
*/
public class UserInfo {
//用户id
private Integer userId;
//角色id
private Integer roleId;
//用户姓名
private String userName;
//用户账号
private String account;
//用户密码
private String password;
//国家
private String countries;
//绑定省份id
private Integer provinceId;
//绑定城市id
private Integer cityId;
//创建时间
private String creationTime;
//登陆次数
private Integer logInNumber;
//上次登陆时间
private String lastTimeOfLanding;
//性别
private Integer sex;
//证件类型(1、身份证)
private Integer documentType;
//身份证
private String IDNumber;
//教育程度(1、研究数及以上)
private Integer educationDegree;
//电话
private String phone;
//微信账号
private String WeChatID;
//出生日期
private String dateBirth;
//邮箱
private String email;
//学校id
private Integer schoolId;
//唯一标示性账号
private String uniqueIdentificationAccount;
//搜索内容
private String searchContent;
private List<UserInfo> user;
//用户头像路径
private String userAvatars;
//------------------------------------------------
//学校名称
private String schoolName;
//省份名称
private String provinceName;
//城市名称
private String cityName;
//条件查询月
private Integer month;
//条件查询结束时间
private String endTime;
//专业类ID
private Integer professionalClassId;
//专业类名称
private String professionalClassName;
//学科ID
private Integer disciplineId;
//学科名称
private String disciplineName;
//专业id
private Integer professionalId;
//专业名称
private String professionalName;
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getCountries() {
return countries;
}
public void setCountries(String countries) {
this.countries = countries;
}
public Integer getProvinceId() {
return provinceId;
}
public void setProvinceId(Integer provinceId) {
this.provinceId = provinceId;
}
public Integer getCityId() {
return cityId;
}
public void setCityId(Integer cityId) {
this.cityId = cityId;
}
public String getCreationTime() {
return creationTime;
}
public void setCreationTime(String creationTime) {
this.creationTime = creationTime;
}
public Integer getLogInNumber() {
return logInNumber;
}
public void setLogInNumber(Integer logInNumber) {
this.logInNumber = logInNumber;
}
public String getLastTimeOfLanding() {
return lastTimeOfLanding;
}
public void setLastTimeOfLanding(String lastTimeOfLanding) {
this.lastTimeOfLanding = lastTimeOfLanding;
}
public Integer getSex() {
return sex;
}
public void setSex(Integer sex) {
this.sex = sex;
}
public Integer getDocumentType() {
return documentType;
}
public void setDocumentType(Integer documentType) {
this.documentType = documentType;
}
public String getIDNumber() {
return IDNumber;
}
public void setIDNumber(String IDNumber) {
this.IDNumber = IDNumber;
}
public Integer getEducationDegree() {
return educationDegree;
}
public void setEducationDegree(Integer educationDegree) {
this.educationDegree = educationDegree;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getWeChatID() {
return WeChatID;
}
public void setWeChatID(String weChatID) {
WeChatID = weChatID;
}
public String getDateBirth() {
return dateBirth;
}
public void setDateBirth(String dateBirth) {
this.dateBirth = dateBirth;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public Integer getSchoolId() {
return schoolId;
}
public void setSchoolId(Integer schoolId) {
this.schoolId = schoolId;
}
public String getUniqueIdentificationAccount() {
return uniqueIdentificationAccount;
}
public void setUniqueIdentificationAccount(String uniqueIdentificationAccount) {
this.uniqueIdentificationAccount = uniqueIdentificationAccount;
}
public String getSearchContent() {
return searchContent;
}
public void setSearchContent(String searchContent) {
this.searchContent = searchContent;
}
public List<UserInfo> getUser() {
return user;
}
public void setUser(List<UserInfo> user) {
this.user = user;
}
public String getUserAvatars() {
return userAvatars;
}
public void setUserAvatars(String userAvatars) {
this.userAvatars = userAvatars;
}
public String getSchoolName() {
return schoolName;
}
public void setSchoolName(String schoolName) {
this.schoolName = schoolName;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public Integer getMonth() {
return month;
}
public void setMonth(Integer month) {
this.month = month;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public Integer getProfessionalClassId() {
return professionalClassId;
}
public void setProfessionalClassId(Integer professionalClassId) {
this.professionalClassId = professionalClassId;
}
public String getProfessionalClassName() {
return professionalClassName;
}
public void setProfessionalClassName(String professionalClassName) {
this.professionalClassName = professionalClassName;
}
public Integer getDisciplineId() {
return disciplineId;
}
public void setDisciplineId(Integer disciplineId) {
this.disciplineId = disciplineId;
}
public String getDisciplineName() {
return disciplineName;
}
public void setDisciplineName(String disciplineName) {
this.disciplineName = disciplineName;
}
public Integer getProfessionalId() {
return professionalId;
}
public void setProfessionalId(Integer professionalId) {
this.professionalId = professionalId;
}
public String getProfessionalName() {
return professionalName;
}
public void setProfessionalName(String professionalName) {
this.professionalName = professionalName;
}
public Integer getRoleId() {
return roleId;
}
public void setRoleId(Integer roleId) {
this.roleId = roleId;
}
@Override
public String toString() {
return "UserInfo{" +
"userId=" + userId +
", roleId=" + roleId +
", userName='" + userName + '\'' +
", account='" + account + '\'' +
", password='" + password + '\'' +
", countries='" + countries + '\'' +
", provinceId=" + provinceId +
", cityId=" + cityId +
", creationTime='" + creationTime + '\'' +
", logInNumber=" + logInNumber +
", lastTimeOfLanding='" + lastTimeOfLanding + '\'' +
", sex=" + sex +
", documentType=" + documentType +
", IDNumber='" + IDNumber + '\'' +
", educationDegree=" + educationDegree +
", phone='" + phone + '\'' +
", WeChatID='" + WeChatID + '\'' +
", dateBirth='" + dateBirth + '\'' +
", email='" + email + '\'' +
", schoolId=" + schoolId +
", uniqueIdentificationAccount='" + uniqueIdentificationAccount + '\'' +
", searchContent='" + searchContent + '\'' +
", user=" + user +
", userAvatars='" + userAvatars + '\'' +
", schoolName='" + schoolName + '\'' +
", provinceName='" + provinceName + '\'' +
", cityName='" + cityName + '\'' +
", month=" + month +
", endTime='" + endTime + '\'' +
", professionalClassId=" + professionalClassId +
", professionalClassName='" + professionalClassName + '\'' +
", disciplineId=" + disciplineId +
", disciplineName='" + disciplineName + '\'' +
", professionalId=" + professionalId +
", professionalName='" + professionalName + '\'' +
'}';
}
}

@ -13,9 +13,11 @@ import com.yipin.liuwanr.entity.ExperimentalClass;
import com.yipin.liuwanr.entity.Professional; import com.yipin.liuwanr.entity.Professional;
import com.yipin.liuwanr.entity.StuProfessionalArchitecture; import com.yipin.liuwanr.entity.StuProfessionalArchitecture;
import com.yipin.liuwanr.entity.Student; import com.yipin.liuwanr.entity.Student;
import org.apache.ibatis.annotations.*;
public interface ExperimentalClassMapper { import java.util.List;
public interface ExperimentalClassMapper {
@Insert("INSERT INTO experimental_class_student(studentId,experimentalClassId)" @Insert("INSERT INTO experimental_class_student(studentId,experimentalClassId)"
+ "VALUES(#{studentId},#{experimentalClassId})") + "VALUES(#{studentId},#{experimentalClassId})")
void experimentClassAddStudent(Student student); void experimentClassAddStudent(Student student);
@ -64,6 +66,9 @@ public interface ExperimentalClassMapper {
@Update("UPDATE experimental_class_ning SET isdel = 1 where experimentalClassId = #{experimentalClassId}") @Update("UPDATE experimental_class_ning SET isdel = 1 where experimentalClassId = #{experimentalClassId}")
void deleteExperimentalClass(Integer experimentalClassId); void deleteExperimentalClass(Integer experimentalClassId);
@Delete("Delete from experimental_class_student where experimentalClassId = #{experimentalClassId}")
void deleteExperimentalClassStu(Integer experimentalClassId);
@Update("UPDATE experimental_class_ning SET experimentalClassName = #{experimentalClassName},classSize = #{classSize},practiceNumber = #{practiceNumber},inspectionNumber = #{inspectionNumber},courseSchedule = #{courseSchedule},founder = #{founder},courseId = #{courseId} where experimentalClassId = #{experimentalClassId}") @Update("UPDATE experimental_class_ning SET experimentalClassName = #{experimentalClassName},classSize = #{classSize},practiceNumber = #{practiceNumber},inspectionNumber = #{inspectionNumber},courseSchedule = #{courseSchedule},founder = #{founder},courseId = #{courseId} where experimentalClassId = #{experimentalClassId}")
void updateExperimentalClass(ExperimentalClass experimentalClass); void updateExperimentalClass(ExperimentalClass experimentalClass);

@ -68,8 +68,8 @@ public interface ExperimentallearningMapper {
* @param studentId * @param studentId
* @return * @return
*/ */
@Select("select ecn.experimentalClassId from experimental_class_ning ecn left join experimental_class_student ecs on ecn.experimentalClassId=ecs.experimentalClassId where\n" + @Select("select ecn.experimentalClassId from experimental_class_ning ecn left join experimental_class_student ecs on ecn.experimentalClassId=ecs.experimentalClassId where " +
"ecn.courseId=#{courseId} and ecs.studentId=#{studentId} GROUP BY ecn.experimentalClassId") "ecn.courseId=#{courseId} and ecs.studentId=#{studentId} and ecn.isdel=0 GROUP BY ecn.experimentalClassId")
Integer queryExperimentalClassId(@Param("courseId") Integer courseId,@Param("studentId")Integer studentId); Integer queryExperimentalClassId(@Param("courseId") Integer courseId,@Param("studentId")Integer studentId);
/** /**
@ -123,6 +123,6 @@ public interface ExperimentallearningMapper {
@Select("select DISTINCT hpm.projectId,projectName,isAttendance from hr_project_management hpm left join teacher_project tp on hpm.projectId=tp.projectId " + @Select("select DISTINCT hpm.projectId,projectName,isAttendance from hr_project_management hpm left join teacher_project tp on hpm.projectId=tp.projectId " +
" where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and tp.isOpenProject=0 and hpm.isShow=0") " where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and tp.isOpenProject=0")
List<Project_Management> getBycourseId(@Param("experimentalClassId")Integer experimentalClassId,@Param("courseId") Integer courseId); List<Project_Management> getBycourseId(@Param("experimentalClassId")Integer experimentalClassId,@Param("courseId") Integer courseId);
} }

@ -1,7 +1,6 @@
package com.yipin.liuwanr.mapper; package com.yipin.liuwanr.mapper;
import java.util.List; import com.yipin.liuwanr.entity.*;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import com.yipin.liuwanr.entity.ApplicationPermissions; import com.yipin.liuwanr.entity.ApplicationPermissions;
@ -10,7 +9,7 @@ import com.yipin.liuwanr.entity.Course;
import com.yipin.liuwanr.entity.CoursePermissions; import com.yipin.liuwanr.entity.CoursePermissions;
import com.yipin.liuwanr.entity.Customer; import com.yipin.liuwanr.entity.Customer;
import com.yipin.liuwanr.entity.Order; import com.yipin.liuwanr.entity.Order;
import com.yipin.liuwanr.entity.OrderVo; import com.yipin.liuwanr.vo.OrderVo;
public interface OrderMapper { public interface OrderMapper {

@ -1,12 +1,11 @@
package com.yipin.liuwanr.mapper; package com.yipin.liuwanr.mapper;
import java.util.List; import com.yipin.liuwanr.entity.ServiceConfig;
import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
import com.yipin.liuwanr.entity.ServiceConfig; import java.util.List;
public interface ServiceConfigMapper { public interface ServiceConfigMapper {

@ -130,6 +130,23 @@ public interface UserMapper {
"</script> "}) "</script> "})
List<UserM> queryUser(UserM user); List<UserM> queryUser(UserM user);
@Select({"<script>",
"SELECT s.schoolName,s.provinceId,s.cityId,s.provinceName,s.cityName,u.userId,u.userName,u.countries,u.creationTime,u.account,u.logInNumber,hor.schoolId,hor.platformId,hor.roleId FROM hr_userInfo u,hr_organization_relationship hor,school s WHERE u.userId = hor.userId and hor.schoolId = s.schoolId and s.isdel = 0",
" <if test='countries!=null and countries !=\"\" '>and u.countries = #{countries} </if>",
" <if test='provinceId!=null and provinceId !=\"\" '>and u.provinceId = #{provinceId} </if>",
" <if test='schoolId!=null and schoolId !=\"\"'>and u.schoolId = #{schoolId} </if>",
" <if test='cityId!=null and cityId !=\"\" '>and u.cityId = #{cityId} </if>",
" <if test='roleId!=null and roleId !=\"\" '>and u.roleId = #{roleId} </if>",
// " <if test='searchContent!=null and searchContent !=\"\" '> AND CONCAT(u.name, s.schoolName) LIKE CONCAT('%',#{searchContent},'%')</if>",
" <if test='month==3'>and u.creationTime>DATE_SUB(CURDATE(), INTERVAL 3 MONTH)</if>",
" <if test='month==6'>and u.creationTime>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)</if>",
" <if test='month==9'>and u.creationTime>DATE_SUB(CURDATE(), INTERVAL 9 MONTH)</if>",
" <if test='month==12'>and u.creationTime>DATE_SUB(CURDATE(), INTERVAL 12 MONTH)</if>",
" <if test='creationTime!=null and endTime!=null and endTime!=\"\" and creationTime!=\"\" '> and u.creationTime between #{creationTime} and #{endTime}</if>",
"GROUP BY u.userId order by u.creationTime desc",
"</script> "})
List<UserInfo> queryUserInfo(UserInfo userInfo);
@Update("UPDATE user SET isdel = 1 where userId = #{userId}") @Update("UPDATE user SET isdel = 1 where userId = #{userId}")
void deleteUser(Integer userId); void deleteUser(Integer userId);

@ -1,23 +1,16 @@
package com.yipin.liuwanr.service; package com.yipin.liuwanr.service;
import java.util.ArrayList; import com.yipin.liuwanr.entity.*;
import java.util.HashMap; import com.yipin.liuwanr.mapper.ExperimentalClassMapper;
import java.util.List; import com.yipin.liuwanr.mapper.TeacherProjectAndCourseMapper;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.yipin.liuwanr.entity.ExperimentalClass;
import com.yipin.liuwanr.entity.Professional;
import com.yipin.liuwanr.entity.Project_Management;
import com.yipin.liuwanr.entity.StuProfessionalArchitecture;
import com.yipin.liuwanr.entity.Student;
import com.yipin.liuwanr.mapper.ExperimentalClassMapper;
import com.yipin.liuwanr.mapper.TeacherProjectAndCourseMapper;
import com.yipin.liuwanr.vo.ExperimentalClassVo;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
@Service @Service
public class ExperimentalClassService { public class ExperimentalClassService {
@ -233,11 +226,12 @@ public class ExperimentalClassService {
return resp; return resp;
} }
//删除实验班级和删除实验班级下所有学生
public HashMap<String, Object> deleteExperimentalClass(Integer experimentalClassId) { public HashMap<String, Object> deleteExperimentalClass(Integer experimentalClassId) {
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
try { try {
experimentalClassMapper.deleteExperimentalClass(experimentalClassId); experimentalClassMapper.deleteExperimentalClass(experimentalClassId);
experimentalClassMapper.deleteExperimentalClassStu(experimentalClassId);
resp.put("retcode", 200); resp.put("retcode", 200);
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -247,6 +241,20 @@ public class ExperimentalClassService {
} }
return resp; return resp;
} }
//删除实验班级下的所有学生
// public HashMap<String, Object> deleteExperimentalClassStu(Integer experimentalClassId) {
// HashMap<String, Object> resp = new HashMap<String, Object>();
// try {
// experimentalClassMapper.deleteExperimentalClassStu(experimentalClassId);
// resp.put("retcode", 200);
// } catch (RuntimeException e) {
// logger.error(e.getMessage());
// resp.put("retcode", 500);
// resp.put("retvalue", "删除实验班级失败!");
// return resp;
// }
// return resp;
// }
public HashMap<String, Object> updateExperimentalClass(ExperimentalClass experimentalClass) { public HashMap<String, Object> updateExperimentalClass(ExperimentalClass experimentalClass) {
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();

@ -44,6 +44,7 @@ public class ExperimentallearningService {
try { try {
if(!StringUtils.isEmpty(courseId)&&!StringUtils.isEmpty(studentId)){ if(!StringUtils.isEmpty(courseId)&&!StringUtils.isEmpty(studentId)){
Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId); Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId);
if(!StringUtils.isEmpty(experimentalClassId)){
List<Integer> projectIds = mapper.queryIsAttendance(studentId, courseId); List<Integer> projectIds = mapper.queryIsAttendance(studentId, courseId);
List<Project_Management> projects = mapper.getBycourseId(experimentalClassId,courseId); List<Project_Management> projects = mapper.getBycourseId(experimentalClassId,courseId);
for (int i = 0; i < projects.size(); i++) { for (int i = 0; i < projects.size(); i++) {
@ -61,6 +62,7 @@ public class ExperimentallearningService {
} }
resp.put("retvalue", projects); resp.put("retvalue", projects);
} }
}
resp.put("retcode", 200); resp.put("retcode", 200);
}catch(Exception e){ }catch(Exception e){
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -107,10 +109,12 @@ public class ExperimentallearningService {
if(!StringUtils.isEmpty(courseId)){ if(!StringUtils.isEmpty(courseId)){
//实验班级 //实验班级
Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId); Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId);
if(!StringUtils.isEmpty(experimentalClassId)){
//学生信息 //学生信息
List<UserM> users =mapper.queryStudentName(experimentalClassId); List<UserM> users =mapper.queryStudentName(experimentalClassId);
resp.put("retvalue", users); resp.put("retvalue", users);
} }
}
resp.put("retcode", 200); resp.put("retcode", 200);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
@ -130,10 +134,12 @@ public class ExperimentallearningService {
if(!StringUtils.isEmpty(courseId)){ if(!StringUtils.isEmpty(courseId)){
//实验班级 //实验班级
Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId); Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId);
if(!StringUtils.isEmpty(experimentalClassId)){
//教师信息 //教师信息
UserM user =mapper.queryTeacherName(experimentalClassId); UserM user =mapper.queryTeacherName(experimentalClassId);
resp.put("retvalue",user); resp.put("retvalue",user);
} }
}
resp.put("retcode", 200); resp.put("retcode", 200);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());

@ -1,25 +1,19 @@
package com.yipin.liuwanr.service; package com.yipin.liuwanr.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yipin.liuwanr.entity.*;
import com.yipin.liuwanr.mapper.OrderMapper;
import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yipin.liuwanr.entity.ApplicationPermissions;
import com.yipin.liuwanr.entity.ContractInformation;
import com.yipin.liuwanr.entity.Course;
import com.yipin.liuwanr.entity.CoursePermissions;
import com.yipin.liuwanr.entity.Order;
import com.yipin.liuwanr.entity.PageResult;
import com.yipin.liuwanr.mapper.OrderMapper;
@Service @Service
public class OrderService { public class OrderService {
@ -47,6 +41,7 @@ public class OrderService {
} }
return resp; return resp;
} }
public HashMap<String, Object> addContractInformation(ContractInformation contractInformation) { public HashMap<String, Object> addContractInformation(ContractInformation contractInformation) {
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
try { try {
@ -119,7 +114,6 @@ public class OrderService {
return resp; return resp;
} }
public HashMap<String, Object> queryOrder(Order order, Integer pageNo, Integer pageSize) { public HashMap<String, Object> queryOrder(Order order, Integer pageNo, Integer pageSize) {
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
try { try {
@ -271,7 +265,6 @@ public class OrderService {
return resp; return resp;
} }
public HashMap<String, Object> queryOrderCustomerContact(Integer customerId) { public HashMap<String, Object> queryOrderCustomerContact(Integer customerId) {
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
try { try {

@ -4,8 +4,12 @@ import java.net.URLEncoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.yipin.liuwanr.entity.*;
import com.yipin.liuwanr.helper.RedisHelper;
import com.yipin.liuwanr.vo.UserVO;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -13,13 +17,14 @@ import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yipin.liuwanr.entity.PageResult;
import com.yipin.liuwanr.entity.Record;
import com.yipin.liuwanr.helper.ExcelExportHelper; import com.yipin.liuwanr.helper.ExcelExportHelper;
import com.yipin.liuwanr.mapper.AssesmentMapper; import com.yipin.liuwanr.mapper.AssesmentMapper;
import com.yipin.liuwanr.mapper.RecordMapper; import com.yipin.liuwanr.mapper.RecordMapper;
import com.yipin.liuwanr.vo.PracticeRecordVo; import com.yipin.liuwanr.vo.PracticeRecordVo;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/** /**
* 练习记录 * 练习记录
@ -172,7 +177,6 @@ public class PracticeService {
return resp; return resp;
} }
public HashMap<String, Object> queryAllExperiment(Integer courseId) { public HashMap<String, Object> queryAllExperiment(Integer courseId) {
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
try { try {
@ -188,5 +192,4 @@ public class PracticeService {
} }
return resp; return resp;
} }
} }

@ -1,17 +1,16 @@
package com.yipin.liuwanr.service; package com.yipin.liuwanr.service;
import java.util.HashMap;
import java.util.List;
import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yipin.liuwanr.entity.PageResult; import com.yipin.liuwanr.entity.PageResult;
import com.yipin.liuwanr.entity.ServiceConfig; import com.yipin.liuwanr.entity.ServiceConfig;
import com.yipin.liuwanr.mapper.ServiceConfigMapper; import com.yipin.liuwanr.mapper.ServiceConfigMapper;
import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
@Service @Service
public class ServiceConfigService { public class ServiceConfigService {

@ -170,6 +170,37 @@ public class UserService {
return resp; return resp;
} }
//查询用户信息
public HashMap<String, Object> queryUserInfo(UserInfo userInfo,Integer pageNo,Integer pageSize){
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
if(pageNo!=null&&pageSize!=null) {
PageHelper.startPage(pageNo, pageSize);
List<UserInfo> list = userMapper.queryUserInfo(userInfo);
PageInfo<UserInfo> info=new PageInfo<UserInfo>(list);
int total1 = (int) info.getTotal();
int totalPages;
totalPages = total1 / pageSize;
if (total1 % pageSize != 0){
totalPages ++;
}
long total = total1;
resp.put("retvalue", new PageResult(total, list,totalPages));
resp.put("retcode", 200);
}else {
List<UserInfo> list = userMapper.queryUserInfo(userInfo);
resp.put("retvalue", list);
resp.put("retcode", 200);
}
} catch (RuntimeException e) {
logger.error(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "查询用户失败!");
return resp;
}
return resp;
}
//删除用户 //删除用户
public HashMap<String, Object> deleteUser(Integer userId){ public HashMap<String, Object> deleteUser(Integer userId){
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();

@ -1,4 +1,8 @@
package com.yipin.liuwanr.entity; package com.yipin.liuwanr.vo;
import com.yipin.liuwanr.entity.ContractInformation;
import com.yipin.liuwanr.entity.CoursePermissions;
import com.yipin.liuwanr.entity.Order;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

@ -34,20 +34,20 @@ public class AliyunOssServiceTest {
/** /**
* 测试上传文件 * 测试上传文件
*/ */
@Test // @Test
public void testUploadFiles() throws IOException { // public void testUploadFiles() throws IOException {
File file = new File("D:\\pic\\1.jpg"); // File file = new File("D:\\pic\\1.jpg");
FileItem fileItem = new DiskFileItem("file", // FileItem fileItem = new DiskFileItem("file",
Files.probeContentType(file.toPath()), // Files.probeContentType(file.toPath()),
false, // false,
file.getName(), // file.getName(),
(int) file.length(), // (int) file.length(),
file.getParentFile()); // file.getParentFile());
IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream()); // IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream());
MultipartFile multipartFile = new CommonsMultipartFile(fileItem); // MultipartFile multipartFile = new CommonsMultipartFile(fileItem);
HashMap<String, Object> map = aliyunOssService.uploadFiles(multipartFile); // HashMap<String, Object> map = aliyunOssService.uploadFiles(multipartFile);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); // map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} // }
/** /**
* 测试下载文件 * 测试下载文件

@ -52,19 +52,19 @@ public class ExperimentalClassServiceTest {
public void addExperimentalClass() { public void addExperimentalClass() {
ExperimentalClass experimentalClass = new ExperimentalClass(); ExperimentalClass experimentalClass = new ExperimentalClass();
experimentalClass.setExperimentalClassName("测试"); experimentalClass.setExperimentalClassName("测试");
experimentalClass.setClassSize(12); experimentalClass.setClassSize(120);
experimentalClass.setFounder("测试"); experimentalClass.setFounder("测试");
experimentalClass.setCourseId(2); experimentalClass.setCourseId(77);
experimentalClass.setUserId(2); experimentalClass.setUserId(452);
experimentalClass.setSchoolId(2); experimentalClass.setSchoolId(2043);
HashMap<String, Object> map = experimentalClassService.addExperimentalClass(experimentalClass); HashMap<String, Object> map = experimentalClassService.addExperimentalClass(experimentalClass);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@Test @Test
public void queryExperimentalClass() { public void queryExperimentalClass() {
Integer schoolId = 1; Integer schoolId = 2043;
Integer courseId = 2; Integer courseId = 77;
HashMap<String, Object> map = experimentalClassService.queryExperimentalClass(schoolId, courseId); HashMap<String, Object> map = experimentalClassService.queryExperimentalClass(schoolId, courseId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -72,7 +72,7 @@ public class ExperimentalClassServiceTest {
//查询实验班级专业 //查询实验班级专业
@Test @Test
public void queryExperimentalClassSP() { public void queryExperimentalClassSP() {
Integer experimentalClassId = 1; Integer experimentalClassId = 56;
HashMap<String, Object> map = experimentalClassService.queryExperimentalClassSP(experimentalClassId); HashMap<String, Object> map = experimentalClassService.queryExperimentalClassSP(experimentalClassId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -80,7 +80,7 @@ public class ExperimentalClassServiceTest {
//查询学生行政班级 //查询学生行政班级
@Test @Test
public void queryStudentClass() { public void queryStudentClass() {
Integer experimentalClassId = 1; Integer experimentalClassId = 56;
HashMap<String, Object> map = experimentalClassService.queryStudentClass(experimentalClassId); HashMap<String, Object> map = experimentalClassService.queryStudentClass(experimentalClassId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -91,7 +91,7 @@ public class ExperimentalClassServiceTest {
@Test @Test
public void queryExperimentalClassDetails() { public void queryExperimentalClassDetails() {
Student student = new Student(); Student student = new Student();
Integer courseId = 1; Integer courseId = 56;
HashMap<String, Object> map = experimentalClassService.queryExperimentalClassDetails(student, courseId); HashMap<String, Object> map = experimentalClassService.queryExperimentalClassDetails(student, courseId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -99,7 +99,7 @@ public class ExperimentalClassServiceTest {
//新增学生显示数据 //新增学生显示数据
@Test @Test
public void queryexperimentalClass() { public void queryexperimentalClass() {
Integer experimentalClassId = 1; Integer experimentalClassId = 56;
HashMap<String, Object> map = experimentalClassService.queryexperimentalClass(experimentalClassId); HashMap<String, Object> map = experimentalClassService.queryexperimentalClass(experimentalClassId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -107,7 +107,7 @@ public class ExperimentalClassServiceTest {
//专业下拉框 //专业下拉框
@Test @Test
public void getProfessionals() { public void getProfessionals() {
Integer experimentalClassId = 1; Integer experimentalClassId = 56;
HashMap<String, Object> map = experimentalClassService.getProfessionals(experimentalClassId); HashMap<String, Object> map = experimentalClassService.getProfessionals(experimentalClassId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -115,7 +115,7 @@ public class ExperimentalClassServiceTest {
//班级下拉框 //班级下拉框
@Test @Test
public void getStudentClass() { public void getStudentClass() {
Integer experimentalClassId = 1; Integer experimentalClassId = 56;
HashMap<String, Object> map = experimentalClassService.getStudentClass(experimentalClassId); HashMap<String, Object> map = experimentalClassService.getStudentClass(experimentalClassId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -123,7 +123,7 @@ public class ExperimentalClassServiceTest {
@Test @Test
@Transactional @Transactional
public void deleteExperimentalClass() { public void deleteExperimentalClass() {
Integer experimentalClassId = 1; Integer experimentalClassId = 56;
HashMap<String, Object> map = experimentalClassService.deleteExperimentalClass(experimentalClassId); HashMap<String, Object> map = experimentalClassService.deleteExperimentalClass(experimentalClassId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -132,6 +132,13 @@ public class ExperimentalClassServiceTest {
@Transactional @Transactional
public void updateExperimentalClass() { public void updateExperimentalClass() {
ExperimentalClass experimentalClass = new ExperimentalClass(); ExperimentalClass experimentalClass = new ExperimentalClass();
experimentalClass.setExperimentalClassName("测试");
experimentalClass.setClassSize(120);
experimentalClass.setFounder("测试");
experimentalClass.setCourseId(77);
experimentalClass.setUserId(452);
experimentalClass.setSchoolId(2043);
experimentalClass.setExperimentalClassId(56);
HashMap<String, Object> map = experimentalClassService.updateExperimentalClass(experimentalClass); HashMap<String, Object> map = experimentalClassService.updateExperimentalClass(experimentalClass);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -141,6 +148,13 @@ public class ExperimentalClassServiceTest {
@Transactional @Transactional
public void updateExperimentClassName() { public void updateExperimentClassName() {
ExperimentalClass experimentalClass = new ExperimentalClass(); ExperimentalClass experimentalClass = new ExperimentalClass();
experimentalClass.setExperimentalClassName("测试");
experimentalClass.setClassSize(120);
experimentalClass.setFounder("测试");
experimentalClass.setCourseId(77);
experimentalClass.setUserId(452);
experimentalClass.setSchoolId(2043);
experimentalClass.setExperimentalClassId(56);
HashMap<String, Object> map = experimentalClassService.updateExperimentalClass(experimentalClass); HashMap<String, Object> map = experimentalClassService.updateExperimentalClass(experimentalClass);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
@ -148,7 +162,7 @@ public class ExperimentalClassServiceTest {
//——————————————————————————————全承珠 //——————————————————————————————全承珠
@Test @Test
public void queryGetByExperimentalClassName() { public void queryGetByExperimentalClassName() {
String experimentalClassName = ""; String experimentalClassName = "测试";
HashMap<String, Object> map = experimentalClassService.queryGetByExperimentalClassName(experimentalClassName); HashMap<String, Object> map = experimentalClassService.queryGetByExperimentalClassName(experimentalClassName);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }

@ -0,0 +1,217 @@
package com.yipin.liuwanr;
import com.yipin.liuwanr.entity.*;
import com.yipin.liuwanr.service.OrderService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@RunWith(SpringRunner.class)
@SpringBootTest
public class OrderServiceTest {
@Autowired
private OrderService orderService;
//添加合同信息
@Test
@Transactional
public void addOrder() {
Order order = new Order();
order.setOrderNumber("1596424017647");
order.setCustomerName("测试");
order.setOrderName("测试");
order.setOrderAmount("120");
order.setOrderType(1);
order.setProvinceId(1);
order.setCityId(1);
order.setOrderContact("张三");
order.setPhone("15267668899");
order.setEmail("123@qq.com");
order.setCustomerId(126);
HashMap<String, Object> map = orderService.addOrder(order);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void addContractInformation() {
ContractInformation contractInformation = new ContractInformation();
contractInformation.setContractInformationName("1");
contractInformation.setContractInformationNumber("1");
contractInformation.setContractInformationSum("1");
contractInformation.setContractInformationLink("1");
contractInformation.setOrderId(20);
HashMap<String, Object> map = orderService.addContractInformation(contractInformation);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
//添加课程权限
@Test
@Transactional
public void addCoursePermissionss() throws ParseException {
List<CoursePermissions> coursePermissionss = new ArrayList<>();
CoursePermissions coursePermissions = new CoursePermissions();
coursePermissions.setCourseId(77);
coursePermissions.setUsePeriod(30);
coursePermissions.setMarketPrice(12.8);
coursePermissions.setTransactionPrice(1);
coursePermissions.setDiscount(7);
coursePermissions.setPortAddressId(1);
coursePermissions.setIsDeliverGoods(1);
coursePermissions.setOrderId(118);
coursePermissionss.add(coursePermissions);
HashMap<String, Object> map = orderService.addCoursePermissionss(coursePermissionss);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
//绑定应用权限
@Test
@Transactional
public void bindingApplicationPermissions() {
ApplicationPermissions applicationPermissions = new ApplicationPermissions();
applicationPermissions.setSystemId("2");
applicationPermissions.setOrderId(2);
HashMap<String, Object> map = orderService.bindingApplicationPermissions(applicationPermissions);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void queryCoursePermissions() {
String courseId = "1";
HashMap<String, Object> map = orderService.queryCoursePermissions(courseId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void queryOrder() {
Order order = new Order();
Integer pageNo = 1;
Integer pageSize = 10;
HashMap<String, Object> map = orderService.queryOrder(order, pageNo, pageSize);
Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
PageResult pageResult = (PageResult) map.get("retvalue");
Long total = pageResult.getTotal();
System.out.println("total = " + total);
List<Order> rows = (List<Order>) pageResult.getRows();
rows.forEach(item -> System.out.println(item.toString()));
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}
}
@Test
@Transactional
public void queryOrderDetails() {
Integer orderId = 1;
HashMap<String, Object> map = orderService.queryOrderDetails(orderId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void deleteOrder() {
List<Integer> orderId = new ArrayList<>();
orderId.add(1);
orderId.add(2);
orderId.add(3);
HashMap<String, Object> map = orderService.deleteOrder(orderId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void updateOrder() {
Order order = new Order();
HashMap<String, Object> map = orderService.updateOrder(order);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void deleteCoursePermissions() {
Integer orderId = 1;
HashMap<String, Object> map = orderService.deleteCoursePermissions(orderId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void updateCoursePermissions() {
List<CoursePermissions> coursePermissionss = new ArrayList<>();
CoursePermissions coursePermissions = new CoursePermissions();
coursePermissionss.add(coursePermissions);
HashMap<String, Object> map = orderService.updateCoursePermissions(coursePermissionss);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void updateContractInformation() {
ContractInformation contractInformation = new ContractInformation();
HashMap<String, Object> map = orderService.updateContractInformation(contractInformation);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
//绑定应用权限
@Test
@Transactional
public void isDeliverGoods() {
CoursePermissions coursePermissions = new CoursePermissions();
HashMap<String, Object> map = orderService.isDeliverGoods(coursePermissions);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void queryOrderCustomer() {
Integer cityId = 1;
Integer provinceId = 1;
HashMap<String, Object> map = orderService.queryOrderCustomer(cityId, provinceId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void queryOrderCustomerContact() {
Integer customerId = 1;
HashMap<String, Object> map = orderService.queryOrderCustomerContact(customerId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
//查询订单课程列表
@Test
@Transactional
public void queryCourseList() {
String searchContent = "";
List<Integer> courseId = new ArrayList<>();
Integer pageNo = 1;
Integer pageSize = 10;
HashMap<String, Object> map = orderService.queryCourseList(searchContent, courseId, pageNo, pageSize);
Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
PageResult pageResult = (PageResult) map.get("retvalue");
Long total = pageResult.getTotal();
System.out.println("total = " + total);
List<Course> rows = (List<Course>) pageResult.getRows();
rows.forEach(item -> System.out.println(item.toString()));
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}
}
}

@ -0,0 +1,83 @@
package com.yipin.liuwanr;
import com.yipin.liuwanr.entity.PageResult;
import com.yipin.liuwanr.entity.ServiceConfig;
import com.yipin.liuwanr.service.ServiceConfigService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
@RunWith(SpringRunner.class)
@SpringBootTest
public class ServiceConfigServiceTest {
@Autowired
private ServiceConfigService serviceConfigService;
@Test
@Transactional
public void addServiceConfig() {
ServiceConfig serviceConfig = new ServiceConfig();
serviceConfig.setSystemName("测试");
serviceConfig.setSystemType(2);
serviceConfig.setSystemAttribution(2);
serviceConfig.setSystemStatus(1);
HashMap<String, Object> map = serviceConfigService.addServiceConfig(serviceConfig);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
public void queryServiceConfig() {
ServiceConfig serviceConfig = new ServiceConfig();
Integer pageNo = 1;
Integer pageSize = 10;
HashMap<String, Object> map = serviceConfigService.queryServiceConfig(serviceConfig, pageNo, pageSize);
Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
PageResult pageResult = (PageResult) map.get("retvalue");
Long total = pageResult.getTotal();
System.out.println("total = " + total);
List<ServiceConfig> rows = (List<ServiceConfig>) pageResult.getRows();
rows.forEach(item -> System.out.println(item.toString()));
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}
}
@Test
public void queryServiceConfigDetails() {
Integer systemId = 1;
HashMap<String, Object> map = serviceConfigService.queryServiceConfigDetails(systemId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void deleteServiceConfig() {
ServiceConfig serviceConfig = new ServiceConfig();
serviceConfig.setSystemId(1);
HashMap<String, Object> map = serviceConfigService.deleteServiceConfig(serviceConfig);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
@Test
@Transactional
public void updateServiceConfig() {
ServiceConfig serviceConfig = new ServiceConfig();
serviceConfig.setSystemName("测试");
serviceConfig.setSystemType(2);
serviceConfig.setSystemAttribution(2);
serviceConfig.setSystemStatus(1);
serviceConfig.setSystemId(1);
HashMap<String, Object> map = serviceConfigService.updateServiceConfig(serviceConfig);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
}
Loading…
Cancel
Save