Explorar o código

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

wubb %!s(int64=8) %!d(string=hai) anos
pai
achega
745c34a112

+ 5 - 0
src/main/java/com/goafanti/admin/controller/AdminBigShotApiController.java

@@ -1,9 +1,14 @@
 package com.goafanti.admin.controller;
 
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.goafanti.common.controller.BaseApiController;
 /**
  * 大咖说首页
  */
+@RestController
+@RequestMapping(value = "/api/admin/bigShot")
 public class AdminBigShotApiController extends BaseApiController{
 		
 }

+ 34 - 1
src/main/java/com/goafanti/admin/controller/AdminStarApiController.java

@@ -1,9 +1,42 @@
 package com.goafanti.admin.controller;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.user.service.UserService;
+
 /**
  * 科技明星
  */
-public class AdminStarApiController extends BaseApiController{
+@RestController
+@RequestMapping(value = "/api/admin/star")
+public class AdminStarApiController extends BaseApiController {
+	@Resource
+	private UserService userService;
+
+	/**
+	 * 科技明星列表
+	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	public Result starList(Integer number, String engagedField, String username, String professionalTitle,
+			String workUnit, 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(userService.listStar(number, engagedField, username, professionalTitle, workUnit, pNo, pSize));
+		return res;
+	}
 }

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

@@ -1168,7 +1168,7 @@
 				AND oi.licence_area = #{area,jdbcType=INTEGER}
 			</if>
 			<if test="field != null">
-				AND oi.field like CONCAT(#{field,jdbcType=VARCHAR}, '%')
+				AND ot.search_area_category like CONCAT(#{field,jdbcType=VARCHAR},'%')
 			</if>
 			<if test="name != null">
 				AND oi.unit_name like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')

+ 36 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -798,4 +798,40 @@
 		u.type = 1
 	and u.id = #{uid,jdbcType=VARCHAR} 
   </select>
+  
+  <select id="findStarListByPage" parameterType="String" resultType="com.goafanti.user.bo.StarListBo">
+  	select 
+  		u.id as uid,
+  		u.number,
+  		ui.username,
+  		uc.engaged_field as engagedField,
+  		uc.professional_title as professionalTitle,
+  		uc.work_unit as workUnit,
+  		adc.achievement_count as achievementNum
+  	from user u
+  	left join user_identity ui on ui.uid = u.id
+  	left join user_career uc on uc.uid = u.id
+  	left join achievement_demand_count adc on adc.uid = u.id
+  	where 
+  		ui.celebrity = 1
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="engagedField != null">
+  		and uc.engaged_field like CONCAT(#{engagedField,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="professionalTitle != null">
+  		and uc.professional_title like CONCAT('%',#{professionalTitle,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="workUnit != null">
+  		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
+  
+  <select id="findStarCount" parameterType="String" resultType="java.lang.Integer">
+  
+  </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/portal/controller/PortalSearchApiController.java

@@ -22,7 +22,7 @@ import com.goafanti.user.service.UserIdentityService;
 
 @RestController
 @RequestMapping(value = "/portal/search")
-public class PortalSearchApiController extends BaseApiController {
+public class PortalSearchController extends BaseApiController {
 	@Resource
 	private AchievementService			achievementService;
 	@Resource

+ 88 - 0
src/main/java/com/goafanti/user/bo/StarListBo.java

@@ -0,0 +1,88 @@
+package com.goafanti.user.bo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class StarListBo {
+	private String	uid;
+
+	private String	engagedField;
+
+	private String	username;
+
+	private String	professionalTitle;
+
+	private String	workUnit;
+
+	private Integer	number;
+
+	private Integer	achievementNum;
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getEngagedField() {
+		return engagedField;
+	}
+
+	public void setEngagedField(String engagedField) {
+		this.engagedField = engagedField;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getProfessionalTitle() {
+		return professionalTitle;
+	}
+
+	public void setProfessionalTitle(String professionalTitle) {
+		this.professionalTitle = professionalTitle;
+	}
+
+	public String getWorkUnit() {
+		return workUnit;
+	}
+
+	public void setWorkUnit(String workUnit) {
+		this.workUnit = workUnit;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	@JsonIgnore
+	public Integer getAchievementNum() {
+		return achievementNum;
+	}
+
+	public void setAchievementNum(Integer achievementNum) {
+		this.achievementNum = achievementNum;
+	}
+
+	public Integer getAchievementNums() {
+		if (null == this.achievementNum) {
+			return 0;
+		} else {
+			return this.achievementNum;
+		}
+	}
+
+	public void setAchievementNums(Integer achievementNum) {
+	}
+
+}

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

@@ -8,6 +8,7 @@ import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserNames;
@@ -57,4 +58,7 @@ public interface UserService {
 
 	Object findOrgPartnerDetail(String uid);
 
+	Pagination<StarListBo> listStar(Integer number, String engagedField, String username, String professionalTitle, String workUnit,
+			Integer pNo, Integer pSize);
+
 }

+ 38 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -31,6 +31,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.OrgPartnerDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserNames;
@@ -432,4 +433,41 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return userMapper.findOrgPartnerDetail(uid, TokenManager.getUserId());
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<StarListBo> listStar(Integer number, String engagedField, String username,
+			String professionalTitle, String workUnit, Integer pNo, Integer pSize) {
+		Map<String, Object> params = new HashMap<>();
+		
+		if (null != number){
+			params.put("number", number);
+		}
+		
+		if (StringUtils.isNotBlank(engagedField)){
+			params.put("engagedField", engagedField);
+		}
+		
+		if (StringUtils.isNotBlank(username)){
+			params.put("username", username);
+		}
+		
+		if (StringUtils.isNotBlank(professionalTitle)){
+			params.put("professionalTitle", professionalTitle);
+		}
+		
+		if (StringUtils.isNotBlank(workUnit)){
+			params.put("workUnit", workUnit);
+		}
+		
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<StarListBo>) findPage("findStarListByPage", "findStarCount", params,
+				pNo, pSize);
+	}
+
 }