diff --git a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
index 188fbba..43a06ef 100644
--- a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
+++ b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
@@ -4,47 +4,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
-
+
-
-
-
-
+
@@ -72,26 +42,26 @@
- {
+ "keyToString": {
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "last_opened_file_path": "F:/02.FNSProject/JAVA_MYSQL_HCJXJY",
+ "settings.editor.selected.configurable": "web.server",
+ "spring.configuration.checksum": "420f802bde281311b05da23e05cddeda"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "mysql"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "mysql"
]
}
-}]]>
+}
@@ -130,7 +100,10 @@
-
+
+
+
+
1730470371982
@@ -139,7 +112,14 @@
1730470371982
-
+
+ 1730697159202
+
+
+
+ 1730697159202
+
+
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java
index db41355..c3e0ab5 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java
@@ -54,6 +54,8 @@ public class WebNewsDto{
*/
private Integer typeId;
+ private Integer flag;
+
/**
* 创建时间
*/
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java
index 0df5deb..54bd092 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java
@@ -41,6 +41,9 @@ public class WebBanner implements Serializable {
@ApiModelProperty(value = "地址", required = true)
private String bannerUrl;
+ @ApiModelProperty(value = "图片地址", required = true)
+ private String bannerPic;
+
/**
* 索引
*/
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java
index fd9c99b..7b18522 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java
@@ -3,6 +3,7 @@ package com.hc.gpbusiness.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
@@ -17,8 +18,8 @@ import java.io.Serializable;
* @author java
* @since 2020-07-29 17:28:24
*/
-@Builder
@Data
+@NoArgsConstructor
public class WebNews implements Serializable {
private static final long serialVersionUID = 485489852911503744L;
@@ -68,6 +69,9 @@ public class WebNews implements Serializable {
@ApiModelProperty(value = "分类", required = true)
private Integer typeId;
+ @ApiModelProperty(value = "置顶", required = true)
+ private Integer flag;
+
/**
* 创建时间
*/
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java
index d07e39a..6ed48f4 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java
@@ -5,7 +5,6 @@ import com.hc.gpbusiness.dto.WebCourseDto;
import com.hc.gpbusiness.mapper.WebCourseMapper;
import com.hc.gpbusiness.mapper.WebCourseTypeMapper;
import com.hc.gpbusiness.model.WebCourse;
-import com.hc.gpbusiness.model.WebCourse;
import com.hc.gpbusiness.model.WebCourseType;
import com.hc.gpbusiness.service.WebCourseService;
import org.springframework.beans.BeanUtils;
@@ -97,10 +96,9 @@ public class WebCourseServiceImpl implements WebCourseService {
*/
@Override
public PageInfo queryAllByLimit(int page, int size, Integer moduleId) {
- PageHelper.startPage(page, size);
- List news = this.courseMapper.queryByModuleId(moduleId);
- List resultList = copyList(news);
- return new PageInfo(resultList);
+ PageInfo info = PageHelper.startPage(page, size).setOrderBy("create_time desc").doSelectPageInfo(() -> this.courseMapper.queryByModuleId(moduleId));
+ info.setList(copyList(info.getList()));
+ return info;
}
public List copyList(List records) {
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java
index d24b900..a87d031 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java
@@ -97,12 +97,28 @@ public class WebNewsServiceImpl implements WebNewsService {
* @param moduleId 板块id
* @return 对象列表
*/
+// @Override
+// public PageInfo queryAllByLimit(int page, int size, Integer moduleId) {
+// PageHelper.startPage(page, size);
+// List news = this.newsMapper.queryNewsByModuleId(moduleId);
+// List resultList = copyList(news);
+// return new PageInfo(resultList);
+// }
+//
+// public PageInfo queryAllByLimit1(int page, int size, Integer moduleId) {
+//
+// List news = this.newsMapper.queryNewsByModuleId(moduleId);
+// List resultList = copyList(news);
+// PageHelper.startPage(page, size).doSelectPage(resultList);
+// PageInfo info = new PageInfo(resultList);
+// return info;
+// }
+
@Override
public PageInfo queryAllByLimit(int page, int size, Integer moduleId) {
- PageHelper.startPage(page, size);
- List news = this.newsMapper.queryNewsByModuleId(moduleId);
- List resultList = copyList(news);
- return new PageInfo(resultList);
+ PageInfo info = PageHelper.startPage(page, size).setOrderBy("flag desc,create_time desc").doSelectPageInfo(() -> this.newsMapper.queryNewsByModuleId(moduleId));
+ info.setList(copyList(info.getList()));
+ return info;
}
public List copyList(List records) {
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebBannerMapper.xml b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebBannerMapper.xml
index cc61e1f..ef244cc 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebBannerMapper.xml
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebBannerMapper.xml
@@ -5,6 +5,7 @@
+
@@ -13,6 +14,7 @@
banner_id,
banner_url,
+ banner_pic,
banner_index,
create_time,
update_time
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebCourseMapper.xml b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebCourseMapper.xml
index 1fad7f3..b480f94 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebCourseMapper.xml
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebCourseMapper.xml
@@ -42,7 +42,7 @@
SELECT
FROM web_course
- WHERE module_id = #{moduleId}
+ WHERE module_id = #{moduleId} order by create_time desc
\ No newline at end of file
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
index 83b1515..580536c 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
@@ -2,13 +2,14 @@
-
+
+
@@ -20,15 +21,23 @@
news_content,
module_id,
type_id,
+ flag,
create_time,
update_time
-