albertshaw 8 years ago
parent
commit
3f0d8b1575

+ 2 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -56,6 +56,8 @@ public interface AchievementService {
 			String keyword, Integer fieldA, Integer fieldB, Integer pageNo, Integer pageSize);
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
+	
+	Achievement selectAchievementDetail(String id);
 
 	int updateMatchDemand(Achievement a);
 

+ 5 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -613,5 +613,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@CacheEvict(value = "internationalAchievementList", allEntries = true)
 	public void cleanInternationalAchievement() {
 		LoggerUtils.debug(logger, "清除国际化技术列表");
+	}
+
+	@Override
+	public Achievement selectAchievementDetail(String id) {
+		return achievementMapper.selectByPrimaryKey(id);
 	}
 }

+ 2 - 2
src/main/java/com/goafanti/activityUser/controller/UserActivityUserApiController.java

@@ -31,9 +31,9 @@ public class UserActivityUserApiController extends BaseApiController {
 		}
 		ActivityUser au = activityUserService.selectByAidAndUid(aid, TokenManager.getUserId());
 		if (null == au) {
-			activityUserService.save(aid);
+			res.setData(activityUserService.save(aid));
 		} else {
-			activityUserService.update(au);
+			res.setData(activityUserService.update(au));
 		}
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -9,7 +9,7 @@ public interface ActivityUserService {
 
 	ActivityUser selectByUid(String userId);
 
-	void save(Long aid);
+	int save(Long aid);
 
 	int update(ActivityUser au);
 

+ 2 - 2
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -29,7 +29,7 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 	}
 
 	@Override
-	public void save(Long aid) {
+	public int save(Long aid) {
 		ActivityUser au = new ActivityUser();
 		au.setAid(aid);
 		au.setUid(TokenManager.getUserId());
@@ -37,7 +37,7 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 		now.set(Calendar.MILLISECOND, 0);
 		au.setCreateTime(now.getTime());
 		au.setLastUpdateTime(au.getCreateTime());
-		activityUserMapper.insert(au);
+		return activityUserMapper.insert(au);
 	}
 
 	@Override

+ 39 - 2
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -5,15 +5,19 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.activity.service.ActivityService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.demand.service.DemandService;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
 
@@ -21,11 +25,15 @@ import com.goafanti.news.service.NewsService;
 @RequestMapping(path = "/api/portal/app", method = RequestMethod.GET)
 public class AppApiController extends BaseApiController {
 	@Resource
-	BannersService			bannersService;
+	private BannersService			bannersService;
 	@Resource
 	private ActivityService	activityService;
 	@Resource
-	NewsService				newsService;
+	private NewsService				newsService;
+	@Resource
+	private AchievementService			achievementService;
+	@Resource
+	private DemandService				demandService;
 
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public Result index() {
@@ -36,4 +44,33 @@ public class AppApiController extends BaseApiController {
 		result.put("news", newsService.findNewsList(0, NewsType.JTDT.getCode(), 5));
 		return res().data(result);
 	}
+	
+	
+	/**
+	 * 科技成果详情
+	 */
+	@RequestMapping(value = "/achievementDetail", method = RequestMethod.GET)
+	public Result achievementDetail(String id) {
+		Result res = new Result();
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			return res;
+		}
+		res.setData(achievementService.selectAchievementDetail(id));
+		return res;
+	}
+
+	/**
+	 * 科技需求详情
+	 */
+	@RequestMapping(value = "/demandDetail", method = RequestMethod.GET)
+	public Result demandDetail(String id) {
+		Result res = new Result();
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
+			return res;
+		}
+		res.setData(demandService.selectDemandDetail(id));
+		return res;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -36,6 +36,8 @@ public interface AchievementMapper {
 	void insertBatch(List<Achievement> achievementList);
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
+	
+	AchievementDetailBo selectAchievementDetail(String id);
 
 	Integer findAchievementNumByUid(String uid);
 

+ 0 - 2
src/main/java/com/goafanti/common/dao/DemandMapper.java

@@ -33,8 +33,6 @@ public interface DemandMapper {
 
 	void insertBatch(List<Demand> demandList);
 
-	DemandSearchDetailBo selectDemandSearchDetail(String id);
-
 	DemandSearchDetailBo selectDemandSearchDetail(String uid, String id);
 
 	Integer findDemandNumByUid(String uid);

+ 1 - 0
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -72,6 +72,7 @@ public interface DemandService {
 
 	int updateByPrimaryKeySelective(Demand d);
 
+	Demand selectDemandDetail(String id);
 
 
 }

+ 5 - 0
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -722,4 +722,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.updateByPrimaryKeySelective(d);
 	}
 
+	@Override
+	public Demand selectDemandDetail(String id) {
+		return demandMapper.selectByPrimaryKey(id);
+	}
+
 }

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

@@ -34,7 +34,6 @@ import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.AchievementOrder;
 import com.goafanti.common.model.AchievementOrderLog;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Demand;
 import com.goafanti.common.model.DemandOrder;
 import com.goafanti.common.model.DemandOrderLog;