Merge remote-tracking branch 'origin/master'

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

@@ -5,8 +5,11 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.user.dao.EmployeeDao;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.page.ExamOrganizationRelationQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamOrganizationRelationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,6 +31,8 @@ public class ExamOrganizationRelationController extends BaseController {
     private ExamOrganizationRelationService examOrganizationRelationService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")
@@ -36,9 +41,13 @@ public class ExamOrganizationRelationController extends BaseController {
         if(Objects.isNull(sysUser)){
             return failed("请重新登录");
         }
-        if(Objects.isNull(queryInfo.getOrganId())){
-            queryInfo.setOrganId(sysUser.getId());
+        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
         }
+
         return succeed(examOrganizationRelationService.queryExamOrgans(queryInfo));
     }
 

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

@@ -7,8 +7,10 @@ import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.thirdparty.ocr.Ocr;
 import com.keao.edu.user.dto.ExamRegistrationStatisticsDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRegistrationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -35,14 +37,19 @@ public class ExamRegistrationController extends BaseController {
     private ExamRegistrationService examRegistrationService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation(value = "学员报名记录查询")
     @GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('examRegistration/list')")
     public HttpResponseResult<PageInfo<ExamRegistration>> list(ExamRegistrationQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(queryInfo.getOrganId())){
-            queryInfo.setOrganId(sysUser.getId());
+        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
         }
         return succeed(examRegistrationService.queryExamRegistrationStudents(queryInfo));
     }

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

@@ -7,8 +7,10 @@ import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.user.dto.ExamReviewDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamReview;
 import com.keao.edu.user.page.ExamReviewQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamReviewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,6 +18,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
+
 @RestController
 @RequestMapping("examReview")
 @Api(tags = "考场服务")
@@ -25,12 +29,19 @@ public class ExamReviewController extends BaseController {
     private ExamReviewService examReviewService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation("分页查询评审结果")
     @GetMapping(value = "/list")
     public HttpResponseResult<PageInfo<ExamReviewDto>> getList(ExamReviewQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        queryInfo.setOrganId(sysUser.getId());
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
+        }
         return succeed(examReviewService.findExamResult(queryInfo));
     }
 

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

@@ -10,8 +10,11 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.ExamRoomQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRoomService;
+import com.netflix.discovery.converters.Auto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -29,13 +32,19 @@ public class ExamRoomController extends BaseController {
     private ExamRoomService examRoomService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation("分页查询监考列表")
     @GetMapping(value = "/list")
     public HttpResponseResult<PageInfo<ExamRoomDto>> getList(ExamRoomQueryInfo queryInfo) {
-        if(Objects.isNull(queryInfo.getOrganId())){
-            SysUser sysUser = sysUserFeignService.queryUserInfo();
-            queryInfo.setOrganId(sysUser.getId());
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+
+        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
         }
         return succeed(examRoomService.queryExamRoomPage(queryInfo));
     }

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

@@ -7,7 +7,9 @@ import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRoomStudentRelationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 @RestController
 @RequestMapping("examRoomStudentRelation")
 @Api(tags = "考场与学生关联服务")
@@ -26,6 +30,8 @@ public class ExamRoomStudentRelationController extends BaseController {
     private ExamRoomStudentRelationService examRoomStudentRelationService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation("开启/关闭教室")
     @GetMapping(value = "/switchClassRoom")
@@ -51,7 +57,12 @@ public class ExamRoomStudentRelationController extends BaseController {
     @GetMapping(value = "/findExamRoomStudents")
     public HttpResponseResult<PageInfo<ExamRoomStudentRelationDto>> findExamRoomStudents(ExamRoomStudentRelationQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        queryInfo.setOrganId(sysUser.getId());
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
+        }
         return succeed(examRoomStudentRelationService.findExamRoomStudents(queryInfo));
     }
 

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

@@ -5,10 +5,13 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamReview;
 import com.keao.edu.user.entity.StudentExamResult;
 import com.keao.edu.user.page.StudentExamResultQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.StudentExamResultService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,13 +36,21 @@ public class StudentExamResultController extends BaseController {
     private StudentExamResultService studentExamResultService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation("查询考试结果")
     @GetMapping(value = "/queryStudentExamResult")
     public HttpResponseResult<PageInfo<StudentExamResult>> queryStudentExamResult(StudentExamResultQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(queryInfo.getOrganId())){
-            queryInfo.setOrganId(sysUser.getId());
+        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
+        }
+        if(){
+
         }
         return succeed(studentExamResultService.queryStudentExamResult(queryInfo));
     }

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

@@ -41,7 +41,7 @@ public class TenantInfoController extends BaseController {
 	@ApiOperation("新增机构")
 	@PostMapping(value = "/add")
 	public HttpResponseResult add(TenantInfo tenantInfo) {
-		tenantInfoService.insert(tenantInfo);
+		tenantInfoService.addTenant(tenantInfo);
 		return succeed();
 	}
 

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

@@ -138,6 +138,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
 	@Override
 	public List<Integer> getChildOrganIds(Integer organId, boolean includeSelf) {
+		if(Objects.isNull(organId)){
+			return null;
+		}
 		Organization organization = organDao.get(organId);
 		if(Objects.isNull(organization)){
 			throw new BizException("当前声部不存在");

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

@@ -1,18 +1,39 @@
 package com.keao.edu.user.service.impl;
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.im.api.client.ImFeignService;
+import com.keao.edu.im.api.entity.ImResult;
+import com.keao.edu.im.api.entity.ImUserModel;
+import com.keao.edu.user.dao.OrganizationDao;
+import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dao.TenantInfoDao;
+import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.entity.TenantInfo;
+import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.TenantInfoService;
+import com.netflix.discovery.converters.Auto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 @Service
 public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo> implements TenantInfoService {
 	
 	@Autowired
 	private TenantInfoDao tenantInfoDao;
+	@Autowired
+	private SysUserDao sysUserDao;
+	@Autowired
+	private OrganizationDao organizationDao;
+	@Autowired
+	private ImFeignService imFeignService;
 
 	@Override
 	public BaseDAO<Integer, TenantInfo> getDAO() {
@@ -21,6 +42,35 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 
 	@Override
 	public void addTenant(TenantInfo tenantInfo) {
+		if(StringUtils.isNotBlank(tenantInfo.getContactPhone())){
+			throw new BizException("请填写手机号码");
+		}
+		SysUser userWithPhone = sysUserDao.queryByPhone(tenantInfo.getContactPhone());
+		if(Objects.nonNull(userWithPhone)){
+			throw new BizException("手机号已被占用");
+		}
+
+		tenantInfoDao.insert(tenantInfo);
+
+		SysUser sysUser = new SysUser();
+		sysUser.setTenantId(tenantInfo.getId().toString());
+		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
+		sysUser.setUserType("ORGAN");
+		sysUser.setRealName(tenantInfo.getName());
+		sysUser.setAvatar(tenantInfo.getLogoUrl());
+		sysUser.setPhone(tenantInfo.getContactPhone());
+		sysUserDao.insert(sysUser);
+
+		Organization organ=new Organization();
+		organ.setTenantId(tenantInfo.getId().toString());
+		organ.setParentOrganId(sysUser.getId());
+		organ.setLevel(0);
+		organ.setParentOrganIdTag(sysUser.getId().toString());
+		organ.setId(sysUser.getId());
+		organizationDao.insert(organ);
 
+		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
+		sysUser.setImToken(imResult.getToken());
+		sysUserDao.update(sysUser);
 	}
 }