|
@@ -1,4 +1,4 @@
|
|
|
-package cn.com.qmth.examcloud.service.core.service;
|
|
|
+package cn.com.qmth.examcloud.core.basic.service.impl;
|
|
|
import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.contains;
|
|
|
|
|
|
import java.io.InputStream;
|
|
@@ -10,19 +10,6 @@ import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
import javax.persistence.criteria.Subquery;
|
|
|
|
|
|
-import cn.com.qmth.examcloud.service.core.dto.OrgDto;
|
|
|
-import cn.com.qmth.examcloud.service.core.entity.Course;
|
|
|
-import cn.com.qmth.examcloud.service.core.entity.CourseSpeciatly;
|
|
|
-import cn.com.qmth.examcloud.service.core.entity.ExamSite;
|
|
|
-import cn.com.qmth.examcloud.service.core.entity.UserRole;
|
|
|
-import cn.com.qmth.examcloud.service.core.enums.OrgType;
|
|
|
-import cn.com.qmth.examcloud.service.core.enums.UserScope;
|
|
|
-import cn.com.qmth.examcloud.service.core.enums.UserType;
|
|
|
-import cn.com.qmth.examcloud.service.core.params.UserParam;
|
|
|
-import cn.com.qmth.examcloud.service.core.repo.ExamSiteRepo;
|
|
|
-import cn.com.qmth.examcloud.service.core.repo.memory.OrgMemRepo;
|
|
|
-import cn.com.qmth.examcloud.service.core.service.sync.DataSendService;
|
|
|
-
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Example;
|
|
@@ -36,10 +23,21 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import cn.com.qmth.examcloud.common.util.excel.ExcelError;
|
|
|
import cn.com.qmth.examcloud.common.util.excel.ExcelReader;
|
|
|
import cn.com.qmth.examcloud.common.util.excel.ExcelReaderHandle;
|
|
|
-import cn.com.qmth.examcloud.service.core.entity.Org;
|
|
|
-import cn.com.qmth.examcloud.service.core.entity.User;
|
|
|
-import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
|
|
|
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.OrgMemRepo;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatly;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
|
|
|
+import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
|
|
|
+import cn.com.qmth.examcloud.core.basic.service.bean.OrgDto;
|
|
|
|
|
|
@Service
|
|
|
public class OrgService {
|
|
@@ -121,7 +119,7 @@ public class OrgService {
|
|
|
user.setLoginName(tempOrg.getCode());
|
|
|
user.setEnable(true);
|
|
|
user.setCreateTime(new Date());
|
|
|
- user.setPassword(UserParam.DEFAULT_PASSWORD);
|
|
|
+ user.setPassword(Consts.DEFAULT_PASSWORD);
|
|
|
List<UserRole> userRoles = new ArrayList<UserRole>();
|
|
|
userRoles.add(new UserRole("ecs_exam_work", "LC_USER"));
|
|
|
user.setUserRoles(userRoles);
|