|
|
@@ -9,9 +9,11 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
import com.goafanti.achievement.service.AchievementInterestService;
|
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
+import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseApiController;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.demand.service.DemandService;
|
|
|
+import com.goafanti.news.service.NewsService;
|
|
|
import com.goafanti.user.service.UserIdentityService;
|
|
|
|
|
|
@RestController
|
|
|
@@ -25,6 +27,8 @@ public class AppDiscoveryController extends BaseApiController {
|
|
|
private UserIdentityService userIdentityService;
|
|
|
@Resource
|
|
|
private AchievementInterestService achievementInterestService;
|
|
|
+ @Resource
|
|
|
+ private NewsService newsService;
|
|
|
|
|
|
/**
|
|
|
* 成果列表
|
|
|
@@ -88,9 +92,9 @@ public class AppDiscoveryController extends BaseApiController {
|
|
|
* 专家列表
|
|
|
*/
|
|
|
@RequestMapping(value = "/expertsList", method = RequestMethod.GET)
|
|
|
- public Result expertsList(String industry, Integer pNo, Integer pSize) {
|
|
|
+ public Result expertsList(String name,String industry, Integer pNo, Integer pSize) {
|
|
|
Result res = new Result();
|
|
|
- res.setData(userIdentityService.expertsList(industry, pNo, pSize));
|
|
|
+ res.setData(userIdentityService.expertsList(name,industry, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -104,4 +108,35 @@ public class AppDiscoveryController extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 政策列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/listNews", method = RequestMethod.GET)
|
|
|
+ public Result appListNews(String param,Integer pNo,Integer pSize) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (null==pNo) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"页码","页码"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (null==pSize) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"页显示数","页显示数"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(newsService.appListNews( param ,pNo, pSize));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 政策详情
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/newsDetail", method = RequestMethod.GET)
|
|
|
+ public Result expertsDetail(long id) {
|
|
|
+ System.out.println("111111111111");
|
|
|
+ Result res = new Result();
|
|
|
+ res.setData(newsService.findNewsDetail( id));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
}
|