Kaynağa Gözat

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw 9 yıl önce
ebeveyn
işleme
46a7159325

+ 72 - 7
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.UUID;
 
 import javax.annotation.Resource;
 
@@ -11,10 +12,15 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrgHumanResource;
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserListBo;
+import com.goafanti.user.service.OrgHumanResourceService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
@@ -28,7 +34,12 @@ public class AdminApiController extends BaseApiController {
 	private UserIdentityService	userIdentityService;
 	@Resource
 	private OrganizationIdentityService organizationIdentityService;
-
+	@Resource
+	private OrgHumanResourceService			orgHumanResourceService;
+	
+	
+	
+	
 	/**
 	 * 个人用户列表
 	 * 
@@ -42,10 +53,10 @@ public class AdminApiController extends BaseApiController {
 	 * @return
 	 * @throws ParseException
 	 */
-	@RequestMapping(value = "/userList", method = RequestMethod.GET)
+	@RequestMapping(value = "/userList", method = RequestMethod.POST)
 	public Result userList(String mobile, String email,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
-			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
+			String aftUsername, Integer auditStatus, String pageNo, String pageSize) throws ParseException {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -55,7 +66,7 @@ public class AdminApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(getUserList(mobile, email, createTime, number, auditStatus, pNo, pSize));
+		res.setData(getUserList(mobile, email, createTime, number, aftUsername, auditStatus, pNo, pSize));
 		return res;
 	}
     
@@ -71,6 +82,17 @@ public class AdminApiController extends BaseApiController {
 		return res;
 	}
 	
+	/**
+	 * 修改个人用户信息
+	 * @return
+	 */
+	@RequestMapping(value = "updateUserDetail", method = RequestMethod.POST)
+	public Result updateUserDetail(UserIdentity userIdentity){
+		Result res = new Result();
+		res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
+		return res;
+	}
+	
     /**
      * 团体用户列表
      * @param mobile
@@ -83,7 +105,7 @@ public class AdminApiController extends BaseApiController {
      * @return
      * @throws ParseException
      */
-	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
+	@RequestMapping(value = "/orgList", method = RequestMethod.POST)
 	public Result orgList(String mobile, String email,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
 			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
@@ -111,6 +133,49 @@ public class AdminApiController extends BaseApiController {
 		res.setData(organizationIdentityService.selectOrgIdentityByUserId(uid));
 		return res;
 	}
+	
+	/**
+	 * 修改团体用户信息
+	 * @param orgIdentity
+	 * @return
+	 */
+	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
+	public Result updateOrgDetail(OrganizationIdentity orgIdentity){
+		Result res = new Result();
+		res.setData(organizationIdentityService.updateByPrimaryKeySelective(orgIdentity));
+		return res;
+	}
+	
+	/**
+	 * 团体用户人力资源情况入口
+	 * @param uid 用户ID
+	 * @return
+	 */
+	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
+	public Result orgHumanResource(String uid){
+		Result res = new Result();
+		res.setData(orgHumanResourceService.selectOrgHumanResourceByUserId(uid));
+		return res;
+	}
+	
+	/**
+	 * 修改团体用户人力资源情况
+	 * @param orgHumanResource
+	 * @return
+	 */
+	@RequestMapping(value = "/updateOrgHumanResource", method = RequestMethod.POST)
+	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource){
+		Result res = new Result();
+		OrgHumanResource org = orgHumanResourceService.selectOrgHumanResourceByUserId(orgHumanResource.getUid());
+		if (null == org){
+			orgHumanResource.setId(UUID.randomUUID().toString());
+			orgHumanResourceService.insert(orgHumanResource);
+		} else {
+			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
+		}
+		res.setData(orgHumanResource); 
+		return res;
+	}
     
 	// org团体列表
 	private Pagination<OrgListBo> getOrgList(String mobile, String email, String[] createTime, Integer number, Integer auditStatus,
@@ -121,8 +186,8 @@ public class AdminApiController extends BaseApiController {
 
 	// user个人列表
 	private Pagination<UserListBo> getUserList(String mobile, String email, String[] createTime, Integer number,
-			Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
-		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, auditStatus, pNo,
+			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
+		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, aftUsername, auditStatus, pNo,
 				pSize);
 	}
 }

+ 19 - 0
src/main/java/com/goafanti/common/dao/OrgHumanResourceMapper.java

@@ -0,0 +1,19 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrgHumanResource;
+
+public interface OrgHumanResourceMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrgHumanResource record);
+
+    int insertSelective(OrgHumanResource record);
+
+    OrgHumanResource selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrgHumanResource record);
+
+    int updateByPrimaryKey(OrgHumanResource record);
+
+	OrgHumanResource selectOrgHumanResourceByUserId(String uid);
+}

+ 373 - 0
src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml

@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.OrgHumanResourceMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgHumanResource" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="firm_total" property="firmTotal" jdbcType="INTEGER" />
+    <result column="tech_total" property="techTotal" jdbcType="INTEGER" />
+    <result column="firm_in_service" property="firmInService" jdbcType="INTEGER" />
+    <result column="tech_in_service" property="techInService" jdbcType="INTEGER" />
+    <result column="firm_part_time" property="firmPartTime" jdbcType="INTEGER" />
+    <result column="tech_part_time" property="techPartTime" jdbcType="INTEGER" />
+    <result column="firm_temporary" property="firmTemporary" jdbcType="INTEGER" />
+    <result column="tech_temporary" property="techTemporary" jdbcType="INTEGER" />
+    <result column="firm_foreign" property="firmForeign" jdbcType="INTEGER" />
+    <result column="tech_foreign" property="techForeign" jdbcType="INTEGER" />
+    <result column="firm_abroad" property="firmAbroad" jdbcType="INTEGER" />
+    <result column="tech_abroad" property="techAbroad" jdbcType="INTEGER" />
+    <result column="firm_thousands" property="firmThousands" jdbcType="INTEGER" />
+    <result column="tech_thousands" property="techThousands" jdbcType="INTEGER" />
+    <result column="doctor" property="doctor" jdbcType="INTEGER" />
+    <result column="master" property="master" jdbcType="INTEGER" />
+    <result column="undergraduate" property="undergraduate" jdbcType="INTEGER" />
+    <result column="college" property="college" jdbcType="INTEGER" />
+    <result column="senior_title" property="seniorTitle" jdbcType="INTEGER" />
+    <result column="intermediate_title" property="intermediateTitle" jdbcType="INTEGER" />
+    <result column="junior_title" property="juniorTitle" jdbcType="INTEGER" />
+    <result column="senior_mechanic" property="seniorMechanic" jdbcType="INTEGER" />
+    <result column="below_thirty" property="belowThirty" jdbcType="INTEGER" />
+    <result column="thirtyone_to_thirtyfour" property="thirtyoneToThirtyfour" jdbcType="INTEGER" />
+    <result column="fortyone_to_fifty" property="fortyoneToFifty" jdbcType="INTEGER" />
+    <result column="above_fifty" property="aboveFifty" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, firm_total, tech_total, firm_in_service, tech_in_service, firm_part_time, 
+    tech_part_time, firm_temporary, tech_temporary, firm_foreign, tech_foreign, firm_abroad, 
+    tech_abroad, firm_thousands, tech_thousands, doctor, master, undergraduate, college, 
+    senior_title, intermediate_title, junior_title, senior_mechanic, below_thirty, 
+    thirtyone_to_thirtyfour, fortyone_to_fifty, above_fifty
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_human_resource
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from org_human_resource
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrgHumanResource" >
+    insert into org_human_resource (id, uid, firm_total, 
+      tech_total, firm_in_service, tech_in_service, 
+      firm_part_time, tech_part_time, firm_temporary, 
+      tech_temporary, firm_foreign, tech_foreign, 
+      firm_abroad, tech_abroad, firm_thousands, 
+      tech_thousands, doctor, master, 
+      undergraduate, college, senior_title, 
+      intermediate_title, junior_title, senior_mechanic, 
+      below_thirty, thirtyone_to_thirtyfour, fortyone_to_fifty, 
+      above_fifty)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{firmTotal,jdbcType=INTEGER}, 
+      #{techTotal,jdbcType=INTEGER}, #{firmInService,jdbcType=INTEGER}, #{techInService,jdbcType=INTEGER}, 
+      #{firmPartTime,jdbcType=INTEGER}, #{techPartTime,jdbcType=INTEGER}, #{firmTemporary,jdbcType=INTEGER}, 
+      #{techTemporary,jdbcType=INTEGER}, #{firmForeign,jdbcType=INTEGER}, #{techForeign,jdbcType=INTEGER}, 
+      #{firmAbroad,jdbcType=INTEGER}, #{techAbroad,jdbcType=INTEGER}, #{firmThousands,jdbcType=INTEGER}, 
+      #{techThousands,jdbcType=INTEGER}, #{doctor,jdbcType=INTEGER}, #{master,jdbcType=INTEGER}, 
+      #{undergraduate,jdbcType=INTEGER}, #{college,jdbcType=INTEGER}, #{seniorTitle,jdbcType=INTEGER}, 
+      #{intermediateTitle,jdbcType=INTEGER}, #{juniorTitle,jdbcType=INTEGER}, #{seniorMechanic,jdbcType=INTEGER}, 
+      #{belowThirty,jdbcType=INTEGER}, #{thirtyoneToThirtyfour,jdbcType=INTEGER}, #{fortyoneToFifty,jdbcType=INTEGER}, 
+      #{aboveFifty,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgHumanResource" >
+    insert into org_human_resource
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="firmTotal != null" >
+        firm_total,
+      </if>
+      <if test="techTotal != null" >
+        tech_total,
+      </if>
+      <if test="firmInService != null" >
+        firm_in_service,
+      </if>
+      <if test="techInService != null" >
+        tech_in_service,
+      </if>
+      <if test="firmPartTime != null" >
+        firm_part_time,
+      </if>
+      <if test="techPartTime != null" >
+        tech_part_time,
+      </if>
+      <if test="firmTemporary != null" >
+        firm_temporary,
+      </if>
+      <if test="techTemporary != null" >
+        tech_temporary,
+      </if>
+      <if test="firmForeign != null" >
+        firm_foreign,
+      </if>
+      <if test="techForeign != null" >
+        tech_foreign,
+      </if>
+      <if test="firmAbroad != null" >
+        firm_abroad,
+      </if>
+      <if test="techAbroad != null" >
+        tech_abroad,
+      </if>
+      <if test="firmThousands != null" >
+        firm_thousands,
+      </if>
+      <if test="techThousands != null" >
+        tech_thousands,
+      </if>
+      <if test="doctor != null" >
+        doctor,
+      </if>
+      <if test="master != null" >
+        master,
+      </if>
+      <if test="undergraduate != null" >
+        undergraduate,
+      </if>
+      <if test="college != null" >
+        college,
+      </if>
+      <if test="seniorTitle != null" >
+        senior_title,
+      </if>
+      <if test="intermediateTitle != null" >
+        intermediate_title,
+      </if>
+      <if test="juniorTitle != null" >
+        junior_title,
+      </if>
+      <if test="seniorMechanic != null" >
+        senior_mechanic,
+      </if>
+      <if test="belowThirty != null" >
+        below_thirty,
+      </if>
+      <if test="thirtyoneToThirtyfour != null" >
+        thirtyone_to_thirtyfour,
+      </if>
+      <if test="fortyoneToFifty != null" >
+        fortyone_to_fifty,
+      </if>
+      <if test="aboveFifty != null" >
+        above_fifty,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="firmTotal != null" >
+        #{firmTotal,jdbcType=INTEGER},
+      </if>
+      <if test="techTotal != null" >
+        #{techTotal,jdbcType=INTEGER},
+      </if>
+      <if test="firmInService != null" >
+        #{firmInService,jdbcType=INTEGER},
+      </if>
+      <if test="techInService != null" >
+        #{techInService,jdbcType=INTEGER},
+      </if>
+      <if test="firmPartTime != null" >
+        #{firmPartTime,jdbcType=INTEGER},
+      </if>
+      <if test="techPartTime != null" >
+        #{techPartTime,jdbcType=INTEGER},
+      </if>
+      <if test="firmTemporary != null" >
+        #{firmTemporary,jdbcType=INTEGER},
+      </if>
+      <if test="techTemporary != null" >
+        #{techTemporary,jdbcType=INTEGER},
+      </if>
+      <if test="firmForeign != null" >
+        #{firmForeign,jdbcType=INTEGER},
+      </if>
+      <if test="techForeign != null" >
+        #{techForeign,jdbcType=INTEGER},
+      </if>
+      <if test="firmAbroad != null" >
+        #{firmAbroad,jdbcType=INTEGER},
+      </if>
+      <if test="techAbroad != null" >
+        #{techAbroad,jdbcType=INTEGER},
+      </if>
+      <if test="firmThousands != null" >
+        #{firmThousands,jdbcType=INTEGER},
+      </if>
+      <if test="techThousands != null" >
+        #{techThousands,jdbcType=INTEGER},
+      </if>
+      <if test="doctor != null" >
+        #{doctor,jdbcType=INTEGER},
+      </if>
+      <if test="master != null" >
+        #{master,jdbcType=INTEGER},
+      </if>
+      <if test="undergraduate != null" >
+        #{undergraduate,jdbcType=INTEGER},
+      </if>
+      <if test="college != null" >
+        #{college,jdbcType=INTEGER},
+      </if>
+      <if test="seniorTitle != null" >
+        #{seniorTitle,jdbcType=INTEGER},
+      </if>
+      <if test="intermediateTitle != null" >
+        #{intermediateTitle,jdbcType=INTEGER},
+      </if>
+      <if test="juniorTitle != null" >
+        #{juniorTitle,jdbcType=INTEGER},
+      </if>
+      <if test="seniorMechanic != null" >
+        #{seniorMechanic,jdbcType=INTEGER},
+      </if>
+      <if test="belowThirty != null" >
+        #{belowThirty,jdbcType=INTEGER},
+      </if>
+      <if test="thirtyoneToThirtyfour != null" >
+        #{thirtyoneToThirtyfour,jdbcType=INTEGER},
+      </if>
+      <if test="fortyoneToFifty != null" >
+        #{fortyoneToFifty,jdbcType=INTEGER},
+      </if>
+      <if test="aboveFifty != null" >
+        #{aboveFifty,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrgHumanResource" >
+    update org_human_resource
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="firmTotal != null" >
+        firm_total = #{firmTotal,jdbcType=INTEGER},
+      </if>
+      <if test="techTotal != null" >
+        tech_total = #{techTotal,jdbcType=INTEGER},
+      </if>
+      <if test="firmInService != null" >
+        firm_in_service = #{firmInService,jdbcType=INTEGER},
+      </if>
+      <if test="techInService != null" >
+        tech_in_service = #{techInService,jdbcType=INTEGER},
+      </if>
+      <if test="firmPartTime != null" >
+        firm_part_time = #{firmPartTime,jdbcType=INTEGER},
+      </if>
+      <if test="techPartTime != null" >
+        tech_part_time = #{techPartTime,jdbcType=INTEGER},
+      </if>
+      <if test="firmTemporary != null" >
+        firm_temporary = #{firmTemporary,jdbcType=INTEGER},
+      </if>
+      <if test="techTemporary != null" >
+        tech_temporary = #{techTemporary,jdbcType=INTEGER},
+      </if>
+      <if test="firmForeign != null" >
+        firm_foreign = #{firmForeign,jdbcType=INTEGER},
+      </if>
+      <if test="techForeign != null" >
+        tech_foreign = #{techForeign,jdbcType=INTEGER},
+      </if>
+      <if test="firmAbroad != null" >
+        firm_abroad = #{firmAbroad,jdbcType=INTEGER},
+      </if>
+      <if test="techAbroad != null" >
+        tech_abroad = #{techAbroad,jdbcType=INTEGER},
+      </if>
+      <if test="firmThousands != null" >
+        firm_thousands = #{firmThousands,jdbcType=INTEGER},
+      </if>
+      <if test="techThousands != null" >
+        tech_thousands = #{techThousands,jdbcType=INTEGER},
+      </if>
+      <if test="doctor != null" >
+        doctor = #{doctor,jdbcType=INTEGER},
+      </if>
+      <if test="master != null" >
+        master = #{master,jdbcType=INTEGER},
+      </if>
+      <if test="undergraduate != null" >
+        undergraduate = #{undergraduate,jdbcType=INTEGER},
+      </if>
+      <if test="college != null" >
+        college = #{college,jdbcType=INTEGER},
+      </if>
+      <if test="seniorTitle != null" >
+        senior_title = #{seniorTitle,jdbcType=INTEGER},
+      </if>
+      <if test="intermediateTitle != null" >
+        intermediate_title = #{intermediateTitle,jdbcType=INTEGER},
+      </if>
+      <if test="juniorTitle != null" >
+        junior_title = #{juniorTitle,jdbcType=INTEGER},
+      </if>
+      <if test="seniorMechanic != null" >
+        senior_mechanic = #{seniorMechanic,jdbcType=INTEGER},
+      </if>
+      <if test="belowThirty != null" >
+        below_thirty = #{belowThirty,jdbcType=INTEGER},
+      </if>
+      <if test="thirtyoneToThirtyfour != null" >
+        thirtyone_to_thirtyfour = #{thirtyoneToThirtyfour,jdbcType=INTEGER},
+      </if>
+      <if test="fortyoneToFifty != null" >
+        fortyone_to_fifty = #{fortyoneToFifty,jdbcType=INTEGER},
+      </if>
+      <if test="aboveFifty != null" >
+        above_fifty = #{aboveFifty,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrgHumanResource" >
+    update org_human_resource
+    set uid = #{uid,jdbcType=VARCHAR},
+      firm_total = #{firmTotal,jdbcType=INTEGER},
+      tech_total = #{techTotal,jdbcType=INTEGER},
+      firm_in_service = #{firmInService,jdbcType=INTEGER},
+      tech_in_service = #{techInService,jdbcType=INTEGER},
+      firm_part_time = #{firmPartTime,jdbcType=INTEGER},
+      tech_part_time = #{techPartTime,jdbcType=INTEGER},
+      firm_temporary = #{firmTemporary,jdbcType=INTEGER},
+      tech_temporary = #{techTemporary,jdbcType=INTEGER},
+      firm_foreign = #{firmForeign,jdbcType=INTEGER},
+      tech_foreign = #{techForeign,jdbcType=INTEGER},
+      firm_abroad = #{firmAbroad,jdbcType=INTEGER},
+      tech_abroad = #{techAbroad,jdbcType=INTEGER},
+      firm_thousands = #{firmThousands,jdbcType=INTEGER},
+      tech_thousands = #{techThousands,jdbcType=INTEGER},
+      doctor = #{doctor,jdbcType=INTEGER},
+      master = #{master,jdbcType=INTEGER},
+      undergraduate = #{undergraduate,jdbcType=INTEGER},
+      college = #{college,jdbcType=INTEGER},
+      senior_title = #{seniorTitle,jdbcType=INTEGER},
+      intermediate_title = #{intermediateTitle,jdbcType=INTEGER},
+      junior_title = #{juniorTitle,jdbcType=INTEGER},
+      senior_mechanic = #{seniorMechanic,jdbcType=INTEGER},
+      below_thirty = #{belowThirty,jdbcType=INTEGER},
+      thirtyone_to_thirtyfour = #{thirtyoneToThirtyfour,jdbcType=INTEGER},
+      fortyone_to_fifty = #{fortyoneToFifty,jdbcType=INTEGER},
+      above_fifty = #{aboveFifty,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectOrgHumanResourceByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from org_human_resource
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 13 - 7
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -537,15 +537,15 @@
   
    <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
   	select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.audit_status as auditStatus
+  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus
     from user u LEFT JOIN organization_identity o 
     ON u.id = o.uid 
     WHERE u.type = 1
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	    and u.mobile = #{mobile,jdbcType=VARCHAR}
 	</if>
 	<if test = "email != null">
-	    and u.email = #{email,jdbcType=INTEGER}
+	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
 		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
@@ -556,6 +556,9 @@
 	<if test=" number != null">
 		and u.number = #{number,jdbcType=Integer}
 	</if>
+	<if test="aftUsername != null">
+		and o.aft_username = #{aftUsername,jdbcType=VARCHAR}
+	</if>
 	<if test="auditStatus != null">
 		and o.audit_status= #{auditStatus,jdbcType=Integer}
 	</if>
@@ -567,15 +570,15 @@
   <select id="findOrgCount" resultType="java.lang.Integer" parameterType="String">
   	select count(1) from (
   		select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.audit_status as auditStatus
-    from user u LEFT JOIN organization_identity o
+  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus
+    from user u LEFT JOIN organization_identity o 
     ON u.id = o.uid 
     WHERE u.type = 1
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	    and u.mobile = #{mobile,jdbcType=VARCHAR}
 	</if>
 	<if test = "email != null">
-	    and u.email = #{email,jdbcType=INTEGER}
+	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
 		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
@@ -586,6 +589,9 @@
 	<if test=" number != null">
 		and u.number = #{number,jdbcType=Integer}
 	</if>
+	<if test="aftUsername != null">
+		and o.aft_username = #{aftUsername,jdbcType=VARCHAR}
+	</if>
 	<if test="auditStatus != null">
 		and o.audit_status= #{auditStatus,jdbcType=Integer}
 	</if>

+ 12 - 6
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -186,15 +186,15 @@
   
   <select id="findUserListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserListBo">
   	select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , i.audit_status as auditStatus
+  	       u.number , i.aft_username as aftUsername, i.audit_status as auditStatus
     from user u LEFT JOIN user_identity i 
     ON u.id = i.uid 
     WHERE u.type = 0
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	    and u.mobile = #{mobile,jdbcType=VARCHAR}
 	</if>
 	<if test = "email != null">
-	    and u.email = #{email,jdbcType=INTEGER}
+	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
 		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
@@ -205,6 +205,9 @@
 	<if test=" number != null">
 		and u.number = #{number,jdbcType=Integer}
 	</if>
+	<if test="aftUsername != null">
+		and i.aft_username = #{aftUsername,jdbcType=VARCHAR}
+	</if>
 	<if test="auditStatus != null">
 		and i.audit_status= #{auditStatus,jdbcType=Integer}
 	</if>
@@ -216,15 +219,15 @@
   <select id="findUserCount" resultType="java.lang.Integer" parameterType="String">
   	select count(1) from (
   		select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , i.audit_status as auditStatus
+  	       u.number , i.aft_username as aftUsername, i.audit_status as auditStatus
     from user u LEFT JOIN user_identity i 
     ON u.id = i.uid 
     WHERE u.type = 0
     <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	    and u.mobile = #{mobile,jdbcType=VARCHAR}
 	</if>
 	<if test = "email != null">
-	    and u.email = #{email,jdbcType=INTEGER}
+	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
 		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
@@ -235,6 +238,9 @@
 	<if test=" number != null">
 		and u.number = #{number,jdbcType=Integer}
 	</if>
+	<if test="aftUsername != null">
+		and i.aft_username = #{aftUsername,jdbcType=VARCHAR}
+	</if>
 	<if test="auditStatus != null">
 		and i.audit_status= #{auditStatus,jdbcType=Integer}
 	</if>

+ 361 - 0
src/main/java/com/goafanti/common/model/OrgHumanResource.java

@@ -0,0 +1,361 @@
+package com.goafanti.common.model;
+
+public class OrgHumanResource {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 企业职工总数
+    */
+    private Integer firmTotal;
+
+    /**
+    * 科技人员总数
+    */
+    private Integer techTotal;
+
+    /**
+    * 企业在职员工人数
+    */
+    private Integer firmInService;
+
+    /**
+    * 科技在职员工人数
+    */
+    private Integer techInService;
+
+    /**
+    * 企业兼职人数
+    */
+    private Integer firmPartTime;
+
+    /**
+    * 科技人员兼职人数
+    */
+    private Integer techPartTime;
+
+    /**
+    * 企业临时聘用人数
+    */
+    private Integer firmTemporary;
+
+    /**
+    * 科技人员临时聘用人数
+    */
+    private Integer techTemporary;
+
+    /**
+    * 企业外籍人员数
+    */
+    private Integer firmForeign;
+
+    /**
+    * 外籍科技人员数
+    */
+    private Integer techForeign;
+
+    /**
+    * 企业留学归国人员数
+    */
+    private Integer firmAbroad;
+
+    /**
+    * 留学归国科技人员数
+    */
+    private Integer techAbroad;
+
+    /**
+    * 企业千人计划人数
+    */
+    private Integer firmThousands;
+
+    /**
+    * 千人计划科技人员数
+    */
+    private Integer techThousands;
+
+    /**
+    * 博士人数
+    */
+    private Integer doctor;
+
+    /**
+    * 硕士人数
+    */
+    private Integer master;
+
+    /**
+    * 本科人数
+    */
+    private Integer undergraduate;
+
+    /**
+    * 大专人数
+    */
+    private Integer college;
+
+    /**
+    * 高级职称人数
+    */
+    private Integer seniorTitle;
+
+    /**
+    * 中级职称人数
+    */
+    private Integer intermediateTitle;
+
+    /**
+    * 初级职称人数
+    */
+    private Integer juniorTitle;
+
+    /**
+    * 高级技工人数
+    */
+    private Integer seniorMechanic;
+
+    /**
+    * 三十岁及以下员工人数
+    */
+    private Integer belowThirty;
+
+    /**
+    * 三十一至三十四岁员工人数
+    */
+    private Integer thirtyoneToThirtyfour;
+
+    /**
+    * 四十一至五十岁员工人数
+    */
+    private Integer fortyoneToFifty;
+
+    /**
+    * 五十岁以上员工人数
+    */
+    private Integer aboveFifty;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public Integer getFirmTotal() {
+        return firmTotal;
+    }
+
+    public void setFirmTotal(Integer firmTotal) {
+        this.firmTotal = firmTotal;
+    }
+
+    public Integer getTechTotal() {
+        return techTotal;
+    }
+
+    public void setTechTotal(Integer techTotal) {
+        this.techTotal = techTotal;
+    }
+
+    public Integer getFirmInService() {
+        return firmInService;
+    }
+
+    public void setFirmInService(Integer firmInService) {
+        this.firmInService = firmInService;
+    }
+
+    public Integer getTechInService() {
+        return techInService;
+    }
+
+    public void setTechInService(Integer techInService) {
+        this.techInService = techInService;
+    }
+
+    public Integer getFirmPartTime() {
+        return firmPartTime;
+    }
+
+    public void setFirmPartTime(Integer firmPartTime) {
+        this.firmPartTime = firmPartTime;
+    }
+
+    public Integer getTechPartTime() {
+        return techPartTime;
+    }
+
+    public void setTechPartTime(Integer techPartTime) {
+        this.techPartTime = techPartTime;
+    }
+
+    public Integer getFirmTemporary() {
+        return firmTemporary;
+    }
+
+    public void setFirmTemporary(Integer firmTemporary) {
+        this.firmTemporary = firmTemporary;
+    }
+
+    public Integer getTechTemporary() {
+        return techTemporary;
+    }
+
+    public void setTechTemporary(Integer techTemporary) {
+        this.techTemporary = techTemporary;
+    }
+
+    public Integer getFirmForeign() {
+        return firmForeign;
+    }
+
+    public void setFirmForeign(Integer firmForeign) {
+        this.firmForeign = firmForeign;
+    }
+
+    public Integer getTechForeign() {
+        return techForeign;
+    }
+
+    public void setTechForeign(Integer techForeign) {
+        this.techForeign = techForeign;
+    }
+
+    public Integer getFirmAbroad() {
+        return firmAbroad;
+    }
+
+    public void setFirmAbroad(Integer firmAbroad) {
+        this.firmAbroad = firmAbroad;
+    }
+
+    public Integer getTechAbroad() {
+        return techAbroad;
+    }
+
+    public void setTechAbroad(Integer techAbroad) {
+        this.techAbroad = techAbroad;
+    }
+
+    public Integer getFirmThousands() {
+        return firmThousands;
+    }
+
+    public void setFirmThousands(Integer firmThousands) {
+        this.firmThousands = firmThousands;
+    }
+
+    public Integer getTechThousands() {
+        return techThousands;
+    }
+
+    public void setTechThousands(Integer techThousands) {
+        this.techThousands = techThousands;
+    }
+
+    public Integer getDoctor() {
+        return doctor;
+    }
+
+    public void setDoctor(Integer doctor) {
+        this.doctor = doctor;
+    }
+
+    public Integer getMaster() {
+        return master;
+    }
+
+    public void setMaster(Integer master) {
+        this.master = master;
+    }
+
+    public Integer getUndergraduate() {
+        return undergraduate;
+    }
+
+    public void setUndergraduate(Integer undergraduate) {
+        this.undergraduate = undergraduate;
+    }
+
+    public Integer getCollege() {
+        return college;
+    }
+
+    public void setCollege(Integer college) {
+        this.college = college;
+    }
+
+    public Integer getSeniorTitle() {
+        return seniorTitle;
+    }
+
+    public void setSeniorTitle(Integer seniorTitle) {
+        this.seniorTitle = seniorTitle;
+    }
+
+    public Integer getIntermediateTitle() {
+        return intermediateTitle;
+    }
+
+    public void setIntermediateTitle(Integer intermediateTitle) {
+        this.intermediateTitle = intermediateTitle;
+    }
+
+    public Integer getJuniorTitle() {
+        return juniorTitle;
+    }
+
+    public void setJuniorTitle(Integer juniorTitle) {
+        this.juniorTitle = juniorTitle;
+    }
+
+    public Integer getSeniorMechanic() {
+        return seniorMechanic;
+    }
+
+    public void setSeniorMechanic(Integer seniorMechanic) {
+        this.seniorMechanic = seniorMechanic;
+    }
+
+    public Integer getBelowThirty() {
+        return belowThirty;
+    }
+
+    public void setBelowThirty(Integer belowThirty) {
+        this.belowThirty = belowThirty;
+    }
+
+    public Integer getThirtyoneToThirtyfour() {
+        return thirtyoneToThirtyfour;
+    }
+
+    public void setThirtyoneToThirtyfour(Integer thirtyoneToThirtyfour) {
+        this.thirtyoneToThirtyfour = thirtyoneToThirtyfour;
+    }
+
+    public Integer getFortyoneToFifty() {
+        return fortyoneToFifty;
+    }
+
+    public void setFortyoneToFifty(Integer fortyoneToFifty) {
+        this.fortyoneToFifty = fortyoneToFifty;
+    }
+
+    public Integer getAboveFifty() {
+        return aboveFifty;
+    }
+
+    public void setAboveFifty(Integer aboveFifty) {
+        this.aboveFifty = aboveFifty;
+    }
+}

+ 34 - 0
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -2,6 +2,8 @@ package com.goafanti.user.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 public class OrgListBo {
     private String id;
 	
@@ -12,6 +14,10 @@ public class OrgListBo {
     private Date createTime;
     
     private Integer number;
+    
+    private String aftUsername;
+    
+    private Integer auditStatus;
 
 	public String getId() {
 		return id;
@@ -52,6 +58,34 @@ public class OrgListBo {
 	public void setNumber(Integer number) {
 		this.number = number;
 	}
+
+	public String getAftUsername() {
+		return aftUsername;
+	}
+
+	public void setAftUsername(String aftUsername) {
+		this.aftUsername = aftUsername;
+	}
+
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
     
+	//注册时间
+	public String getCreateTimeFormattedDate(){
+		if (this.createTime == null) {
+			 return null;
+		   } else {
+			 return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		   }
+	}
+			
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+				
+	}
     
 }

+ 21 - 0
src/main/java/com/goafanti/user/bo/UserListBo.java

@@ -18,6 +18,10 @@ public class UserListBo {
     
     private Integer number;
     
+    private String aftUsername;
+    
+    private Integer auditStatus;
+    
     
 	public String getId() {
 		return id;
@@ -59,6 +63,23 @@ public class UserListBo {
 		this.number = number;
 	}
 	
+	
+	public String getAftUsername() {
+		return aftUsername;
+	}
+
+	public void setAftUsername(String aftUsername) {
+		this.aftUsername = aftUsername;
+	}
+
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
 	//注册时间
 	public String getCreateTimeFormattedDate(){
 		if (this.createTime == null) {

+ 148 - 124
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -2,9 +2,7 @@ package com.goafanti.user.controller;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 import javax.annotation.Resource;
@@ -20,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.OrganizationInfo;
 import com.goafanti.common.model.OrganizationProperties;
@@ -41,6 +40,7 @@ import com.goafanti.user.bo.UidAndTypeBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserInfoBo;
 import com.goafanti.user.bo.UserPageHomeBo;
+import com.goafanti.user.service.OrgHumanResourceService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationInfoService;
 import com.goafanti.user.service.OrganizationPropertiesService;
@@ -78,9 +78,12 @@ public class UserApiController extends BaseApiController {
 	private OrganizationTechService			organizationTechService;
 	@Resource
 	private OrganizationPropertiesService	organizationPropertiesService;
-    
+	@Resource
+	private OrgHumanResourceService			orgHumanResourceService;
+
 	/**
 	 * 修改密码
+	 * 
 	 * @param password
 	 * @param newPassword
 	 * @return
@@ -110,9 +113,10 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 重置密码
+	 * 
 	 * @param resetCode
 	 * @param mobile
 	 * @param type
@@ -120,15 +124,15 @@ public class UserApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/resetPwd", method = RequestMethod.POST)
-	public Result resetPwd(String resetCode,String mobile,Integer type,String newPwd){
+	public Result resetPwd(String resetCode, String mobile, Integer type, String newPwd) {
 		Result res = new Result();
-		if(TimeUtils.checkOverTime("resetCode")){
-			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME,"页面超时失效,请重新获取验证码!"));
+		if (TimeUtils.checkOverTime("resetCode")) {
+			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME, "页面超时失效,请重新获取验证码!"));
 			this.cleanCodeSession();
 			return res;
 		}
-		if(!TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE).equals(resetCode)){
-			res.getError().add(buildError(ErrorConstants.RESET_CODE_ERROR,"页面失效,请重新获取验证码!"));
+		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE).equals(resetCode)) {
+			res.getError().add(buildError(ErrorConstants.RESET_CODE_ERROR, "页面失效,请重新获取验证码!"));
 			this.cleanCodeSession();
 			return res;
 		}
@@ -140,29 +144,28 @@ public class UserApiController extends BaseApiController {
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.RESET_CODE_TIME);
 		return res;
 	}
-	
-	
+
 	/**
 	 * 
 	 * @param mobileCode
 	 * @return
 	 */
 	@RequestMapping(value = "/checkMCode", method = RequestMethod.POST)
-	public Result checkMCode(String mobileCode){
+	public Result checkMCode(String mobileCode) {
 		Result res = new Result();
-		if(TimeUtils.checkOverTime("register")){
-			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR,"手机验证码超时失效"));
+		if (TimeUtils.checkOverTime("register")) {
+			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
 			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE);
 			TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE_TIME);
 			return res;
 		}
 		System.out.println(TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE));
-		if(!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)){
-			res.getError().add(buildError(ErrorConstants.MCODE_ERROR,"手机验证码错误"));
+		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
+			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
 			return res;
 		}
 		return res;
-				
+
 	}
 
 	/**
@@ -242,12 +245,12 @@ public class UserApiController extends BaseApiController {
 		res.setData(handleFile(res, "/avatar/", false, req, ""));
 		return res;
 	}
-	
+
 	/**
 	 * 公共可替换
 	 */
-	@RequestMapping(value="/avatar/uploadReplace",method = RequestMethod.POST)
-	public Result avatarReplace(HttpServletRequest req ,String sign) {
+	@RequestMapping(value = "/avatar/uploadReplace", method = RequestMethod.POST)
+	public Result avatarReplace(HttpServletRequest req, String sign) {
 		Result res = new Result();
 		res.setData(handleFile(res, "/avatar/", false, req, sign));
 		return res;
@@ -265,29 +268,27 @@ public class UserApiController extends BaseApiController {
 		res.setData(handleFile(res, "/identity/", true, req, sign));
 		return res;
 	}
-	
+
 	/**
 	 * 专利
 	 * 
 	 * @param req
 	 * @return
 	 *//*
-	
-	 @RequestMapping(value = "/patent/upload", method = RequestMethod.POST)
-	  public Result patentFile(HttpServletRequest req ,String sign) {
-		 Result res = new Result();
-		 res.setData(handleFile(res, "/patent/", true, req, sign));
-		 return	  res; 
-		 }*/
-
-	
+		 * 
+		 * @RequestMapping(value = "/patent/upload", method =
+		 * RequestMethod.POST) public Result patentFile(HttpServletRequest req
+		 * ,String sign) { Result res = new Result();
+		 * res.setData(handleFile(res, "/patent/", true, req, sign)); return
+		 * res; }
+		 */
 
 	private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req, String sign) {
 		List<MultipartFile> files = getFiles(req);
 		String fileName = "";
 		if (isPrivate || sign != "") {
-				fileName = path + TokenManager.getUserId() + "_" + sign + ".jpg";
-			
+			fileName = path + TokenManager.getUserId() + "_" + sign + ".jpg";
+
 		} else {
 			fileName = path + System.nanoTime() + ".jpg";
 		}
@@ -597,34 +598,59 @@ public class UserApiController extends BaseApiController {
 	public Result ability() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		//UserAbility u = userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
-		UserAbility u =userAbilityService.selectUserAbilityByUserId(ub.getUid());
+		// UserAbility u =
+		// userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
+		UserAbility u = userAbilityService.selectUserAbilityByUserId(ub.getUid());
 		res.setData(u);
 		return res;
 	}
-
-	
-	
-	
-	
-	
-	
-	
-	
+    
+	/**
+	 * 团体人力资源情况入口
+	 * @return
+	 */
+	@RequestMapping(value = "/humanResource", method = RequestMethod.GET)
+	public Result humanResource() {
+		Result res = new Result();
+        res.setData(orgHumanResourceService.selectOrgHumanResourceByUserId(TokenManager.getUserId()));
+		return res;
+	}
 	
 	/**
+	 * 团体人力资源情况修改保存(用户端)
+	 * @param orgHumanResource
+	 * @return
+	 */
+	@RequestMapping(value = "/SaveHumanResource", method = RequestMethod.POST)
+	public Result SaveHumanResource(OrgHumanResource orgHumanResource){
+		Result res = new Result();
+		OrgHumanResource org = orgHumanResourceService.selectOrgHumanResourceByUserId(TokenManager.getUserId());
+		if (null == org){
+			orgHumanResource.setId(UUID.randomUUID().toString());
+			orgHumanResource.setUid(TokenManager.getUserId());
+			orgHumanResourceService.insert(orgHumanResource);
+		} else {
+			orgHumanResource.setId(org.getId());
+			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
+		}
+		res.setData(orgHumanResource); 
+		return res;
+	}
+
+	/**
 	 * 首页
+	 * 
 	 * @return
 	 */
-	@RequestMapping(value ="/homePage",method = RequestMethod.GET)
-	public Result homePage(){
+	@RequestMapping(value = "/homePage", method = RequestMethod.GET)
+	public Result homePage() {
 		Result res = new Result();
-		if (TokenManager.isLogin()){
+		if (TokenManager.isLogin()) {
 			UserPageHomeBo userPageHomeBo = userService.selectUserPageHomeBoByUserId(TokenManager.getUserId());
 			res.setData(userPageHomeBo);
 		}
 		return res;
-		
+
 	}
 
 	/**
@@ -641,161 +667,163 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 个人实名认证流程入口
+	 * 
 	 * @return
 	 */
-	@RequestMapping(value="/userPro",method = RequestMethod.GET)
-	public Result userProcess(){
+	@RequestMapping(value = "/userPro", method = RequestMethod.GET)
+	public Result userProcess() {
 		Result res = new Result();
-		if (TokenManager.isLogin()){
+		if (TokenManager.isLogin()) {
 			res.setData(userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId()));
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 个人实名认证流程下一步
 	 */
-	@RequestMapping(value="/userNextPro",method = RequestMethod.POST)
-	public Result userNextProcess(UserIdentity userIdentity ,String verificationCode){
+	@RequestMapping(value = "/userNextPro", method = RequestMethod.POST)
+	public Result userNextProcess(UserIdentity userIdentity, String verificationCode) {
 		Result res = new Result();
-		if (1 == userIdentity.getProcess()){
-			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)){
-				res.getError().add(buildError(ErrorConstants.VCODE_ERROR,"验证码错误"));
+		if (1 == userIdentity.getProcess()) {
+			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)) {
+				res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
 				return res;
 			}
 		}
-		
-		if (3 == userIdentity.getProcess()){
+
+		if (3 == userIdentity.getProcess()) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			u.setAuditStatus(1);
 			userIdentityService.updateByPrimaryKeySelective(u);
 		}
-		
-		if (5 == userIdentity.getProcess()){
+
+		if (5 == userIdentity.getProcess()) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
-			if ((System.currentTimeMillis() - u.getPaymentDate().getTime()) > 432000000){
+			if ((System.currentTimeMillis() - u.getPaymentDate().getTime()) > 432000000) {
 				u.setAuditStatus(4);
 				userIdentityService.updateByPrimaryKeySelective(u);
-				res.getError().add(buildError("","1"));//超过打款日期5日,无法提交确认
+				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
 				return res;
 			}
-			if (3 == u.getWrongCount()){
+			if (3 == u.getWrongCount()) {
 				u.setAuditStatus(4);
 				u.setProcess(5);
 				userIdentityService.updateByPrimaryKeySelective(u);
-				res.getError().add(buildError("","2"));//输入错误金额次数过多
+				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				return res;
-			} 
-			if (0 != (u.getAmountMoney().compareTo(userIdentity.getAmountMoney()))){
+			}
+			if (0 != (u.getAmountMoney().compareTo(userIdentity.getAmountMoney()))) {
 				int t = 3 - u.getWrongCount() - 1;
-				u.setWrongCount(u.getWrongCount()+1);
-				userIdentityService.updateByPrimaryKeySelective(u);	
-				if (0 == t){
+				u.setWrongCount(u.getWrongCount() + 1);
+				userIdentityService.updateByPrimaryKeySelective(u);
+				if (0 == t) {
 					u.setAuditStatus(4);
 					u.setProcess(5);
 					userIdentityService.updateByPrimaryKeySelective(u);
-					res.getError().add(buildError("","2"));//输入错误金额次数过多
+					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
-					res.getError().add(buildError("","输入打款金额错误,您还有" + t + "次机会"));
+					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
 				}
 				return res;
 			}
 			userIdentity.setAuditStatus(5);
 		}
-		return dealUserProcess(res,userIdentity,TokenManager.getUserId());
+		return dealUserProcess(res, userIdentity, TokenManager.getUserId());
 	}
-	
+
 	/**
 	 * 团体实名认证流程入口
 	 */
-	@RequestMapping(value="/orgProcess",method = RequestMethod.GET)
-	public Result orgProcess(){
+	@RequestMapping(value = "/orgProcess", method = RequestMethod.GET)
+	public Result orgProcess() {
 		Result res = new Result();
-		if (TokenManager.isLogin()){
+		if (TokenManager.isLogin()) {
 			res.setData(organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()));
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 团体实名认证流程下一步
 	 */
-	@RequestMapping(value="/orgNextPro",method = RequestMethod.POST)
-	public Result orgNextProcess(OrganizationIdentity orgIdentity, String verificationCode){
+	@RequestMapping(value = "/orgNextPro", method = RequestMethod.POST)
+	public Result orgNextProcess(OrganizationIdentity orgIdentity, String verificationCode) {
 		Result res = new Result();
-		if (1 == orgIdentity.getProcess()){
-			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)){
-				res.getError().add(buildError(ErrorConstants.VCODE_ERROR,"验证码错误"));
+		if (1 == orgIdentity.getProcess()) {
+			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)) {
+				res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
 				return res;
 			}
 		}
-		if (3 == orgIdentity.getProcess()){
-			OrganizationIdentity  o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
+		if (3 == orgIdentity.getProcess()) {
+			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 			o.setAuditStatus(1);
 			organizationIdentityService.updateByPrimaryKeySelective(o);
 		}
-		if (5 == orgIdentity.getProcess()){
+		if (5 == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
-			if (System.currentTimeMillis() - o.getPaymentDate().getTime() > 432000000){
+			if (System.currentTimeMillis() - o.getPaymentDate().getTime() > 432000000) {
 				o.setAuditStatus(4);
 				organizationIdentityService.updateByPrimaryKeySelective(o);
-				res.getError().add(buildError("", "1"));//超过打款日期5日,无法提交确认
+				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
 				return res;
 			}
-			if (3 == o.getWrongCount()){
+			if (3 == o.getWrongCount()) {
 				o.setAuditStatus(4);
 				o.setProcess(5);
 				organizationIdentityService.updateByPrimaryKeySelective(o);
-				res.getError().add(buildError("", "2"));//输入错误金额次数过多
+				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				return res;
-			} 
-			if (0 != (o.getValidationAmount().compareTo(orgIdentity.getValidationAmount()))){
+			}
+			if (0 != (o.getValidationAmount().compareTo(orgIdentity.getValidationAmount()))) {
 				int t = 3 - o.getWrongCount() - 1;
 				o.setWrongCount(o.getWrongCount() + 1);
-				organizationIdentityService.updateByPrimaryKeySelective(o);	
-				if (0 == t){
+				organizationIdentityService.updateByPrimaryKeySelective(o);
+				if (0 == t) {
 					o.setAuditStatus(4);
 					o.setProcess(5);
 					organizationIdentityService.updateByPrimaryKeySelective(o);
-					res.getError().add(buildError("","2"));//输入错误金额次数过多
+					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
 				}
-				  return res;
+				return res;
 			}
 			orgIdentity.setAuditStatus(5);
 		}
-		return dealOrgProcess(res, orgIdentity ,TokenManager.getUserId());
+		return dealOrgProcess(res, orgIdentity, TokenManager.getUserId());
 	}
-	
+
 	/**
 	 * 认证失败
 	 */
-	@RequestMapping(value="/identFailed", method = RequestMethod.GET)
-	public Result authenticationFailed(){
+	@RequestMapping(value = "/identFailed", method = RequestMethod.GET)
+	public Result authenticationFailed() {
 		Result res = new Result();
 		return dealFaild(res);
 	}
-	
+
 	/**
 	 * 管理端确认用户认证
+	 * 
 	 * @param auditStatus
 	 * @param money
 	 * @param uid
 	 * @return
 	 */
-	@RequestMapping(value="/adminConfirmIdent", method = RequestMethod.POST)
-	public Result adminConfirmIdent(Integer auditStatus, BigDecimal money, String uid){
+	@RequestMapping(value = "/adminConfirmIdent", method = RequestMethod.POST)
+	public Result adminConfirmIdent(Integer auditStatus, BigDecimal money, String uid) {
 		Result res = new Result();
-		if (0 == userService.selectByPrimaryKey(uid).getType()){
+		if (0 == userService.selectByPrimaryKey(uid).getType()) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(uid);
 			u.setAuditStatus(auditStatus);
 			u.setAmountMoney(money);
 			res.setData(userIdentityService.updateByPrimaryKeySelective(u));
-		}else{
+		} else {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
 			o.setAuditStatus(auditStatus);
 			o.setValidationAmount(money);
@@ -803,10 +831,10 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
-	//认证失败清除相关认证信息
-	private Result dealFaild(Result res){
-		if (0 == userService.selectByPrimaryKey(TokenManager.getUserId()).getType()){
+
+	// 认证失败清除相关认证信息
+	private Result dealFaild(Result res) {
+		if (0 == userService.selectByPrimaryKey(TokenManager.getUserId()).getType()) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			UserIdentity user = new UserIdentity();
 			user.setId(u.getId());
@@ -825,11 +853,11 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
-	//orgProcess
-	private Result dealOrgProcess(Result res, OrganizationIdentity o ,String uid){
+
+	// orgProcess
+	private Result dealOrgProcess(Result res, OrganizationIdentity o, String uid) {
 		OrganizationIdentity org = organizationIdentityService.selectOrgIdentityByUserId(uid);
-		if (null == org){
+		if (null == org) {
 			o.setId(UUID.randomUUID().toString());
 			o.setUid(uid);
 			res.setData(organizationIdentityService.insert(o));
@@ -839,11 +867,11 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
-	//userProcess
-	private Result dealUserProcess(Result res,UserIdentity userIdentity,String uid){
+
+	// userProcess
+	private Result dealUserProcess(Result res, UserIdentity userIdentity, String uid) {
 		UserIdentity identity = userIdentityService.selectUserIdentityByUserId(uid);
-		if (null == identity){
+		if (null == identity) {
 			userIdentity.setId(UUID.randomUUID().toString());
 			userIdentity.setUid(uid);
 			res.setData(userIdentityService.insert(userIdentity));
@@ -853,17 +881,14 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
-		
-		
-	
-	private void cleanCodeSession(){
+
+	private void cleanCodeSession() {
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.RESET_CODE);
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.RESET_CODE_TIME);
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE);
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE_TIME);
 	}
-	
+
 	private UidAndTypeBo basicInfo(UserService userService) {
 		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
 		UidAndTypeBo ub = new UidAndTypeBo();
@@ -871,6 +896,5 @@ public class UserApiController extends BaseApiController {
 		ub.setUid(u.getId());
 		return ub;
 	}
-	
 
 }

+ 13 - 0
src/main/java/com/goafanti/user/service/OrgHumanResourceService.java

@@ -0,0 +1,13 @@
+package com.goafanti.user.service;
+
+import com.goafanti.common.model.OrgHumanResource;
+
+public interface OrgHumanResourceService {
+
+	OrgHumanResource selectOrgHumanResourceByUserId(String uid);
+
+	OrgHumanResource insert(OrgHumanResource orgHumanResource);
+
+	int updateByPrimaryKeySelective(OrgHumanResource orgHumanResource);
+
+}

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

@@ -28,7 +28,7 @@ public interface UserService {
 	UserDownLoadBo selectUserDownLoadBoByUserId(String userId);
 
 	Pagination<UserListBo> listUser(String mobile, String email, String[] createTime, Integer number,
-			Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
+			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
 	
 
 }

+ 30 - 0
src/main/java/com/goafanti/user/service/impl/OrgHumanResourceServiceImpl.java

@@ -0,0 +1,30 @@
+package com.goafanti.user.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrgHumanResourceMapper;
+import com.goafanti.common.model.OrgHumanResource;
+import com.goafanti.user.service.OrgHumanResourceService;
+@Service
+public class OrgHumanResourceServiceImpl implements OrgHumanResourceService{
+	@Autowired
+	private OrgHumanResourceMapper  orgHumanResourceMapper;
+	
+	@Override
+	public OrgHumanResource selectOrgHumanResourceByUserId(String uid) {
+		return orgHumanResourceMapper.selectOrgHumanResourceByUserId(uid);
+	}
+	
+	@Override
+	public OrgHumanResource insert(OrgHumanResource orgHumanResource) {
+		orgHumanResourceMapper.insert(orgHumanResource);
+		return orgHumanResource;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgHumanResource orgHumanResource) {
+		return orgHumanResourceMapper.updateByPrimaryKeySelective(orgHumanResource);
+	}
+
+}

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

@@ -99,7 +99,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<UserListBo> listUser(String mobile, String email, String[] pDate, Integer number,
-			Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
+			String aftUsername, Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
 		Map<String, Object> params = new HashMap<>();
 		Date pStart = null;
 		Date pEnd = null;
@@ -131,6 +131,10 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 			params.put("number", number);
 		}
 		
+		if (null != aftUsername){
+			params.put("aftUsername", aftUsername);
+		}
+		
 		if (null != auditStatus){
 			params.put("auditStatus", auditStatus);
 		}

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

@@ -41,7 +41,7 @@ jdbc.filters=stat
 jedis.host=localhost
 jedis.port=6379
 jedis.timeout=5000
-jedis.password=aft@2016!redis$
+jedis.password=
 
 pwd.hash_algorithm_name=md5
 pwd.hash_iterations=2

+ 3 - 3
src/main/resources/spring/spring-mybatis.xml

@@ -10,13 +10,13 @@
 			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
 			http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
 			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
-	<!-- 自动扫描(自动注入) -->
+	
 	<context:component-scan base-package="com.goafanti.*.service;com.goafanti.*.*.service" />
 	
 	<bean id="log-filter" class="com.alibaba.druid.filter.logging.Log4jFilter">
     	<property name="resultSetLogEnabled" value="true" />
 	</bean>
-	<!-- 配置数据源 -->
+	
 	<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
 		<property name="url" value="${jdbc.url}" /> 
 		<property name="username" value="${jdbc.username}" /> 
@@ -81,7 +81,7 @@
 			<tx:method name="*"  read-only="true"/>
 		</tx:attributes>
 	</tx:advice>
- 	<!-- AOP配置--> 
+ 	
 	<aop:config proxy-target-class="true">
 		<aop:pointcut id="myPointcut"
 			expression="execution(public * com.goafanti.*.service.impl.*.*(..))" />

+ 28 - 29
src/main/resources/spring/spring-shiro.xml

@@ -11,9 +11,9 @@
        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
     
      <bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">
-        <property name="maxIdle" value="100"/><!-- 最大闲置 -->
-        <property name="minIdle" value="10"/><!-- 最小闲置 -->
-        <property name="testOnBorrow" value="true"/><!-- 可以获取 -->
+        <property name="maxIdle" value="100"/>
+        <property name="minIdle" value="10"/>
+        <property name="testOnBorrow" value="true"/>
     </bean>
     
 	<bean id="jedisPool" class="redis.clients.jedis.JedisPool">
@@ -25,16 +25,16 @@
 	  
 	</bean>
 	
-	<!-- 会话Session ID生成器 -->
+
 	<bean id="sessionIdGenerator" class="org.apache.shiro.session.mgt.eis.JavaUuidSessionIdGenerator"/>
 
-	<!-- 会话Cookie模板 -->
+	
 	<bean id="sessionIdCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
 	    <constructor-arg value="AFT_SID"/>
 	    <property name="httpOnly" value="true"/>
-	    <!--cookie的有效时间 -->
+	    
 	    <property name="maxAge" value="1296000"/>
-	    <!-- 配置存储Session Cookie的domain为 一级域名
+	    <!-- 
 	    <property name="domain" value=""/>
 	     -->
 	</bean>
@@ -48,38 +48,38 @@
 	    <property name="shiroSessionRepository" ref="jedisShiroSessionRepository"/>
 	    <property name="sessionIdGenerator" ref="sessionIdGenerator"/>
 	</bean>
-	<!-- 手动操作Session,管理Session -->
+	<!--  -->
 	<bean id="customSessionManager" class="com.goafanti.core.shiro.session.CustomSessionManager">
 		<property name="shiroSessionRepository" ref="jedisShiroSessionRepository"/>
 		 <property name="customShiroSessionDAO" ref="customShiroSessionDAO"/>
 	</bean>
  
-	<!-- 会话验证调度器 -->
+	<!--  -->
 	<bean id="sessionValidationScheduler" class="org.apache.shiro.session.mgt.ExecutorServiceSessionValidationScheduler">
-		 <!-- 间隔多少时间检查,不配置是60分钟 -->
+		 <!--  -->
 	     <property name="interval" value="${session.validate.timespan}"/>
 	     <property name="sessionManager" ref="sessionManager"/>
 	</bean>
-	<!-- 安全管理器 -->
+	<!--  -->
     <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
         <property name="realm" ref="userRealm"/>
         <property name="sessionManager" ref="sessionManager"/>
         <property name="cacheManager" ref="customShiroCacheManager"/>
     </bean>
-	<!-- 用户缓存 -->
+	<!--  -->
 	<bean id="customShiroCacheManager" class="com.goafanti.core.shiro.cache.impl.CustomShiroCacheManager">
 	    <property name="shiroCacheManager" ref="jedisShiroCacheManager"/>
 	</bean>
 	
-	<!-- shiro 缓存实现,对ShiroCacheManager,我是采用redis的实现 -->
+	<!--  -->
 	<bean id="jedisShiroCacheManager" class="com.goafanti.core.shiro.cache.impl.JedisShiroCacheManager">
 	    <property name="jedisManager" ref="jedisManager"/>
 	</bean>
-	<!-- redis 的缓存 -->
+	<!-- -->
 	<bean id="jedisManager" class="com.goafanti.core.shiro.cache.JedisManager">
 	    <property name="jedisPool" ref="jedisPool"/>
 	</bean>
-	<!-- 静态注入,相当于调用SecurityUtils.setSecurityManager(securityManager) -->
+	<!-- SecurityUtils.setSecurityManager(securityManager) -->
 	<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 	    <property name="staticMethod" value="org.apache.shiro.SecurityUtils.setSecurityManager"/>
 	    <property name="arguments" ref="securityManager"/>
@@ -91,44 +91,43 @@
 	    <property name="hashIterations" value="${pwd.hash_iterations}"/>  
 	    <property name="storedCredentialsHexEncoded" value="true"/>  
 	</bean>  
-	<!-- 授权 认证 -->
+	<!--  -->
 	<bean id="userRealm" class="com.goafanti.core.shiro.token.UserRealm" >
 		<property name="credentialsMatcher" ref="credentialsMatcher"/>  
 	</bean>
 	
 	<!-- Session Manager -->
 	<bean id="sessionManager" class="org.apache.shiro.web.session.mgt.DefaultWebSessionManager">
-		<!-- 相隔多久检查一次session的有效性   -->
+		<!--    -->
 	 	<property name="sessionValidationInterval" value="1800000"/>  
-	 	 <!-- session 有效时间为半小时 (毫秒单位)-->  
+	 	 <!-- -->  
 	<property name="globalSessionTimeout" value="1800000"/>
 	   <property name="sessionDAO" ref="customShiroSessionDAO"/>
-	   <!-- session 监听,可以多个。 -->
+	   <!-- session  -->
 	   <property name="sessionListeners">
 	       <list>
 	           <ref bean="customSessionListener"/>
 	       </list>
 	   </property>
-	   <!-- 间隔多少时间检查,不配置是60分钟 -->	
+	   <!--  -->	
 	  <property name="sessionValidationScheduler" ref="sessionValidationScheduler"/>
-	  <!-- 是否开启 检测,默认开启 -->
+	  <!--  -->
 	  <property name="sessionValidationSchedulerEnabled" value="true"/>
-	   <!-- 是否删除无效的,默认也是开启 -->
+	   <!--  -->
 	  <property name="deleteInvalidSessions" value="true"/>
-		<!-- 会话Cookie模板 -->
+		<!--  -->
 	   <property name="sessionIdCookie" ref="sessionIdCookie"/>
 	</bean>
-	<!-- session 创建、删除、查询 -->
+	<!--  -->
 	<bean id="jedisShiroSessionRepository" class="com.goafanti.core.shiro.cache.JedisShiroSessionRepository" >
 		 <property name="jedisManager" ref="jedisManager"/>
 	</bean>
 
 	<!--
-		自定义角色过滤器 支持多个角色可以访问同一个资源 eg:/home.jsp = authc,roleOR[admin,user]
-		用户有admin或者user角色 就可以访问
+		
 	-->
 	
-	<!-- 认证数据库存储-->
+	<!-- -->
     <bean id="shiroManager" class="com.goafanti.core.shiro.service.impl.ShiroManagerImpl"/>
     <bean id="login" class="com.goafanti.core.shiro.filter.LoginFilter"/>
     <bean id="role" class="com.goafanti.core.shiro.filter.RoleFilter"/>
@@ -141,7 +140,7 @@
 		<property name="successUrl" value="/main" />
 		<property name="unauthorizedUrl" value="/login" />
 	
-		<!-- 读取初始自定义权限内容-->
+		<!-- -->
        <property name="filterChainDefinitions" value="#{shiroManager.loadFilterChainDefinitions()}"/>   
        <property name="filters">
            <util:map>
@@ -152,7 +151,7 @@
            </util:map>
        </property>
 	</bean>
-	<!-- Shiro生命周期处理器-->
+	<!-- -->
 	<bean id="lifecycleBeanPostProcessor" class="org.apache.shiro.spring.LifecycleBeanPostProcessor" />
 	
 </beans>

+ 5 - 5
src/main/webapp/WEB-INF/web.xml

@@ -17,7 +17,7 @@
 	<listener>
 		<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
 	</listener>
-	<!-- 开放所有的跨域操作 -->
+	
 	<filter>
 		<filter-name>CorsFilter</filter-name>
 		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
@@ -78,22 +78,22 @@
 		<load-on-startup>1</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
-	<!-- 配置 Druid 监控信息显示页面 -->
+	
 	<!-- <servlet>
 		<servlet-name>DruidStatView</servlet-name>
 		<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
 		<init-param>
-			允许清空统计数据
+			
 			<param-name>resetEnable</param-name>
 			<param-value>true</param-value>
 		</init-param>
 		<init-param>
-			用户名
+			
 			<param-name>loginUsername</param-name>
 			<param-value>druid</param-value>
 		</init-param>
 		<init-param>
-			密码
+			
 			<param-name>loginPassword</param-name>
 			<param-value>aft@2016</param-value>
 		</init-param>