Kaynağa Gözat

Merge branch 'test' of jishutao/jitao-server into prod

gitadmin 7 yıl önce
ebeveyn
işleme
554b2e3899

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

@@ -18,7 +18,7 @@ import com.goafanti.news.service.NewsService;
 import com.goafanti.user.service.UserIdentityService;
 
 @RestController
-@RequestMapping(path = "/open/discovery", method = RequestMethod.GET)
+@RequestMapping(path = "/app/discovery", method = RequestMethod.GET)
 public class AppDiscoveryController extends CertifyApiController {
 	@Resource
 	private AchievementService	achievementService;
@@ -134,7 +134,7 @@ public class AppDiscoveryController extends CertifyApiController {
 	@RequestMapping(value = "/newsDetail", method = RequestMethod.GET)
 	public Result newsDetail(long id) {
 		Result res = new Result();
-		res.setData(newsService.findNewsDetail(id));
+		res.setData(newsService.findAppNewsDetail(id));
 		return res;
 	}
 	

+ 0 - 3
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -637,12 +637,10 @@ public class AppUserController extends CertifyApiController {
 					AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-
 		if (StringUtils.isBlank(ia.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
 			return res;
 		}
-
 		/*if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
 				&& !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
 				&& !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
@@ -674,7 +672,6 @@ public class AppUserController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果名称", "成果名称"));
 			return res;
 		}
-
 		if (null == ia.getCategory()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到数据类别", "数据类别"));
 			return res;

+ 10 - 0
src/main/java/com/goafanti/app/controller/OpenAppDiscoveryController.java

@@ -151,6 +151,16 @@ public class OpenAppDiscoveryController extends BaseApiController {
 		return res;
 	}
 	/**
+	 * 新闻详情
+	 */
+	@RequestMapping(value = "/newsDetail", method = RequestMethod.GET)
+	public Result newsDetail(long id) {
+		Result res = new Result();
+		res.setData(newsService.findAppNewsDetail(id));
+		return res;
+	}
+	
+	/**
 	 * 科技资讯列表
 	 */
 	@RequestMapping(value = "/listInformation", method = RequestMethod.GET)

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

@@ -640,6 +640,7 @@
   p.author,
   p.audit_status as auditStatus,
   p.edit_time as editTime,
+  p.create_time as createTime,
   p.id,
   p.source,
   p.release_date as releaseDate,

+ 1 - 1
src/main/java/com/goafanti/common/model/News.java

@@ -259,7 +259,7 @@ public class News {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.createTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.createTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 12 - 0
src/main/java/com/goafanti/news/bo/PolicyResult.java

@@ -2,6 +2,9 @@ package com.goafanti.news.bo;
 
 import java.util.List;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.Policy;
 
 public class PolicyResult extends Policy {
@@ -16,4 +19,13 @@ public void setPublishPages(List<String> publishPages) {
 	this.publishPages = publishPages;
 }
 
+
+public String getCreateTimeFormattedDate() {
+	if (super.getCreateTime() == null) {
+		return null;
+	} else {
+		return DateFormatUtils.format(super.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+	}
+}
+
 }

+ 4 - 0
src/main/java/com/goafanti/news/service/NewsService.java

@@ -352,6 +352,10 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return p;
 	}
 
+	public News findAppNewsDetail(long id) {
+		return newsMapper.selectByPrimaryKey(id);
+	}
+