update:教学点

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysMenuService.java

@@ -1,12 +1,11 @@
 package com.ym.mec.auth.service;
 
+import java.util.List;
+
 import com.ym.mec.auth.api.dto.MenuQueryInfo;
 import com.ym.mec.auth.api.entity.SysMenu;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.List;
-
 public interface SysMenuService extends BaseService<Integer, SysMenu> {
 
     /**

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -6,11 +6,14 @@ import com.ym.mec.auth.service.SysMenuService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityUtils;
+
 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.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -25,6 +28,7 @@ public class MenuController extends BaseController {
 
     @ApiOperation("新增菜单")
     @PutMapping(value = "/add",consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('menu/add')")
     public Object getMenu(@RequestBody SysMenu sysMenu) {
         SysMenu menuByPermission = sysMenuService.findMenuByPermission(sysMenu.getPermission());
         if(menuByPermission != null){
@@ -35,6 +39,7 @@ public class MenuController extends BaseController {
 
     @ApiOperation("根据菜单id删除菜单")
     @DeleteMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('menu/del')")
     public Object delMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
         sysMenuService.recursiveDel(id);
         return succeed();
@@ -42,6 +47,7 @@ public class MenuController extends BaseController {
 
     @ApiOperation("根据菜单id修改菜单")
     @PutMapping(value = "/update",consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('menu/update')")
     public Object updateMenu(@RequestBody SysMenu sysMenu) {
         SysMenu menuByPermission = sysMenuService.findMenuByPermission(sysMenu.getPermission());
         if(menuByPermission != null && !menuByPermission.getId().equals(sysMenu.getId())){
@@ -54,12 +60,14 @@ public class MenuController extends BaseController {
 
     @ApiOperation("根据菜单id查询菜单")
     @GetMapping(value = "/{id}",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('menu')")
     public Object getMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
         return succeed(sysMenuService.get(id));
     }
 
     @ApiOperation("查询用户可访问菜单树状结构")
     @GetMapping(value = "/findByUser")
+    @PreAuthorize("@pcs.hasPermissions('menu/findByUser')")
     public Object findByUser(@RequestBody(required = false) MenuQueryInfo menuQueryInfo) {
         AuthUser user = SecurityUtils.getUser();
         if(user != null){

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -11,6 +11,7 @@ import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -43,18 +44,21 @@ public class RoleController extends BaseController {
 	private SysUserRoleService sysUserRoleService;
 
 	@GetMapping(value = "/queryRoleCodeListByUserId")
+    @PreAuthorize("@pcs.hasPermissions('role/queryRoleCodeListByUserId')")
 	public Object queryRoleCodeListByUserId(Integer userId) {
 		return sysUserRoleService.queryRoleCodeListByUserId(userId);
 	}
 
 	@ApiOperation("根据权限id查询角色")
 	@GetMapping(value = "/{id}")
+    @PreAuthorize("@pcs.hasPermissions('role')")
 	public Object getRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
 		return succeed(sysRoleService.getRole(id));
 	}
 
 	@ApiOperation("删除角色")
 	@PostMapping(value = "/del")
+    @PreAuthorize("@pcs.hasPermissions('role/del')")
 	public Object delRole(Integer id) {
 		sysRoleService.delRole(id);
 		return succeed();
@@ -62,6 +66,7 @@ public class RoleController extends BaseController {
 
 	@ApiOperation("修改角色")
 	@PostMapping(value = "/update")
+    @PreAuthorize("@pcs.hasPermissions('role/update')")
 	public Object updateRole(@RequestBody SysRole sysRole) {
 		sysRole.setUpdateTime(new Date());
 		sysRoleService.updateRole(sysRole);
@@ -70,6 +75,7 @@ public class RoleController extends BaseController {
 
 	@ApiOperation("新增角色")
 	@PostMapping(value = "/add")
+    @PreAuthorize("@pcs.hasPermissions('role/add')")
 	public Object addRole(@RequestBody SysRole sysRole) {
 		sysRoleService.addRole(sysRole);
 		return succeed();
@@ -77,6 +83,7 @@ public class RoleController extends BaseController {
 
 	@ApiOperation("分页查询角色列表")
 	@GetMapping(value = "/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('role/queryPage')")
 	public Object queryPage(QueryInfo queryInfo) {
 		return succeed(sysRoleService.queryPage(queryInfo));
 	}
@@ -85,6 +92,7 @@ public class RoleController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "menuIds", value = "菜单id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/addRoleMenu", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('role/addRoleMenu')")
 	public Object addRoleMenu(String roleId, String menuIds) {
 		if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(menuIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
@@ -97,6 +105,7 @@ public class RoleController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "menuIds", value = "菜单id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/delRoleMenu", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('role/delRoleMenu')")
 	public Object delRoleMenu(String roleId, String menuIds) {
 		if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(menuIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
@@ -108,6 +117,7 @@ public class RoleController extends BaseController {
 	@ApiOperation("根据角色编号查询拥有的菜单列表")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer") })
 	@GetMapping(value = "/getMenus")
+    @PreAuthorize("@pcs.hasPermissions('role/getMenus')")
 	public Object getMenus(Integer roleId) {
 		if (roleId == null) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -7,13 +7,16 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityUtils;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.util.LinkedMultiValueMap;
@@ -65,6 +68,7 @@ public class TokenController extends BaseController {
 
 	@ApiOperation(value = "获取用户信息")
     @GetMapping("/api/queryUserInfo")
+    @PreAuthorize("@pcs.hasPermissions('/api/queryUserInfo')")
     public Object apiQueryUserInfo() {
 		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
@@ -84,6 +88,7 @@ public class TokenController extends BaseController {
     }
 
 	@PostMapping(value = "/refreshToken",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('refreshToken')")
 	@ApiOperation(value = "刷新token")
 	public HttpResponseResult refreshToken(String refreshToken, String clientId, String clientSecret) throws IOException {
 		String url = "http://auth-server/oauth/token";
@@ -106,6 +111,7 @@ public class TokenController extends BaseController {
 	}
 
 	@PostMapping(value = "exit",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('exit')")
 	@ApiOperation(value = "退出登录")
 	public HttpResponseResult logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION) String authHeader) {
 		if (StringUtils.isBlank(authHeader)) {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -10,6 +10,7 @@ import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -48,12 +49,14 @@ public class UserController extends BaseController {
 			@ApiImplicitParam(name = "createStartDate", value = "开始注册时间", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "createEndDate", value = "结束注册时间", required = true, dataType = "String") })
 	@GetMapping(value = "/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('user/queryPage')")
 	public Object queryPage(SysUserQueryInfo queryInfo) {
 		return succeed(sysUserService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "查询用户信息接口")
 	@GetMapping("/query")
+    @PreAuthorize("@pcs.hasPermissions('user/query')")
 	public Object query() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
@@ -64,6 +67,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "根据用户编号获取用户基本信息")
 	@GetMapping("/getBasic")
+    @PreAuthorize("@pcs.hasPermissions('user/getBasic')")
 	public Object getBasic(Integer userId) {
 		if (userId == null) {
 			return failed("参数校验异常");
@@ -82,12 +86,14 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "新增用户")
+    @PreAuthorize("@pcs.hasPermissions('user/add')")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
 		return succeed(sysUserService.add(sysUser));
 	}
 
 	@ApiOperation(value = "设置密码")
+    @PreAuthorize("@pcs.hasPermissions('user/setPassword')")
 	@PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String") })
@@ -105,6 +111,7 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "修改密码")
+    @PreAuthorize("@pcs.hasPermissions('user/updatePassword')")
 	@PostMapping(value = "/updatePassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "authCode", value = "验证码", required = true, dataType = "String"),
@@ -126,6 +133,7 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "修改用户")
+    @PreAuthorize("@pcs.hasPermissions('user/update')")
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 	public Object update(SysUser sysUser) {
 		AuthUser user = SecurityUtils.getUser();
@@ -141,6 +149,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "获取用户角色列表")
 	@GetMapping("/getRole")
+    @PreAuthorize("@pcs.hasPermissions('user/getRole')")
 	public Object getRole() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
@@ -153,6 +162,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/addRole", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('user/addRole')")
 	public Object getRole(String userId, String roleIds) {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
@@ -165,6 +175,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/delRole", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('user/delRole')")
 	public Object delRole(String userId, String roleIds) {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SchoolDao.java

@@ -1,16 +1,15 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.School;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import com.ym.mec.common.dal.BaseDAO;
-
-import org.apache.ibatis.annotations.Param;
-
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.dal.BaseDAO;
+
 public interface SchoolDao extends BaseDAO<Integer, School> {
 
 
@@ -27,4 +26,11 @@ public interface SchoolDao extends BaseDAO<Integer, School> {
      * @return
      */
     List<Map<Integer, String>> queryNameByIds(@Param("schoolIds") Set<Integer> schoolIds);
+    
+    /**
+     * 获取老师的教学点
+     * @param userId
+     * @return
+     */
+    List<School> findByUserId(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherSchoolDao.java

@@ -1,19 +0,0 @@
-package com.ym.mec.biz.dal.dao;
-
-import com.ym.mec.biz.dal.entity.TeacherSchool;
-import com.ym.mec.common.dal.BaseDAO;
-
-import java.util.List;
-
-public interface TeacherSchoolDao extends BaseDAO<Long, TeacherSchool> {
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/14
-     * @params [teacherId]
-     * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherSchool>
-     * @describe 根据教师编号获取教学点信息
-     */
-    List<TeacherSchool> findByTeacherId(Integer teacherId);
-
-}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/School.java

@@ -1,11 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
-import java.math.BigDecimal;
-
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -15,6 +13,8 @@ public class School {
 
 	/**  */
 	private Integer id;
+	
+	private Integer userId;
 
 	/**  */
 	@ApiModelProperty(value = "学校名称", required = false)
@@ -66,6 +66,14 @@ public class School {
 		return this.id;
 	}
 
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public void setName(String name) {
 		this.name = name;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Teacher.java

@@ -1,10 +1,5 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
-import com.ym.mec.biz.dal.enums.JobTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -12,6 +7,11 @@ import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 /**
  * 对应数据库表(teacher):
  */
@@ -86,13 +86,13 @@ public class Teacher extends SysUser {
 	private Date demissionDate;
 
 	@ApiModelProperty(value = "老师教学点列表", required = false)
-	private List<TeacherSchool> teacherSchools;
+	private List<School> teacherSchools;
 
-	public List<TeacherSchool> getTeacherSchools() {
+	public List<School> getTeacherSchools() {
 		return teacherSchools;
 	}
 
-	public void setTeacherSchools(List<TeacherSchool> teacherSchools) {
+	public void setTeacherSchools(List<School> teacherSchools) {
 		this.teacherSchools = teacherSchools;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherSchool.java

@@ -1,121 +0,0 @@
-package com.ym.mec.biz.dal.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(teacher_school):
- */
-public class TeacherSchool {
-
-	/**  */
-	private Long id;
-	
-	/**  */
-	@ApiModelProperty(value = "用户编号",required = false)
-	private Integer userId;
-	
-	/** 省 */
-	@ApiModelProperty(value = "省份",required = false)
-	private String province;
-	
-	/** 市 */
-	@ApiModelProperty(value = "市",required = false)
-	private String city;
-	
-	/** 区 */
-	@ApiModelProperty(value = "区",required = false)
-	private String district;
-	
-	/** 地址 */
-	@ApiModelProperty(value = "地址",required = false)
-	private String address;
-	
-	/** 经纬度 */
-	@ApiModelProperty(value = "经纬度",required = false)
-	private String longitudeLatitude;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setProvince(String province){
-		this.province = province;
-	}
-	
-	public String getProvince(){
-		return this.province;
-	}
-			
-	public void setCity(String city){
-		this.city = city;
-	}
-	
-	public String getCity(){
-		return this.city;
-	}
-			
-	public void setDistrict(String district){
-		this.district = district;
-	}
-	
-	public String getDistrict(){
-		return this.district;
-	}
-			
-	public void setAddress(String address){
-		this.address = address;
-	}
-	
-	public String getAddress(){
-		return this.address;
-	}
-			
-	public void setLongitudeLatitude(String longitudeLatitude){
-		this.longitudeLatitude = longitudeLatitude;
-	}
-	
-	public String getLongitudeLatitude(){
-		return this.longitudeLatitude;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -94,6 +95,17 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	Map renew(String musicGroupId, Integer userId);
 
 	/**
+	 * 课酬调整
+	 * @param courseScheduleId 课程编号
+	 * @param teacherId 老师编号
+	 * @param salary 老师薪水
+	 * @param subsidy 老师补贴
+	 * @param scope 范围(one,all)
+	 * @return
+	 */
+	boolean updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope);
+
+	/**
 	 * 获取乐团列表
 	 * @param queryInfo
 	 * @return

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherSchoolService.java

@@ -1,21 +0,0 @@
-package com.ym.mec.biz.service;
-
-import com.ym.mec.biz.dal.entity.TeacherSchool;
-import com.ym.mec.common.service.BaseService;
-
-import java.util.List;
-
-public interface TeacherSchoolService extends BaseService<Long, TeacherSchool> {
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/14
-     * @params [teacherId]
-     * @return java.util.List<com.ym.mec.biz.dal.entity.TeacherSchool>
-     * @describe 根据教师编号获取教学点
-     */
-    List<TeacherSchool> findByTeacherId(Integer teacherId);
-
-
-
-}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ChargeTypeDao;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.MusicGroupBuildLogDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
@@ -33,6 +34,7 @@ import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -112,6 +114,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 	@Autowired
 	private StudentRegistrationService studentRegistrationService;
+	
+	@Autowired
+	private CourseScheduleDao courseScheduleDao;
 
 	@Autowired
 	private PayService payService;
@@ -422,6 +427,27 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
 	@Override
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+	public boolean updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope) {
+		
+		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
+		if(courseSchedule == null){
+			throw new BizException("课程信息不存在");
+		}
+		
+		if("all".equals(scope)){
+			Integer classGrpupId = courseSchedule.getClassGroupId();
+			//未结算的课酬都修改
+		}else{
+			//判断当前课程是否结算
+			
+		}
+		//更新所有课酬、补贴
+		
+		return false;
+	}
+
+	@Override
 	public PageInfo<MusicGroup> queryMusicGroupPage(MusicGroupQueryInfo queryInfo) {
 		PageInfo<MusicGroup> musicGroupPageInfo = queryPage(queryInfo);
 		List<MusicGroup> musicGroupList = musicGroupPageInfo.getRows();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherSchoolServiceImpl.java

@@ -1,36 +0,0 @@
-package com.ym.mec.biz.service.impl;
-
-import com.ym.mec.biz.dal.dao.TeacherSchoolDao;
-import com.ym.mec.biz.dal.entity.TeacherSchool;
-import com.ym.mec.biz.service.TeacherSchoolService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-@Service
-public class TeacherSchoolServiceImpl extends BaseServiceImpl<Long, TeacherSchool> implements TeacherSchoolService {
-	
-	@Autowired
-	private TeacherSchoolDao teacherSchoolDao;
-
-	@Override
-	public BaseDAO<Long, TeacherSchool> getDAO() {
-		return teacherSchoolDao;
-	}
-
-	@Override
-	public List<TeacherSchool> findByTeacherId(Integer teacherId) {
-		if(Objects.isNull(teacherId)){
-			throw new BizException("请指定教师");
-		}
-		return teacherSchoolDao.findByTeacherId(teacherId);
-	}
-
-
-}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -1,18 +1,36 @@
 package com.ym.mec.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
-import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.DemoGroupDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.OrganizationDao;
+import com.ym.mec.biz.dal.dao.SchoolDao;
+import com.ym.mec.biz.dal.dao.SubjectDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.NamesDto;
 import com.ym.mec.biz.dal.dto.TeacherCloseDto;
-import com.ym.mec.biz.dal.dto.UserGoodsDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.entity.TeacherSchool;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherQueryInfo;
 import com.ym.mec.biz.service.TeacherService;
@@ -21,19 +39,9 @@ import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
-import org.apache.commons.collections.ListUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  implements TeacherService {
@@ -51,7 +59,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private OrganizationDao organizationDao;
 	@Autowired
-	private TeacherSchoolDao teacherSchoolDao;
+	private SchoolDao schoolDao;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
@@ -213,7 +221,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		Teacher teacher = teacherDao.get(id);
 		if(teacher != null){
 			//获取老师教学点列表
-			List<TeacherSchool> teacherSchools = teacherSchoolDao.findByTeacherId(id);
+			List<School> teacherSchools = schoolDao.findByUserId(id);
 			teacher.setTeacherSchools(teacherSchools);
 			//获取流动范围
 			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){

mec-biz/src/main/resources/config/mybatis/SchoolMapper.xml

@@ -8,6 +8,7 @@
 
     <resultMap type="com.ym.mec.biz.dal.entity.School" id="School">
         <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
         <result column="name_" property="name"/>
         <result column="organ_id_" property="organId"/>
         <result column="address_" property="address"/>
@@ -36,8 +37,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.School" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO school
-        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_,cooperation_organ_id_,remark_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy},#{cooperationOrganId},#{remark})
+        (id_,user_id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_,cooperation_organ_id_,remark_)
+        VALUES(#{id},#{userId},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy},#{cooperationOrganId},#{remark})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,6 +51,9 @@
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>
@@ -116,4 +120,8 @@
             #{item}
         </foreach>
     </select>
+    
+    <select id="findByUserId" resultMap="School">
+        select id_ * from school where del_flag_ = 0 and user_id_ = #{userId}
+    </select>
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipSchoolController.java

@@ -1,66 +0,0 @@
-package com.ym.mec.teacher.controller;
-
-import com.ym.mec.biz.dal.entity.TeacherSchool;
-import com.ym.mec.biz.service.TeacherSchoolService;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-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;
-
-/**
- * @Author Joburgess
- * @Date 2019/10/14
- */
-@Api(value = "教师vip课教学点服务")
-@RequestMapping("teacherVipSchool")
-@RestController
-public class TeacherVipSchoolController extends BaseController {
-
-    @Autowired
-    private TeacherSchoolService teacherSchoolService;
-
-    @ApiOperation("单查询")
-    @GetMapping(value = "/query")
-    public Object query(Long id) {
-        return succeed(teacherSchoolService.get(id));
-    }
-
-    @ApiOperation("根据教师编号获取教学点")
-    @GetMapping(value = "/queryAll")
-    public Object queryAll(Integer teacherId) {
-        return succeed(teacherSchoolService.findByTeacherId(teacherId));
-    }
-
-    @ApiOperation("新增")
-    @PostMapping(value = "/add")
-    public Object add(TeacherSchool teacherSchool) {
-        Date date = new Date();
-        teacherSchool.setCreateTime(date);
-        teacherSchool.setUpdateTime(date);
-        teacherSchoolService.insert(teacherSchool);
-        return succeed();
-    }
-
-    @ApiOperation("修改")
-    @PostMapping(value = "/update")
-    public Object update(TeacherSchool teacherSchool) {
-        Date date = new Date();
-        teacherSchool.setUpdateTime(date);
-        teacherSchoolService.update(teacherSchool);
-        return succeed();
-    }
-
-    @ApiOperation("删除")
-    @PostMapping(value = "/delete")
-    public Object delete(Long id) {
-        teacherSchoolService.delete(id);
-        return succeed();
-    }
-
-}

mec-web/src/main/java/com/ym/mec/web/controller/TeacherVipSchoolController.java

@@ -1,74 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.biz.dal.entity.TeacherSchool;
-import com.ym.mec.biz.service.TeacherSchoolService;
-import com.ym.mec.common.controller.BaseController;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-
-/**
- * @Author Joburgess
- * @Date 2019/10/14
- */
-@Api(value = "教师vip课教学点服务")
-@RequestMapping("teacherVipSchool")
-@RestController
-public class TeacherVipSchoolController extends BaseController {
-
-    @Autowired
-    private TeacherSchoolService teacherSchoolService;
-
-    @ApiOperation("单查询")
-    @GetMapping(value = "/query")
-    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/query')")
-    public Object query(Long id) {
-        return succeed(teacherSchoolService.get(id));
-    }
-
-    @ApiOperation("根据教师编号获取教学点")
-    @GetMapping(value = "/queryAll")
-    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/queryAll')")
-    public Object queryAll(Integer teacherId) {
-        return succeed(teacherSchoolService.findByTeacherId(teacherId));
-    }
-
-    @ApiOperation("新增")
-    @PostMapping(value = "/add")
-    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/add')")
-    public Object add(TeacherSchool teacherSchool) {
-        Date date = new Date();
-        teacherSchool.setCreateTime(date);
-        teacherSchool.setUpdateTime(date);
-        teacherSchoolService.insert(teacherSchool);
-        return succeed();
-    }
-
-    @ApiOperation("修改")
-    @PostMapping(value = "/update")
-    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/update')")
-    public Object update(TeacherSchool teacherSchool) {
-        Date date = new Date();
-        teacherSchool.setUpdateTime(date);
-        teacherSchoolService.update(teacherSchool);
-        return succeed();
-    }
-
-    @ApiOperation("删除")
-    @PostMapping(value = "/delete")
-    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/delete')")
-    public Object delete(Long id) {
-        teacherSchoolService.delete(id);
-        return succeed();
-    }
-
-}