zouxuan 5 years ago
parent
commit
21310172cf

+ 1 - 1
codegen/src/main/java/com/yonge/crud/CodegenApplication.java

@@ -28,7 +28,7 @@ public class CodegenApplication {
 		 */
 
 		// "src/generateConfigration.xml"
-		GenerateConfiguration genConfig = toObject("src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
+		GenerateConfiguration genConfig = toObject("codegen/src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
 
 		Configuration config = genConfig.getDbConfiguration();
 

+ 9 - 0
mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.entity.SysUserBankCard;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.upload.UploadUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,8 @@ public class StudentManageController extends BaseController {
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired
+    private ImGroupNoticeService imGroupNoticeService;
+    @Autowired
     private SysUserBankCardService sysUserBankCardService;
     @Autowired
     private StudentManageService studentManageService;
@@ -82,6 +85,12 @@ public class StudentManageController extends BaseController {
         return succeed(classGroupService.findGroupUsers(groupId));
     }
 
+    @ApiOperation(value = "分页查询群公告列表")
+    @GetMapping(value = "/queryNoticePage")
+    public Object queryNoticePage(QueryInfo queryInfo){
+        return succeed(imGroupNoticeService.queryPage(queryInfo));
+    }
+
     @ApiOperation(value = "根据群编号,获取用户群名片")
     @GetMapping("classGroup/getUserInfoWithUserId")
     public Object getUserInfoWithUserId(Integer groupId,Integer userId) {

+ 11 - 0
mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.teacher.controller;
 
+import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -10,6 +12,7 @@ import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,6 +38,8 @@ public class TeacherController extends BaseController {
     @Autowired
     private TeacherService teacherService;
     @Autowired
+    private ImGroupNoticeService imGroupNoticeService;
+    @Autowired
     private SubjectService subjectService;
     @Autowired
     private ClassGroupService classGroupService;
@@ -111,6 +116,12 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.queryGroupStudents(sysUser.getId(),search));
     }
 
+    @ApiOperation(value = "分页查询群公告列表")
+    @GetMapping(value = "/queryNoticePage")
+    public Object queryNoticePage(QueryInfo queryInfo){
+        return succeed(imGroupNoticeService.queryPage(queryInfo));
+    }
+
     @ApiOperation(value = "获取教师上课结算列表")
     @GetMapping("/queryCloses")
     public Object queryCloses(TeacherCloseQueryInfo queryInfo){

+ 8 - 8
mec-web/src/main/java/com/ym/mec/web/controller/education/ImGroupNoticeController.java

@@ -43,6 +43,14 @@ public class ImGroupNoticeController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "获取单条")
+    @PostMapping("/get")
+    @PreAuthorize("@pcs.hasPermissions('imGroupNotice/get','system')")
+    public Object get(Long id) {
+        imGroupNoticeService.get(id);
+        return succeed();
+    }
+
     @ApiOperation(value = "删除")
     @PostMapping("/del")
     @PreAuthorize("@pcs.hasPermissions('imGroupNotice/del','system')")
@@ -50,12 +58,4 @@ public class ImGroupNoticeController extends BaseController {
         imGroupNoticeService.delete(id);
         return succeed();
     }
-
-    @ApiOperation(value = "分页查询作业列表")
-    @GetMapping(value = "/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('imGroupNotice/queryPage','system')")
-    public Object queryPage(QueryInfo queryInfo){
-        return succeed(imGroupNoticeService.queryPage(queryInfo));
-    }
-
 }