update

mec-auth/mec-auth-api/pom.xml

@@ -19,6 +19,10 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.spring4all</groupId>
+			<artifactId>swagger-spring-boot-starter</artifactId>
+		</dependency>
 	
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysMenu.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,33 +9,43 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysMenu {
 
 	/** 菜单ID */
+	@ApiModelProperty(value = "菜单ID",required = false)
 	private Integer id;
 
 	/** 菜单名称 */
+	@ApiModelProperty(value = "菜单名称",required = false)
 	private String name;
 
 	/** 菜单权限标识 */
+	@ApiModelProperty(value = "菜单权限标识",required = false)
 	private String permission;
 
 	/** 接口路径 */
+	@ApiModelProperty(value = "接口路径",required = false)
 	private String path;
 
 	/** 父菜单ID */
+	@ApiModelProperty(value = "父菜单ID",required = false)
 	private Integer parentId;
 
 	/** 图标 */
+	@ApiModelProperty(value = "图标 */",required = false)
 	private String icon;
 
 	/** 前端页面地址 */
+	@ApiModelProperty(value = "前端页面地址",required = false)
 	private String component;
 
 	/** 排序值 */
+	@ApiModelProperty(value = "排序值",required = false)
 	private Integer sort;
 
 	/** 0-开启，1- 关闭 */
+	@ApiModelProperty(value = "0-开启，1- 关闭",required = false)
 	private String keepAlive;
 
 	/** 菜单类型 （0菜单 1按钮） */
+	@ApiModelProperty(value = "菜单类型 （0菜单 1按钮）",required = false)
 	private String type;
 
 	/** 创建时间 */
@@ -44,6 +55,7 @@ public class SysMenu {
 	private java.util.Date updateTime;
 
 	/** 逻辑删除标记(0--正常 1--删除) */
+	@ApiModelProperty(value = "逻辑删除标记(0--正常 1--删除)",required = false)
 	private String delFlag;
 
 	public Integer getId() {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysOauthClientDetails.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,18 +9,23 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysOauthClientDetails {
 
 	/** 客户端ID */
+	@ApiModelProperty(value = "客户端ID",required = false)
 	private String id;
 	
 	/** 资源ID */
+	@ApiModelProperty(value = "资源ID",required = false)
 	private String resourceIds;
 	
 	/** 客户端密钥 */
+	@ApiModelProperty(value = "客户端密钥",required = false)
 	private String clientSecret;
 	
 	/** 作用域 */
+	@ApiModelProperty(value = "作用域",required = false)
 	private String scope;
 	
 	/** 授权方式 */
+	@ApiModelProperty(value = "授权方式",required = false)
 	private String authorizedGrantTypes;
 	
 	/**  */
@@ -29,15 +35,19 @@ public class SysOauthClientDetails {
 	private String authorities;
 	
 	/** 请求令牌有效时间 */
+	@ApiModelProperty(value = "请求令牌有效时间",required = false)
 	private Integer accessTokenValidity;
 	
 	/** 刷新令牌有效时间 */
+	@ApiModelProperty(value = "刷新令牌有效时间",required = false)
 	private Integer refreshTokenValidity;
 	
 	/** 扩展信息 */
+	@ApiModelProperty(value = "扩展信息",required = false)
 	private String additionalInformation;
 	
 	/** 是否自动放行 */
+	@ApiModelProperty(value = "是否自动放行",required = false)
 	private String autoapprove;
 
 	public String getId() {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRole.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,12 +12,15 @@ public class SysRole {
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "角色名称",required = false)
 	private String roleName;
 	
 	/**  */
+	@ApiModelProperty(value = "角色编码",required = false)
 	private String roleCode;
 	
 	/**  */
+	@ApiModelProperty(value = "角色描述",required = false)
 	private String roleDesc;
 	
 	/**  */
@@ -26,6 +30,7 @@ public class SysRole {
 	private java.util.Date updateTime;
 	
 	/** 删除标识（0-正常,1-删除） */
+	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
 	private String delFlag;
 
 	public Integer getId() {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRoleDept.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,9 +12,11 @@ public class SysRoleDept {
 	private Integer id;
 	
 	/** 角色ID */
+	@ApiModelProperty(value = "角色ID",required = false)
 	private Integer roleId;
 	
 	/** 部门ID */
+	@ApiModelProperty(value = "部门ID",required = false)
 	private Integer deptId;
 	
 	public void setId(Integer id){

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRoleMenu.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,9 +9,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysRoleMenu {
 
 	/** 角色ID */
+	@ApiModelProperty(value = "角色ID",required = false)
 	private Integer roleId;
 	
 	/** 菜单ID */
+	@ApiModelProperty(value = "菜单ID",required = false)
 	private Integer menuId;
 	
 	public void setRoleId(Integer roleId){

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -2,6 +2,7 @@ package com.ym.mec.auth.api.entity;
 
 import java.util.Date;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.enums.SysUserType;
@@ -16,21 +17,27 @@ public class SysUser {
 	private Integer id;
 
 	/** 用户名 */
+	@ApiModelProperty(value = "用户名",required = false)
 	private String username;
 
 	/**  */
+	@ApiModelProperty(value = "密码",required = false)
 	private String password;
 
 	/** 随机盐 */
+	@ApiModelProperty(value = "随机盐",required = false)
 	private String salt;
 
 	/** 简介 */
+	@ApiModelProperty(value = "菜单ID",required = false)
 	private String phone;
 
 	/** 头像 */
+	@ApiModelProperty(value = "头像",required = false)
 	private String avatar;
 
 	/** 部门ID */
+	@ApiModelProperty(value = "部门ID",required = false)
 	private Integer organId;
 
 	/** 创建时间 */
@@ -42,29 +49,39 @@ public class SysUser {
 	private java.util.Date updateTime;
 
 	/** 0-正常，9-锁定 */
+	@ApiModelProperty(value = "0-正常，9-锁定",required = false)
 	private String lockFlag;
 
 	/** 0-正常，1-删除 */
+	@ApiModelProperty(value = "0-正常，1-删除",required = false)
 	private String delFlag;
 
 	/** 微信openid */
+	@ApiModelProperty(value = "微信openid",required = false)
 	private String wxOpenid;
 
 	/** QQ openid */
+	@ApiModelProperty(value = "QQ openid",required = false)
 	private String qqOpenid;
 
 	/** 用户类型 */
+	@ApiModelProperty(value = "用户类型",required = false)
 	private SysUserType userType;
 
+	@ApiModelProperty(value = "性别",required = false)
 	private UserGenderEnum gender;
 
+	@ApiModelProperty(value = "民族",required = false)
 	private String nation;
 
 //	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "生日",required = false)
 	private Date birthdate;
 
+	@ApiModelProperty(value = "邮箱",required = false)
 	private String email;
 
+	@ApiModelProperty(value = "融云token",required = false)
 	private String imToken;
 
 	public String getImToken() {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserLogin.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,24 +9,31 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysUserLogin {
 
 	/**  */
+	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 	
 	/** 用户登录总次数 */
+	@ApiModelProperty(value = "用户登录总次数",required = false)
 	private Integer loginCount;
 	
 	/** 最后登录时间 */
+	@ApiModelProperty(value = "最后登录时间",required = false)
 	private java.util.Date lastLoginTime;
 	
 	/** 最后登录IP */
+	@ApiModelProperty(value = "最后登录IP",required = false)
 	private String lastLoginIp;
 	
 	/** 连续登陆失败的次数 */
+	@ApiModelProperty(value = "连续登陆失败的次数",required = false)
 	private Integer failCount;
 	
 	/** 锁定时间 单位：分钟(超过锁定时间自动解锁) */
+	@ApiModelProperty(value = "锁定时间 单位：分钟",required = false)
 	private Integer lockTime;
 	
 	/** 锁定日期 */
+	@ApiModelProperty(value = "锁定日期",required = false)
 	private java.util.Date lockDate;
 
 	public Integer getUserId() {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserLoginLog.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -10,15 +11,19 @@ public class SysUserLoginLog {
 	private Long id;
 
 	/** 会员ID */
+	@ApiModelProperty(value = "会员ID",required = false)
 	private Integer userId;
 
 	/** 登录IP */
+	@ApiModelProperty(value = "登录IP",required = false)
 	private String loginIp;
 
 	/** 登录时间 */
+	@ApiModelProperty(value = "登录时间",required = false)
 	private java.util.Date loginTime;
 
 	/** 终端类型(0,pc端;1,人工;2,移动端;3,自动) */
+	@ApiModelProperty(value = "终端类型(0,pc端;1,人工;2,移动端;3,自动)",required = false)
 	private Integer source;
 
 	public Long getId() {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserRole.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,9 +9,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysUserRole {
 
 	/** 用户ID */
+	@ApiModelProperty(value = "用户ID",required = false)
 	private Integer userId;
 	
 	/** 角色ID */
+	@ApiModelProperty(value = "角色ID",required = false)
 	private Integer roleId;
 	
 	public void setUserId(Integer userId){

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/enums/YesOrNoEnum.java

@@ -0,0 +1,33 @@
+package com.ym.mec.auth.api.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
+    YES(1,"是"),
+    NO(0,"否");
+
+    private Integer code;
+    private String msg;
+
+    YesOrNoEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -3,6 +3,8 @@ package com.ym.mec.auth.web.controller;
 import com.ym.mec.auth.api.entity.SysMenu;
 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;
@@ -56,10 +58,14 @@ public class MenuController extends BaseController {
         return succeed(sysMenuService.get(id));
     }
 
-    @ApiOperation("根据用户编号查询用户可访问菜单")
-    @GetMapping("/findByUser/{id}")
-    public Object findByUser(@ApiParam(value = "用户编号", required = true) @PathVariable("id") Integer id) {
-        return succeed(sysMenuService.findByUser(id));
+    @ApiOperation("查询用户可访问菜单")
+    @GetMapping("/findByUser")
+    public Object findByUser() {
+        AuthUser user = SecurityUtils.getUser();
+        if(user != null){
+            return succeed(sysMenuService.findByUser(user.getUserId()));
+        }
+        return failed();
     }
 
 

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

@@ -7,6 +7,8 @@ import com.ym.mec.auth.service.SysUserRoleService;
 import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.auth.web.controller.queryInfo.SysUserQueryInfo;
 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.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,12 +30,12 @@ public class UserController extends BaseController {
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
 
-	@ApiOperation("根据用户名查询用户信息接口")
+	/*@ApiOperation("根据用户名查询用户信息接口")
 	@ApiImplicitParam(name = "username", value = "用户名", required = true, dataType = "String", paramType = "path")
 	@GetMapping("/{username}")
 	public Object getUser(@PathVariable("username") String username) {
 		return succeed(sysUserService.queryUserInfoByUsername(username));
-	}
+	}*/
 
 	@ApiOperation(value = "分页查询用户信息")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),
@@ -44,10 +46,14 @@ public class UserController extends BaseController {
 		return succeed(sysUserService.queryPage(queryInfo));
 	}
 
-	@ApiOperation(value = "根据用户编号查询用户信息接口")
-	@GetMapping("/query/{id}")
-	public Object query(@ApiParam(value = "用户的昵称", required = true) @PathVariable("id") Integer id) {
-		return succeed(sysUserService.get(id));
+	@ApiOperation(value = "查询用户信息接口")
+	@GetMapping("/query")
+	public Object query() {
+		AuthUser user = SecurityUtils.getUser();
+		if(user != null){
+			return succeed(sysUserService.get(user.getUserId()));
+		}
+		return failed();
 	}
 
 	@ApiOperation(value = "新增用户")
@@ -61,26 +67,35 @@ public class UserController extends BaseController {
 		return succeed();
 	}
 
-	@ApiOperation(value = "删除用户")
+	/*@ApiOperation(value = "删除用户")
 	@DeleteMapping("/del/{id}")
 	public Object del(@ApiParam(value = "用户编号", required = true) @PathVariable("id") Integer id) {
 		return sysUserService.deleteById(id) ? succeed("删除成功") : failed("删除失败");
-	}
+	}*/
 
 	@ApiOperation(value = "修改用户")
 	@PutMapping("/update")
 	public Object update(@RequestBody SysUser sysUser) {
-		Date date = new Date();
-		sysUser.setUpdateTime(date);
-		sysUser.setPassword(new BCryptPasswordEncoder().encode(sysUser.getPassword()));
-		sysUserService.update(sysUser);
-		return succeed();
+		AuthUser user = SecurityUtils.getUser();
+		if(user != null){
+			Date date = new Date();
+			sysUser.setId(user.getUserId());
+			sysUser.setUpdateTime(date);
+			sysUser.setPassword(new BCryptPasswordEncoder().encode(sysUser.getPassword()));
+			sysUserService.update(sysUser);
+			return succeed();
+		}
+		return failed();
 	}
 
 	@ApiOperation(value = "获取用户角色列表")
-	@GetMapping("/getRole/{id}")
-	public Object getRole(@ApiParam(value = "用户编号", required = true) @PathVariable("id") Integer id) {
-		return succeed(sysRoleService.findRoleByUserId(id));
+	@GetMapping("/getRole")
+	public Object getRole() {
+		AuthUser user = SecurityUtils.getUser();
+		if(user != null) {
+			return succeed(sysRoleService.findRoleByUserId(user.getUserId()));
+		}
+		return failed();
 	}
 
 	@ApiOperation(value = "用户角色新增")

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -102,11 +102,13 @@
 		SELECT COUNT(*) FROM sys_menu
 	</select>
 
-    <select id="getMenusByRoleId" resultType="com.ym.mec.auth.api.entity.SysMenu">
-		SELECT sm.* FROM sys_role_menu srm LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_ WHERE srm.role_id_ = 1 AND sm.del_flag_ = 0
+    <select id="getMenusByRoleId" resultMap="SysMenu">
+		SELECT sm.* FROM sys_role_menu srm
+		LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
+		WHERE srm.role_id_ = #{roleId} AND sm.del_flag_ = 0
 	</select>
 
-    <select id="findByUser" resultType="com.ym.mec.auth.api.entity.SysMenu">
+    <select id="findByUser" resultMap="SysMenu">
 		SELECT sm.* FROM sys_user_role sur
 		LEFT JOIN sys_role sr ON sur.role_id_ = sr.id_
 		LEFT JOIN sys_role_menu srm ON sr.id_ = srm.role_id_
@@ -115,7 +117,7 @@
 	</select>
 
     <!-- 根据权限标识查菜单 -->
-    <select id="findMenuByPermission" resultType="com.ym.mec.auth.api.entity.SysMenu">
+    <select id="findMenuByPermission" resultMap="SysMenu">
         SELECT * FROM `sys_role_menu` WHERE `permission_` = #{permission} AND sm.del_flag_ = 0
     </select>
 </mapper>

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

@@ -0,0 +1,56 @@
+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.CooperationOrgan;
+import com.ym.mec.web.service.CooperationOrganService;
+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 java.util.Date;
+
+@RequestMapping("cooperationOrgan")
+@Api(tags = "合作单位(教学点)服务")
+@RestController
+public class CooperationOrganController extends BaseController {
+
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
+
+    @ApiOperation(value = "新增合作单位(教学点)")
+    @PostMapping("/add")
+    public Object add(@RequestBody CooperationOrgan cooperationOrgan) {
+        cooperationOrganService.insert(cooperationOrgan);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除合作单位(教学点)")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "合作单位(教学点)编号", required = true) @PathVariable("id") Integer id) {
+        cooperationOrganService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改合作单位(教学点)")
+    @PutMapping("/update")
+    public Object update(@RequestBody CooperationOrgan cooperationOrgan) {
+        cooperationOrgan.setUpdateTime(new Date());
+        cooperationOrganService.update(cooperationOrgan);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询合作单位(教学点)列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+        return succeed(cooperationOrganService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "根据机构编号获取合作单位(教学点)列表")
+    @GetMapping("/queryByOrganId")
+    public Object queryByOrganId(@RequestParam Integer organId){
+        return succeed(cooperationOrganService.queryByOrganId(organId));
+    }
+}

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

@@ -53,4 +53,10 @@ public class SchoolController extends BaseController {
     public Object queryPage(@RequestBody SchoolQueryInfo queryInfo){
         return succeed(schoolService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "根据机构编号获取学校列表")
+    @GetMapping("/queryByOrganId")
+    public Object queryByOrganId(@RequestParam Integer organId){
+        return succeed(schoolService.queryByOrganId(organId,null));
+    }
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/CooperationOrganDao.java

@@ -2,8 +2,18 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.CooperationOrgan;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan> {
 
-	
+
+    /**
+     * 根据机构编号获取合作单位(教学点)列表
+     * @param organId
+     * @return
+     */
+    List<CooperationOrgan> queryByOrganId(@Param("organId") Integer organId);
 }

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

@@ -2,8 +2,18 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.School;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SchoolDao extends BaseDAO<Integer, School> {
 
-	
+
+    /**
+     * 根据机构编号获取合作单位列表
+     * @param organId
+     * @return
+     */
+    List<School> queryByOrganId(@Param("organId") Integer organId, @Param("delFlag") YesOrNoEnum delFlag);
 }

mec-web/src/main/java/com/ym/mec/web/dal/entity/CooperationOrgan.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,18 +12,27 @@ public class CooperationOrgan {
 	private Integer id;
 	
 	/** 单位名称 */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private String name;
+
+	/** 分部编号 */
+	@ApiModelProperty(value = "分部编号",required = false)
+	private Integer organId;
 	
 	/** 联系人 */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private String linkman;
 	
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private String job;
 	
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private String mobileNo;
 	
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private String address;
 	
 	/**  */
@@ -30,7 +40,15 @@ public class CooperationOrgan {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-web/src/main/java/com/ym/mec/web/service/CooperationOrganService.java

@@ -3,6 +3,14 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.CooperationOrgan;
 
+import java.util.List;
+
 public interface CooperationOrganService extends BaseService<Integer, CooperationOrgan> {
 
+    /**
+     * 根据机构编号获取合作单位(教学点)列表
+     * @param organId
+     * @return
+     */
+    List<CooperationOrgan> queryByOrganId(Integer organId);
 }

mec-web/src/main/java/com/ym/mec/web/service/SchoolService.java

@@ -2,7 +2,16 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.School;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
+import java.util.List;
 
 public interface SchoolService extends BaseService<Integer, School> {
 
+    /**
+     * 根据机构编号获取合作单位列表
+     * @param organId
+     * @return
+     */
+    List<School> queryByOrganId(Integer organId, YesOrNoEnum delFlag);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/CooperationOrganServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.service.impl;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,8 @@ import com.ym.mec.web.dal.dao.CooperationOrganDao;
 import com.ym.mec.web.dal.entity.CooperationOrgan;
 import com.ym.mec.web.service.CooperationOrganService;
 
+import java.util.List;
+
 @Service
 public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, CooperationOrgan>  implements CooperationOrganService {
 	
@@ -19,5 +22,9 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 	public BaseDAO<Integer, CooperationOrgan> getDAO() {
 		return cooperationOrganDao;
 	}
-	
+
+	@Override
+	public List<CooperationOrgan> queryByOrganId(Integer organId) {
+		return cooperationOrganDao.queryByOrganId(organId);
+	}
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/SchoolServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.service.impl;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,8 @@ import com.ym.mec.web.dal.dao.SchoolDao;
 import com.ym.mec.web.dal.entity.School;
 import com.ym.mec.web.service.SchoolService;
 
+import java.util.List;
+
 @Service
 public class SchoolServiceImpl extends BaseServiceImpl<Integer, School>  implements SchoolService {
 	
@@ -19,5 +22,9 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School>  impleme
 	public BaseDAO<Integer, School> getDAO() {
 		return schoolDao;
 	}
-	
+
+	@Override
+	public List<School> queryByOrganId(Integer organId, YesOrNoEnum delFlag) {
+		return schoolDao.queryByOrganId(organId,delFlag);
+	}
 }

mec-web/src/main/resources/config/mybatis/CooperationOrganMapper.xml

@@ -3,88 +3,89 @@
 <!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CooperationOrganDao">
 
-	<resultMap type="com.ym.mec.web.dal.entity.CooperationOrgan"
-		id="CooperationOrgan">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="linkman_" property="linkman" />
-		<result column="job_" property="job" />
-		<result column="mobile_no_" property="mobileNo" />
-		<result column="address_" property="address" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
+    <resultMap type="com.ym.mec.web.dal.entity.CooperationOrgan"
+               id="CooperationOrgan">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="linkman_" property="linkman"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="job_" property="job"/>
+        <result column="mobile_no_" property="mobileNo"/>
+        <result column="address_" property="address"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
 
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CooperationOrgan">
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CooperationOrgan">
 		SELECT * FROM
 		cooperation_organ WHERE id_ = #{id}
 	</select>
 
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CooperationOrgan">
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CooperationOrgan">
 		SELECT * FROM cooperation_organ
 		ORDER BY id_
 	</select>
 
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CooperationOrgan"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO cooperation_organ
-		(id_,name_,linkman_,job_,mobile_no_,address_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{linkman},#{job},#{mobileNo},#{address},#{createTime},#{updateTime})
-	</insert>
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CooperationOrgan"
+            useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
+            AS ID FROM DUAL </selectKey> -->
+        INSERT INTO cooperation_organ
+        (id_,name_,linkman_,job_,mobile_no_,address_,organ_id_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{linkman},#{job},#{mobileNo},#{address},#{organId},now(),now())
+    </insert>
 
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CooperationOrgan">
-		UPDATE cooperation_organ
-		<set>
-			<if test="address != null">
-				address_ = #{address},
-			</if>
-			<if test="job != null">
-				job_ = #{job},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="linkman != null">
-				linkman_ = #{linkman},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="mobileNo != null">
-				mobile_no_ = #{mobileNo},
-			</if>
-			<if test="name != null">
-				name_ = #{name},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CooperationOrgan">
+        UPDATE cooperation_organ
+        <set>
+            <if test="address != null">
+                address_ = #{address},
+            </if>
+            <if test="job != null">
+                job_ = #{job},
+            </if>
+            <if test="linkman != null">
+                linkman_ = #{linkman},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="mobileNo != null">
+                mobile_no_ = #{mobileNo},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
 
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM cooperation_organ WHERE id_ =
 		#{id}
 	</delete>
 
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CooperationOrgan"
-		parameterType="map">
-		SELECT * FROM cooperation_organ ORDER BY id_
-		<include refid="global.limit" />
-	</select>
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CooperationOrgan"
+            parameterType="map">
+        SELECT * FROM cooperation_organ ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
 
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
 		cooperation_organ
 	</select>
+    <select id="queryByOrganId" resultMap="CooperationOrgan">
+        SELECT * FROM cooperation_organ WHERE organ_id_ = #{organId}
+    </select>
 </mapper>

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

@@ -93,4 +93,15 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM school
 	</select>
+    <select id="queryByOrganId" resultMap="School">
+        SELECT * FROM school
+        <where>
+            <if test="organId != null">
+                organ_id_ = #{organId}
+            </if>
+            <if test="delFlag != null">
+                AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+        </where>
+    </select>
 </mapper>