Merge remote-tracking branch 'origin/master'

edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/RoomController.java

@@ -36,7 +36,7 @@ public class RoomController{
 
     @RequestMapping(value = "/roomQuery", method = RequestMethod.POST)
     public Object signIn(String roomId) throws Exception {
-        roomService.roomQuery(roomId);
+        roomService.startRecord(roomId);
         return new BaseResponse<>();
     }
 

edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -227,11 +227,11 @@ public class IMHelper {
      */
     public IMApiResultInfo startRecord(String hostUserId, String roomId) throws Exception {
         if (hostUserId == null) {
-            throw new IllegalArgumentException("Paramer 'userId' is required");
+            throw new IllegalArgumentException("Paramer 'hostUserId' is required");
         }
 
-        if (hostUserId == null) {
-            throw new IllegalArgumentException("Paramer 'groupId' is required");
+        if (roomId == null) {
+            throw new IllegalArgumentException("Paramer 'roomId' is required");
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("mode","3");
@@ -242,7 +242,7 @@ public class IMHelper {
         jsonObject.put("sliceMin","60");
         jsonObject.put("hostUserId",hostUserId);
         JSONObject json = new JSONObject();
-        json.put("sessionId",roomQuery(roomId));
+        json.put("sessionId","roomQuery(roomId)");
         json.put("config",jsonObject);
 
         String body = json.toJSONString();

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -81,6 +81,12 @@ public class RoomServiceImpl implements RoomService {
         imHelper.roomQuery(roomId);
     }
 
+    @Override
+    public void startRecord(String roomId) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        imHelper.startRecord(sysUser.getId().toString(),roomId);
+    }
+
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     @Override
     public RoomResult joinRoom(String roomId, boolean isAudience, boolean isDisableCamera,boolean isMusicMode) throws ApiException, Exception {

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/RoomService.java

@@ -17,6 +17,8 @@ public interface RoomService {
 
     void roomQuery(String roomId) throws Exception;
 
+    void startRecord(String roomId) throws Exception;
+
     void signOut(Long roomId);
 
     public Boolean leaveRoom(String roomId,String userId) throws ApiException, Exception;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -37,7 +37,7 @@ public class EmployeeController extends BaseController {
 	@ApiImplicitParam(name = "id", value = "员工ID", required = true, dataType = "Integer", paramType = "path")
 	@GetMapping(value = "/query")
 	public HttpResponseResult<Employee> query(Integer id) {
-		return succeed(employeeService.get(id));
+		return succeed(employeeService.getEmployee(id));
 	}
 
 	@ApiOperation("新增员工")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -9,6 +9,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.thirdparty.adapay.ConfigInit;
 import com.keao.edu.thirdparty.adapay.Payment;
 import com.keao.edu.thirdparty.yqpay.Msg;
+import com.keao.edu.user.dto.ExamPaymentInfo;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Employee;
@@ -149,8 +150,8 @@ public class ExamOrderController extends BaseController {
     @GetMapping(value = "/paymentResult")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
-    public HttpResponseResult<ExamRegistrationPayment> getExamOrderInfo(String orderNo) {
-        return succeed(examRegistrationPaymentService.getByOrderNo(orderNo));
+    public HttpResponseResult<ExamPaymentInfo> getExamOrderInfo(String orderNo) {
+        return succeed(examRegistrationPaymentService.getExamOrderInfo(orderNo));
     }
 
     @PostMapping("/notify")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -112,7 +112,7 @@ public class ExamRegistrationController extends BaseController {
     @ApiOperation(value = "获取报名信息(报名)")
     @GetMapping(value = "getExamRegistration")
     @ApiImplicitParams({@ApiImplicitParam(name = "examRegistrationId", value = "报名id", required = true, dataType = "int")})
-    public HttpResponseResult<ExamRegistration> getExamRegistration(Long examRegistrationId) {
+    public HttpResponseResult<ExamRegistrationDto> getExamRegistration(Long examRegistrationId) {
         return succeed(examRegistrationService.getExamRegistration(examRegistrationId));
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -40,14 +40,6 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      */
     List<ExamRegistrationPayment> getOrdersByStatus(@Param("status") String status, @Param("payType") String payType);
 
-    /**
-     * 获取报名订单信息
-     *
-     * @param orderNo
-     * @return
-     */
-    StudentExamPaymentDto getOrderInfo(@Param("orderNo") String orderNo);
-
 
     /**
      * 获取过期未支付的订单列表

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/SysUserDao.java

@@ -51,4 +51,10 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 */
 	void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roles") Set<Integer> roles);
 
+	/**
+	 * 获取用户角色列表
+	 * @param userId
+	 * @return
+	 */
+    Set<Integer> queryRoleIds(Integer userId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamPaymentInfo.java

@@ -0,0 +1,30 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+import io.swagger.annotations.ApiModelProperty;
+
+public class ExamPaymentInfo{
+
+    @ApiModelProperty(value = "订单信息")
+    private ExamRegistrationPayment examRegistrationPayment;
+
+    @ApiModelProperty(value = "报名信息")
+    private ExamRegistrationDto examRegistrationDto;
+
+    public ExamRegistrationDto getExamRegistrationDto() {
+        return examRegistrationDto;
+    }
+
+    public void setExamRegistrationDto(ExamRegistrationDto examRegistrationDto) {
+        this.examRegistrationDto = examRegistrationDto;
+    }
+
+    public ExamRegistrationPayment getExamRegistrationPayment() {
+        return examRegistrationPayment;
+    }
+
+    public void setExamRegistrationPayment(ExamRegistrationPayment examRegistrationPayment) {
+        this.examRegistrationPayment = examRegistrationPayment;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/EmployeeService.java

@@ -19,4 +19,6 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
     void updateEmployee(Employee employee);
 
     void del(Integer id);
+
+    Employee getEmployee(Integer id);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -2,6 +2,7 @@ package com.keao.edu.user.service;
 
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.dto.ExamPaymentInfo;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistration;
@@ -26,10 +27,10 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
     /**
      * 根据订单号获取订单
      *
-     * @param OrderNo
+     * @param orderNo
      * @return
      */
-    ExamRegistrationPayment getByOrderNo(String OrderNo);
+    ExamRegistrationPayment getByOrderNo(String orderNo);
 
 
     /**
@@ -37,7 +38,7 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      * @param orderNo
      * @return
      */
-    StudentExamPaymentDto getExamOrderInfo(String orderNo);
+    ExamPaymentInfo getExamOrderInfo(String orderNo);
 
     /**
      * 更新订单信息

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -20,6 +20,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Set;
+
 @Service
 public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> implements EmployeeService {
 	
@@ -67,6 +69,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				}
 				sysUserDao.update(user);
 			}else if(employee1.getDelFlag()){
+				SysUser sysUser1 = employee1.getSysUser();
+				if(StringUtils.isEmpty(sysUser1.getUserType())){
+					sysUser1.setUserType("SYSTEM");
+				}else {
+					sysUser1.setUserType(sysUser1.getUserType() + ",SYSTEM");
+				}
+				sysUserDao.update(sysUser1);
 				employee1.setDelFlag(false);
 				employeeDao.update(employee1);
 			}else{
@@ -115,7 +124,27 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
 		Employee employee = employeeDao.get(id);
+		SysUser sysUser = employee.getSysUser();
+		String userType = sysUser.getUserType();
+		if(userType.contains(",SYSTEM")){
+			userType.replace(",SYSTEM","");
+		}else if(userType.contains("SYSTEM,")){
+			userType.replace("SYSTEM,","");
+		}else {
+			sysUser.setUserType("");
+		}
+		sysUser.setUserType(userType);
+		sysUserDao.update(sysUser);
 		sysUserDao.delEmployeeRole(employee.getUserId());
 		employeeDao.delete(id);
 	}
+
+	@Override
+	public Employee getEmployee(Integer id) {
+		Employee employee = employeeDao.get(id);
+		SysUser sysUser = employee.getSysUser();
+		Set<Integer> roleIds = sysUserDao.queryRoleIds(sysUser.getId());
+		sysUser.setRoles(roleIds);
+		return employee;
+	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -12,6 +12,8 @@ import com.keao.edu.thirdparty.yqpay.YqPayFeignService;
 import com.keao.edu.thirdparty.yqpay.YqPayUtil;
 import com.keao.edu.user.dao.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.ExamRegistrationPaymentDao;
+import com.keao.edu.user.dto.ExamPaymentInfo;
+import com.keao.edu.user.dto.ExamRegistrationDto;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
@@ -59,13 +61,18 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public ExamRegistrationPayment getByOrderNo(String OrderNo) {
-        return examRegistrationPaymentDao.getByOrderNo(OrderNo);
+    public ExamRegistrationPayment getByOrderNo(String orderNo) {
+        return examRegistrationPaymentDao.getByOrderNo(orderNo);
     }
 
     @Override
-    public StudentExamPaymentDto getExamOrderInfo(String orderNo) {
-        return examRegistrationPaymentDao.getOrderInfo(orderNo);
+    public ExamPaymentInfo getExamOrderInfo(String orderNo) {
+        ExamPaymentInfo examPaymentInfo = new ExamPaymentInfo();
+        ExamRegistrationPayment order = examRegistrationPaymentDao.getByOrderNo(orderNo);
+        ExamRegistrationDto examRegistration = examRegistrationService.getExamRegistration(order.getExamRegistrationId());
+        examPaymentInfo.setExamRegistrationPayment(order);
+        examPaymentInfo.setExamRegistrationDto(examRegistration);
+        return examPaymentInfo;
     }
 
     @Override

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -90,6 +90,13 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
+				SysUser sysUser1 = organization.getSysUser();
+				if(StringUtils.isEmpty(sysUser1.getUserType())){
+					sysUser1.setUserType("SYSTEM");
+				}else {
+					sysUser1.setUserType(sysUser1.getUserType() + ",SYSTEM");
+				}
+				sysUserDao.update(sysUser1);
 				organization.setDelFlag(YesOrNoEnum.NO);
 				organDao.update(organization);
 			}else{
@@ -201,6 +208,18 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		Integer count = examOrganizationRelationDao.findByOrganId(id);
 		Organization organization = organDao.get(id);
 		if(count == null || count == 0){
+			SysUser sysUser = organization.getSysUser();
+			String userType = sysUser.getUserType();
+			if(userType.contains(",SYSTEM")){
+				userType.replace(",SYSTEM","");
+			}else if(userType.contains("SYSTEM,")){
+				userType.replace("SYSTEM,","");
+			}else {
+				sysUser.setUserType("");
+			}
+			sysUser.setUserType(userType);
+			sysUserDao.update(sysUser);
+
 			sysUserDao.delEmployeeRole(organization.getUserId());
 			organDao.delete(id);
 		}else {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -74,7 +74,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 			return id;
 		}
 		sysUser.setUserType("TEACHER");
-		sysUser.setUsername(sysUser.getRealName());
+//		sysUser.setUsername(sysUser.getRealName());
 		sysUserDao.insert(sysUser);
 		Integer userId = sysUser.getId();
 		teacher.setUserId(userId);

edu-user/edu-user-server/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -30,10 +30,9 @@
 
     <!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="Employee" >
-		SELECT e.*,su.*,sur.role_id_ FROM employee e
+		SELECT e.*,su.* FROM employee e
 		LEFT JOIN sys_user su ON e.user_id_ = su.id_
-		LEFT JOIN sys_user_role sur ON e.user_id_ = sur.user_id_
-		WHERE e.user_id_ = #{userId}
+		WHERE e.user_id_ = #{userId} LIMIT 1
 	</select>
 	
 	<!-- 全查询 -->

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -187,11 +187,6 @@
         SELECT * FROM exam_registration_payment WHERE pay_type_ = #{payType} AND trans_status_ = #{status}
     </select>
 
-    <select id="getOrderInfo" resultMap="com.keao.edu.user.dao.StudentDao.queryApplyListMap">
-        SELECT * FROM exam_registration_payment erp
-        LEFT JOIN exam_registration er ON er.id_ = erp.exam_registration_id_
-        WHERE erp.order_no_ = #{orderNo}
-    </select>
     <!-- 获取超时未支付的订单 -->
     <select id="findOrdersOverTime" resultMap="ExamRegistrationPayment">
         SELECT * FROM exam_registration_payment WHERE order_no_ IN

edu-user/edu-user-server/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -27,7 +27,9 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="Organization" >
-		SELECT * FROM organization WHERE id_ = #{id}
+		SELECT * FROM organization o
+		LEFT JOIN sys_user su ON o.user_id_ = su.id_
+		WHERE o.id_ = #{id} LIMIT 1
 	</select>
 	
 	<!-- 全查询 -->

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -30,7 +30,7 @@
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
         <result column="tenant_id_" property="tenantId"/>
-        <collection property="roles" ofType="int" column="role_id_"/>
+        <!--<collection property="roles" ofType="java.lang.Integer" column="role_id_"/>-->
     </resultMap>
 
     <resultMap id="BaseUserInfoDto" type="com.keao.edu.user.dto.BaseUserInfoDto">
@@ -179,6 +179,11 @@
     <select id="queryByPhoneAndClient" resultMap="SysUser">
         select * from sys_user where (phone_ = #{phone} OR username_ = #{phone}) AND user_type_ LIKE CONCAT('%',#{client},'%') LIMIT 1 FOR UPDATE
     </select>
+    <select id="queryRoleIds" resultType="java.lang.Integer">
+        SELECT sur.role_id_ FROM employee e
+		LEFT JOIN sys_user_role sur ON e.user_id_ = sur.user_id_
+		WHERE e.user_id_ = #{userId}
+    </select>
 
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values