Преглед изворни кода

官网首页等内容优化、新增热门等相关处理开发

anderx пре 3 година
родитељ
комит
05f282bd19

+ 34 - 25
src/main/java/com/kede/common/controller/PublicApiController.java

@@ -49,13 +49,13 @@ import java.util.Date;
 @RestController
 @RequestMapping(value = "/open")
 public class PublicApiController extends BaseController {
-	
+
 	@Resource
 	private LinkesService linkesService;
 	@Resource
 	private NewsService newsService;
 	@Resource
-	private CustomerCaseService customerCaseService; 
+	private CustomerCaseService customerCaseService;
 	@Resource
 	private OrganizationService	organizationService;
 	@Resource
@@ -75,7 +75,7 @@ public class PublicApiController extends BaseController {
 
 	@Value(value = "${upload.path}")
 	public  String uploadPath = "";
-	
+
 	/**
 	 * 微信支付,通知--- 成功结果
 	 */
@@ -84,7 +84,7 @@ public class PublicApiController extends BaseController {
 	 * 微信支付,通知--- 失败结果
 	 */
 	public static String NOTIFY_FAIL = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
-	
+
 	@RequestMapping(value = "/listNews", method = RequestMethod.GET)
 	public Result listNews(InputNews in,Integer pageSize,Integer pageNo) {
 		Result res =new Result();
@@ -92,7 +92,16 @@ public class PublicApiController extends BaseController {
 		res.data(newsService.listnewsDetails(in,pageSize,pageNo));
 		return res;
 	}
-	
+
+	@RequestMapping(value = "/listHotNews", method = RequestMethod.GET)
+	public Result listHotNews(InputNews in,Integer pageSize) {
+		Result res =new Result();
+		in.setReleaseStatus(1);
+		in.setHot(1l);
+		res.data(newsService.listnewsDetails(in,pageSize,1));
+		return res;
+	}
+
 	@RequestMapping(value = "/listRecruitment", method = RequestMethod.GET)
 	public Result listRecruitment(InputRecruitment ir,Integer pageSize,Integer pageNo) {
 		Result res =new Result();
@@ -100,7 +109,7 @@ public class PublicApiController extends BaseController {
 		res.data(recruitmentService.listRecruitment(ir,pageSize,pageNo));
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/listOrganization", method = RequestMethod.GET)
 	public Result listOrganization(InputOrganization io,Integer pageSize,Integer pageNo) {
 		Result res =new Result();
@@ -108,7 +117,7 @@ public class PublicApiController extends BaseController {
 		res.data(organizationService.listOrganization(io,pageSize,pageNo));
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/listCustomerCase", method = RequestMethod.GET)
 	public Result listCustomerCase(InputCustomerCase ic,Integer pageSize,Integer pageNo) {
 		Result res =new Result();
@@ -116,7 +125,7 @@ public class PublicApiController extends BaseController {
 		res.data(customerCaseService.listCustomerCase(ic,pageSize,pageNo));
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/addVisitingCustomers", method = RequestMethod.POST)
 	public Result addVisitingCustomers(VisitingCustomers vc) {
 		Result res =new Result();
@@ -137,24 +146,24 @@ public class PublicApiController extends BaseController {
 		res.data(activityService.listDetails(in,pageSize,pageNo));
 		return res;
 	}
-	
-	
+
+
 	@RequestMapping(value = "/projectTypeList", method = RequestMethod.GET)
 	public Result projectTypeList(String name) {
 		Result res =new Result();
-		
+
 		res.data(projectTypeService.list(name));
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/projectList", method = RequestMethod.GET)
 	public Result projectList(String name, String startTime, String endTime,Integer pageNo,Integer pageSize) {
 		Result res =new Result();
-		
+
 		res.data(projectService.list( name,  startTime,  endTime, 1,1,pageNo, pageSize));
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/selectProject", method = RequestMethod.GET)
 	@CrossOrigin(origins="*",allowCredentials="true")
 	public Result selectProject(Integer id) {
@@ -165,23 +174,23 @@ public class PublicApiController extends BaseController {
 		res.data(projectService.getProject( id));
 		return res;
 	}
-	
-	
+
+
 	@RequestMapping(value = "/payCallBack", method = RequestMethod.POST)
 	public String wxPayCallBack(HttpServletRequest req, HttpServletResponse response) {
 		LoggerUtils.debug(getClass(), "===============微信支付回调==========================");
 		wxService.wxPayCallBack(req);
 		return NOTIFY_SUCCESS;
 	}
-	
-	
+
+
 	@RequestMapping(value = "/nativePay",method = RequestMethod.POST)
 	@CrossOrigin(origins="*",allowCredentials="true")
 	public Result wxNativePay(Project p) {
 		LoggerUtils.debug(getClass(), "===============微信nativePay==========================");
 		Result res=new Result();
 		p=projectService.get(p.getId());
-		if (p==null) {	
+		if (p==null) {
 			res.getError().add(buildError("","项目不存在"));
 			return res;
 		}
@@ -193,16 +202,16 @@ public class PublicApiController extends BaseController {
 		}
 		return res.data(wxService.pushNativePay(p,"NATIVE"));
 	}
-	
-	
-	
+
+
+
 	@RequestMapping(value = "/H5Pay",method = RequestMethod.POST)
 	@CrossOrigin(origins="*",allowCredentials="true")
 	public Result H5Pay(Project p) {
 		LoggerUtils.debug(getClass(), "===============微信nativePay==========================");
 		Result res=new Result();
 		p=projectService.get(p.getId());
-		if (p==null) {	
+		if (p==null) {
 			res.getError().add(buildError("","项目不存在"));
 			return res;
 		}
@@ -214,11 +223,11 @@ public class PublicApiController extends BaseController {
 		}
 		return res.data(wxService.pushNativePay(p,"MWEB"));
 	}
-	
+
 	@RequestMapping(value = "/weChatDetails", method = RequestMethod.GET)
 	public Result weChatDetails(Integer type,Integer pid) {
 		Result res=new Result();
-		if (type==null&&pid==null) {	
+		if (type==null&&pid==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;
 		}

+ 2 - 2
src/main/java/com/kede/common/controller/WebpageController.java

@@ -137,7 +137,7 @@ public class WebpageController extends BaseController {
 		List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
 		o=list.size()>0?list.get(0):null;
 		modelview.addObject("banners",o);
-		OutNews outNews = newsService.selectNews(new InputNews(id));
+		OutNews outNews = newsService.addHotelectNews(new InputNews(id));
 		String title=outNews.getTitle();
 		if (title.length()>18)title=title.substring(0,18);
 		String content = outNews.getContent();
@@ -390,7 +390,7 @@ public class WebpageController extends BaseController {
 		OutNews gs1=new OutNews();
 		List<OutNews> gs2=new ArrayList<>();
 		for (int i = 0; i < list.size(); i++) {
-			list.get(i).setReleaseTimeConvert(DateUtils.formatDate(list.get(i).getReleaseTime(), AFTConstants.MMDD));
+			list.get(i).setReleaseTimeConvert(DateUtils.formatDate(list.get(i).getReleaseTime(), AFTConstants.YYYYMMDD));
 			list.get(i).setContent(displayRestriction(list.get(i).getContent()));
 			if (i==0) {
 				gs1=list.get(i);

+ 30 - 21
src/main/java/com/kede/common/mapper/NewsMapper.xml

@@ -14,10 +14,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
     <result column="keywords" jdbcType="VARCHAR" property="keywords" />
+    <result column="hot" jdbcType="BIGINT" property="hot" />
   </resultMap>
   <sql id="Base_Column_List">
     id, title, publisher, `type`, picture_url, `status`, sort, content, release_status,
-    create_time, release_time, keywords
+    create_time, release_time, keywords, hot
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -29,24 +30,21 @@
     delete from news
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.kede.common.model.News">
-    insert into news (id, title, publisher,
-      `type`, picture_url, `status`,
-      sort, content, release_status,
-      create_time, release_time, keywords
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.kede.common.model.News" useGeneratedKeys="true">
+    insert into news (title, publisher, `type`,
+      picture_url, `status`, sort,
+      content, release_status, create_time,
+      release_time, keywords, hot
       )
-    values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{publisher,jdbcType=VARCHAR},
-      #{type,jdbcType=INTEGER}, #{pictureUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
-      #{sort,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{releaseStatus,jdbcType=INTEGER},
-      #{createTime,jdbcType=TIMESTAMP}, #{releaseTime,jdbcType=TIMESTAMP}, #{keywords,jdbcType=VARCHAR}
+    values (#{title,jdbcType=VARCHAR}, #{publisher,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
+      #{pictureUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER},
+      #{content,jdbcType=VARCHAR}, #{releaseStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+      #{releaseTime,jdbcType=TIMESTAMP}, #{keywords,jdbcType=VARCHAR}, #{hot,jdbcType=BIGINT}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.kede.common.model.News">
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.kede.common.model.News" useGeneratedKeys="true">
     insert into news
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="title != null">
         title,
       </if>
@@ -80,11 +78,11 @@
       <if test="keywords != null">
         keywords,
       </if>
+      <if test="hot != null">
+        hot,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
       </if>
@@ -118,6 +116,9 @@
       <if test="keywords != null">
         #{keywords,jdbcType=VARCHAR},
       </if>
+      <if test="hot != null">
+        #{hot,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.kede.common.model.News">
@@ -156,6 +157,9 @@
       <if test="keywords != null">
         keywords = #{keywords,jdbcType=VARCHAR},
       </if>
+      <if test="hot != null">
+        hot = #{hot,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -171,19 +175,20 @@
       release_status = #{releaseStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       release_time = #{releaseTime,jdbcType=TIMESTAMP},
-      keywords = #{keywords,jdbcType=VARCHAR}
+      keywords = #{keywords,jdbcType=VARCHAR},
+      hot = #{hot,jdbcType=BIGINT}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
   <select id="selectByid" resultType="com.kede.news.bo.OutNews">
    select id, title, publisher, type, picture_url pictureUrl, status, sort, release_status releaseStatus,content,
-  	date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimeConvert,create_time createTime,keywords,
+  	date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimeConvert,create_time createTime,keywords,hot,
     date_format(release_time,'%Y-%m-%d %H:%i:%S') as releaseTimeConvert ,release_time releaseTime
     from news where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="findNewsList" resultType="com.kede.news.bo.OutNews">
   select id, title, publisher, type, picture_url pictureUrl, status, sort, release_status releaseStatus,content,
-  	date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimeConvert,create_time createTime,
+  	date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimeConvert,create_time createTime,hot,keywords,
     date_format(release_time,'%Y-%m-%d %H:%i:%S') as releaseTimeConvert ,release_time releaseTime
     from news where 1=1
      <if test="n.id!=null">
@@ -201,7 +206,11 @@
     <if test="n.type!=null">
     and type = #{n.type}
     </if>
-    order by releaseStatus desc,sort desc,id desc
+    order by
+    <if test="n.hot ==1">
+      hot desc,
+    </if>
+    releaseStatus desc,sort desc
     <if test="page_sql!=null">
 			${page_sql}
 	</if>

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

@@ -21,7 +21,7 @@ public class News implements Serializable {
     private String publisher;
 
     /**
-     * 类型 0公司新闻 1行业新闻 2高新技术企业 3军工三证
+     * 类型 0官方公告 1政策解读 2高新技术企业 3军工三证
      */
     private Integer type;
 
@@ -65,6 +65,11 @@ public class News implements Serializable {
      */
     private String keywords;
 
+    /**
+     * 热度
+     */
+    private Long hot;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -162,4 +167,12 @@ public class News implements Serializable {
     public void setKeywords(String keywords) {
         this.keywords = keywords;
     }
+
+    public Long getHot() {
+        return hot;
+    }
+
+    public void setHot(Long hot) {
+        this.hot = hot;
+    }
 }

+ 4 - 2
src/main/java/com/kede/news/bo/InputNews.java

@@ -5,13 +5,15 @@ import com.kede.common.model.News;
 public class InputNews extends News{
 	private String releaseTimes;
 
+
+
 	public InputNews() {
 	}
 	public InputNews(Integer id) {
 		this.setId(id);
 	}
 	/**
-	 * 
+	 *
 	 * @param type 类型 0公司新闻 1行业新闻
 	 * @param releaseStatus 发布 0否 1是
 	 * @param status 0正常 1首页
@@ -29,6 +31,6 @@ public class InputNews extends News{
 		this.releaseTimes = releaseTimes;
 	}
 
-	
+
 
 }

+ 1 - 0
src/main/java/com/kede/news/service/NewsService.java

@@ -15,5 +15,6 @@ public interface NewsService {
 	Pagination<OutNews> listnewsDetails(InputNews in, Integer pageSize, Integer pageNo);
 
 	OutNews selectNews(InputNews in);
+	OutNews addHotelectNews(InputNews in);
 
 }

+ 8 - 0
src/main/java/com/kede/news/service/impl/NewsServiceImpl.java

@@ -80,4 +80,12 @@ public class NewsServiceImpl extends BaseMybatisDao<NewsMapper> implements NewsS
 		return newsMapper.selectByid(in.getId());
 	}
 
+	@Override
+	public OutNews addHotelectNews(InputNews in) {
+		OutNews outNews = newsMapper.selectByid(in.getId());
+		outNews.setHot(outNews.getHot()+1);
+		newsMapper.updateByPrimaryKeySelective(outNews);
+		return outNews;
+	}
+
 }

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

@@ -616,12 +616,12 @@
                     </div>
                     <div class="newslist-right">
                         <div class="news-fenlei">
-                            <span class="active">公司新闻</span>
-                            <span>行业新闻</span>
+                            <span class="active">官方公告</span>
+                            <span>政策解读</span>
                             <span>高新技术企业</span>
                             <span>军工三证</span>
                         </div>
-                        <!-- 公司新闻 -->
+                        <!-- 官方公告 -->
                         <ul class="active news-list-it">
                             <li th:each="gs:${gs2}">
                                 <a th:href="${'/news/'+gs.id}" target="_blank" >
@@ -638,7 +638,7 @@
                             </li>
 
                         </ul>
-                        <!-- 行业新闻 -->
+                        <!-- 政策解读 -->
                         <ul class="news-list-it">
                             <li th:each="y:${hyxw}">
                                 <a th:href="${'/news/'+y.id}" target="_blank" >

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/news.html

@@ -30,8 +30,8 @@
             <div class="container">
                 <ul>
                     <li class="active"><a href="javascript:;">全部</a> </li>
-                    <li><a href="javascript:;">科德新闻</a> </li>
-                    <li><a href="javascript:;">行业资讯</a> </li>
+                    <li><a href="javascript:;">官方公告</a> </li>
+                    <li><a href="javascript:;">政策解读</a> </li>
                     <li><a href="javascript:;">高新技术企业</a> </li>
                     <li><a href="javascript:;">军工三证</a> </li>
                 </ul>