Browse Source

部分复杂接口采用json传输,其他用表单或者get url

zouxuan 5 years ago
parent
commit
78cd57037f

+ 6 - 6
mec-web/src/main/java/com/ym/mec/web/controller/ChargeTypeController.java

@@ -22,29 +22,29 @@ public class ChargeTypeController extends BaseController {
 
     @ApiOperation(value = "新增收费类型")
     @PostMapping("/add")
-    public Object add(@RequestBody ChargeType chargeType) {
+    public Object add(ChargeType chargeType) {
         chargeTypeService.insert(chargeType);
         return succeed();
     }
 
     @ApiOperation(value = "删除收费类型")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
         chargeTypeService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改收费类型")
-    @PutMapping("/update")
-    public Object update(@RequestBody ChargeType chargeType) {
+    @PostMapping("/update")
+    public Object update(ChargeType chargeType) {
         chargeType.setUpdateTime(new Date());
         chargeTypeService.update(chargeType);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询收费类型列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(chargeTypeService.queryPage(queryInfo));
     }
 

+ 5 - 7
mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -5,13 +5,11 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.web.service.ClassGroupService;
 import com.ym.mec.web.service.ClassGroupTeacherMapperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import jdk.nashorn.internal.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,23 +42,23 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "删除班级")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "班级编号", required = true) @PathVariable("id") Integer id) {
         classGroupService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改班级")
-    @PutMapping("/update")
-    public Object update(@RequestBody ClassGroup classGroup) {
+    @PostMapping("/update")
+    public Object update(ClassGroup classGroup) {
         classGroup.setUpdateTime(new Date());
         classGroupService.update(classGroup);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询班级列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(classGroupService.queryPage(queryInfo));
     }
 

+ 6 - 6
mec-web/src/main/java/com/ym/mec/web/controller/CooperationOrganController.java

@@ -22,13 +22,13 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "新增合作单位(教学点)")
     @PostMapping("/add")
-    public Object add(@RequestBody CooperationOrgan cooperationOrgan) {
+    public Object add(CooperationOrgan cooperationOrgan) {
         cooperationOrganService.insert(cooperationOrgan);
         return succeed();
     }
 
     @ApiOperation(value = "删除合作单位(教学点)")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "合作单位(教学点)编号", required = true) @PathVariable("id") Integer id) {
         cooperationOrganService.delete(id);
         return succeed();
@@ -36,21 +36,21 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "修改合作单位(教学点)")
     @PutMapping("/update")
-    public Object update(@RequestBody CooperationOrgan cooperationOrgan) {
+    public Object update(CooperationOrgan cooperationOrgan) {
         cooperationOrgan.setUpdateTime(new Date());
         cooperationOrganService.update(cooperationOrgan);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询合作单位(教学点)列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(cooperationOrganService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "根据机构编号获取合作单位(教学点)列表")
     @GetMapping("/queryByOrganId")
-    public Object queryByOrganId(@RequestParam Integer organId){
+    public Object queryByOrganId(Integer organId){
         return succeed(cooperationOrganService.queryByOrganId(organId));
     }
 }

+ 2 - 2
mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -29,7 +29,7 @@ public class CourseScheduleController extends BaseController {
     private StudentAttendanceService studentAttendanceService;
 
     @ApiOperation(value = "排课")
-    @PutMapping("/batchAddCourseSchedule/{musicGroupID}")
+    @PostMapping("/batchAddCourseSchedule/{musicGroupID}")
     public Object batchAddCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                          @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
         String s = scheduleService.batchAddCourseSchedule(courseSchedules);
@@ -41,7 +41,7 @@ public class CourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "批量跟新排课")
-    @PutMapping("/batchUpdateCourseSchedule/{musicGroupID}")
+    @PostMapping("/batchUpdateCourseSchedule/{musicGroupID}")
     public Object batchUpdateCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                             @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
         String s = scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);

+ 7 - 22
mec-web/src/main/java/com/ym/mec/web/controller/GoodsCategoryController.java

@@ -1,27 +1,15 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.web.dal.entity.Subject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.GoodsCategory;
 import com.ym.mec.web.dal.page.GoodsCategoryQueryInfo;
 import com.ym.mec.web.service.GoodsCategoryService;
 import com.ym.mec.web.service.GoodsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("category")
 @Api(tags = "商品分类服务")
@@ -35,7 +23,7 @@ public class GoodsCategoryController extends BaseController {
     private GoodsService goodsService;
 
     @ApiOperation(value = "删除商品分类")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "商品分类编号", required = true) @PathVariable("id") Integer id) {
         int num = goodsService.findGoodsNumByCategoryId(id);
         if (num > 0) {
@@ -54,10 +42,7 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "分页查询商品分类列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) GoodsCategoryQueryInfo queryInfo) {
-        if(queryInfo == null){
-            queryInfo = new GoodsCategoryQueryInfo();
-        }
+    public Object queryPage(GoodsCategoryQueryInfo queryInfo) {
         return succeed(goodsCategoryService.queryPage(queryInfo));
     }
 

+ 5 - 8
mec-web/src/main/java/com/ym/mec/web/controller/GoodsController.java

@@ -20,21 +20,21 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "新增商品(教材、辅件)")
     @PostMapping("/add")
-    public Object add(@RequestBody Goods goods){
+    public Object add(Goods goods){
         goodsService.insert(goods);
         return succeed();
     }
 
     @ApiOperation(value = "删除商品(教材、辅件)")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
         goodsService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改商品(教材、辅件)")
-    @PutMapping("/update")
-    public Object update(@RequestBody Goods goods){
+    @PostMapping("/update")
+    public Object update(Goods goods){
         goods.setUpdateTime(new Date());
         goodsService.update(goods);
         return succeed();
@@ -48,10 +48,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) GoodsQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new GoodsQueryInfo();
-        }
+    public Object queryPage(GoodsQueryInfo queryInfo){
         return succeed(goodsService.queryPage(queryInfo));
     }
 

+ 9 - 8
mec-web/src/main/java/com/ym/mec/web/controller/LeaveCategoryController.java

@@ -2,15 +2,16 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.web.dal.entity.ChargeType;
 import com.ym.mec.web.dal.entity.LeaveCategory;
-import com.ym.mec.web.service.ChargeTypeService;
 import com.ym.mec.web.service.LeaveCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
 
@@ -24,21 +25,21 @@ public class LeaveCategoryController extends BaseController {
 
     @ApiOperation(value = "新增请假类型")
     @PostMapping("/add")
-    public Object add(@RequestBody LeaveCategory leaveCategory) {
+    public Object add(LeaveCategory leaveCategory) {
         leaveCategoryService.insert(leaveCategory);
         return succeed();
     }
 
     @ApiOperation(value = "删除请假类型")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "请假类型编号", required = true) @PathVariable("id") Integer id) {
         leaveCategoryService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改请假类型")
-    @PutMapping("/update")
-    public Object update(@RequestBody LeaveCategory leaveCategory) {
+    @PostMapping("/update")
+    public Object update(LeaveCategory leaveCategory) {
         leaveCategory.setUpdateTime(new Date());
         leaveCategoryService.update(leaveCategory);
         return succeed();
@@ -46,7 +47,7 @@ public class LeaveCategoryController extends BaseController {
 
     @ApiOperation(value = "分页查询请假类型列表")
     @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(leaveCategoryService.queryPage(queryInfo));
     }
 

+ 8 - 9
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -8,7 +8,6 @@ import com.ym.mec.web.service.MusicGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +21,7 @@ public class MusicGroupController extends BaseController {
     @Autowired
     private MusicGroupService musicGroupService;
 
-    @ApiOperation(value = "新增乐团")
+/*    @ApiOperation(value = "新增乐团")
     @PostMapping("/add")
     public Object add(@RequestBody MusicGroup musicGroup){
         if(musicGroup != null){
@@ -34,18 +33,18 @@ public class MusicGroupController extends BaseController {
             return succeed();
         }
         return failed();
-    }
+    }*/
 
     @ApiOperation(value = "删除乐团")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "乐团编号", required = true) @PathVariable("id") String id){
         musicGroupService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改乐团")
-    @PutMapping("/update")
-    public Object update(@RequestBody MusicGroup musicGroup){
+    @PostMapping("/update")
+    public Object update(MusicGroup musicGroup){
         musicGroup.setUpdateTime(new Date());
         musicGroupService.update(musicGroup);
         return succeed();
@@ -58,12 +57,12 @@ public class MusicGroupController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询乐团列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody MusicGroupQueryInfo queryInfo){
+    @GetMapping("/queryPage")
+    public Object queryPage(MusicGroupQueryInfo queryInfo){
         return succeed(musicGroupService.queryPage(queryInfo));
     }
 
-    @ApiOperation(value = "建团申请数据提交")
+    @ApiOperation(value = "新增乐团  建团申请数据提交")
     @PostMapping("/createGroup")
     public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto){
         musicGroupService.createGroup(subFeeSettingDto);

+ 7 - 6
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentCalenderController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Date;
 import java.util.List;
 
@@ -22,7 +23,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicGroupPaymentCalender musicGroupPaymentCalender) {
+    public Object add(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         musicGroupPaymentCalenderService.insert(musicGroupPaymentCalender);
         return succeed();
     }
@@ -35,23 +36,23 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     }
 
     @ApiOperation(value = "删除乐团缴费日历")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "乐团缴费日历编号", required = true) @PathVariable("id") Long id) {
         musicGroupPaymentCalenderService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改乐团缴费日历")
-    @PutMapping("/update")
-    public Object update(@RequestBody MusicGroupPaymentCalender musicGroupPaymentCalender) {
+    @PostMapping("/update")
+    public Object update(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         musicGroupPaymentCalender.setUpdateTime(new Date());
         musicGroupPaymentCalenderService.update(musicGroupPaymentCalender);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询乐团缴费日历列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(musicGroupPaymentCalenderService.queryPage(queryInfo));
     }
 

+ 6 - 6
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentEntitiesController.java

@@ -23,7 +23,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "新增乐团付费主体")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
+    public Object add(MusicGroupPaymentEntities musicGroupPaymentEntities){
         musicGroupPaymentEntitiesService.insert(musicGroupPaymentEntities);
         return succeed();
     }
@@ -36,23 +36,23 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
     }
 
     @ApiOperation(value = "删除乐团付费主体")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "乐团付费主体编号", required = true) @PathVariable("id") Integer id){
         musicGroupPaymentEntitiesService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改乐团付费主体")
-    @PutMapping("/update")
-    public Object update(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
+    @PostMapping("/update")
+    public Object update(MusicGroupPaymentEntities musicGroupPaymentEntities){
         musicGroupPaymentEntities.setUpdateTime(new Date());
         musicGroupPaymentEntitiesService.update(musicGroupPaymentEntities);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询乐团付费主体")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo){
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
         return succeed(musicGroupPaymentEntitiesService.queryPage(queryInfo));
     }
 }

+ 5 - 11
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupSubjectPlanController.java

@@ -1,21 +1,15 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.web.dal.dao.MusicGroupDao;
-import com.ym.mec.web.dal.dto.SubFeeSettingDto;
-import com.ym.mec.web.dal.entity.MusicGroup;
-import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.web.dal.page.MusicGroupQueryInfo;
-import com.ym.mec.web.service.MusicGroupService;
 import com.ym.mec.web.service.MusicGroupSubjectPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("musicGroupSubjectPlan")
 @Api(tags = "乐团声部计划服务")
@@ -32,7 +26,7 @@ public class MusicGroupSubjectPlanController extends BaseController {
     }
 
     @ApiOperation(value = "乐团声部分班情况")
-    @PostMapping("/getMusicSubjectClass")
+    @GetMapping("/getMusicSubjectClass")
     public Object getMusicSubjectClass(@ApiParam(value = "乐团编号", required = true) int musicGroupId) {
         return succeed(musicGroupSubjectPlanService.getMusicSubjectClassPlan(musicGroupId));
     }

+ 3 - 6
mec-web/src/main/java/com/ym/mec/web/controller/OrganizationController.java

@@ -22,16 +22,13 @@ public class OrganizationController extends BaseController {
 
     @ApiOperation(value = "分页查询分部列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) OrganizationQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new OrganizationQueryInfo();
-        }
+    public Object queryPage(OrganizationQueryInfo queryInfo){
         return succeed(organizationService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "新增分部")
     @PostMapping("/add")
-    public Object add(@RequestBody Organization organization){
+    public Object add(Organization organization){
         return succeed(organizationService.insert(organization));
     }
 
@@ -43,7 +40,7 @@ public class OrganizationController extends BaseController {
 
     @ApiOperation(value = "修改分部信息")
     @PostMapping("/update")
-    public Object update(@RequestBody Organization organization){
+    public Object update(Organization organization){
         organization.setUpdateTime(new Date());
         return succeed(organizationService.update(organization));
     }

+ 6 - 6
mec-web/src/main/java/com/ym/mec/web/controller/SchoolController.java

@@ -22,21 +22,21 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "新增学校")
     @PostMapping("/add")
-    public Object add(@RequestBody School school){
+    public Object add(School school){
         schoolService.insert(school);
         return succeed();
     }
 
     @ApiOperation(value = "删除学校")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "学校编号", required = true) @PathVariable("id") Integer id){
         schoolService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改学校")
-    @PutMapping("/update")
-    public Object update(@RequestBody School school){
+    @PostMapping("/update")
+    public Object update(School school){
         school.setUpdateTime(new Date());
         schoolService.update(school);
         return succeed();
@@ -49,8 +49,8 @@ public class SchoolController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询学校列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody SchoolQueryInfo queryInfo){
+    @GetMapping("/queryPage")
+    public Object queryPage(SchoolQueryInfo queryInfo){
         return succeed(schoolService.queryPage(queryInfo));
     }
 

+ 11 - 17
mec-web/src/main/java/com/ym/mec/web/controller/StudentRegistrationController.java

@@ -2,7 +2,6 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.StudentRegistration;
-import com.ym.mec.web.dal.page.StudentApplyDetailQueryInfo;
 import com.ym.mec.web.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.web.service.StudentRegistrationService;
 import io.swagger.annotations.*;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
-import java.util.HashMap;
 
 @RequestMapping("studentRegistration")
 @Api(tags = "学生报名信息服务")
@@ -23,40 +21,38 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
-    public Object add(@RequestBody StudentRegistration studentRegistration) {
+    public Object add(StudentRegistration studentRegistration) {
         studentRegistrationService.insert(studentRegistration);
         return succeed();
     }
 
     @ApiOperation(value = "删除学生报名信息")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "学生报名信息编号", required = true) @PathVariable("id") Long id) {
         studentRegistrationService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改学生报名信息")
-    @PutMapping("/update")
-    public Object update(@RequestBody StudentRegistration studentRegistration) {
+    @PostMapping("/update")
+    public Object update(StudentRegistration studentRegistration) {
         studentRegistration.setUpdateTime(new Date());
         studentRegistrationService.update(studentRegistration);
         return succeed();
     }
 
     @ApiOperation(value = "批量调剂学生报名专业")
-    @PutMapping("/batchUpdateSubject")
-    public Object batchUpdateSubject(@RequestBody HashMap<String, String> param) {
-        String userId = param.get("userId");
-        String subId = param.get("subId");
-        if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(subId)) {
+    @PostMapping("/batchUpdateSubject")
+    public Object batchUpdateSubject(String userId,Integer subId) {
+        if (StringUtils.isEmpty(userId) || subId == null) {
             return failed();
         }
-        return succeed(studentRegistrationService.batchUpdateSubject(userId, Integer.parseInt(subId)));
+        return succeed(studentRegistrationService.batchUpdateSubject(userId, subId));
     }
 
     @ApiOperation(value = "乐团【报名中、缴费中】 学生详情列表分页查询")
-    @PostMapping("/queryStudentApplyDetail")
-    public Object queryStudentApplyDetail(@RequestBody StudentRegistrationQueryInfo queryInfo) {
+    @GetMapping("/queryStudentApplyDetail")
+    public Object queryStudentApplyDetail(StudentRegistrationQueryInfo queryInfo) {
         return succeed(studentRegistrationService.queryStudentDetailPage(queryInfo));
     }
 
@@ -64,9 +60,7 @@ public class StudentRegistrationController extends BaseController {
     @GetMapping("/queryFeeDetail")
     @ApiImplicitParams({@ApiImplicitParam(name = "studentId", value = "学生编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
-    public Object queryFeeDetail(@RequestBody HashMap<String, String> param) {
-        String studentId = param.get("studentId");
-        String musicGroupId = param.get("musicGroupId");
+    public Object queryFeeDetail(String studentId,String musicGroupId) {
         if (StringUtils.isEmpty(studentId) || StringUtils.isEmpty(musicGroupId)) {
             return succeed(studentRegistrationService.queryFeeDetail(Integer.parseInt(studentId), musicGroupId));
         }

+ 5 - 13
mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -3,14 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.Subject;
 import com.ym.mec.web.dal.entity.SubjectGoodsMapper;
-import com.ym.mec.web.dal.page.GoodsQueryInfo;
 import com.ym.mec.web.dal.page.SubjectQueryInfo;
 import com.ym.mec.web.service.SubjectService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 @RequestMapping("subject")
@@ -36,33 +34,27 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "分页查询科目列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) SubjectQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new SubjectQueryInfo();
-        }
+    public Object queryPage(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "分页查询科目树状列表")
     @GetMapping("/queryPageTree")
-    public Object queryPageTree(@RequestBody(required = false) SubjectQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new SubjectQueryInfo();
-        }
+    public Object queryPageTree(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPageTree(queryInfo));
     }
 
     @ApiOperation(value = "通过乐团编号查询乐团科目规划")
     @GetMapping("/querySubByMusicGroupId")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubByMusicGroupId(@RequestParam Integer musicGroupId){
+    public Object findSubByMusicGroupId(Integer musicGroupId){
         return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
     }
 
     @ApiOperation(value = "通过乐团收费类型,获取默认的声部列表")
     @GetMapping("/findDefaultSubByGroupId")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByGroupId(@RequestParam Integer musicGroupId){
+    public Object findDefaultSubByGroupId(Integer musicGroupId){
         return succeed(subjectService.findDefaultSubByGroupId(musicGroupId));
     }
 
@@ -76,7 +68,7 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "通过乐团编号获取声部列表以及声部报名、缴费、计划人数")
     @GetMapping("/findSubApplyDetail")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubApplyDetail(@RequestParam Integer musicGroupId){
+    public Object findSubApplyDetail(Integer musicGroupId){
         return succeed(subjectService.findSubApplyDetail(musicGroupId));
     }
 }

+ 3 - 7
mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -2,7 +2,6 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.security.SecurityUtils;
-import com.ym.mec.web.dal.dto.TeacherUserDto;
 import com.ym.mec.web.dal.entity.Teacher;
 import com.ym.mec.web.dal.page.TeacherQueryInfo;
 import com.ym.mec.web.service.ClassGroupService;
@@ -28,7 +27,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "新增教师")
     @PostMapping("/add")
-    public Object add(@RequestBody Teacher teacher) {
+    public Object add(Teacher teacher) {
         try {
             teacherService.add(teacher);
         } catch (Exception e) {
@@ -47,7 +46,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "修改教师")
     @PostMapping("/update")
-    public Object update(@RequestBody Teacher teacher) {
+    public Object update(Teacher teacher) {
         Integer organId = SecurityUtils.getUser().getOrganId();
         if(organId != null){
             teacher.setOrganId(organId);
@@ -70,10 +69,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "分页查询教师列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) TeacherQueryInfo queryInfo) {
-        if(queryInfo == null){
-            queryInfo = new TeacherQueryInfo();
-        }
+    public Object queryPage(TeacherQueryInfo queryInfo) {
         return succeed(teacherService.queryPage(queryInfo));
     }