From 9af76a989343d4cfbb5e900c97e7e440d6597647 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 Aug 2021 17:24:16 +0800
Subject: [PATCH] 新闻修改
---
src/main/java/org/springblade/modules/article/entity/Article.java | 5 +
src/main/java/org/springblade/modules/article/vo/ArticleVo.java | 5 +
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 17 +++++
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 16 +++++
src/main/java/org/springblade/modules/depl/controller/DeplController.java | 94 +++++++++++++++---------------
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java | 7 ++
src/main/java/org/springblade/modules/article/service/ArticleService.java | 8 ++
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 11 +++
8 files changed, 116 insertions(+), 47 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/controller/ArticleController.java b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
index 2dfc906..bd73a6a 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -49,6 +49,22 @@
}
/**
+ *
+ * 查询资讯分页信息(角色权限)
+ * @param response
+ * @param article 资讯对象
+ * @param query 查询参数
+ * @return
+ */
+ @GetMapping("/pageDate")
+ public R<IPage<Article>> pageDate(HttpServletResponse response, ArticleVo article, Query query){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(articleService.pageDate(Condition.getPage(query),article));
+ }
+
+ /**
* 资讯详情
* @param article 资讯查询对象
* @param response
diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index 4f24de1..0619a1d 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -86,4 +86,9 @@
* 是否推荐 1：推荐 2：不推荐
*/
private Integer recommend;
+
+ /**
+ * 发布状态 0:未发布 1:已发布
+ */
+ private String publish;
}
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java
index e2576e9..5a3b56d 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java
@@ -22,4 +22,11 @@
* @return
*/
List<Article> selectArticlePage(IPage<Article> page, @Param("article") ArticleVo article);
+ /**
+ * 查询资讯分页信息(角色权限)
+ * @param page
+ * @param article 资讯对象
+ * @return
+ */
+ List<Article> pageDate(IPage<Article> page, @Param("article") ArticleVo article);
}
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index 9dee091..ea91a91 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -27,4 +27,21 @@
</if>
order by create_time desc
</select>
+
+ <!--查询资讯分页列表信息-->
+ <select id="pageDate" resultType="org.springblade.modules.article.entity.Article">
+ select * from sys_article
+ where 1=1
+ <if test="article.articleType!=null and article.articleType!=''">
+ and article_type LIKE CONCAT ('%', #{article.articleType},'%')
+ </if>
+ <if test="article.keyword!=null and article.keyword!=''">
+ AND CONCAT(title,source_name)
+ LIKE CONCAT ('%', #{article.keyword},'%')
+ </if>
+ <if test="(article.rolename==null and article.rolename=='') or (article.rolename!='administrator' and article.rolename!='policeAdmin')">
+ AND publish = 1
+ </if>
+ order by create_time desc
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/article/service/ArticleService.java b/src/main/java/org/springblade/modules/article/service/ArticleService.java
index 4153e16..64722cf 100644
--- a/src/main/java/org/springblade/modules/article/service/ArticleService.java
+++ b/src/main/java/org/springblade/modules/article/service/ArticleService.java
@@ -18,4 +18,12 @@
* @return
*/
IPage<Article> selectArticlePage(IPage<Article> page, ArticleVo article);
+
+ /**
+ * 查询资讯分页信息(角色权限)
+ * @param page
+ * @param article 资讯对象
+ * @return
+ */
+ IPage<Article> pageDate(IPage<Article> page, ArticleVo article);
}
diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index 4735812..37bba74 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -27,4 +27,15 @@
public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVo article) {
return page.setRecords(baseMapper.selectArticlePage(page,article));
}
+
+ /**
+ * 查询资讯分页信息(角色权限)
+ * @param page
+ * @param article 资讯对象
+ * @return
+ */
+ @Override
+ public IPage<Article> pageDate(IPage<Article> page, ArticleVo article) {
+ return page.setRecords(baseMapper.pageDate(page,article));
+ }
}
diff --git a/src/main/java/org/springblade/modules/article/vo/ArticleVo.java b/src/main/java/org/springblade/modules/article/vo/ArticleVo.java
index 0ac6c57..3d75895 100644
--- a/src/main/java/org/springblade/modules/article/vo/ArticleVo.java
+++ b/src/main/java/org/springblade/modules/article/vo/ArticleVo.java
@@ -22,4 +22,9 @@
* 查询关键字
*/
private String keyword;
+
+ /**
+ * 角色id
+ */
+ private String rolename;
}
diff --git a/src/main/java/org/springblade/modules/depl/controller/DeplController.java b/src/main/java/org/springblade/modules/depl/controller/DeplController.java
index c712368..9271cfd 100644
--- a/src/main/java/org/springblade/modules/depl/controller/DeplController.java
+++ b/src/main/java/org/springblade/modules/depl/controller/DeplController.java
@@ -140,54 +140,13 @@
*
* @param file
*/
- @PostMapping("put-depl")
- public R put(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
- //填写你文件上传的地址以及相应信息
- String url = "http://web.byisf.com:9000";
- String access = "adminminio";
- String secret = "adminminio";
- String bucket = "jfpt";
- MinioClient minioClient =
- MinioClient.builder()
- .endpoint(url)
- .credentials(access, secret)
- .build();
- // 检查存储桶是否已经存在
- boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
- if (!isExist) {
- // 创建一个名为zip的存储桶，用于zip文件。
- minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
- minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
- }
- String fileName = file.getOriginalFilename();
- String newName = "upload/depl/" + UUID.randomUUID().toString().replaceAll("-", "")
- + fileName.substring(fileName.lastIndexOf("."));
- InputStream in = file.getInputStream();
- //创建头部信息
- Map<String, String> headers = new HashMap<>(1 << 2);
- //添加自定义内容类型
- headers.put("Content-Type", "application/octet-stream");
- //上传
- minioClient.putObject(
- PutObjectArgs.builder().bucket(bucket).object(newName).stream(
- in, in.available(), -1)
- .headers(headers)
- .build());
- in.close();
- String urls = "https://web.byisf.com/minio/jfpt/" + newName;
- return R.data(urls);
- }
-
// @PostMapping("put-depl")
-// public R put(HttpServletResponse response, @RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
-// response.setHeader("Access-Control-Allow-Origin", "*");
-// response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
-// response.setHeader("Access-Control-Allow-Credentials","true");
+// public R put(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
// //填写你文件上传的地址以及相应信息
-// String url = "http://223.82.109.183:2081";
-// String access = "zhbaadmin";
-// String secret = "zhbapassword";
-// String bucket = "zhba";
+// String url = "http://web.byisf.com:9000";
+// String access = "adminminio";
+// String secret = "adminminio";
+// String bucket = "jfpt";
// MinioClient minioClient =
// MinioClient.builder()
// .endpoint(url)
@@ -215,10 +174,51 @@
// .headers(headers)
// .build());
// in.close();
-// String urls = "http://223.82.109.183:2081/minio/zhba/" + newName;
+// String urls = "https://web.byisf.com/minio/jfpt/" + newName;
// return R.data(urls);
// }
+ @PostMapping("put-depl")
+ public R put(HttpServletResponse response, @RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ //填写你文件上传的地址以及相应信息
+ String url = "http://223.82.109.183:2081";
+ String access = "zhbaadmin";
+ String secret = "zhbapassword";
+ String bucket = "zhba";
+ MinioClient minioClient =
+ MinioClient.builder()
+ .endpoint(url)
+ .credentials(access, secret)
+ .build();
+ // 检查存储桶是否已经存在
+ boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
+ if (!isExist) {
+ // 创建一个名为zip的存储桶，用于zip文件。
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
+ minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
+ }
+ String fileName = file.getOriginalFilename();
+ String newName = "upload/depl/" + UUID.randomUUID().toString().replaceAll("-", "")
+ + fileName.substring(fileName.lastIndexOf("."));
+ InputStream in = file.getInputStream();
+ //创建头部信息
+ Map<String, String> headers = new HashMap<>(1 << 2);
+ //添加自定义内容类型
+ headers.put("Content-Type", "application/octet-stream");
+ //上传
+ minioClient.putObject(
+ PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ in, in.available(), -1)
+ .headers(headers)
+ .build());
+ in.close();
+ String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ return R.data(urls);
+ }
+
/**
* 部署详情
*/
--
Gitblit v1.9.3