|
|
@@ -5,6 +5,7 @@ import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
+import java.util.Collections;
|
|
|
import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -24,6 +25,7 @@ import com.goafanti.admin.service.AftFileService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseApiController;
|
|
|
+import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.AftFile;
|
|
|
import com.goafanti.common.model.OrgActivity;
|
|
|
import com.goafanti.common.model.OrgActivityCost;
|
|
|
@@ -40,10 +42,12 @@ import com.goafanti.common.model.OrgTechAchievement;
|
|
|
import com.goafanti.common.model.OrgTechCenter;
|
|
|
import com.goafanti.common.model.OrgTechProduct;
|
|
|
import com.goafanti.common.model.OrganizationIdentity;
|
|
|
+import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.model.UserAbility;
|
|
|
import com.goafanti.common.model.UserIdentity;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
+import com.goafanti.common.utils.PasswordUtil;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -69,6 +73,7 @@ import com.goafanti.techservice.cognizance.service.OrgStandardService;
|
|
|
import com.goafanti.techservice.cognizance.service.OrgTechAchievementService;
|
|
|
import com.goafanti.techservice.cognizance.service.OrgTechCenterService;
|
|
|
import com.goafanti.techservice.cognizance.service.OrgTechProductService;
|
|
|
+import com.goafanti.techservice.patent.service.AdminService;
|
|
|
import com.goafanti.user.bo.OrgListBo;
|
|
|
import com.goafanti.user.bo.UserListBo;
|
|
|
import com.goafanti.user.service.OrgHumanResourceService;
|
|
|
@@ -118,9 +123,38 @@ public class AdminApiController extends BaseApiController {
|
|
|
private OrgAnnualReportService orgAnnualReportService;
|
|
|
@Resource
|
|
|
private AftFileService aftFileService;
|
|
|
+ @Resource(name = "passwordUtil")
|
|
|
+ private PasswordUtil passwordUtil;
|
|
|
+ @Resource
|
|
|
+ private AdminService adminService;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 新增用户
|
|
|
+ * @param mobile
|
|
|
+ * @param type
|
|
|
+ * @param unitName
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/addNewUser", method = RequestMethod.POST)
|
|
|
+ public Result addNewUser(String mobile, Integer type, String unitName){
|
|
|
+ Result res = new Result();
|
|
|
+ User u = new User();
|
|
|
+ u.setId(UUID.randomUUID().toString());
|
|
|
+ u.setMobile(mobile);
|
|
|
+ u.setType(type);
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
+ now.set(Calendar.MILLISECOND, 0);
|
|
|
+ u.setCreateTime(now.getTime());
|
|
|
+ u.setPassword(passwordUtil.getEncryptPwd(u));
|
|
|
+ u.setLvl(0);
|
|
|
+ List<Admin> admins = adminService.selectAllAdmin();
|
|
|
+ if (!admins.isEmpty()) {
|
|
|
+ Collections.shuffle(admins);
|
|
|
+ u.setAid(admins.get(0).getId());
|
|
|
+ }
|
|
|
+ userService.insertRegister(u, "", unitName);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/**
|
|
|
@@ -1125,7 +1159,11 @@ public class AdminApiController extends BaseApiController {
|
|
|
|
|
|
// 判断用户是否通过认证
|
|
|
private Result checkCertify(Result res, String uid) {
|
|
|
- if (5 != organizationIdentityService.selectOrgIdentityByUserId(uid).getAuditStatus()) {
|
|
|
+ OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
|
|
|
+ if (null == o){
|
|
|
+ res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
+ }
|
|
|
+ if (5 != o.getAuditStatus()) {
|
|
|
res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
}
|
|
|
return res;
|