|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.admin.controller;
|
|
|
|
|
|
import java.text.ParseException;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
+import com.goafanti.admin.bo.AdminDetail;
|
|
|
import com.goafanti.admin.bo.InputAdmin;
|
|
|
import com.goafanti.admin.service.AdminService;
|
|
|
import com.goafanti.cognizance.bo.ActivityNumberBo;
|
|
|
@@ -57,6 +59,7 @@ import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
+import com.goafanti.common.enums.AdminFields;
|
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
|
import com.goafanti.common.enums.CognizanceApplyFields;
|
|
|
import com.goafanti.common.enums.OrgActivityFields;
|
|
|
@@ -75,6 +78,7 @@ import com.goafanti.common.enums.OrgTechProductFields;
|
|
|
import com.goafanti.common.enums.OrganizationIdentityFields;
|
|
|
import com.goafanti.common.enums.UserAbilityFields;
|
|
|
import com.goafanti.common.enums.UserIdentityFields;
|
|
|
+import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.OrgActivity;
|
|
|
import com.goafanti.common.model.OrgActivityCost;
|
|
|
import com.goafanti.common.model.OrgAnnualReport;
|
|
|
@@ -155,9 +159,10 @@ public class AdminApiController extends CertifyApiController {
|
|
|
private AdminService adminService;
|
|
|
@Resource
|
|
|
private OrgTechCenterDetailService orgTechCenterDetailService;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 管理员列表
|
|
|
+ *
|
|
|
* @param province
|
|
|
* @param number
|
|
|
* @param mobile
|
|
|
@@ -184,35 +189,166 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(adminService.listAdmin(province, number, mobile, name, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增管理员
|
|
|
+ *
|
|
|
* @param admin
|
|
|
* @param bindingResult
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/insertAdmin", method = RequestMethod.POST)
|
|
|
- public Result insertAdmin(@Valid InputAdmin admin, BindingResult bindingResult){
|
|
|
+ public Result insertAdmin(@Valid InputAdmin admin, BindingResult bindingResult) {
|
|
|
Result res = new Result();
|
|
|
+
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!checkAdminLogin(res)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == admin.getMobile()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == admin.getName()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+ Admin a = adminService.selectByMobile(admin.getMobile().trim());
|
|
|
+ if (null != a) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
+ now.set(Calendar.MILLISECOND, 0);
|
|
|
+ Admin ad = new Admin();
|
|
|
+ BeanUtils.copyProperties(admin, ad);
|
|
|
+ ad.setId(UUID.randomUUID().toString());
|
|
|
+ ad.setCreateTime(now.getTime());
|
|
|
+ if (StringUtils.isBlank(ad.getPassword())){
|
|
|
+ ad.setPassword("123456");
|
|
|
+ }
|
|
|
+ ad.setPassword(passwordUtil.getEncryptPwd(ad));
|
|
|
+ adminService.insert(ad);
|
|
|
+
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 管理员详情
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/adminDetail", method = RequestMethod.GET)
|
|
|
+ public Result adminDetail(String id){
|
|
|
+ Result res = new Result();
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(id)){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ AdminDetail ad = adminService.selectAdminDetail(id);
|
|
|
+ res.setData(ad);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 修改管理员信息
|
|
|
+ *
|
|
|
* @param admin
|
|
|
* @param bindingResult
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
|
|
|
- public Result updateAdmin(@Valid InputAdmin admin, BindingResult bindingResult){
|
|
|
+ public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds,
|
|
|
+ @Valid InputAdmin admin, BindingResult bindingResult) {
|
|
|
Result res = new Result();
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (!checkAdminLogin(res)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == admin.getId()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == admin.getMobile()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == admin.getName()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Admin aa = adminService.selectByMobile(admin.getMobile().trim());
|
|
|
+ if (!admin.getId().equals(aa.getId()) ){
|
|
|
+ res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Admin a = adminService.selectByPrimaryKey(admin.getId());
|
|
|
+
|
|
|
+ if (null == a){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ Admin ad = new Admin();
|
|
|
+ BeanUtils.copyProperties(admin, ad);
|
|
|
+ List<String> roles = new ArrayList<String>();
|
|
|
+ for (String role : roleIds){
|
|
|
+ roles.add(role);
|
|
|
+ }
|
|
|
+ res.setData(adminService.updateByPrimaryKeySelective(ad, roles));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 重置管理员密码
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/resetPwd", method = RequestMethod.POST)
|
|
|
+ public Result resetPwd(String id) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (!checkAdminLogin(res)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ Admin admin = adminService.selectByPrimaryKey(id);
|
|
|
+ if (null == admin){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ Admin a = new Admin();
|
|
|
+ a.setId(admin.getId());
|
|
|
+ a.setCreateTime(admin.getCreateTime());
|
|
|
+ a.setPassword("123456");
|
|
|
+ a.setPassword(passwordUtil.getEncryptPwd(a));
|
|
|
+ res.setData(adminService.updateByPrimaryKey(a));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* 新增用户
|
|
|
@@ -2156,7 +2292,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
if (null == cid) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发中心ID"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
|
|
|
return res;
|
|
|
}
|
|
|
|