Browse Source

企业参与国家标准或行业标准制定情况明细接口

Antiloveg 9 years ago
parent
commit
3a373d0f91

+ 96 - 43
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -13,11 +13,12 @@ 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.OrgStandard;
 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.techservice.cognizance.service.OrgStandardService;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrgHumanResourceService;
@@ -29,17 +30,16 @@ import com.goafanti.user.service.UserService;
 @RequestMapping(value = "/api/admin")
 public class AdminApiController extends BaseApiController {
 	@Resource
-	private UserService			userService;
+	private UserService					userService;
 	@Resource
-	private UserIdentityService	userIdentityService;
+	private UserIdentityService			userIdentityService;
 	@Resource
-	private OrganizationIdentityService organizationIdentityService;
+	private OrganizationIdentityService	organizationIdentityService;
 	@Resource
-	private OrgHumanResourceService			orgHumanResourceService;
-	
-	
-	
-	
+	private OrgHumanResourceService		orgHumanResourceService;
+	@Resource
+	private OrgStandardService	orgStandardService;
+
 	/**
 	 * 个人用户列表
 	 * 
@@ -69,9 +69,10 @@ public class AdminApiController extends BaseApiController {
 		res.setData(getUserList(mobile, email, createTime, number, aftUsername, auditStatus, pNo, pSize));
 		return res;
 	}
-    
+
 	/**
 	 * 个人用户信息明细
+	 * 
 	 * @param uid
 	 * @return
 	 */
@@ -81,30 +82,32 @@ public class AdminApiController extends BaseApiController {
 		res.setData(userIdentityService.selectUserIdentityByUserId(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 修改个人用户信息
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "updateUserDetail", method = RequestMethod.POST)
-	public Result updateUserDetail(UserIdentity userIdentity){
+	public Result updateUserDetail(UserIdentity userIdentity) {
 		Result res = new Result();
 		res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
 		return res;
 	}
-	
-    /**
-     * 团体用户列表
-     * @param mobile
-     * @param email
-     * @param createTime
-     * @param number
-     * @param auditStatus
-     * @param pageNo
-     * @param pageSize
-     * @return
-     * @throws ParseException
-     */
+
+	/**
+	 * 团体用户列表
+	 * 
+	 * @param mobile
+	 * @param email
+	 * @param createTime
+	 * @param number
+	 * @param auditStatus
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 * @throws ParseException
+	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.POST)
 	public Result orgList(String mobile, String email,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
@@ -121,73 +124,123 @@ public class AdminApiController extends BaseApiController {
 		res.setData(getOrgList(mobile, email, createTime, number, auditStatus, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 团体用户明细
+	 * 
 	 * @param uid
 	 * @return
 	 */
-	@RequestMapping(value="/orgDetail", method = RequestMethod.POST)
-	public Result orgDetail(String uid){
+	@RequestMapping(value = "/orgDetail", method = RequestMethod.POST)
+	public Result orgDetail(String uid) {
 		Result res = new Result();
 		res.setData(organizationIdentityService.selectOrgIdentityByUserId(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 修改团体用户信息
+	 * 
 	 * @param orgIdentity
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
-	public Result updateOrgDetail(OrganizationIdentity orgIdentity){
+	public Result updateOrgDetail(OrganizationIdentity orgIdentity) {
 		Result res = new Result();
 		res.setData(organizationIdentityService.updateByPrimaryKeySelective(orgIdentity));
 		return res;
 	}
-	
+
 	/**
 	 * 团体用户人力资源情况入口
-	 * @param uid 用户ID
+	 * 
+	 * @param uid
+	 *            用户ID
 	 * @return
 	 */
 	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
-	public Result orgHumanResource(String uid){
+	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){
+	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource) {
 		Result res = new Result();
 		OrgHumanResource org = orgHumanResourceService.selectOrgHumanResourceByUserId(orgHumanResource.getUid());
-		if (null == org){
+		if (null == org) {
 			orgHumanResource.setId(UUID.randomUUID().toString());
 			orgHumanResourceService.insert(orgHumanResource);
 		} else {
 			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
 		}
-		res.setData(orgHumanResource); 
+		res.setData(orgHumanResource);
+		return res;
+	}
+
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细入口
+	 * 
+	 * @param uid
+	 *            用户id
+	 * @return
+	 */
+	@RequestMapping(value = "/standard", method = RequestMethod.POST)
+	public Result standard(String uid, String standardName, String standardNumber, Integer standardLevel,
+			Integer participateWay, String pageNo, String pageSize) {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
+				pSize, uid));
+
 		return res;
 	}
-    
+	
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细修改保存
+	 * @param orgStandard
+	 * @return
+	 */
+	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
+	public Result developStandard(OrgStandard orgStandard){
+		Result res = new Result();
+		if (StringUtils.isBlank(orgStandard.getId())){
+			orgStandard.setId(UUID.randomUUID().toString());
+			orgStandardService.insert(orgStandard);
+		} else {
+			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+		}
+		res.setData(orgStandard);	
+		return res;
+	}
+	
+	
+
 	// org团体列表
-	private Pagination<OrgListBo> getOrgList(String mobile, String email, String[] createTime, Integer number, Integer auditStatus,
-			Integer pNo, Integer pSize) throws ParseException {
-		return (Pagination<OrgListBo>) organizationIdentityService.listOrg(mobile, email, createTime, number, 
+	private Pagination<OrgListBo> getOrgList(String mobile, String email, String[] createTime, Integer number,
+			Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
+		return (Pagination<OrgListBo>) organizationIdentityService.listOrg(mobile, email, createTime, number,
 				auditStatus, pNo, pSize);
 	}
 
 	// user个人列表
 	private Pagination<UserListBo> getUserList(String mobile, String email, String[] createTime, Integer number,
 			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
-		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, aftUsername, auditStatus, pNo,
-				pSize);
+		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, aftUsername,
+				auditStatus, pNo, pSize);
 	}
 }

+ 2 - 2
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -94,7 +94,7 @@ public class BaseController {
 			model.addAttribute("userData", TokenManager.getToken() );
 		}
 		
-		model.addAttribute("accessKey",accessKey);
-		model.addAttribute("accessSecret",accessSecret);
+		/*model.addAttribute("accessKey",accessKey);
+		model.addAttribute("accessSecret",accessSecret);*/
 	}
 }

+ 18 - 0
src/main/java/com/goafanti/common/dao/OrgStandardMapper.java

@@ -0,0 +1,18 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrgStandard;
+
+public interface OrgStandardMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrgStandard record);
+
+    int insertSelective(OrgStandard record);
+
+    OrgStandard selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrgStandard record);
+
+    int updateByPrimaryKey(OrgStandard record);
+
+}

+ 171 - 0
src/main/java/com/goafanti/common/mapper/OrgStandardMapper.xml

@@ -0,0 +1,171 @@
+<?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.OrgStandardMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgStandard" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="standard_name" property="standardName" jdbcType="VARCHAR" />
+    <result column="standard_number" property="standardNumber" jdbcType="VARCHAR" />
+    <result column="standard_level" property="standardLevel" jdbcType="INTEGER" />
+    <result column="participate_way" property="participateWay" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, standard_name, standard_number, standard_level, participate_way, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_standard
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from org_standard
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrgStandard" >
+    insert into org_standard (id, uid, standard_name, 
+      standard_number, standard_level, participate_way, create_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{standardName,jdbcType=VARCHAR}, 
+      #{standardNumber,jdbcType=VARCHAR}, #{standardLevel,jdbcType=INTEGER}, #{participateWay,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgStandard" >
+    insert into org_standard
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="standardName != null" >
+        standard_name,
+      </if>
+      <if test="standardNumber != null" >
+        standard_number,
+      </if>
+      <if test="standardLevel != null" >
+        standard_level,
+      </if>
+      <if test="participateWay != null" >
+        participate_way,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </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="standardName != null" >
+        #{standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="standardNumber != null" >
+        #{standardNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="standardLevel != null" >
+        #{standardLevel,jdbcType=INTEGER},
+      </if>
+      <if test="participateWay != null" >
+        #{participateWay,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrgStandard" >
+    update org_standard
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="standardName != null" >
+        standard_name = #{standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="standardNumber != null" >
+        standard_number = #{standardNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="standardLevel != null" >
+        standard_level = #{standardLevel,jdbcType=INTEGER},
+      </if>
+      <if test="participateWay != null" >
+        participate_way = #{participateWay,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrgStandard" >
+    update org_standard
+    set uid = #{uid,jdbcType=VARCHAR},
+      standard_name = #{standardName,jdbcType=VARCHAR},
+      standard_number = #{standardNumber,jdbcType=VARCHAR},
+      standard_level = #{standardLevel,jdbcType=INTEGER},
+      participate_way = #{participateWay,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+   <select id="findOrgStandardListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from org_standard
+    where 1=1
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+    <if test="standardName != null">
+    	and  standard_name = #{standardName,jdbcType=VARCHAR}
+    </if>
+    <if test="standardNumber != null">
+    	and   standard_number= #{standardNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="standardLevel != null">
+    	and   standard_level= #{standardLevel,jdbcType=INTEGER}
+    </if>
+    <if test="participateWay != null">
+    	and   participate_way= #{participateWay,jdbcType=INTEGER}
+    </if>
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+  </select>
+  
+   <select id="findOrgStandardCount" resultType="java.lang.Integer" parameterType="String">
+   	select count(1) from (
+   		 select 
+    <include refid="Base_Column_List" />
+    from org_standard
+    where 1=1
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+    <if test="standardName != null">
+    	and  standard_name = #{standardName,jdbcType=VARCHAR}
+    </if>
+    <if test="standardNumber != null">
+    	and   standard_number= #{standardNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="standardLevel != null">
+    	and   standard_level= #{standardLevel,jdbcType=INTEGER}
+    </if>
+    <if test="participateWay != null">
+    	and   participate_way= #{participateWay,jdbcType=INTEGER}
+    </if>
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+    )
+    as total
+    </select>
+</mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -511,7 +511,7 @@
 	    and p.author = #{author,jdbcType=VARCHAR}
 	</if>
 	<if test="locationProvince != null">
-	    and  o.location_province=#{locationProvince,jdbcType=VARCHAR}
+	    and  o.location_province = #{locationProvince,jdbcType=VARCHAR}
 	</if>
 	 order by p.create_time desc) x
 	 LEFT JOIN admin a on a.id = x.author

+ 105 - 0
src/main/java/com/goafanti/common/model/OrgStandard.java

@@ -0,0 +1,105 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+public class OrgStandard {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 标准名称
+    */
+    private String standardName;
+
+    /**
+    * 标准编号
+    */
+    private String standardNumber;
+
+    /**
+    * 标准级别
+    */
+    private Integer standardLevel;
+
+    /**
+    * 参与方式
+    */
+    private Integer participateWay;
+    
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    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 String getStandardName() {
+        return standardName;
+    }
+
+    public void setStandardName(String standardName) {
+        this.standardName = standardName;
+    }
+
+    public String getStandardNumber() {
+        return standardNumber;
+    }
+
+    public void setStandardNumber(String standardNumber) {
+        this.standardNumber = standardNumber;
+    }
+
+    public Integer getStandardLevel() {
+        return standardLevel;
+    }
+
+    public void setStandardLevel(Integer standardLevel) {
+        this.standardLevel = standardLevel;
+    }
+
+    public Integer getParticipateWay() {
+        return participateWay;
+    }
+
+    public void setParticipateWay(Integer participateWay) {
+        this.participateWay = participateWay;
+    }
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+    
+	//创建时间
+	public String getCreateTimeFormattedDate(){
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		}
+	}
+		
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+			
+	}
+}

+ 67 - 0
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -0,0 +1,67 @@
+package com.goafanti.techservice.cognizance.controller;
+
+import java.util.UUID;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrgStandard;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.techservice.cognizance.service.OrgStandardService;
+import com.goafanti.user.service.UserService;
+
+@Controller
+@RequestMapping(value = "/techservice/cognizance")
+public class CognizanceApiController extends BaseApiController {
+	@Resource
+	private UserService			userService;	
+	@Resource
+	private OrgStandardService	orgStandardService;
+
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细入口
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/standard", method = RequestMethod.POST)
+	public Result standard(String standardName, String standardNumber, Integer standardLevel, Integer participateWay,
+			String pageNo, String pageSize) {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
+				pSize, TokenManager.getUserId()));
+		return res;
+	}
+
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细修改保存
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
+	public Result developStandard(OrgStandard orgStandard) {
+		Result res = new Result();
+		if (StringUtils.isBlank(orgStandard.getId()) ) {
+			orgStandard.setId(UUID.randomUUID().toString());
+			orgStandard.setUid(TokenManager.getUserId());
+			orgStandardService.insert(orgStandard);
+		} else {
+			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+		}
+		res.setData(orgStandard);
+		return res;
+	}
+}

+ 15 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgStandardService.java

@@ -0,0 +1,15 @@
+package com.goafanti.techservice.cognizance.service;
+
+import com.goafanti.common.model.OrgStandard;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface OrgStandardService {
+
+	OrgStandard insert(OrgStandard orgStandard);
+
+	int updateByPrimaryKeySelective(OrgStandard orgStandard);
+
+	Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
+			Integer participateWay, Integer pNo, Integer pSize, String userId);
+
+}

+ 68 - 0
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgStandardServiceImpl.java

@@ -0,0 +1,68 @@
+package com.goafanti.techservice.cognizance.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrgStandardMapper;
+import com.goafanti.common.model.OrgStandard;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.cognizance.service.OrgStandardService;
+
+@Service
+public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> implements OrgStandardService {
+	@Autowired
+	private OrgStandardMapper orgStandardMapper;
+
+	@Override
+	public OrgStandard insert(OrgStandard orgStandard) {
+		orgStandardMapper.insert(orgStandard);
+		return orgStandard;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgStandard orgStandard) {
+		return orgStandardMapper.updateByPrimaryKeySelective(orgStandard);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
+			Integer participateWay, Integer pageNo, Integer pageSize, String uid) {
+		Map<String, Object> params = new HashMap<>();
+		
+		if (!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
+		if (!StringUtils.isBlank(standardName)){
+			params.put("standardName", standardName);
+		}
+		
+		if (!StringUtils.isBlank(standardNumber)){
+			params.put("standardNumber", standardNumber);
+		}
+		
+		if (null == standardLevel){
+			params.put("standardLevel", standardLevel);
+		}
+		
+		if (null == participateWay){
+			params.put("participateWay", participateWay);
+		}
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<OrgStandard>) findPage("findOrgStandardListByPage", "findOrgStandardCount", params, pageNo,
+				pageSize);
+	}
+}

+ 2 - 0
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -831,6 +831,8 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	
 
 	// 认证失败清除相关认证信息
 	private Result dealFaild(Result res) {

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

@@ -4,7 +4,6 @@ import java.util.Calendar;
 import java.util.UUID;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
-	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
+	    <!-- <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
 	  
 	</bean>