Merge branch 'master' of http://git.dayaedu.com/yonge/mec

# Conflicts:
#	mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.im.ImFeignService;
+import com.ym.mec.im.UserFeignService;
+
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -58,6 +60,9 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
+	private UserFeignService userFeignService;
+	
+	@Autowired
 	private ClientDetailsService clientDetailsService;
 
 	@Value("${message.lesseeOrganId}")
@@ -131,6 +136,21 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 			Map<String,Object> map = new HashMap<>(3);
 			map.put("password", StringUtils.isEmpty(sysUser.getPassword())?false:true);
 			map.put("authentication",oAuth2AccessToken);
+			
+			String tenantId = "1";
+			if (StringUtils.equalsIgnoreCase(clientId, "TEACHER")) {
+				// 查询老师所在分部
+				Integer organId = userFeignService.queryTeacherOrganId(sysUser.getId());
+				if (organId == 43) {
+					tenantId = "2";
+				}
+			} else if (StringUtils.equalsIgnoreCase(clientId, "STUDENT")) {
+				if (sysUser.getOrganId() == 43) {
+					tenantId = "2";
+				}
+			}
+			map.put("tenantId", tenantId);
+
 			map.put("isLessee",false);
 			if("TEACHER".equals(clientId.toUpperCase())){
 				Integer organId = sysUserService.getTeacherOrganId(sysUser.getId());
@@ -142,6 +162,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 					map.put("isLessee",true);
 				}
 			}
+			
 			response.setContentType("application/json; charset=utf-8");
 			HttpResponseResult result = new HttpResponseResult(true, HttpStatus.OK.value(), map, "");
 			response.getWriter().write(objectMapper.writeValueAsString(result));

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

@@ -0,0 +1,7 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.SysTenantAccount;
+
+public interface SysTenantAccountDao extends com.ym.mec.common.dal.BaseDAO<Integer, SysTenantAccount> {
+
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.SysTenantAccountDetail;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface SysTenantAccountDetailDao extends BaseDAO<Long, SysTenantAccountDetail> {
+
+	
+}

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

@@ -0,0 +1,81 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_tenant_account):
+ */
+public class SysTenantAccount {
+
+	/**  */
+	private Integer userId;
+	
+	/** 可用分钟数 */
+	private Integer availableMinutes;
+	
+	/** 冻结分钟数 */
+	private Integer frozenMinutes;
+	
+	/** 账户状态(0,冻结,1,正常;-1,注销;) */
+	private Integer status;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setAvailableMinutes(Integer availableMinutes){
+		this.availableMinutes = availableMinutes;
+	}
+	
+	public Integer getAvailableMinutes(){
+		return this.availableMinutes;
+	}
+			
+	public void setFrozenMinutes(Integer frozenMinutes){
+		this.frozenMinutes = frozenMinutes;
+	}
+	
+	public Integer getFrozenMinutes(){
+		return this.frozenMinutes;
+	}
+			
+	public void setStatus(Integer status){
+		this.status = status;
+	}
+	
+	public Integer getStatus(){
+		return this.status;
+	}
+			
+	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/dal/entity/SysTenantAccountDetail.java

@@ -0,0 +1,136 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_tenant_account_detail):
+ */
+public class SysTenantAccountDetail {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer userId;
+	
+	/** 交易类型 */
+	private String transType;
+	
+	/** 交易状态 */
+	private String transStatus;
+	
+	/** 交易流水 */
+	private String transNo;
+	
+	/** 现金数额 */
+	private java.math.BigDecimal transCashAmount;
+	
+	/** 账户总可用分钟数 */
+	private Integer totalAvailableMinutes;
+	
+	/** 交易的分钟数 */
+	private Integer transMinutes;
+	
+	/**  */
+	private String memo;
+	
+	/**  */
+	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 setTransType(String transType){
+		this.transType = transType;
+	}
+	
+	public String getTransType(){
+		return this.transType;
+	}
+			
+	public void setTransStatus(String transStatus){
+		this.transStatus = transStatus;
+	}
+	
+	public String getTransStatus(){
+		return this.transStatus;
+	}
+			
+	public void setTransNo(String transNo){
+		this.transNo = transNo;
+	}
+	
+	public String getTransNo(){
+		return this.transNo;
+	}
+			
+	public void setTransCashAmount(java.math.BigDecimal transCashAmount){
+		this.transCashAmount = transCashAmount;
+	}
+	
+	public java.math.BigDecimal getTransCashAmount(){
+		return this.transCashAmount;
+	}
+			
+	public void setTotalAvailableMinutes(Integer totalAvailableMinutes){
+		this.totalAvailableMinutes = totalAvailableMinutes;
+	}
+	
+	public Integer getTotalAvailableMinutes(){
+		return this.totalAvailableMinutes;
+	}
+			
+	public void setTransMinutes(Integer transMinutes){
+		this.transMinutes = transMinutes;
+	}
+	
+	public Integer getTransMinutes(){
+		return this.transMinutes;
+	}
+			
+	public void setMemo(String memo){
+		this.memo = memo;
+	}
+	
+	public String getMemo(){
+		return this.memo;
+	}
+			
+	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/SysTenantAccountDetailService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.SysTenantAccountDetail;
+import com.ym.mec.common.service.BaseService;
+
+public interface SysTenantAccountDetailService extends BaseService<Long, SysTenantAccountDetail> {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.SysTenantAccount;
+import com.ym.mec.common.service.BaseService;
+
+public interface SysTenantAccountService extends BaseService<Integer, SysTenantAccount> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.SysTenantAccountDetailDao;
+import com.ym.mec.biz.dal.entity.SysTenantAccountDetail;
+import com.ym.mec.biz.service.SysTenantAccountDetailService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class SysTenantAccountDetailServiceImpl extends BaseServiceImpl<Long, SysTenantAccountDetail>  implements SysTenantAccountDetailService {
+	
+	@Autowired
+	private SysTenantAccountDetailDao sysTenantAccountDetailDao;
+
+	@Override
+	public BaseDAO<Long, SysTenantAccountDetail> getDAO() {
+		return sysTenantAccountDetailDao;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.SysTenantAccountDao;
+import com.ym.mec.biz.dal.entity.SysTenantAccount;
+import com.ym.mec.biz.service.SysTenantAccountService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTenantAccount> implements SysTenantAccountService {
+
+	@Autowired
+	private SysTenantAccountDao sysTenantAccountDao;
+
+	@Override
+	public BaseDAO<Integer, SysTenantAccount> getDAO() {
+		return sysTenantAccountDao;
+	}
+
+}

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

@@ -132,4 +132,8 @@
         SELECT * FROM course_schedule_evaluate cse
         WHERE cse.teacher_id_ = #{teacherId} AND cse.course_schedule_id_ = #{courseScheduleId}
     </select>
+
+<!--    <select id="getNeedReports" resultMap="CourseScheduleEvaluate">-->
+
+<!--    </select>-->
 </mapper>

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

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.biz.dal.dao.SysTenantAccountDetailDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.SysTenantAccountDetail"
+		id="SysTenantAccountDetail">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="trans_type_" property="transType" />
+		<result column="trans_status_" property="transStatus" />
+		<result column="trans_no_" property="transNo" />
+		<result column="trans_cash_amount_" property="transCashAmount" />
+		<result column="total_available_minutes_" property="totalAvailableMinutes" />
+		<result column="trans_minutes_" property="transMinutes" />
+		<result column="memo_" property="memo" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysTenantAccountDetail">
+		SELECT *
+		FROM sys_tenant_account_detail WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysTenantAccountDetail">
+		SELECT * FROM
+		sys_tenant_account_detail ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysTenantAccountDetail"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO sys_tenant_account_detail
+		(id_,user_id_,trans_type_,trans_status_,trans_no_,trans_cash_amount_,total_available_minutes_,trans_minutes_,memo_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{transType},#{transStatus},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysTenantAccountDetail">
+		UPDATE sys_tenant_account_detail
+		<set>
+			<if test="transCashAmount != null">
+				trans_cash_amount_ = #{transCashAmount},
+			</if>
+			<if test="userId != null">
+				user_id_ = #{userId},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="totalAvailableMinutes != null">
+				total_available_minutes_ = #{totalAvailableMinutes},
+			</if>
+			<if test="transType != null">
+				trans_type_ = #{transType},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="memo != null">
+				memo_ = #{memo},
+			</if>
+			<if test="transStatus != null">
+				trans_status_ = #{transStatus},
+			</if>
+			<if test="transNo != null">
+				trans_no_ = #{transNo},
+			</if>
+			<if test="transMinutes != null">
+				trans_minutes_ = #{transMinutes},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM sys_tenant_account_detail WHERE
+		id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysTenantAccountDetail"
+		parameterType="map">
+		SELECT * FROM sys_tenant_account_detail ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		sys_tenant_account_detail
+	</select>
+</mapper>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.biz.dal.dao.SysTenantAccountDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.SysTenantAccount"
+		id="SysTenantAccount">
+		<result column="user_id_" property="userId" />
+		<result column="available_minutes_" property="availableMinutes" />
+		<result column="frozen_minutes_" property="frozenMinutes" />
+		<result column="status_" property="status" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysTenantAccount">
+		SELECT * FROM sys_tenant_account
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysTenantAccount"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO sys_tenant_account
+		(user_id_,available_minutes_,frozen_minutes_,status_,create_time_,update_time_)
+		VALUES(#{userId},#{availableMinutes},#{frozenMinutes},#{status},#{createTime},#{updateTime})
+	</insert>
+
+
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysTenantAccount"
+		parameterType="map">
+		SELECT * FROM sys_tenant_account
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		sys_tenant_account
+	</select>
+</mapper>

mec-client-api/src/main/java/com/ym/mec/im/UserFeignService.java

@@ -12,4 +12,7 @@ public interface UserFeignService {
 
 	@RequestMapping(value = "api/createCashAccount")
 	Boolean createCashAccount(@RequestParam("userId") Integer userId);
+	
+	@RequestMapping(value = "api/queryTeacherOrganId")
+	public Integer queryTeacherOrganId(@RequestParam("userId") Integer userId);
 }

mec-client-api/src/main/java/com/ym/mec/im/fallback/UserFeignServiceFallback.java

@@ -10,4 +10,10 @@ public class UserFeignServiceFallback implements UserFeignService {
 	@Override
 	public Boolean createCashAccount(Integer userId) {
 		return false;
-	}}
+	}
+
+	@Override
+	public Integer queryTeacherOrganId(Integer userId) {
+		return null;
+	}
+}

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

@@ -51,7 +51,7 @@ public class StudyReportController extends BaseController {
 			courseScheduleEvaluate.setMonth(DateUtil.format(nowDate,"yyyy年MM月"));
 		}
 
-		return succeed(courseScheduleEvaluateService.findByGroupId(groupId));
+		return succeed(courseScheduleEvaluates);
 	}
 
 	@ApiOperation(value = "评论详情")

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

@@ -1,15 +1,19 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
-import com.ym.mec.biz.service.PracticeLessonApplyService;
-import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.service.PracticeLessonApplyService;
+import com.ym.mec.common.controller.BaseController;
+
 @RequestMapping("api")
 @Api(tags = "对外接口")
 @RestController
@@ -17,6 +21,9 @@ public class APIController extends BaseController {
 
 	@Autowired
 	private SysUserCashAccountDao sysUserCashAccountDao;
+	
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Autowired
 	private PracticeLessonApplyService practiceLessonApplyService;
@@ -29,6 +36,15 @@ public class APIController extends BaseController {
 		return true;
 	}
 
+	@GetMapping("/queryTeacherOrganId")
+	public Integer queryTeacherOrganId(Integer userId) {
+		Teacher teacher = teacherDao.get(userId);
+		if (teacher != null) {
+			return teacher.getOrganId();
+		}
+		return null;
+	}
+
 	@GetMapping("/practiceSum")
 	public Object practiceSum() {
 		return succeed(practiceLessonApplyService.practiceSum());