Antiloveg 8 years ago
parent
commit
04aa66da26

+ 41 - 3
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -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;

+ 2 - 1
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -111,7 +111,7 @@ public class FileUtils {
 	 * @return
 	 */
 	public static String getDownloadFileName(String path) {
-		if (StringUtils.isBlank(path)) {
+		if (StringUtils.isBlank(path) || path.lastIndexOf(".") < 0) {
 			return null;
 		}
 		String fileName = "";
@@ -189,5 +189,6 @@ public class FileUtils {
 	private static String subStr(String s) {
 		return "企业" + s.substring(s.lastIndexOf("_") + 1, s.lastIndexOf("."));
 	}
+	
 
 }

+ 2 - 1
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -1154,7 +1154,8 @@ public class CognizanceApiController extends BaseApiController {
 
 	// 判断用户是否通过认证
 	private Result checkCertify(Result res) {
-		if (5 != organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()).getAuditStatus()) {
+		OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
+		if (null == o || 5 != o.getAuditStatus()) {
 			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
 		}
 		return res;

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -94,7 +94,7 @@ public class UserRegisterController extends BaseController {
 				Collections.shuffle(admins);
 				user.setAid(admins.get(0).getId());// 随机分配管理员
 			}
-			userService.insertRegister(user, contacts, companyName, user.getId());
+			userService.insertRegister(user, contacts, companyName);
 		}
 
 		return res;

+ 1 - 1
src/main/java/com/goafanti/user/service/UserService.java

@@ -21,7 +21,7 @@ public interface UserService {
 
 	User selectByMobieAndType(String mobile, Integer type);
 
-	User insertRegister(User user, String companyName, String contacts, String uid);
+	User insertRegister(User user, String companyName, String contacts);
 
 	UserPageHomeBo selectUserPageHomeBoByUserId(String userId);
 

+ 5 - 13
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -14,7 +14,6 @@ import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.OrganizationInfoMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.OrganizationInfo;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -38,24 +37,17 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	
 	
 	@Override
-	public User insertRegister(User user,String contacts,String companyName,String uid) {
+	public User insertRegister(User user,String contacts,String unitName) {
 		userMapper.insert(user);
 		if (1 == user.getType()){
-			if (!StringUtils.isBlank(companyName)){
-				OrganizationInfo organizationInfo = new OrganizationInfo();
-				organizationInfo.setUid(uid);
-				organizationInfo.setCompanyName(companyName);
-				organizationInfo.setId(UUID.randomUUID().toString());
-				organizationInfoMapper.insert(organizationInfo);
-			}
-			if (!StringUtils.isBlank(contacts)){
+			if (!StringUtils.isBlank(unitName) || !StringUtils.isBlank(contacts)){
 				OrganizationIdentity organizationIdentity = new OrganizationIdentity();
-				organizationIdentity.setUid(uid);
+				organizationIdentity.setUid(user.getId());
+				organizationIdentity.setUnitName(null == unitName ? "" : unitName);
+				organizationIdentity.setContacts(null == contacts ? "" : contacts);
 				organizationIdentity.setId(UUID.randomUUID().toString());
-				organizationIdentity.setContacts(contacts);
 				organizationIdentityMapper.insert(organizationIdentity);
 			}
-		
 	    }
 		return user;
 	}

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -50,7 +50,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.1
+static.host=//afts.hnzhiming.com/1.0.2
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -52,7 +52,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.1
+static.host=//afts.hnzhiming.com/1.0.2
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -50,4 +50,4 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.1
+static.host=//afts.hnzhiming.com/1.0.2

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//aftts.hnzhiming.com/1.0.1
+static.host=//aftts.hnzhiming.com/1.0.2
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload