From 96be942be13525bf9dd752cb3bb031c8a498f500 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 21 Aug 2020 09:31:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ExperimentalClassService=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerController.java | 497 +++++++-------- .../liuwanr/entity/ExperimentalClass.java | 261 ++++---- .../mapper/ExperimentalClassMapper.java | 16 +- .../com/yipin/liuwanr/mapper/OrderMapper.java | 203 +++--- .../liuwanr/mapper/ServiceConfigMapper.java | 49 +- .../service/ExperimentalClassService.java | 27 +- .../yipin/liuwanr/service/OrderService.java | 603 +++++++++--------- .../liuwanr/service/ServiceConfigService.java | 195 +++--- .../liuwanr/ExperimentalClassServiceTest.java | 42 +- .../com/yipin/liuwanr/OrderServiceTest.java | 217 +++++++ .../liuwanr/ServiceConfigServiceTest.java | 83 +++ 11 files changed, 1252 insertions(+), 941 deletions(-) create mode 100644 src/test/java/com/yipin/liuwanr/OrderServiceTest.java create mode 100644 src/test/java/com/yipin/liuwanr/ServiceConfigServiceTest.java diff --git a/src/main/java/com/yipin/liuwanr/controller/CustomerController.java b/src/main/java/com/yipin/liuwanr/controller/CustomerController.java index a74cfd9..3e0e856 100644 --- a/src/main/java/com/yipin/liuwanr/controller/CustomerController.java +++ b/src/main/java/com/yipin/liuwanr/controller/CustomerController.java @@ -1,268 +1,263 @@ 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.Response; +import com.yipin.liuwanr.entity.School; import com.yipin.liuwanr.entity.UserM; import com.yipin.liuwanr.helper.RedisHelper; import com.yipin.liuwanr.service.CustomerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; @RestController @RequestMapping("/customer") @CrossOrigin public class CustomerController { - @Autowired - private CustomerService customerService; + @Autowired + private CustomerService customerService; - @Autowired - RedisHelper redisHelper; + @Autowired + RedisHelper redisHelper; - /** - * 添加客户 - */ - @PostMapping("/addCustomer") - Response addCustomer(@RequestBody Customer customer) { - Response resp = new Response(); - UserM userm = new UserM(); - Integer provinceId = customer.getProvinceId(); - Integer cityId = customer.getCityId(); - String countries = customer.getCountries(); - String phone = customer.getAdminPhone(); - String email = customer.getEmail(); - String name = customer.getAdminName(); - Integer schoolId = customer.getSchoolId(); - userm.setSchoolId(schoolId); - userm.setCityId(cityId); - userm.setCountries(countries); - userm.setProvinceId(provinceId); - userm.setPhone(phone); - userm.setEmail(email); - userm.setName(name); - userm.setPassword("huoran123"); - if (email==null||email==""){ - resp.setStatus(300); - resp.setErrmessage("邮箱不能为空！"); - }if (phone==null||phone==""){ - resp.setStatus(300); - resp.setErrmessage("电话不能为空！"); - }else if (name==null||name==""){ - resp.setStatus(300); - resp.setErrmessage("姓名不能为空！"); - }else if (schoolId==null){ - resp.setStatus(300); - resp.setErrmessage("学校不能为空！"); - }else if (provinceId==null){ - resp.setStatus(300); - resp.setErrmessage("省份不能为空！"); - }else if (cityId==null) { - resp.setStatus(300); - resp.setErrmessage("城市不能为空！"); - } else { - HashMap ret = customerService.addCustomer(customer); - HashMap ret1 = customerService.addAdmin(userm); - 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 String countries,Integer provinceId,Integer cityId,Integer pageNo,Integer pageSize,String searchContent) { - Response resp = new Response(); - Customer customer = new Customer(); - if (searchContent!=null&&searchContent!="") { - customer.setSearchContent(searchContent); - } - if (countries!=null&&countries!="") { - customer.setCountries(countries); - } - if (provinceId!=null) { - customer.setProvinceId(provinceId); - } - if (cityId!=null) { - customer.setCityId(cityId); - } - HashMap ret = customerService.queryCustomer(customer,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; -} - - /** - * 查询客户详情 - */ - @GetMapping("/queryCustomerDetails") - Response queryCustomerDetails(@RequestParam Integer customerId) { - Response resp = new Response(); - if (customerId==null) { - resp.setStatus(300); - resp.setErrmessage("Parameter Invalid"); - }else { - HashMap ret = customerService.queryCustomerDetails(customerId); - 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("/deleteCustomer") - Response deleteCustomer(@RequestBody Customer customer) { - Response resp = new Response(); - if (customer.getCustomer().isEmpty()) { - resp.setStatus(300); - resp.setErrmessage("客户不能为空！"); - } else { - HashMap ret = customerService.deleteCustomer(customer); - 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("/updateCustomer") - Response updateCustomer(@RequestBody Customer customer) { - Response resp = new Response(); - if (customer.getCustomerId()==null) { - resp.setStatus(300); - resp.setErrmessage("客户不能为空！"); - } else { - HashMap ret = customerService.updateCustomer(customer); - 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("/queryCustomerIsExists") - Response queryCustomerIsExists(@RequestParam Integer schoolId) { - Response resp = new Response(); - if (schoolId==null) { - resp.setStatus(300); - resp.setErrmessage("学校不能为空！"); - }else { - HashMap ret = customerService.queryCustomerIsExists(schoolId); - 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("/queryCustomerIndustryClass") - Response queryCustomerIndustryClass() { - Response resp = new Response(); - HashMap ret = customerService.queryCustomerIndustryClass(); - 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("/queryCustomerIndustry") - Response queryCustomerIndustry(@RequestParam Integer industryClassId) { - Response resp = new Response(); - HashMap ret = customerService.queryCustomerIndustry(industryClassId); - 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("/addCustomer") + Response addCustomer(@RequestBody Customer customer) { + Response resp = new Response(); + UserM userm = new UserM(); + Integer provinceId = customer.getProvinceId(); + Integer cityId = customer.getCityId(); + String countries = customer.getCountries(); + String phone = customer.getAdminPhone(); + String email = customer.getEmail(); + String name = customer.getAdminName(); + Integer schoolId = customer.getSchoolId(); + userm.setSchoolId(schoolId); + userm.setCityId(cityId); + userm.setCountries(countries); + userm.setProvinceId(provinceId); + userm.setPhone(phone); + userm.setEmail(email); + userm.setName(name); + userm.setPassword("huoran123"); + if (email == null || email == "") { + resp.setStatus(300); + resp.setErrmessage("邮箱不能为空！"); + } + if (phone == null || phone == "") { + resp.setStatus(300); + resp.setErrmessage("电话不能为空！"); + } else if (name == null || name == "") { + resp.setStatus(300); + resp.setErrmessage("姓名不能为空！"); + } else if (schoolId == null) { + resp.setStatus(300); + resp.setErrmessage("学校不能为空！"); + } else if (provinceId == null) { + resp.setStatus(300); + resp.setErrmessage("省份不能为空！"); + } else if (cityId == null) { + resp.setStatus(300); + resp.setErrmessage("城市不能为空！"); + } else { + HashMap ret = customerService.addCustomer(customer); + HashMap ret1 = customerService.addAdmin(userm); + 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 String countries, Integer provinceId, Integer cityId, Integer pageNo, Integer pageSize, String searchContent) { + Response resp = new Response(); + Customer customer = new Customer(); + if (searchContent != null && searchContent != "") { + customer.setSearchContent(searchContent); + } + if (countries != null && countries != "") { + customer.setCountries(countries); + } + if (provinceId != null) { + customer.setProvinceId(provinceId); + } + if (cityId != null) { + customer.setCityId(cityId); + } + HashMap ret = customerService.queryCustomer(customer, 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; + } + + /** + * 查询客户详情 + */ + @GetMapping("/queryCustomerDetails") + Response queryCustomerDetails(@RequestParam Integer customerId) { + Response resp = new Response(); + if (customerId == null) { + resp.setStatus(300); + resp.setErrmessage("Parameter Invalid"); + } else { + HashMap ret = customerService.queryCustomerDetails(customerId); + 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("/deleteCustomer") + Response deleteCustomer(@RequestBody Customer customer) { + Response resp = new Response(); + if (customer.getCustomer().isEmpty()) { + resp.setStatus(300); + resp.setErrmessage("客户不能为空！"); + } else { + HashMap ret = customerService.deleteCustomer(customer); + 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("/updateCustomer") + Response updateCustomer(@RequestBody Customer customer) { + Response resp = new Response(); + if (customer.getCustomerId() == null) { + resp.setStatus(300); + resp.setErrmessage("客户不能为空！"); + } else { + HashMap ret = customerService.updateCustomer(customer); + 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("/queryCustomerIsExists") + Response queryCustomerIsExists(@RequestParam Integer schoolId) { + Response resp = new Response(); + if (schoolId == null) { + resp.setStatus(300); + resp.setErrmessage("学校不能为空！"); + } else { + HashMap ret = customerService.queryCustomerIsExists(schoolId); + 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("/queryCustomerIndustryClass") + Response queryCustomerIndustryClass() { + Response resp = new Response(); + HashMap ret = customerService.queryCustomerIndustryClass(); + 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("/queryCustomerIndustry") + Response queryCustomerIndustry(@RequestParam Integer industryClassId) { + Response resp = new Response(); + HashMap ret = customerService.queryCustomerIndustry(industryClassId); + 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("/querySchool") - Response querySchool(@RequestParam String schoolName) { - Response resp = new Response(); - School school = new School(); - if (schoolName!=null||schoolName!=""){ - school.setSchoolName(schoolName); - } - HashMap ret = customerService.querySchool(school); - resp.setStatus(200); - resp.setErrmessage("Parameter effective"); - 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("/querySchool") + Response querySchool(@RequestParam String schoolName) { + Response resp = new Response(); + School school = new School(); + if (schoolName != null || schoolName != "") { + school.setSchoolName(schoolName); + } + HashMap ret = customerService.querySchool(school); + resp.setStatus(200); + resp.setErrmessage("Parameter effective"); + 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; + } } diff --git a/src/main/java/com/yipin/liuwanr/entity/ExperimentalClass.java b/src/main/java/com/yipin/liuwanr/entity/ExperimentalClass.java index 6cfa6b4..40e66c3 100644 --- a/src/main/java/com/yipin/liuwanr/entity/ExperimentalClass.java +++ b/src/main/java/com/yipin/liuwanr/entity/ExperimentalClass.java @@ -4,130 +4,147 @@ import java.util.List; /** * 实验班级信息 - * - * @author 全承珠 * + * @author 全承珠 */ public class ExperimentalClass { - //实验班级主键ID - private Integer experimentalClassId; - //实验班级名称 - private String experimentalClassName; - //班级大小 - private Integer classSize; - //练习次数 - private Integer practiceNumber; - //考核次数 - private Integer inspectionNumber; - //课程进度 - private String courseSchedule; - //创建时间 - private String creationTime; - //创建人 - private String founder; - //绑定课程Id - private Integer courseId; - //绑定学校id - private Integer schoolId; - //绑定用户Id - private Integer userId; - - private List students; - - public List getStudents() { - return students; - } - - public void setStudents(List students) { - this.students = students; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getSchoolId() { - return schoolId; - } - - public void setSchoolId(Integer schoolId) { - this.schoolId = schoolId; - } - - public Integer getExperimentalClassId() { - return experimentalClassId; - } - - public void setExperimentalClassId(Integer experimentalClassId) { - this.experimentalClassId = experimentalClassId; - } - - public String getExperimentalClassName() { - return experimentalClassName; - } - - public void setExperimentalClassName(String experimentalClassName) { - this.experimentalClassName = experimentalClassName; - } - - public Integer getClassSize() { - return classSize; - } - - public void setClassSize(Integer classSize) { - this.classSize = classSize; - } - - public Integer getPracticeNumber() { - return practiceNumber; - } - - public void setPracticeNumber(Integer practiceNumber) { - this.practiceNumber = practiceNumber; - } - - public Integer getInspectionNumber() { - return inspectionNumber; - } - - public void setInspectionNumber(Integer inspectionNumber) { - this.inspectionNumber = inspectionNumber; - } - - public String getCourseSchedule() { - return courseSchedule; - } - - public void setCourseSchedule(String courseSchedule) { - this.courseSchedule = courseSchedule; - } - - public String getCreationTime() { - return creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getFounder() { - return founder; - } - - public void setFounder(String founder) { - this.founder = founder; - } - - public Integer getCourseId() { - return courseId; - } - - public void setCourseId(Integer courseId) { - this.courseId = courseId; - } + //实验班级主键ID + private Integer experimentalClassId; + //实验班级名称 + private String experimentalClassName; + //班级大小 + private Integer classSize; + //练习次数 + private Integer practiceNumber; + //考核次数 + private Integer inspectionNumber; + //课程进度 + private String courseSchedule; + //创建时间 + private String creationTime; + //创建人 + private String founder; + //绑定课程Id + private Integer courseId; + //绑定学校id + private Integer schoolId; + //绑定用户Id + private Integer userId; + + private List students; + + public List getStudents() { + return students; + } + + public void setStudents(List students) { + this.students = students; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getSchoolId() { + return schoolId; + } + + public void setSchoolId(Integer schoolId) { + this.schoolId = schoolId; + } + + public Integer getExperimentalClassId() { + return experimentalClassId; + } + + public void setExperimentalClassId(Integer experimentalClassId) { + this.experimentalClassId = experimentalClassId; + } + + public String getExperimentalClassName() { + return experimentalClassName; + } + + public void setExperimentalClassName(String experimentalClassName) { + this.experimentalClassName = experimentalClassName; + } + + public Integer getClassSize() { + return classSize; + } + + public void setClassSize(Integer classSize) { + this.classSize = classSize; + } + + public Integer getPracticeNumber() { + return practiceNumber; + } + + public void setPracticeNumber(Integer practiceNumber) { + this.practiceNumber = practiceNumber; + } + + public Integer getInspectionNumber() { + return inspectionNumber; + } + + public void setInspectionNumber(Integer inspectionNumber) { + this.inspectionNumber = inspectionNumber; + } + + public String getCourseSchedule() { + return courseSchedule; + } + + public void setCourseSchedule(String courseSchedule) { + this.courseSchedule = courseSchedule; + } + + public String getCreationTime() { + return creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getFounder() { + return founder; + } + + public void setFounder(String founder) { + this.founder = founder; + } + + public Integer getCourseId() { + return courseId; + } + + public void setCourseId(Integer 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 + + '}'; + } } diff --git a/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java index 2762d03..aa95625 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java @@ -13,16 +13,18 @@ import com.yipin.liuwanr.entity.ExperimentalClass; import com.yipin.liuwanr.entity.Professional; import com.yipin.liuwanr.entity.StuProfessionalArchitecture; import com.yipin.liuwanr.entity.Student; +import org.apache.ibatis.annotations.*; +import java.util.List; public interface ExperimentalClassMapper { @Insert("INSERT INTO experimental_class_student(studentId,experimentalClassId)" + "VALUES(#{studentId},#{experimentalClassId})") void experimentClassAddStudent(Student student); - + @Delete("DELETE from experimental_class_student where studentId = #{studentId} and experimentalClassId = #{experimentalClassId}") void experimentClassDeleteStudent(Student student); - + //创建实验班级 @Insert("INSERT INTO experimental_class_ning(experimentalClassName,classSize,creationTime,founder,courseId,isdel,userId,schoolId)" + "VALUES(#{experimentalClassName},#{classSize},now(),#{founder},#{courseId},0,#{userId},#{schoolId})") @@ -34,19 +36,19 @@ public interface ExperimentalClassMapper { + "from experimental_class_ning where isdel = 0 and schoolId = #{schoolId} and courseId=#{courseId}", " "}) List queryExperimentalClass(Integer schoolId,Integer courseId); - + //查询实验班级学生专业 @Select({" "}) List queryExperimentalClassSP(Integer experimentalClassId); - + //查询学生行政班级 @Select({" "}) List queryStudentClass(Integer experimentalClassId); - + @Select({" "}) List queryExperimentalClassDetails(Student student); - + @Select({" "}) List queryExperimentalClassDetails1(Integer experimentalClassId); - + @Update("UPDATE experimental_class_ning SET isdel = 1 where experimentalClassId = #{experimentalClassId}") void deleteExperimentalClass(Integer experimentalClassId); diff --git a/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java b/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java index 3fa8d81..28eeb4d 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java @@ -1,7 +1,6 @@ package com.yipin.liuwanr.mapper; -import java.util.List; - +import com.yipin.liuwanr.entity.*; import org.apache.ibatis.annotations.*; import com.yipin.liuwanr.entity.ApplicationPermissions; @@ -32,106 +31,106 @@ public interface OrderMapper { //添加课程权限 @Insert({" "}) - void addCoursePermissionss(@Param("coursePermissionss")List coursePermissionss); - - @Insert("INSERT INTO hr_application_permissions(systemId,isdel,orderId" - + ") VALUES(#{systemId},0,#{orderId})") - void bindingApplicationPermissions(ApplicationPermissions applicationPermissions); - - @Select("SELECT c.courseId,c.courseName,c.marketPrice from course c where c.isdel = 0 and FIND_IN_SET(c.courseId,#{courseId})") - List queryCoursePermissions(String courseId); - - @Select({" "}) - List queryOrder(Order order); - - @Select( - "SELECT o.* from orders o where o.isdel = 0 and o.orderId = #{orderId} ") - @Results({ - @Result(property = "orders", column = "orderId",one = @One(select = "com.yipin.liuwanr.mapper.OrderMapper.queryOrderDetailsO")), - @Result(property = "contractInformations", column = "orderId",one = @One(select = "com.yipin.liuwanr.mapper.OrderMapper.queryOrderDetailsCI")), - @Result(property = "coursePermissionss", column = "orderId",many = @Many(select = "com.yipin.liuwanr.mapper.OrderMapper.queryOrderDetailsCP")) -}) - List queryOrderDetails(Integer orderId); - - @Select({" "}) - Order queryOrderDetailsO(Integer orderId); - - @Select({" "}) - ListqueryOrderDetailsCP(Integer orderId); - - @Select({" "}) - ContractInformation queryOrderDetailsCI(Integer orderId); - - @Update({" "}) - void deleteOrder(@Param("orderId")List orderId); - - @Update("UPDATE orders SET customerName = #{customerName},orderName = #{orderName},orderAmount = #{orderAmount},orderType = #{orderType},provinceId = #{provinceId},cityId = #{cityId},orderContact = #{orderContact},phone = #{phone},email = #{email},customerId = #{customerId} where orderId = #{orderId}") - void updateOrder(Order order); + //缺少个过期时间 + "INSERT INTO hr_course_permissions(courseId,usePeriod,marketPrice,transactionPrice,discount,portAddressId,isDeliverGoods,isdel,orderId) VALUES" + + "" + + " (#{c.courseId},#{c.usePeriod},#{c.marketPrice},#{c.transactionPrice},#{c.discount},#{c.portAddressId},#{c.isDeliverGoods},0,#{c.orderId})" + + "", + " "}) + void addCoursePermissionss(@Param("coursePermissionss") List coursePermissionss); - @Delete("Delete from hr_course_permissions WHERE orderId = #{orderId}") - void deleteCoursePermissions(Integer orderId); + @Insert("INSERT INTO hr_application_permissions(systemId,isdel,orderId" + + ") VALUES(#{systemId},0,#{orderId})") + void bindingApplicationPermissions(ApplicationPermissions applicationPermissions); + + @Select("SELECT c.courseId,c.courseName,c.marketPrice from course c where c.isdel = 0 and FIND_IN_SET(c.courseId,#{courseId})") + List queryCoursePermissions(String courseId); + + @Select({" "}) + List queryOrder(Order order); + + @Select( + "SELECT o.* from orders o where o.isdel = 0 and o.orderId = #{orderId} ") + @Results({ + @Result(property = "orders", column = "orderId", one = @One(select = "com.yipin.liuwanr.mapper.OrderMapper.queryOrderDetailsO")), + @Result(property = "contractInformations", column = "orderId", one = @One(select = "com.yipin.liuwanr.mapper.OrderMapper.queryOrderDetailsCI")), + @Result(property = "coursePermissionss", column = "orderId", many = @Many(select = "com.yipin.liuwanr.mapper.OrderMapper.queryOrderDetailsCP")) + }) + List queryOrderDetails(Integer orderId); + + @Select({" "}) + Order queryOrderDetailsO(Integer orderId); + + @Select({" "}) + List queryOrderDetailsCP(Integer orderId); + + @Select({" "}) + ContractInformation queryOrderDetailsCI(Integer orderId); + + @Update({" "}) + void deleteOrder(@Param("orderId") List orderId); + + @Update("UPDATE orders SET customerName = #{customerName},orderName = #{orderName},orderAmount = #{orderAmount},orderType = #{orderType},provinceId = #{provinceId},cityId = #{cityId},orderContact = #{orderContact},phone = #{phone},email = #{email},customerId = #{customerId} where orderId = #{orderId}") + void updateOrder(Order order); + + @Delete("Delete from hr_course_permissions WHERE orderId = #{orderId}") + void deleteCoursePermissions(Integer orderId); + + //缺少个过期时间 + @Update("INSERT INTO hr_course_permissions(courseId,usePeriod,marketPrice,transactionPrice,discount,portAddressId,isDeliverGoods,orderId) VALUES (#{courseId},#{usePeriod},#{marketPrice},#{transactionPrice},#{discount},#{portAddressId},#{isDeliverGoods},#{orderId})") + void updateCoursePermissions(CoursePermissions coursePermissions); + + @Update("UPDATE hr_contract_information SET contractInformationName = #{contractInformationName},contractInformationNumber = #{contractInformationNumber},contractInformationSum = #{contractInformationSum},contractInformationLink = #{contractInformationLink} where contractInformationId = #{contractInformationId}") + void updateContractInformation(ContractInformation contractInformation); + + @Update({" "}) + void isDeliverGoods(CoursePermissions coursePermissions); + + @Select({" "}) + List queryOrderCustomer(Integer cityId, Integer provinceId); + + @Select({" "}) + List queryOrderCustomerContact(Integer customerId); + + //查询订单课程列表 + @Select({" "}) + List queryCourseList(String searchContent, @Param("courseId") List courseId); - //缺少个过期时间 - @Update("INSERT INTO hr_course_permissions(courseId,usePeriod,marketPrice,transactionPrice,discount,portAddressId,isDeliverGoods,orderId) VALUES (#{courseId},#{usePeriod},#{marketPrice},#{transactionPrice},#{discount},#{portAddressId},#{isDeliverGoods},#{orderId})") - void updateCoursePermissions(CoursePermissions coursePermissions); - - @Update("UPDATE hr_contract_information SET contractInformationName = #{contractInformationName},contractInformationNumber = #{contractInformationNumber},contractInformationSum = #{contractInformationSum},contractInformationLink = #{contractInformationLink} where contractInformationId = #{contractInformationId}") - void updateContractInformation(ContractInformation contractInformation); - - @Update({" "}) - void isDeliverGoods(CoursePermissions coursePermissions); - - @Select({" "}) - List queryOrderCustomer(Integer cityId,Integer provinceId); - - @Select({" "}) - List queryOrderCustomerContact(Integer customerId); - - //查询订单课程列表 - @Select({" "}) - List queryCourseList(String searchContent,@Param("courseId")List courseId); - } \ No newline at end of file diff --git a/src/main/java/com/yipin/liuwanr/mapper/ServiceConfigMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ServiceConfigMapper.java index 2b5861f..d4fdafd 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ServiceConfigMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ServiceConfigMapper.java @@ -1,34 +1,33 @@ 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.Select; import org.apache.ibatis.annotations.Update; -import com.yipin.liuwanr.entity.ServiceConfig; +import java.util.List; public interface ServiceConfigMapper { - - @Insert("INSERT INTO service_config(systemName,systemType,systemAttribution,systemStatus,isdel) VALUES(#{systemName},#{systemType},#{systemAttribution},#{systemStatus},0)") - void addServiceConfig(ServiceConfig serviceConfig); - - @Select({" "}) - List queryServiceConfig(ServiceConfig serviceConfig); - - @Select({" "}) - List queryServiceConfigDetails(Integer systemId); - - @Update("UPDATE service_config SET isdel = 1 where systemId = #{systemId}") - void deleteServiceConfig(ServiceConfig serviceConfig); - - @Update("UPDATE service_config SET systemName = #{systemName},systemType = #{systemType},systemAttribution = #{systemAttribution},systemStatus = #{systemStatus} where systemId = #{systemId}") - void updateServiceConfig(ServiceConfig serviceConfig); + + @Insert("INSERT INTO service_config(systemName,systemType,systemAttribution,systemStatus,isdel) VALUES(#{systemName},#{systemType},#{systemAttribution},#{systemStatus},0)") + void addServiceConfig(ServiceConfig serviceConfig); + + @Select({" "}) + List queryServiceConfig(ServiceConfig serviceConfig); + + @Select({" "}) + List queryServiceConfigDetails(Integer systemId); + + @Update("UPDATE service_config SET isdel = 1 where systemId = #{systemId}") + void deleteServiceConfig(ServiceConfig serviceConfig); + + @Update("UPDATE service_config SET systemName = #{systemName},systemType = #{systemType},systemAttribution = #{systemAttribution},systemStatus = #{systemStatus} where systemId = #{systemId}") + void updateServiceConfig(ServiceConfig serviceConfig); } \ No newline at end of file diff --git a/src/main/java/com/yipin/liuwanr/service/ExperimentalClassService.java b/src/main/java/com/yipin/liuwanr/service/ExperimentalClassService.java index 69dc22f..09f2559 100644 --- a/src/main/java/com/yipin/liuwanr/service/ExperimentalClassService.java +++ b/src/main/java/com/yipin/liuwanr/service/ExperimentalClassService.java @@ -1,23 +1,16 @@ package com.yipin.liuwanr.service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - +import com.yipin.liuwanr.entity.*; +import com.yipin.liuwanr.mapper.ExperimentalClassMapper; +import com.yipin.liuwanr.mapper.TeacherProjectAndCourseMapper; import org.jboss.logging.Logger; import org.springframework.beans.factory.annotation.Autowired; 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 java.util.HashMap; +import java.util.List; + @Service public class ExperimentalClassService { @@ -86,7 +79,7 @@ public class ExperimentalClassService { Integer experimentalClassId = experimentalClass.getExperimentalClassId(); Integer courseId = experimentalClass.getCourseId(); List projectIds = projectAndCourseMapper.queryProject(courseId); - projectAndCourseMapper.addBatchTeachProject(experimentalClassId,courseId,projectIds); + projectAndCourseMapper.addBatchTeachProject(experimentalClassId, courseId, projectIds); resp.put("retcode", 200); } catch (RuntimeException e) { @@ -98,11 +91,11 @@ public class ExperimentalClassService { return resp; } - public HashMap queryExperimentalClass(Integer schoolId,Integer courseId) { + public HashMap queryExperimentalClass(Integer schoolId, Integer courseId) { HashMap resp = new HashMap(); try { - if(!StringUtils.isEmpty(courseId)){ - resp.put("retvalue", experimentalClassMapper.queryExperimentalClass(schoolId,courseId)); + if (!StringUtils.isEmpty(courseId)) { + resp.put("retvalue", experimentalClassMapper.queryExperimentalClass(schoolId, courseId)); resp.put("retcode", 200); } } catch (RuntimeException e) { diff --git a/src/main/java/com/yipin/liuwanr/service/OrderService.java b/src/main/java/com/yipin/liuwanr/service/OrderService.java index fe7c1a5..430d851 100644 --- a/src/main/java/com/yipin/liuwanr/service/OrderService.java +++ b/src/main/java/com/yipin/liuwanr/service/OrderService.java @@ -1,319 +1,312 @@ 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.SimpleDateFormat; import java.util.Date; 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.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 public class OrderService { - - private static Logger logger = Logger.getLogger(OrderService.class); - - @Autowired - private OrderMapper orderMapper; - //添加合同信息 - public HashMap addOrder(Order order){ - HashMap resp = new HashMap(); - try { - long timeStamp = new Date().getTime();//获取时间戳 - String orderNumber = String.valueOf(timeStamp);//long转String - order.setOrderNumber(orderNumber); - orderMapper.addOrder(order); - resp.put("orderId", order.getOrderId()); - resp.put("retcode", 200); - orderMapper.updateOrderCustomer(order); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "添加订单失败！"); - return resp; - } - return resp; - } - public HashMap addContractInformation(ContractInformation contractInformation){ - HashMap resp = new HashMap(); - try { - orderMapper.addContractInformation(contractInformation); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "添加信息合同失败！"); - return resp; - } - return resp; - } - - //添加课程权限 - public HashMap addCoursePermissionss(List coursePermissionss) throws ParseException{ - HashMap resp = new HashMap(); - try { - Integer size = coursePermissionss.size(); - for (int i = 0; i < size; i++) { - CoursePermissions coursePermissionssList = coursePermissionss.get(i); - Integer usePeriod = coursePermissionssList.getUsePeriod(); - Integer usePeriod1 = usePeriod*1000*(60*60*24); - long DQSJC = System.currentTimeMillis(); - long expireSJC = usePeriod1 + DQSJC; - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - long lt = new Long(expireSJC); - Date date = new Date(lt); - String time = simpleDateFormat.format(date); - coursePermissionss.get(i).setExpirationTime(time); - } - orderMapper.addCoursePermissionss(coursePermissionss); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "添加课程权限失败！"); - return resp; - } - return resp; - } - - //绑定应用权限 - public HashMap bindingApplicationPermissions(ApplicationPermissions applicationPermissions){ - HashMap resp = new HashMap(); - try { - orderMapper.bindingApplicationPermissions(applicationPermissions); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap queryCoursePermissions(String courseId){ - HashMap resp = new HashMap(); - try { - List list = orderMapper.queryCoursePermissions(courseId); - resp.put("retvalue", list); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - - public HashMap queryOrder(Order order,Integer pageNo,Integer pageSize){ - HashMap resp = new HashMap(); - try { - if(pageNo!=null&&pageSize!=null) { - PageHelper.startPage(pageNo, pageSize); - List list = orderMapper.queryOrder(order); - PageInfo info=new PageInfo(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 list = orderMapper.queryOrder(order); - resp.put("retvalue", list); - resp.put("retcode", 200); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap queryOrderDetails(Integer orderId){ - HashMap resp = new HashMap(); - try { - resp.put("retvalue", orderMapper.queryOrderDetails(orderId)); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap deleteOrder(List orderId){ - HashMap resp = new HashMap(); - try { - orderMapper.deleteOrder(orderId); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap updateOrder(Order order){ - HashMap resp = new HashMap(); - try { - orderMapper.updateOrder(order); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } + private static Logger logger = Logger.getLogger(OrderService.class); + + @Autowired + private OrderMapper orderMapper; + + //添加合同信息 + public HashMap addOrder(Order order) { + HashMap resp = new HashMap(); + try { + long timeStamp = new Date().getTime();//获取时间戳 + String orderNumber = String.valueOf(timeStamp);//long转String + order.setOrderNumber(orderNumber); + orderMapper.addOrder(order); + resp.put("orderId", order.getOrderId()); + resp.put("retcode", 200); + orderMapper.updateOrderCustomer(order); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "添加订单失败！"); + return resp; + } + return resp; + } + + public HashMap addContractInformation(ContractInformation contractInformation) { + HashMap resp = new HashMap(); + try { + orderMapper.addContractInformation(contractInformation); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "添加信息合同失败！"); + return resp; + } + return resp; + } + + //添加课程权限 + public HashMap addCoursePermissionss(List coursePermissionss) throws ParseException { + HashMap resp = new HashMap(); + try { + Integer size = coursePermissionss.size(); + for (int i = 0; i < size; i++) { + CoursePermissions coursePermissionssList = coursePermissionss.get(i); + Integer usePeriod = coursePermissionssList.getUsePeriod(); + Integer usePeriod1 = usePeriod * 1000 * (60 * 60 * 24); + long DQSJC = System.currentTimeMillis(); + long expireSJC = usePeriod1 + DQSJC; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + long lt = new Long(expireSJC); + Date date = new Date(lt); + String time = simpleDateFormat.format(date); + coursePermissionss.get(i).setExpirationTime(time); + } + orderMapper.addCoursePermissionss(coursePermissionss); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "添加课程权限失败！"); + return resp; + } + return resp; + } + + //绑定应用权限 + public HashMap bindingApplicationPermissions(ApplicationPermissions applicationPermissions) { + HashMap resp = new HashMap(); + try { + orderMapper.bindingApplicationPermissions(applicationPermissions); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap queryCoursePermissions(String courseId) { + HashMap resp = new HashMap(); + try { + List list = orderMapper.queryCoursePermissions(courseId); + resp.put("retvalue", list); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap queryOrder(Order order, Integer pageNo, Integer pageSize) { + HashMap resp = new HashMap(); + try { + if (pageNo != null && pageSize != null) { + PageHelper.startPage(pageNo, pageSize); + List list = orderMapper.queryOrder(order); + PageInfo info = new PageInfo(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 list = orderMapper.queryOrder(order); + resp.put("retvalue", list); + resp.put("retcode", 200); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap queryOrderDetails(Integer orderId) { + HashMap resp = new HashMap(); + try { + resp.put("retvalue", orderMapper.queryOrderDetails(orderId)); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap deleteOrder(List orderId) { + HashMap resp = new HashMap(); + try { + orderMapper.deleteOrder(orderId); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap updateOrder(Order order) { + HashMap resp = new HashMap(); + try { + orderMapper.updateOrder(order); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap deleteCoursePermissions(Integer orderId) { + HashMap resp = new HashMap(); + try { + orderMapper.deleteCoursePermissions(orderId); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap updateCoursePermissions(List coursePermissionss) { + HashMap resp = new HashMap(); + int size = coursePermissionss.size(); + if (coursePermissionss.isEmpty()) { + resp.put("retcode", 200); + } else { + try { + for (int i = 0; i < size; i++) { + CoursePermissions coursePermissions = coursePermissionss.get(i); + orderMapper.updateCoursePermissions(coursePermissions); + } + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + } + return resp; + } + + public HashMap updateContractInformation(ContractInformation contractInformation) { + HashMap resp = new HashMap(); + try { + orderMapper.updateContractInformation(contractInformation); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + //绑定应用权限 + public HashMap isDeliverGoods(CoursePermissions coursePermissions) { + HashMap resp = new HashMap(); + try { + orderMapper.isDeliverGoods(coursePermissions); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap queryOrderCustomer(Integer cityId, Integer provinceId) { + HashMap resp = new HashMap(); + try { + resp.put("retvalue", orderMapper.queryOrderCustomer(cityId, provinceId)); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } - public HashMap deleteCoursePermissions(Integer orderId){ - HashMap resp = new HashMap(); - try { - orderMapper.deleteCoursePermissions(orderId); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } + public HashMap queryOrderCustomerContact(Integer customerId) { + HashMap resp = new HashMap(); + try { + resp.put("retvalue", orderMapper.queryOrderCustomerContact(customerId)); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } - public HashMap updateCoursePermissions(List coursePermissionss){ - HashMap resp = new HashMap(); - int size = coursePermissionss.size(); - if (coursePermissionss.isEmpty()) { - resp.put("retcode", 200); - }else { - try { - for (int i = 0; i < size; i++) { - CoursePermissions coursePermissions = coursePermissionss.get(i); - orderMapper.updateCoursePermissions(coursePermissions); - } - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - } - return resp; - } - - public HashMap updateContractInformation(ContractInformation contractInformation){ - HashMap resp = new HashMap(); - try { - orderMapper.updateContractInformation(contractInformation); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - //绑定应用权限 - public HashMap isDeliverGoods(CoursePermissions coursePermissions){ - HashMap resp = new HashMap(); - try { - orderMapper.isDeliverGoods(coursePermissions); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap queryOrderCustomer(Integer cityId,Integer provinceId){ - HashMap resp = new HashMap(); - try { - resp.put("retvalue", orderMapper.queryOrderCustomer(cityId,provinceId)); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - - public HashMap queryOrderCustomerContact(Integer customerId){ - HashMap resp = new HashMap(); - try { - resp.put("retvalue", orderMapper.queryOrderCustomerContact(customerId)); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - //查询订单课程列表 - public HashMap queryCourseList(String searchContent,List courseId,Integer pageNo,Integer pageSize){ - HashMap resp = new HashMap(); - try { - if(pageNo!=null&&pageSize!=null) { - PageHelper.startPage(pageNo, pageSize); - List list = orderMapper.queryCourseList(searchContent,courseId); - PageInfo info=new PageInfo(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 list = orderMapper.queryCourseList(searchContent,courseId); - resp.put("retvalue", list); - resp.put("retcode", 200); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } + //查询订单课程列表 + public HashMap queryCourseList(String searchContent, List courseId, Integer pageNo, Integer pageSize) { + HashMap resp = new HashMap(); + try { + if (pageNo != null && pageSize != null) { + PageHelper.startPage(pageNo, pageSize); + List list = orderMapper.queryCourseList(searchContent, courseId); + PageInfo info = new PageInfo(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 list = orderMapper.queryCourseList(searchContent, courseId); + resp.put("retvalue", list); + resp.put("retcode", 200); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } } diff --git a/src/main/java/com/yipin/liuwanr/service/ServiceConfigService.java b/src/main/java/com/yipin/liuwanr/service/ServiceConfigService.java index e35c4ed..32da9fd 100644 --- a/src/main/java/com/yipin/liuwanr/service/ServiceConfigService.java +++ b/src/main/java/com/yipin/liuwanr/service/ServiceConfigService.java @@ -1,110 +1,109 @@ 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.PageInfo; import com.yipin.liuwanr.entity.PageResult; import com.yipin.liuwanr.entity.ServiceConfig; 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 public class ServiceConfigService { - - private static Logger logger = Logger.getLogger(ServiceConfigService.class); - - @Autowired - private ServiceConfigMapper serviceConfigMapper; - public HashMap addServiceConfig(ServiceConfig serviceConfig){ - HashMap resp = new HashMap(); - try { - serviceConfigMapper.addServiceConfig(serviceConfig); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap queryServiceConfig(ServiceConfig serviceConfig,Integer pageNo,Integer pageSize){ - HashMap resp = new HashMap(); - try { - if(pageNo!=null&&pageSize!=null) { - PageHelper.startPage(pageNo, pageSize); - List list = serviceConfigMapper.queryServiceConfig(serviceConfig); - PageInfo info=new PageInfo(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 list = serviceConfigMapper.queryServiceConfig(serviceConfig); - resp.put("retvalue", list); - resp.put("retcode", 200); - } - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap queryServiceConfigDetails(Integer systemId){ - HashMap resp = new HashMap(); - try { - resp.put("retvalue", serviceConfigMapper.queryServiceConfigDetails(systemId)); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap deleteServiceConfig(ServiceConfig serviceConfig){ - HashMap resp = new HashMap(); - try { - serviceConfigMapper.deleteServiceConfig(serviceConfig); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - - public HashMap updateServiceConfig(ServiceConfig serviceConfig){ - HashMap resp = new HashMap(); - try { - serviceConfigMapper.updateServiceConfig(serviceConfig); - resp.put("retcode", 200); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - resp.put("retcode", 500); - resp.put("retvalue", "Inquiry Failed"); - return resp; - } - return resp; - } - + private static Logger logger = Logger.getLogger(ServiceConfigService.class); + + @Autowired + private ServiceConfigMapper serviceConfigMapper; + + public HashMap addServiceConfig(ServiceConfig serviceConfig) { + HashMap resp = new HashMap(); + try { + serviceConfigMapper.addServiceConfig(serviceConfig); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap queryServiceConfig(ServiceConfig serviceConfig, Integer pageNo, Integer pageSize) { + HashMap resp = new HashMap(); + try { + if (pageNo != null && pageSize != null) { + PageHelper.startPage(pageNo, pageSize); + List list = serviceConfigMapper.queryServiceConfig(serviceConfig); + PageInfo info = new PageInfo(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 list = serviceConfigMapper.queryServiceConfig(serviceConfig); + resp.put("retvalue", list); + resp.put("retcode", 200); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap queryServiceConfigDetails(Integer systemId) { + HashMap resp = new HashMap(); + try { + resp.put("retvalue", serviceConfigMapper.queryServiceConfigDetails(systemId)); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap deleteServiceConfig(ServiceConfig serviceConfig) { + HashMap resp = new HashMap(); + try { + serviceConfigMapper.deleteServiceConfig(serviceConfig); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + public HashMap updateServiceConfig(ServiceConfig serviceConfig) { + HashMap resp = new HashMap(); + try { + serviceConfigMapper.updateServiceConfig(serviceConfig); + resp.put("retcode", 200); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + } diff --git a/src/test/java/com/yipin/liuwanr/ExperimentalClassServiceTest.java b/src/test/java/com/yipin/liuwanr/ExperimentalClassServiceTest.java index d24ba9f..d7d8428 100644 --- a/src/test/java/com/yipin/liuwanr/ExperimentalClassServiceTest.java +++ b/src/test/java/com/yipin/liuwanr/ExperimentalClassServiceTest.java @@ -52,19 +52,19 @@ public class ExperimentalClassServiceTest { public void addExperimentalClass() { ExperimentalClass experimentalClass = new ExperimentalClass(); experimentalClass.setExperimentalClassName("测试"); - experimentalClass.setClassSize(12); + experimentalClass.setClassSize(120); experimentalClass.setFounder("测试"); - experimentalClass.setCourseId(2); - experimentalClass.setUserId(2); - experimentalClass.setSchoolId(2); + experimentalClass.setCourseId(77); + experimentalClass.setUserId(452); + experimentalClass.setSchoolId(2043); HashMap map = experimentalClassService.addExperimentalClass(experimentalClass); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @Test public void queryExperimentalClass() { - Integer schoolId = 1; - Integer courseId = 2; + Integer schoolId = 2043; + Integer courseId = 77; HashMap map = experimentalClassService.queryExperimentalClass(schoolId, courseId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -72,7 +72,7 @@ public class ExperimentalClassServiceTest { //查询实验班级专业 @Test public void queryExperimentalClassSP() { - Integer experimentalClassId = 1; + Integer experimentalClassId = 56; HashMap map = experimentalClassService.queryExperimentalClassSP(experimentalClassId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -80,7 +80,7 @@ public class ExperimentalClassServiceTest { //查询学生行政班级 @Test public void queryStudentClass() { - Integer experimentalClassId = 1; + Integer experimentalClassId = 56; HashMap map = experimentalClassService.queryStudentClass(experimentalClassId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -91,7 +91,7 @@ public class ExperimentalClassServiceTest { @Test public void queryExperimentalClassDetails() { Student student = new Student(); - Integer courseId = 1; + Integer courseId = 56; HashMap map = experimentalClassService.queryExperimentalClassDetails(student, courseId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -99,7 +99,7 @@ public class ExperimentalClassServiceTest { //新增学生显示数据 @Test public void queryexperimentalClass() { - Integer experimentalClassId = 1; + Integer experimentalClassId = 56; HashMap map = experimentalClassService.queryexperimentalClass(experimentalClassId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -107,7 +107,7 @@ public class ExperimentalClassServiceTest { //专业下拉框 @Test public void getProfessionals() { - Integer experimentalClassId = 1; + Integer experimentalClassId = 56; HashMap map = experimentalClassService.getProfessionals(experimentalClassId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -115,7 +115,7 @@ public class ExperimentalClassServiceTest { //班级下拉框 @Test public void getStudentClass() { - Integer experimentalClassId = 1; + Integer experimentalClassId = 56; HashMap map = experimentalClassService.getStudentClass(experimentalClassId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -123,7 +123,7 @@ public class ExperimentalClassServiceTest { @Test @Transactional public void deleteExperimentalClass() { - Integer experimentalClassId = 1; + Integer experimentalClassId = 56; HashMap map = experimentalClassService.deleteExperimentalClass(experimentalClassId); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -132,6 +132,13 @@ public class ExperimentalClassServiceTest { @Transactional public void updateExperimentalClass() { ExperimentalClass experimentalClass = new ExperimentalClass(); + experimentalClass.setExperimentalClassName("测试"); + experimentalClass.setClassSize(120); + experimentalClass.setFounder("测试"); + experimentalClass.setCourseId(77); + experimentalClass.setUserId(452); + experimentalClass.setSchoolId(2043); + experimentalClass.setExperimentalClassId(56); HashMap map = experimentalClassService.updateExperimentalClass(experimentalClass); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -141,6 +148,13 @@ public class ExperimentalClassServiceTest { @Transactional public void updateExperimentClassName() { ExperimentalClass experimentalClass = new ExperimentalClass(); + experimentalClass.setExperimentalClassName("测试"); + experimentalClass.setClassSize(120); + experimentalClass.setFounder("测试"); + experimentalClass.setCourseId(77); + experimentalClass.setUserId(452); + experimentalClass.setSchoolId(2043); + experimentalClass.setExperimentalClassId(56); HashMap map = experimentalClassService.updateExperimentalClass(experimentalClass); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } @@ -148,7 +162,7 @@ public class ExperimentalClassServiceTest { //——————————————————————————————全承珠 @Test public void queryGetByExperimentalClassName() { - String experimentalClassName = ""; + String experimentalClassName = "测试"; HashMap map = experimentalClassService.queryGetByExperimentalClassName(experimentalClassName); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); } diff --git a/src/test/java/com/yipin/liuwanr/OrderServiceTest.java b/src/test/java/com/yipin/liuwanr/OrderServiceTest.java new file mode 100644 index 0000000..0c19a77 --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/OrderServiceTest.java @@ -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 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 map = orderService.addContractInformation(contractInformation); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //添加课程权限 + @Test + @Transactional + public void addCoursePermissionss() throws ParseException { + List 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 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 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 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 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 rows = (List) 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 map = orderService.queryOrderDetails(orderId); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + @Test + @Transactional + public void deleteOrder() { + List orderId = new ArrayList<>(); + orderId.add(1); + orderId.add(2); + orderId.add(3); + HashMap 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 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 map = orderService.deleteCoursePermissions(orderId); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + @Test + @Transactional + public void updateCoursePermissions() { + List coursePermissionss = new ArrayList<>(); + CoursePermissions coursePermissions = new CoursePermissions(); + coursePermissionss.add(coursePermissions); + HashMap 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 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 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 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 map = orderService.queryOrderCustomerContact(customerId); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //查询订单课程列表 + @Test + @Transactional + public void queryCourseList() { + String searchContent = ""; + List courseId = new ArrayList<>(); + Integer pageNo = 1; + Integer pageSize = 10; + HashMap 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 rows = (List) pageResult.getRows(); + rows.forEach(item -> System.out.println(item.toString())); + } else { + String msg = (String) map.get("retvalue"); + System.out.println(msg); + } + } + +} diff --git a/src/test/java/com/yipin/liuwanr/ServiceConfigServiceTest.java b/src/test/java/com/yipin/liuwanr/ServiceConfigServiceTest.java new file mode 100644 index 0000000..47a8e21 --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/ServiceConfigServiceTest.java @@ -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 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 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 rows = (List) 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 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 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 map = serviceConfigService.updateServiceConfig(serviceConfig); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + +} From b86bf250e58bf780be1afc5552ebebb31d27b127 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 21 Aug 2020 18:11:58 +0800 Subject: [PATCH 2/3] projectAndCourseService test end --- .../liuwanr/entity/Project_Management.java | 15 ++ .../service/MakeuplistServiceTest.java | 165 ++++++++++++++++++ .../service/ProjectAndCourseServiceTest.java | 120 +++++++++++++ .../liuwanr/service/StaffGradServiceTest.java | 93 ++++++++++ 4 files changed, 393 insertions(+) create mode 100644 src/test/java/com/yipin/liuwanr/service/MakeuplistServiceTest.java create mode 100644 src/test/java/com/yipin/liuwanr/service/ProjectAndCourseServiceTest.java create mode 100644 src/test/java/com/yipin/liuwanr/service/StaffGradServiceTest.java diff --git a/src/main/java/com/yipin/liuwanr/entity/Project_Management.java b/src/main/java/com/yipin/liuwanr/entity/Project_Management.java index ca491bc..a2c2cb7 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Project_Management.java +++ b/src/main/java/com/yipin/liuwanr/entity/Project_Management.java @@ -30,6 +30,21 @@ public class Project_Management { private Integer isAttendance; private Integer signin;//是否签到 + public Project_Management(){ + + } + + public Project_Management(Integer isOpenProject,Integer projectId){ + this.isOpenProject = isOpenProject; + this.projectId = projectId; + } + + public Project_Management(Integer projectId,Integer isAttendance,Integer founder){ + this.projectId = projectId; + this.isAttendance = isAttendance; + this.founder = founder; + } + private List courseLinks; public List getCourseLinks() { diff --git a/src/test/java/com/yipin/liuwanr/service/MakeuplistServiceTest.java b/src/test/java/com/yipin/liuwanr/service/MakeuplistServiceTest.java new file mode 100644 index 0000000..3437830 --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/service/MakeuplistServiceTest.java @@ -0,0 +1,165 @@ +package com.yipin.liuwanr.service; + +import org.apache.commons.io.IOUtils; +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.lang.Nullable; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashMap; + +/** + * @auther River + * @date 2020/8/19 9:39 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +public class MakeuplistServiceTest { + + @Autowired + private MakeuplistService makeuplistService; + + /** + * 查询数据 + */ + @Test + @Transactional + public void queryAllMakeuplistTest(){ + Integer staffId = 1; + long uploadTime = 0L; + Integer uploadType = 1; + Integer schoolId = 5; + String time = "2020-07-24 18:51"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + try { + uploadTime = sdf.parse(time).getTime() / 1000; + } catch (ParseException e) { + e.printStackTrace(); + } + HashMap queryAllMakeuplist = makeuplistService.queryAllMakeuplist(staffId, uploadTime, uploadType, schoolId); + for (String s : queryAllMakeuplist.keySet()) { + System.out.println("key:" + s + "," + "value:" + queryAllMakeuplist.get(s)); + } + } + + /** + * 获取学生信息 + */ + @Test + @Transactional + public void getStudentTest(){ + Integer staffId = 1; + long uploadTime = 0L; + Integer uploadType = 1; + Integer schoolId = 5; + String time = "2020-07-24 18:51"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + try { + uploadTime = sdf.parse(time).getTime() / 1000; + } catch (ParseException e) { + e.printStackTrace(); + } + HashMap student = makeuplistService.getStudent(staffId, uploadTime, uploadType, schoolId); + for (String s : student.keySet()) { + System.out.println("key:" + s + "," + "value:" + student.get(s)); + } + } + + /** + * 获取补考信息 + */ + @Test + @Transactional + public void getByMakeuplistTest(){ + Integer staffId = 1; + long uploadTime = 0L; + Integer uploadType = 1; + Integer schoolId = 5; + String time = "2020-07-24 18:51"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + try { + uploadTime = sdf.parse(time).getTime() / 1000; + } catch (ParseException e) { + e.printStackTrace(); + } + HashMap makeuplist = makeuplistService.getByMakeuplist(staffId, uploadTime, uploadType, schoolId); + for (String s : makeuplist.keySet()) { + System.out.println("key:" + s + "," + "value:" + makeuplist.get(s)); + } + } + + /** + * 导入数据 + */ + @Test + @Transactional + public void addMakeuplistTest(){ + MultipartFile file = new MultipartFile() { + @Override + public String getName() { + return null; + } + @Nullable + @Override + public String getOriginalFilename() { + return null; + } + @Nullable + @Override + public String getContentType() { + return null; + } + @Override + public boolean isEmpty() { + return false; + } + @Override + public long getSize() { + return 0; + } + @Override + public byte[] getBytes() throws IOException { + return new byte[0]; + } + @Override + public InputStream getInputStream() throws IOException { + return null; + } + @Override + public void transferTo(File dest) throws IOException, IllegalStateException { + } + }; + Integer schoolId = 5; + Integer staffId = 1; + long uploadTime = 0L; + String time = "2020-07-24 18:51"; + File file1 = new File("C:\\Users\\Hello\\Desktop\\aaaa.xlsx"); + try { + //将file类型文件转换为MultipartFile类型文件 + FileInputStream input = new FileInputStream(file1); + file = new MockMultipartFile("file", file1.getName(), "text/plain", IOUtils.toByteArray(input)); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + try { + uploadTime = sdf.parse(time).getTime() / 1000; + } catch (ParseException e) { + e.printStackTrace(); + } + HashMap makeuplist = makeuplistService.addMakeuplist(file, schoolId, staffId, uploadTime); + for (String s : makeuplist.keySet()) { + System.out.println("key:" + s + "," + "value:" + makeuplist.get(s)); + } + } +} diff --git a/src/test/java/com/yipin/liuwanr/service/ProjectAndCourseServiceTest.java b/src/test/java/com/yipin/liuwanr/service/ProjectAndCourseServiceTest.java new file mode 100644 index 0000000..edf199b --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/service/ProjectAndCourseServiceTest.java @@ -0,0 +1,120 @@ +package com.yipin.liuwanr.service; + +import com.yipin.liuwanr.entity.CourseSchedule; +import com.yipin.liuwanr.entity.Project_Management; +import com.yipin.liuwanr.vo.CourseAndProjectVo; +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; + +/** + * @auther River + * @date 2020/8/21 11:38 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +public class ProjectAndCourseServiceTest { + + @Autowired + private ProjectAndCourseService projectAndCourseService; + + /** + * 根据课程查询实验项目信息 + */ + @Test + @Transactional + public void queryProjectTest(){ + Integer courseId = 77; + Integer experimentalClassId = 87; + Integer pageNo = 1; + Integer pageSize = 10; + HashMap project = projectAndCourseService.queryProject(courseId, experimentalClassId, pageNo, pageSize); + for (String s : project.keySet()) { + System.out.println("key:" + s + "," + "value:" + project.get(s)); + } + } + + /** + * 修改项目状态 + */ + @Test + @Transactional + public void updateIsExperimentTest(){ + CourseAndProjectVo vo = new CourseAndProjectVo(); + vo.setCourseId(77); + vo.setExperimentalClassId(87); + vo.setProject(new Project_Management(1,289)); + HashMap experiment = projectAndCourseService.updateIsExperiment(vo); + for (String s : experiment.keySet()) { + System.out.println("key:" + s + "," + "value:" + experiment.get(s)); + } + } + + /** + * 修改考勤状态 + */ + @Test + @Transactional + public void updateIsAttendanceTest(){ + CourseAndProjectVo vo = new CourseAndProjectVo(); + vo.setCourseId(77); + vo.setExperimentalClassId(87); + vo.setProject(new Project_Management(1,289,null)); + HashMap attendance = projectAndCourseService.updateIsAttendance(vo); + for (String s : attendance.keySet()) { + System.out.println("key:" + s + "," + "value:" + attendance.get(s)); + } + } + + /** + * 获取课程进度 + */ + @Test + @Transactional + public void getCourseScheduleTest(){ + Integer courseId = 77; + Integer experimentalClassId = 87; + Integer studentId = null; + HashMap courseSchedule = projectAndCourseService.getCourseSchedule(courseId, experimentalClassId, studentId); + for (String s : courseSchedule.keySet()) { + System.out.println("key:" + s + "," + "value:" + courseSchedule.get(s)); + } + } + + /** + * 添加课程进度 + */ + @Test + @Transactional + public void addCourseScheduleTest(){ + CourseSchedule courseSchedule = new CourseSchedule(); + courseSchedule.setScheduleId(1); + courseSchedule.setProjectId(5); + courseSchedule.setCourseId(5); + courseSchedule.setExperimentalClassId(0); + HashMap courseSchedule1 = projectAndCourseService.addCourseSchedule(courseSchedule); + for (String s : courseSchedule1.keySet()) { + System.out.println("key:" + s + "," + "value:" + courseSchedule1.get(s)); + } + } + + /** + * 课程视频 + */ + @Test + @Transactional + public void getCoursevideoTest(){ + Integer courseId = 77; + Integer experimentalClassId = 87; + Integer studentId = null; + HashMap coursevideo = projectAndCourseService.getCoursevideo(courseId, experimentalClassId, studentId); + for (String s : coursevideo.keySet()) { + System.out.println("key:" + s + "," + "value:" + coursevideo.get(s)); + } + } +} diff --git a/src/test/java/com/yipin/liuwanr/service/StaffGradServiceTest.java b/src/test/java/com/yipin/liuwanr/service/StaffGradServiceTest.java new file mode 100644 index 0000000..9752514 --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/service/StaffGradServiceTest.java @@ -0,0 +1,93 @@ +package com.yipin.liuwanr.service; + +import com.yipin.liuwanr.entity.StaffGrade; +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; + +/** + * @auther River + * @date 2020/8/20 10:57 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +public class StaffGradServiceTest { + + @Autowired + private StaffGradeService staffGradeService; + + /** + * 添加员工年级 + */ + @Test + @Transactional + public void addStaffGradeTest(){ + StaffGrade staffGrade = new StaffGrade(); + staffGrade.setStaffGradeName("教导处"); + staffGrade.setStaffProfessionalArchitectureId(1); + HashMap addStaffGrade = staffGradeService.addStaffGrade(staffGrade); + for (String s : addStaffGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + addStaffGrade.get(s)); + } + } + + /** + * 查询员工年级 + */ + @Test + @Transactional + public void queryStaffGradeTest(){ + Integer staffProfessionalArchitectureId = 1; + HashMap staffGrade = staffGradeService.queryStaffGrade(staffProfessionalArchitectureId); + for (String s : staffGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + staffGrade.get(s)); + } + } + + /** + * 删除员工年级 + */ + @Test + @Transactional + public void deleteStaffGradeTest(){ + Integer staffGradeId = 1; + HashMap staffGrade = staffGradeService.deleteStaffGrade(staffGradeId); + for (String s : staffGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + staffGrade.get(s)); + } + } + + /** + * 查询员工年级详情 + */ + @Test + @Transactional + public void queryStaffGradeDetailsTest(){ + Integer staffGradeId = 1; + HashMap staffGradeDetails = staffGradeService.queryStaffGradeDetails(staffGradeId); + for (String s : staffGradeDetails.keySet()) { + System.out.println("key:" + s + "," + "value:" + staffGradeDetails.get(s)); + } + } + + /** + * 更新员工年级 + */ + @Test + @Transactional + public void updateStaffGradeTest(){ + StaffGrade staffGrade = new StaffGrade(); + staffGrade.setStaffProfessionalArchitectureId(1); + staffGrade.setStaffGradeName("教务处"); + staffGrade.setStaffGradeId(1); + HashMap staffGrade1 = staffGradeService.updateStaffGrade(staffGrade); + for (String s : staffGrade1.keySet()) { + System.out.println("key:" + s + "," + "value:" + staffGrade1.get(s)); + } + } +} From b435e6390ccb02ce3ab39a51de9540afa5805636 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Wed, 26 Aug 2020 17:21:46 +0800 Subject: [PATCH 3/3] all test accomplish --- .../java/com/yipin/liuwanr/entity/Staff.java | 23 ++ .../com/yipin/liuwanr/entity/Student.java | 33 +++ .../com/yipin/liuwanr/mapper/OrderMapper.java | 2 + .../liuwanr/service/SchoolServiceTest.java | 101 +++++++ .../liuwanr/service/StaffServiceTest.java | 194 +++++++++++++ ...tuProfessionalArchitectureServiceTest.java | 258 ++++++++++++++++++ 6 files changed, 611 insertions(+) create mode 100644 src/test/java/com/yipin/liuwanr/service/SchoolServiceTest.java create mode 100644 src/test/java/com/yipin/liuwanr/service/StaffServiceTest.java create mode 100644 src/test/java/com/yipin/liuwanr/service/StuProfessionalArchitectureServiceTest.java diff --git a/src/main/java/com/yipin/liuwanr/entity/Staff.java b/src/main/java/com/yipin/liuwanr/entity/Staff.java index 3265d61..875ae50 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Staff.java +++ b/src/main/java/com/yipin/liuwanr/entity/Staff.java @@ -139,4 +139,27 @@ public class Staff { public void setStaffProfessionalArchitectureId(Integer staffProfessionalArchitectureId) { this.staffProfessionalArchitectureId = staffProfessionalArchitectureId; } + + @Override + public String toString() { + return "Staff{" + + "staffId=" + staffId + + ", staffName='" + staffName + '\'' + + ", staffWorkNumber='" + staffWorkNumber + '\'' + + ", phone='" + phone + '\'' + + ", email='" + email + '\'' + + ", logNumber=" + logNumber + + ", lastTimeOfLanding='" + lastTimeOfLanding + '\'' + + ", staffGradeId=" + staffGradeId + + ", staffProfessionalArchitectureId=" + staffProfessionalArchitectureId + + ", staffProfessionalArchitectureName='" + staffProfessionalArchitectureName + '\'' + + ", nameAndNumber='" + nameAndNumber + '\'' + + ", roleId=" + roleId + + ", staffGradeName='" + staffGradeName + '\'' + + ", uniqueIdentificationAccount='" + uniqueIdentificationAccount + '\'' + + ", staffGradeIds='" + staffGradeIds + '\'' + + ", staffProfessionalArchitectureIds='" + staffProfessionalArchitectureIds + '\'' + + ", schoolId=" + schoolId + + '}'; + } } diff --git a/src/main/java/com/yipin/liuwanr/entity/Student.java b/src/main/java/com/yipin/liuwanr/entity/Student.java index 849fa02..8e83f71 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Student.java +++ b/src/main/java/com/yipin/liuwanr/entity/Student.java @@ -219,4 +219,37 @@ public class Student { public void setIsAssess(Integer isAssess) { this.isAssess = isAssess; } + + @Override + public String toString() { + return "Student{" + + "studentId=" + studentId + + ", studentName='" + studentName + '\'' + + ", studentNumber='" + studentNumber + '\'' + + ", phone='" + phone + '\'' + + ", email='" + email + '\'' + + ", roleId=" + roleId + + ", schoolId=" + schoolId + + ", professionalId=" + professionalId + + ", gradeId=" + gradeId + + ", classId=" + classId + + ", experimentalClassName='" + experimentalClassName + '\'' + + ", experimentalClassId='" + experimentalClassId + '\'' + + ", isAssess=" + isAssess + + ", uniqueIdentificationAccount='" + uniqueIdentificationAccount + '\'' + + ", searchContent='" + searchContent + '\'' + + ", professionalIds='" + professionalIds + '\'' + + ", gradeIds='" + gradeIds + '\'' + + ", classIds='" + classIds + '\'' + + ", professionalName='" + professionalName + '\'' + + ", gradeName='" + gradeName + '\'' + + ", studentNameNumber='" + studentNameNumber + '\'' + + ", intExperimentalClassId=" + intExperimentalClassId + + ", className='" + className + '\'' + + ", loginNumber=" + loginNumber + + ", lastLoginTime='" + lastLoginTime + '\'' + + ", attendance='" + attendance + '\'' + + ", stuProfessionalArchitectureName='" + stuProfessionalArchitectureName + '\'' + + '}'; + } } diff --git a/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java b/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java index 28eeb4d..6df3a52 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java @@ -11,6 +11,8 @@ import com.yipin.liuwanr.entity.Customer; import com.yipin.liuwanr.entity.Order; import com.yipin.liuwanr.vo.OrderVo; +import java.util.List; + public interface OrderMapper { //添加订单 diff --git a/src/test/java/com/yipin/liuwanr/service/SchoolServiceTest.java b/src/test/java/com/yipin/liuwanr/service/SchoolServiceTest.java new file mode 100644 index 0000000..33baf61 --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/service/SchoolServiceTest.java @@ -0,0 +1,101 @@ +package com.yipin.liuwanr.service; + +import com.yipin.liuwanr.entity.School; +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; + +/** + * @auther River + * @date 2020/8/24 9:14 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +public class SchoolServiceTest { + + @Autowired + private SchoolService schoolService; + + /** + * 添加学校 + */ + @Test + @Transactional + public void addSchoolTest(){ + School school = new School(); + school.setSchoolName("北京大学"); + school.setProvinceId(1); + school.setCityId(1); + school.setLevel(1); + HashMap addSchool = schoolService.addSchool(school); + for (String s : addSchool.keySet()) { + System.out.println("key:" + s + "," + "value:" + addSchool.get(s)); + } + } + + /** + * 查询学校 + */ + @Test + @Transactional + public void querySchoolTest(){ + School school = new School(); + school.setProvinceId(1); + school.setCityId(1); + school.setLevel(1); + HashMap querySchool = schoolService.querySchool(school); + for (String s : querySchool.keySet()) { + System.out.println("key:" + s + "," + "value:" + querySchool.get(s)); + } + } + + /** + * 查询学校详情 + */ + @Test + @Transactional + public void querySchoolDetailsTest(){ + Integer schoolId = 1; + HashMap schoolDetails = schoolService.querySchoolDetails(schoolId); + for (String s : schoolDetails.keySet()) { + System.out.println("key:" + s + "," + "value:" + schoolDetails.get(s)); + } + } + + /** + * 删除学校 + */ + @Test + @Transactional + public void deleteSchoolTest(){ + School school = new School(); + school.setSchoolId(1); + HashMap deleteSchool = schoolService.deleteSchool(school); + for (String s : deleteSchool.keySet()) { + System.out.println("key:" + s + "," + "value:" + deleteSchool.get(s)); + } + } + + /** + * 更新学校 + */ + @Test + @Transactional + public void updateSchoolTest(){ + School school = new School(); + school.setSchoolId(1); + school.setProvinceId(1); + school.setCityId(1); + school.setLevel(1); + school.setSchoolName("北京大学"); + HashMap updateSchool = schoolService.updateSchool(school); + for (String s : updateSchool.keySet()) { + System.out.println("key:" + s + "," + "value:" + updateSchool.get(s)); + } + } +} diff --git a/src/test/java/com/yipin/liuwanr/service/StaffServiceTest.java b/src/test/java/com/yipin/liuwanr/service/StaffServiceTest.java new file mode 100644 index 0000000..34cf31c --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/service/StaffServiceTest.java @@ -0,0 +1,194 @@ +package com.yipin.liuwanr.service; + +import com.yipin.liuwanr.entity.Staff; +import com.yipin.liuwanr.entity.UserM; +import com.yipin.liuwanr.vo.UserVO; +import org.apache.commons.io.IOUtils; +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.lang.Nullable; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.util.HashMap; + +/** + * @auther River + * @date 2020/8/24 9:45 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +public class StaffServiceTest { + + @Autowired + private StaffService staffService; + + /** + * 读取员工表 + */ + @Test + @Transactional + public void readStaffTest(){ + MultipartFile file = new MultipartFile() { + @Override + public String getName() { + return null; + } + @Nullable + @Override + public String getOriginalFilename() { + return null; + } + @Nullable + @Override + public String getContentType() { + return null; + } + @Override + public boolean isEmpty() { + return false; + } + @Override + public long getSize() { + return 0; + } + @Override + public byte[] getBytes() throws IOException { + return new byte[0]; + } + @Override + public InputStream getInputStream() throws IOException { + return null; + } + @Override + public void transferTo(File dest) throws IOException, IllegalStateException { + } + }; + Integer schoolId = 1; + File file1 = new File("C:\\Users\\Hello\\Desktop\\aaaa.xlsx"); + try { + //将file类型文件转换为MultipartFile类型文件 + FileInputStream input = new FileInputStream(file1); + file = new MockMultipartFile("file", file1.getName(), "text/plain", IOUtils.toByteArray(input)); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + HashMap readStaff = staffService.readStaff(file, schoolId); + for (String s : readStaff.keySet()) { + System.out.println("key:" + s + "," + "value:" + readStaff.get(s)); + } + } + + /** + * 添加员工 + */ + @Test + @Transactional + public void addStaffTest(){ + Staff staff = new Staff(); + staff.setSchoolId(2043); + staff.setEmail("4867687@qq.com"); + staff.setPhone("18873465488"); + staff.setRoleId(3); + staff.setStaffGradeId(2050); + staff.setStaffName("zha"); + staff.setStaffProfessionalArchitectureId(2057); + staff.setStaffWorkNumber("1222"); + staff.setUniqueIdentificationAccount("204312221598238094000"); + HashMap addStaff = staffService.addStaff(staff); + for (String s : addStaff.keySet()) { + System.out.println("key:" + s + "," + "value:" + addStaff.get(s)); + } + } + + /** + * 查询员工 + */ + @Test + @Transactional + public void queryStaffTest(){ + Staff staff = new Staff(); + Integer pageNo = 1; + Integer pageSize = 10; + staff.setSchoolId(2043); + HashMap queryStaff = staffService.queryStaff(staff, pageNo, pageSize); + for (String s : queryStaff.keySet()) { + System.out.println("key:" + s + "," + "value:" + queryStaff.get(s)); + } + } + + /** + * 删除员工 + */ + @Test + @Transactional + public void deleteStaffTest(){ + Integer staffId = 118; + String phone = "13137366427"; + HashMap deleteStaff = staffService.deleteStaff(staffId, phone); + for (String s : deleteStaff.keySet()) { + System.out.println("key:" + s + "," + "value:" + deleteStaff.get(s)); + } + } + + /** + * 查询员工详情 + */ + @Test + @Transactional + public void queryStaffDetailsTest(){ + Integer staffId = 118; + HashMap staffDetails = staffService.queryStaffDetails(staffId); + for (String s : staffDetails.keySet()) { + System.out.println("key:" + s + "," + "value:" + staffDetails.get(s)); + } + } + + /** + * 更新员工 + */ + @Test + @Transactional + public void updateStaffTest(){ + UserVO userVO = new UserVO(); + Staff staff = new Staff(); + UserM user = new UserM(); + staff.setEmail("123@qq.com"); + staff.setPhone("13137366427"); + staff.setRoleId(4); + staff.setSchoolId(2043); + staff.setStaffGradeId(2050); + staff.setStaffId(118); + staff.setStaffName("世杰-教师"); + staff.setStaffProfessionalArchitectureId(2057); + staff.setStaffWorkNumber("123"); + staff.setUniqueIdentificationAccount("20431231596424406000"); + userVO.setStaff(staff); + user.setAccountRole(3); + user.setCityId(1); + user.setDisciplineId(1); + user.setEmail("123@qq.com"); + user.setName("世杰-教师"); + user.setPhone("13137366427"); + user.setProfessionalClassId(1); + user.setProvinceId(4); + user.setProfessionalId(4); + user.setSchoolId(2043); + user.setUniqueIdentificationAccount("20431231596424406000"); + user.setUserAccount("123"); + user.setUserId(461); + user.setWorkNumber("123"); + userVO.setUser(user); + HashMap updateStaff = staffService.updateStaff(userVO); + for (String s : updateStaff.keySet()) { + System.out.println("key:" + s + "," + "value:" + updateStaff.get(s)); + } + } +} diff --git a/src/test/java/com/yipin/liuwanr/service/StuProfessionalArchitectureServiceTest.java b/src/test/java/com/yipin/liuwanr/service/StuProfessionalArchitectureServiceTest.java new file mode 100644 index 0000000..05823eb --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/service/StuProfessionalArchitectureServiceTest.java @@ -0,0 +1,258 @@ +package com.yipin.liuwanr.service; + +import com.yipin.liuwanr.entity.StuProfessionalArchitecture; +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; + +/** + * @auther River + * @date 2020/8/25 9:46 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +public class StuProfessionalArchitectureServiceTest { + + @Autowired + private StuProfessionalArchitectureService stuProfessionalArchitectureService; + + /** + * 添加学生专业组织 + */ + @Test + @Transactional + public void addStuProfessionalArchitectureTest(){ + StuProfessionalArchitecture stuPA = new StuProfessionalArchitecture(); + stuPA.setSchoolId(2043); + stuPA.setStuProfessionalArchitectureName("计算机学院"); + HashMap stuProfessionalArchitecture = stuProfessionalArchitectureService.addStuProfessionalArchitecture(stuPA); + for (String s : stuProfessionalArchitecture.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuProfessionalArchitecture.get(s)); + } + } + + /** + * 查询学生专业架构 + */ + @Test + @Transactional + public void queryStuProfessionalArchitectureTest(){ + Integer schoolId = 1; + HashMap professionalArchitecture = stuProfessionalArchitectureService.queryStuProfessionalArchitecture(schoolId); + for (String s : professionalArchitecture.keySet()) { + System.out.println("key:" + s + "," + "value:" + professionalArchitecture.get(s)); + } + } + + /** + * 查询学生专业架构详情 + */ + @Test + @Transactional + public void queryStuPADTest(){ + Integer stuProfessionalArchitectureId = 34; + HashMap stuPAD = stuProfessionalArchitectureService.queryStuPAD(stuProfessionalArchitectureId); + for (String s : stuPAD.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuPAD.get(s)); + } + } + + /** + * 删除学生专业 + */ + @Test + @Transactional + public void deleteStuProfessionalArchitectureTest(){ + Integer stuProfessionalArchitectureId = 34; + HashMap professionalArchitecture = stuProfessionalArchitectureService.deleteStuProfessionalArchitecture(stuProfessionalArchitectureId); + for (String s : professionalArchitecture.keySet()) { + System.out.println("key:" + s + "," + "value:" + professionalArchitecture.get(s)); + } + } + + /** + * 删除学生转年级 + */ + @Test + @Transactional + public void deleteStuGradeTest(){ + Integer gradeId = 1; + HashMap stuGrade = stuProfessionalArchitectureService.deleteStuGrade(gradeId); + for (String s : stuGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuGrade.get(s)); + } + } + + /** + * 删除学生转班级 + */ + @Test + @Transactional + public void deleteStuClassTest(){ + Integer classId = 1; + HashMap stuClass = stuProfessionalArchitectureService.deleteStuClass(classId); + for (String s : stuClass.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuClass.get(s)); + } + } + + /** + * 更新学生专业架构 + */ + @Test + @Transactional + public void updateStuProfessionalArchitectureTest(){ + StuProfessionalArchitecture stuPA = new StuProfessionalArchitecture(); + stuPA.setSchoolId(2043); + stuPA.setStuProfessionalArchitectureId(34); + stuPA.setStuProfessionalArchitectureName("英语"); + HashMap professionalArchitecture = stuProfessionalArchitectureService.updateStuProfessionalArchitecture(stuPA); + for (String s : professionalArchitecture.keySet()) { + System.out.println("key:" + s + "," + "value:" + professionalArchitecture.get(s)); + } + } + + /** + * 查询全部学生专业架构 + */ + @Test + @Transactional + public void queryStudentProfessionalArchitectureTest(){ + Integer schoolId = 1; + HashMap professionalArchitecture = stuProfessionalArchitectureService.queryStuProfessionalArchitecture(schoolId); + for (String s : professionalArchitecture.keySet()) { + System.out.println("key:" + s + "," + "value:" + professionalArchitecture.get(s)); + } + } + + /** + * 查询学生年级 + */ + @Test + @Transactional + public void queryStuGradeTest(){ + Integer stuProfessionalArchitectureId = 34; + HashMap queryStuGrade = stuProfessionalArchitectureService.queryStuGrade(stuProfessionalArchitectureId); + for (String s : queryStuGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + queryStuGrade.get(s)); + } + } + + /** + * 查询学生年级详情 + */ + @Test + @Transactional + public void queryStuGradeDTest(){ + Integer gradeId = 1; + HashMap stuGradeD = stuProfessionalArchitectureService.queryStuGradeD(gradeId); + for (String s : stuGradeD.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuGradeD.get(s)); + } + } + + /** + * 查询学生班级 + */ + @Test + @Transactional + public void queryStuClassTest(){ + Integer gradeId = 1; + HashMap stuClass = stuProfessionalArchitectureService.queryStuClass(gradeId); + for (String s : stuClass.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuClass.get(s)); + } + } + + /** + * 查询学生班级详情 + */ + @Test + @Transactional + public void queryStuClassDTest(){ + Integer classId = 1; + HashMap stuClassD = stuProfessionalArchitectureService.queryStuClassD(classId); + for (String s : stuClassD.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuClassD.get(s)); + } + } + + /** + * 添加班级 + */ + @Test + @Transactional + public void addStuClassTest(){ + StuProfessionalArchitecture stuPA = new StuProfessionalArchitecture(); + stuPA.setClassName("12"); + stuPA.setGradeId(20); + HashMap addStuClass = stuProfessionalArchitectureService.addStuClass(stuPA); + for (String s : addStuClass.keySet()) { + System.out.println("key:" + s + "," + "value:" + addStuClass.get(s)); + } + } + + /** + * 修改班级 + */ + @Test + @Transactional + public void updateStuClassTest(){ + StuProfessionalArchitecture stuPA = new StuProfessionalArchitecture(); + stuPA.setClassName("13"); + stuPA.setClassId(76); + HashMap stuClass = stuProfessionalArchitectureService.updateStuClass(stuPA); + for (String s : stuClass.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuClass.get(s)); + } + } + + /** + * 添加年级 + */ + @Test + @Transactional + public void addStuGradeTest(){ + StuProfessionalArchitecture stuPA = new StuProfessionalArchitecture(); + stuPA.setGradeName("2020"); + stuPA.setStuProfessionalArchitectureId(37); + HashMap stuGrade = stuProfessionalArchitectureService.addStuGrade(stuPA); + for (String s : stuGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuGrade.get(s)); + } + } + + /** + * 修改年级 + */ + @Test + @Transactional + public void updateStuGradeTest(){ + StuProfessionalArchitecture stuPA = new StuProfessionalArchitecture(); + stuPA.setGradeId(50); + stuPA.setGradeName("2018"); + stuPA.setStuProfessionalArchitectureId(37); + HashMap stuGrade = stuProfessionalArchitectureService.updateStuGrade(stuPA); + for (String s : stuGrade.keySet()) { + System.out.println("key:" + s + "," + "value:" + stuGrade.get(s)); + } + } + + /** + * 查询学生 + */ + @Test + @Transactional + public void queryStudentTest(){ + Integer classId = 1; + HashMap student = stuProfessionalArchitectureService.queryStudent(classId); + for (String s : student.keySet()) { + System.out.println("key:" + s + "," + "value:" + student.get(s)); + } + } +}