Explorar o código

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

Conflicts:
	src/main/java/com/goafanti/common/controller/WebpageController.java
wanghui %!s(int64=8) %!d(string=hai) anos
pai
achega
e8f6b66d04
Modificáronse 22 ficheiros con 278 adicións e 109 borrados
  1. 4 1
      schema/20170725-lectureUser.sql
  2. 2 2
      src/main/java/com/goafanti/LectureUser/service/impl/LectureUserServiceImpl.java
  3. 3 0
      src/main/java/com/goafanti/admin/controller/AdminNewsApiController.java
  4. 20 13
      src/main/java/com/goafanti/common/controller/WebpageController.java
  5. 2 0
      src/main/java/com/goafanti/common/dao/NewsMapper.java
  6. 1 0
      src/main/java/com/goafanti/common/enums/NewsCacheKey.java
  7. 4 2
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  8. 2 2
      src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml
  9. 21 7
      src/main/java/com/goafanti/common/mapper/LectureMapper.xml
  10. 115 1
      src/main/java/com/goafanti/common/mapper/LectureUserMapper.xml
  11. 14 1
      src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
  12. 1 1
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  13. 1 1
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  14. 18 8
      src/main/java/com/goafanti/common/model/Lecture.java
  15. 11 0
      src/main/java/com/goafanti/lecture/bo/InputLecture.java
  16. 15 2
      src/main/java/com/goafanti/news/bo/NewsSummary.java
  17. 14 0
      src/main/java/com/goafanti/news/service/NewsService.java
  18. 15 5
      src/main/java/com/goafanti/portal/bo/InternationalListBo.java
  19. 1 1
      src/main/webapp/WEB-INF/views/common.html
  20. 1 1
      src/main/webapp/WEB-INF/views/portal/evaluation/index.html
  21. 11 60
      src/main/webapp/WEB-INF/views/portal/index.html
  22. 2 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html

+ 4 - 1
schema/20170725-lectureUser.sql

@@ -5,4 +5,7 @@ CREATE TABLE `lecture_user` (
   `last_update_time` DATETIME NULL COMMENT '最近一次咨询时间',
   PRIMARY KEY (`lid`, `uid`))
 ENGINE = InnoDB DEFAULT CHARSET=utf8mb4
-COMMENT = '科技讲堂报名'
+COMMENT = '科技讲堂报名';
+
+alter table `lecture` 
+add column `lecturer` varchar(45) NULL comment '讲师';

+ 2 - 2
src/main/java/com/goafanti/LectureUser/service/impl/LectureUserServiceImpl.java

@@ -64,7 +64,7 @@ public class LectureUserServiceImpl extends BaseMybatisDao<LectureUserMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		return (Pagination<LectureUserListBo>) findPage("findActivityUserListByPage", "findActivityUserCount",
+		return (Pagination<LectureUserListBo>) findPage("findLectureUserListByPage", "findLectureUserCount",
 				disposeLectureList(lectureName, mobile, number, username, null), pNo, pSize);
 	}
 
@@ -79,7 +79,7 @@ public class LectureUserServiceImpl extends BaseMybatisDao<LectureUserMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		return (Pagination<LectureUserListBo>) findPage("findActivityOrgListByPage", "findActivityOrgCount",
+		return (Pagination<LectureUserListBo>) findPage("findLectureOrgListByPage", "findLectureOrgCount",
 				disposeLectureList(lectureName, mobile, number, null, unitName), pNo, pSize);
 	}
 

+ 3 - 0
src/main/java/com/goafanti/admin/controller/AdminNewsApiController.java

@@ -168,11 +168,14 @@ public class AdminNewsApiController extends BaseApiController {
 			newsService.cleanList(); // 清除策源地页面新闻列表缓存
 		} else if (NewsCacheKey.NEWS_PORTAL_LIST_CACHE_KEY.getCode().equals(cacheKey)) {
 			newsService.cleanPortalList(); // 清除新闻列表页列表缓存
+		} else if (NewsCacheKey.NEWS_INDEX_LIST_CACHE_KEY.getCode().equals(cacheKey)){
+			newsService.cleanIndexNewsList(); //清除首页新闻缓存
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "缓存标记"));
 		}
 		return res;
 	}
+	
 
 	private Result disposeInputNews(Result res, InputNews news, String createTimeFormattedDate) {
 		if (StringUtils.isBlank(news.getTitle())) {

+ 20 - 13
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -20,6 +20,8 @@ import com.goafanti.demand.service.DemandService;
 import com.goafanti.portal.bo.InternationalListBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
+import com.goafanti.news.enums.NewsType;
+import com.goafanti.news.service.NewsService;
 
 @Controller
 public class WebpageController extends BaseController {
@@ -39,6 +41,24 @@ public class WebpageController extends BaseController {
 	@Resource
 	private OrganizationIdentityService organizationIdentityService;
 	
+	@Resource
+	private NewsService			newsService;
+
+	/**
+	 * 首页
+	 */
+	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
+	public ModelAndView portalIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/index");
+		List<Banners> banners = bannersService.findPortalBanners(BannersType.SHOU_YE.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banner", banners.get(0));
+		}
+		modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2));
+		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
+		return modelview;
+	}
+
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/user/account/index");
@@ -315,19 +335,6 @@ public class WebpageController extends BaseController {
 	}
 
 	/**
-	 * 首页
-	 */
-	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
-	public ModelAndView portalIndex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/index");
-		List<Banners> banners = bannersService.findPortalBanners(BannersType.SHOU_YE.getKey());
-		if (!banners.isEmpty()) {
-			modelview.addObject("banner", banners.get(0));
-		}
-		return modelview;
-	}
-
-	/**
 	 * 金融圈
 	 */
 	@RequestMapping(value = "/portal/financial/financialIndex", method = RequestMethod.GET)

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

@@ -28,4 +28,6 @@ public interface NewsMapper {
 
 	List<NewsPortalList> findPortalList(Map<String, Object> params);
 
+	List<NewsSummary> findIndexNewsList(Map<String, Object> params);
+
 }

+ 1 - 0
src/main/java/com/goafanti/common/enums/NewsCacheKey.java

@@ -6,6 +6,7 @@ import java.util.Map;
 public enum NewsCacheKey {
 	NEWS_LIST_CACHE_KEY("news_list_cache_key", "策源地新闻列表缓存"),
 	NEWS_PORTAL_LIST_CACHE_KEY("news_portal_list_cache_key", "新闻列表页面缓存"),
+	NEWS_INDEX_LIST_CACHE_KEY("news_index_list_cache_key", "首页新闻列表缓存"),
 	
 	OTHER("", "未知参数");
 	

+ 4 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1353,13 +1353,15 @@
   
   <select id="selectInternationalAchievement" resultType="com.goafanti.portal.bo.InternationalListBo">
   	select 
-  		a.id as uid,
+  		a.id as id,
   		a.name as techName,
   		a.introduction,
   		a.owner_name as ownerName,
+  		a.owner_type as ownerType,
   		a.technical_picture_url as technicalPictureUrl,
   		a.country_name_zh as countryNameZh
-  	from achievement a 
+  	from 
+  		achievement a 
 	where 
 		a.deleted_sign = 0 and a.data_category = 1 
 	<!-- and a.release_status = 1 and nternational_flag = 1 -->

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -173,7 +173,7 @@
   		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="unitName != null">
-  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
   	</if>
   	order by au.last_update_time desc
   	<if test="page_sql!=null">
@@ -199,7 +199,7 @@
   		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="unitName != null">
-  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
   	</if>
   </select>
   

+ 21 - 7
src/main/java/com/goafanti/common/mapper/LectureMapper.xml

@@ -14,10 +14,11 @@
     <result column="hot" property="hot" jdbcType="INTEGER" />
     <result column="dynamic" property="dynamic" jdbcType="INTEGER" />
     <result column="end_time" property="endTime" jdbcType="TIMESTAMP" />
+    <result column="lecturer" property="lecturer" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, lecture_time, create_time, last_update_time, name, summary, deleted_sign, lecture_url,
-    hot, dynamic, end_time
+    hot, dynamic, end_time, lecturer
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -36,7 +37,7 @@
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{lectureTime,jdbcType=TIMESTAMP}, 
       #{createTime,jdbcType=TIMESTAMP}, #{lastUpdateTime,jdbcType=TIMESTAMP}, #{name,jdbcType=VARCHAR}, 
       #{summary,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{lectureUrl,jdbcType=VARCHAR},
-      #{hot,jdbcType=INTEGER}, #{dynamic,jdbcType=INTEGER}, #{endTime,jdbcType=TIMESTAMP})
+      #{hot,jdbcType=INTEGER}, #{dynamic,jdbcType=INTEGER}, #{endTime,jdbcType=TIMESTAMP}, #{lecturer,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Lecture" >
     insert into lecture
@@ -77,6 +78,9 @@
       <if test="endTime != null" >
         end_time,
       </if>
+      <if test="lecturer != null" >
+        lecturer,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -112,9 +116,12 @@
       <if test="dynamic != null" >
         #{dynamic,jdbcType=INTEGER},
       </if>
-       <if test="endTime != null" >
+      <if test="endTime != null" >
         #{endTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="lecturer != null" >
+        #{lecturer,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Lecture" >
@@ -153,6 +160,9 @@
       <if test="endTime != null" >
         end_time = #{endTime,jdbcType=TIMESTAMP},
       </if>
+       <if test="lecturer != null" >
+        lecturer = #{lecturer,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -168,7 +178,8 @@
       lecture_url = #{lectureUrl,jdbcType=VARCHAR},
       hot = #{hot,jdbcType=INTEGER},
       dynamic = #{dynamic,jdbcType=INTEGER},
-      end_time = #{endTime,jdbcType=TIMESTAMP}
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      lecturer = #{lecturer,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -192,7 +203,8 @@
 	  		ui.username,
 	  		l.hot,
 	  		l.dynamic,
-	  		l.end_time as endTime
+	  		l.end_time as endTime,
+	  		l.lecturer
 	  	from lecture l
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 
@@ -269,7 +281,8 @@
 	  		ui.username,
 	  		l.hot,
 	  		l.dynamic,
-	  		l.end_time as endTime
+	  		l.end_time as endTime,
+	  		l.lecturer
 	  	from lecture l
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 
@@ -288,7 +301,8 @@
 	  		ui.username,
 	  		l.hot,
 	  		l.dynamic,
-	  		l.end_time as endTime
+	  		l.end_time as endTime,
+	  		l.lecturer
 	  	from lecture l
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 

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

@@ -82,11 +82,125 @@
   
    <delete id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	delete
-  		from activity_user
+  		from lecture_user
   	where id in
   	<foreach item="item" index="index" collection="list" open="("
 			separator="," close=")">
 			#{item}
 	</foreach>
   </delete>
+  
+  <select id="findLectureUserListByPage" parameterType="String" resultType="com.goafanti.LectureUser.bo.LectureUserListBo">
+  	select
+  		lu.lid,
+  		lu.uid,
+  		lu.create_time as createTime,
+  		lu.last_update_time as lastUpdateTime,
+  		l.name as lectureName,
+  		u.number,
+  		u.mobile,
+  		ui.username,
+  		l.lecture_time as lectureTime,
+  		l.end_time as endTime
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join user_identity ui on ui.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 0 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="lectureName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by lu.last_update_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findLectureUserCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join user_identity ui on ui.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 0  
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="lectureName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
+  
+  <select id="findLectureOrgListByPage" parameterType="String" resultType="com.goafanti.LectureUser.bo.LectureUserListBo">
+  	select
+  		lu.lid,
+  		lu.uid,
+  		lu.create_time as createTime,
+  		lu.last_update_time as lastUpdateTime,
+  		l.name as lectureName,
+  		u.number,
+  		u.mobile,
+  		oi.unit_name as unitName,
+  		l.lecture_time as lectureTime,
+  		l.end_time as endTime
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join organization_identity oi on oi.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="lectureName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by lu.last_update_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findLectureOrgCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from lecture_user lu
+  	left join user u on u.id = lu.uid
+  	left join organization_identity oi on oi.uid = lu.uid
+  	left join lecture l on l.id = lu.lid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and l.name like CONCAT('%',#{lectureName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
 </mapper>

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

@@ -9,9 +9,10 @@
 		<result column="type" jdbcType="INTEGER" property="type" />
 		<result column="hot" jdbcType="INTEGER" property="hot" />
 		<result column="summary" jdbcType="VARCHAR" property="summary" />
+		<result column="source" jdbcType="VARCHAR" property="source" />
 	</resultMap>
 	<sql id="Summary_Column_List">
-		id, create_time, title, title_img, type, hot, summary
+		id, create_time, title, title_img, type, hot, summary, source
 	</sql>
 	<select id="findList" resultMap="SummaryResultMap">
 		select
@@ -25,6 +26,18 @@
 		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
 	</select>
 	
+	<select id="findIndexNewsList" resultMap="SummaryResultMap">
+		select
+		<include refid="Summary_Column_List" />
+		from news
+		where hot = 1 
+		<if test=" type != null">
+			and type = #{type,jdbcType=INTEGER}
+		</if>
+		order by create_time desc
+		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
+	</select>
+	
 	<select id="findNewsListByPage" parameterType="String" resultMap="BaseResultMap">
   	select
   		id,

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

@@ -1178,7 +1178,7 @@
   
   <select id="selectInternationalOrganization" resultType="com.goafanti.portal.bo.InternationalListBo">
 	select
-		a.id as uid,
+		a.id,
 		b.unit_name as unitName,
 		c.logo_url as logoUrl,
 		c.country_name_zh as countryNameZh,

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

@@ -491,7 +491,7 @@
 	 </select>
   	 <select id="selectInternationalUser" resultType="com.goafanti.portal.bo.InternationalListBo">
 		select 
-			a.id as uid,
+			a.id,
 			b.username as ownerName,
 			c.ability_label as abilityLabel,
 			d.person_portrait_url personPortraitUrl,

+ 18 - 8
src/main/java/com/goafanti/common/model/Lecture.java

@@ -66,6 +66,8 @@ public class Lecture {
 	 */
 	private Date	endTime;
 
+	private String	lecturer;
+
 	public String getId() {
 		return id;
 	}
@@ -165,6 +167,14 @@ public class Lecture {
 		this.endTime = endTime;
 	}
 
+	public String getLecturer() {
+		return lecturer;
+	}
+
+	public void setLecturer(String lecturer) {
+		this.lecturer = lecturer;
+	}
+
 	public String getLectureTimeFormattedDate() {
 		if (this.lectureTime == null) {
 			return null;
@@ -188,18 +198,18 @@ public class Lecture {
 	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
 
 	}
-	
-	public Integer getLectureStatus(){
-		if (this.lectureTime == null){
+
+	public Integer getLectureStatus() {
+		if (this.lectureTime == null) {
 			return ActivityStatus.ENROLL.getCode();
-		} 
-		if (new Date().getTime() > this.lectureTime.getTime()){
+		}
+		if (new Date().getTime() > this.lectureTime.getTime()) {
 			return ActivityStatus.CLOSED.getCode();
 		}
 		return ActivityStatus.ENROLL.getCode();
 	}
-	
-	public void setLectureStatus(Integer lectureStatus){
-		
+
+	public void setLectureStatus(Integer lectureStatus) {
+
 	}
 }

+ 11 - 0
src/main/java/com/goafanti/lecture/bo/InputLecture.java

@@ -30,6 +30,9 @@ public class InputLecture {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	dynamic;
 
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	lecturer;
+
 	public String getId() {
 		return id;
 	}
@@ -86,4 +89,12 @@ public class InputLecture {
 		this.dynamic = dynamic;
 	}
 
+	public String getLecturer() {
+		return lecturer;
+	}
+
+	public void setLecturer(String lecturer) {
+		this.lecturer = lecturer;
+	}
+
 }

+ 15 - 2
src/main/java/com/goafanti/news/bo/NewsSummary.java

@@ -44,6 +44,11 @@ public class NewsSummary {
 	 */
 	private String	summary;
 	
+	/**
+	 * 来源
+	 */
+	private String	source;
+
 	@JsonFormat(shape = Shape.STRING)
 	public Long getId() {
 		return id;
@@ -52,7 +57,7 @@ public class NewsSummary {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
+
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -100,7 +105,15 @@ public class NewsSummary {
 	public void setSummary(String summary) {
 		this.summary = summary;
 	}
-	
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
 	public String getCreateTimeFormattedDate() {
 		if (this.createTime == null) {
 			return null;

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

@@ -32,6 +32,20 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 	NewsMapper					newsMapper;
 
 	private static final Logger	logger	= LoggerFactory.getLogger(NewsService.class);
+	
+	@Cacheable(value = "IndexNewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
+	public List<NewsSummary> findIndexNewsList(Integer pageNo, Integer type, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("type", type);
+		params.put("pageSize", pageSize);
+		params.put("pageNo", pageNo);
+		return newsMapper.findIndexNewsList(params);
+	}
+
+	@CacheEvict(value = "IndexNewsListCache", allEntries = true)
+	public void cleanIndexNewsList() {
+		LoggerUtils.debug(logger, "清除首页新闻列表缓存");
+	}
 
 	@Cacheable(value = "NewsCache", key = "'News:'+#id")
 	public News selectById(Long id) {

+ 15 - 5
src/main/java/com/goafanti/portal/bo/InternationalListBo.java

@@ -1,12 +1,14 @@
 package com.goafanti.portal.bo;
 
 public class InternationalListBo {
-	private String			uid;
+	private String			id;
 	
 	private String			techName;
 
 	private String			ownerName;
 	
+	private Integer			ownerType;
+	
 	private String			technicalPictureUrl;
 	
 	private String 			countryNameZh;
@@ -23,12 +25,12 @@ public class InternationalListBo {
 	
 	private String			achievementCount;
 	
-	public String getUid() {
-		return uid;
+	public String getId() {
+		return id;
 	}
 
-	public void setUid(String uid) {
-		this.uid = uid;
+	public void setId(String id) {
+		this.id = id;
 	}
 
 	public String getTechName() {
@@ -47,6 +49,14 @@ public class InternationalListBo {
 		this.ownerName = ownerName;
 	}
 
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+
 	public String getTechnicalPictureUrl() {
 		return technicalPictureUrl;
 	}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/common.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/evaluation/index.html

@@ -88,7 +88,7 @@
 			</div>
 		</div>
 		<div class="container benifit_content">
-			<div class="section-title">评估的好处</div>
+			<div class="section-title">评估的重要性</div>
 			<div class="section-subtitle">EVALUATION OF THE BENEFITS</div>
 			<div class="section-content">
 				<p><span>1</span>摸清家底,维护企业资产的完整。以财务报告为目的的品牌评估成为企业资产管理的重要环节。</p>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 11 - 60
src/main/webapp/WEB-INF/views/portal/index.html


+ 2 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html

@@ -55,7 +55,8 @@
 						<h4 th:text="${lecture.name}" th:title="${lecture.name}"></h4>
 						<p th:text="${lecture.summary}" th:title="${lecture.summary}"></p>
 						<p th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}">2017-07-02 09:30:00</p>
-						<span th:class="${lecture.lectureStatus} == 0 ? 'customer-service' : ''" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'"></span>
+						<span th:class="${lecture.lectureStatus} == 0 ? 'customer-service apply' : ''" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'"></span>
+						<input type="hidden" class="lid" th:value="${lecture.id}">
 					</div>
 				</li>
 			</ul>