Antiloveg 8 years ago
parent
commit
a28acba4ce

+ 25 - 0
src/main/java/com/goafanti/admin/bo/AdminDetail.java

@@ -0,0 +1,25 @@
+package com.goafanti.admin.bo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.Role;
+
+
+public class AdminDetail extends Admin {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private List<Role> roles = new ArrayList<>();
+
+	public List<Role> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<Role> roles) {
+		this.roles = roles;
+	}
+	
+	
+}

+ 71 - 0
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -1,5 +1,76 @@
 package com.goafanti.admin.bo;
 
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
 public class InputAdmin {
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String id;
+	
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	mobile;
+
+	@Size(min = 0, max = 6, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	name;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	password;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	email;
+
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	province;
+	
+	
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
 
 }

+ 145 - 9
src/main/java/com/goafanti/admin/controller/AdminApiController.java

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

+ 7 - 0
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -89,6 +89,13 @@ public class AdminPatentApiController extends CertifyApiController {
 	@Resource
 	private OrgRatepayService				orgRatepayService;
 
+	@RequestMapping(value = "", method = RequestMethod.GET)
+	public Result lastYearTaxUrl(){
+		Result res = new Result();
+		return res;
+	}
+	
+	
 	/**
 	 * 专利相关材料上传
 	 * 

+ 9 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -2,6 +2,7 @@ package com.goafanti.admin.service;
 
 import java.util.List;
 
+import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -16,4 +17,12 @@ public interface AdminService {
 	Pagination<Admin> listAdmin(String province, Integer number, String mobile, String name, Integer pNo,
 			Integer pSize);
 
+	int insert(Admin ad);
+
+	int updateByPrimaryKeySelective(Admin ad, List<String> roleIds);
+
+	int updateByPrimaryKey(Admin a);
+
+	AdminDetail selectAdminDetail(String id);
+
 }

+ 46 - 3
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -4,21 +4,25 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
 
 @Service
 public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements AdminService {
 	@Autowired
 	private AdminMapper adminMapper;
+	@Autowired
+	private UserRoleMapper userRoleMapper;
 
 	@Override
 	public List<Admin> selectAllAdmin() {
@@ -41,9 +45,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
-		if (!TokenManager.hasRole("999999")) {
+		/*if (!TokenManager.hasRole("999999")) {
 			return null;
-		}
+		}*/
 
 		if (StringUtils.isNotBlank(province)) {
 			params.put("province", province);
@@ -73,4 +77,43 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 				pageSize);
 	}
 
+	@Override
+	public int insert(Admin ad) {
+		return adminMapper.insert(ad);
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(Admin ad, List<String> roleIds) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("uid", ad.getId());
+		params.put("roles", roleIds);
+		
+		if (ad.getId() != "1") {
+			userRoleMapper.deleteByUserId(ad.getId());
+			if (!roleIds.isEmpty()) {
+				userRoleMapper.insertBatch(params);
+			}
+		}
+		
+		return adminMapper.updateByPrimaryKeySelective(ad);
+	}
+
+	@Override
+	public int updateByPrimaryKey(Admin a) {
+		return adminMapper.updateByPrimaryKeySelective(a);
+	}
+
+	@Override
+	public AdminDetail selectAdminDetail(String id) {
+		Admin a = adminMapper.selectByPrimaryKey(id);
+		if (null == a){
+			return null;
+		}
+		
+		AdminDetail ad = new AdminDetail();
+		BeanUtils.copyProperties(a, ad);
+		ad.setRoles(adminMapper.selectRolesByPrimaryKey(id));
+		return null;
+	}
+
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import java.util.List;
 
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.Role;
 
 public interface AdminMapper {
     int deleteByPrimaryKey(String id);
@@ -20,4 +21,6 @@ public interface AdminMapper {
 	List<Admin> selectAllAdmin();
 
 	Admin selectByMobile(String mobile);
+
+	List<Role> selectRolesByPrimaryKey(String uid);
 }

+ 5 - 1
src/main/java/com/goafanti/common/dao/UserRoleMapper.java

@@ -10,11 +10,15 @@ public interface UserRoleMapper {
 
 	int insertSelective(UserRole record);
 
-	List<String> findUserIdByRoleId(String roleId);
+	List<String> findUserIdByRoleId(String rid);
 
 	List<String> findUserIdByRoleIds(List<String> roleIds);
 
 	void deleteByRoleId(List<String> records);
 
 	int deleteByUserRole(Map<String, Object> params);
+
+	int deleteByUserId(String id);
+
+	int insertBatch(Map<String, Object> params);
 }

+ 53 - 0
src/main/java/com/goafanti/common/enums/AdminFields.java

@@ -0,0 +1,53 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AdminFields {
+	MOBILE("mobile", "登录帐号"),
+	NAME("name", " 用户名"),
+	PASSWORD("password", "密码"),
+	EMAIL("email", "邮箱"),
+	PROVINCE("province", "所在省份"),
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, AdminFields> status = new HashMap<String, AdminFields>();
+	
+	private AdminFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (AdminFields value : AdminFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static AdminFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 8 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -178,4 +178,12 @@
     	and number = #{number,jdbcType=INTEGER}
     </if>
   </select>
+  
+  <select id="selectRolesByPrimaryKey" parameterType="java.lang.String">
+   select r.name, r.id, r.type
+    from role r
+    left join user_role ur on ur.rid=r.id
+    where ur.uid = #{uid,jdbcType=VARCHAR}
+  </select>
+  
 </mapper>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -82,10 +82,10 @@
   </select>
   
   <insert id="insertBatch" parameterType="com.goafanti.common.model.Permission">
-    insert into t_permission (id, name, url)
+    insert into permission (id, name, url)
     values 
     <foreach item="item" index="index" collection="list" separator=",">
-      (#{item.id,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR})
+      (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR})
     </foreach>
     ON DUPLICATE KEY UPDATE
 	    name = values(name),

+ 4 - 4
src/main/java/com/goafanti/common/mapper/RoleMapper.xml

@@ -20,10 +20,10 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.Role">
-    insert into role (id, role_name, role_type
-      )
-    values (#{id,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR}, #{roleType,jdbcType=INTEGER}
-      )
+    insert into role (id, role_name)
+    values (#{id,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR})
+    ON DUPLICATE KEY UPDATE
+	role_name = values(role_name)
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Role">
     insert into role

+ 10 - 0
src/main/java/com/goafanti/common/mapper/RolePermissionMapper.xml

@@ -33,4 +33,14 @@
     delete from role_permission
     where rid = #{rid,jdbcType=VARCHAR} and pid = #{pid,jdbcType=VARCHAR}
   </delete>
+  
+  <insert id="insertBatch" parameterType="com.goafanti.common.model.RolePermission">
+    insert into role_permission (rid, pid)
+    values 
+    <foreach item="item" index="index" collection="list" separator=",">
+      (#{item.rid,jdbcType=VARCHAR}, #{item.pid,jdbcType=VARCHAR})
+    </foreach>
+    ON DUPLICATE KEY UPDATE
+	    pid = values(pid)
+  </insert>
 </mapper>

+ 11 - 0
src/main/java/com/goafanti/common/mapper/UserRoleMapper.xml

@@ -53,4 +53,15 @@
       (#{uid,jdbcType=VARCHAR}, #{item,jdbcType=VARCHAR})
     </foreach>
   </insert>
+  
+  <select id ="findUserIdByRoleId" parameterType="java.lang.String" resultType="java.lang.String">
+    select uid from user_role where rid = #{rid, jdbcType=VARCHAR}
+  </select>
+  
+  <select id="findUserIdByRoleIds" parameterType="java.util.List" resultType="java.lang.String">
+    select uid from user_role where rid in
+     <foreach item="item" index="index" collection="list" open="(" separator="," close=")">  
+	  #{item,jdbcType=VARCHAR}  
+    </foreach>
+  </select>
 </mapper>

+ 112 - 98
src/main/java/com/goafanti/common/model/Admin.java

@@ -2,106 +2,106 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-public class Admin extends BaseModel implements AftUser{
-	private static final long serialVersionUID = 1L;
-	
-    private String id;
-
-    /**
-    * 手机号(登录帐号)
-    */
-    private String mobile;
-
-    /**
-    * 用户名
-    */
-    private String name;
-
-    /**
-    * 密码
-    */
-    private String password;
-
-    /**
-    * 邮箱
-    */
-    private String email;
-
-    /**
-    * 创建时间
-    */
-    private Date createTime;
-
-    /**
-    * 员工工号
-    */
-    private Integer number;
-    
-    /**
-     * 所在省份
-     */
-    private String province;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-    
-    
+public class Admin extends BaseModel implements AftUser {
+	private static final long	serialVersionUID	= 1L;
+
+	private String				id;
+
+	/**
+	 * 手机号(登录帐号)
+	 */
+	private String				mobile;
+
+	/**
+	 * 用户名
+	 */
+	private String				name;
+
+	/**
+	 * 密码
+	 */
+	private String				password;
+
+	/**
+	 * 邮箱
+	 */
+	private String				email;
+
+	/**
+	 * 创建时间
+	 */
+	private Date				createTime;
+
+	/**
+	 * 员工工号
+	 */
+	private Integer				number;
+
+	/**
+	 * 所在省份
+	 */
+	private String				province;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@JsonIgnore
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
 
 	public String getProvince() {
 		return province;
@@ -111,6 +111,20 @@ public class Admin extends BaseModel implements AftUser{
 		this.province = province;
 	}
 
+	// 创建时间
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		}
+	}
+
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
+	}
+    
+	@JsonIgnore
 	@Override
 	public String getAid() {
 		return null;

+ 1 - 9
src/main/java/com/goafanti/common/model/Role.java

@@ -2,25 +2,17 @@ package com.goafanti.common.model;
 
 import java.io.Serializable;
 
-public class Role implements Serializable{
+public class Role extends BaseModel implements Serializable{
     /**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private String id;
 
     private String roleName;
 
     private Integer roleType;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 
     public String getRoleName() {
         return roleName;

+ 8 - 0
src/main/java/com/goafanti/common/utils/PasswordUtil.java

@@ -24,10 +24,18 @@ public class PasswordUtil {
 	public void encryptPassword(User user) {
 		user.setPassword(getEncryptPwd(user));
 	}
+	
+	public void encryptPassword(Admin admin){
+		admin.setPassword(getEncryptPwd(admin));
+	}
 
 	public String getEncryptPwd(User user) {
 		return new SimpleHash(algorithmName, user.getPassword(), getSalt(user), hashIterations).toHex();
 	}
+	
+	public String getEncryptPwd(Admin admin) {
+		return new SimpleHash(algorithmName, admin.getPassword(), getManageSalt(admin), hashIterations).toHex();
+	}
 
 	public String getEncryptPwd(String pwd, Date date) {
 		return new SimpleHash(algorithmName, pwd, getSalt(date), hashIterations).toHex();

+ 2 - 2
src/main/java/com/goafanti/patent/controller/PatentApiController.java

@@ -110,7 +110,7 @@ public class PatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/download", method = RequestMethod.GET)
 	public Result download(String id, String sign, HttpServletResponse response) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
+		if (!checkUserLogin(res)) {
 			return res;
 		}
 		if (StringUtils.isEmpty(id)) {
@@ -150,7 +150,7 @@ public class PatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadTemplateFile", method = RequestMethod.GET)
 	public Result downloadTemplateFile(HttpServletResponse response, String sign) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
+		if (!checkUserLogin(res)) {
 			return res;
 		}
 		AttachmentType attachmentType = AttachmentType.getField(sign);

+ 8 - 1
src/main/java/com/goafanti/permission/service/impl/RoleServiceImpl.java

@@ -73,7 +73,13 @@ public class RoleServiceImpl extends BaseMybatisDao<RoleMapper> implements RoleS
 	public int deleteByPrimaryKeys(List<String> records) {
 		rolePermissionMapper.deleteByRoleId(records);
 		userRoleMapper.deleteByRoleId(records);
-		TokenManager.clearUserAuthByUserId((String[]) userRoleMapper.findUserIdByRoleIds(records).toArray());
+		List<String> list = userRoleMapper.findUserIdByRoleIds(records);
+		String[] arr = new String[list.size()];
+		for (int i = 0; i<arr.length; i++){
+			arr[i] = list.get(i);
+		}
+		//TokenManager.clearUserAuthByUserId((String[]) userRoleMapper.findUserIdByRoleIds(records).toArray());
+		TokenManager.clearUserAuthByUserId(arr);
 		return roleMapper.deleteByPrimaryKeys(records);
 	}
 
@@ -119,6 +125,7 @@ public class RoleServiceImpl extends BaseMybatisDao<RoleMapper> implements RoleS
 				rolePermissionMapper.insertBatch(rps);
 			}
 		}
+		record.getId();
 		return roleMapper.insert(record);
 	}