From 71bf751d248aff415c95b2bc09dc1bb0219c9428 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Jul 2021 10:36:44 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-sys/src/main/java/com/xzx/gc/system/vo/ApiBannerListVo.java | 20 ++++++
gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java | 5 +
gc-sys/src/main/resources/mapper/system/BannerMapper.xml | 8 ++
gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java | 55 ++++++++++++++++++
gc-sys/src/main/java/com/xzx/gc/system/mapper/BannerMapper.java | 3 +
gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java | 5 +
gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml | 6 ++
gc-sys/src/main/java/com/xzx/gc/system/mapper/SysNewsMapper.java | 2
gc-sys/src/main/java/com/xzx/gc/system/vo/ApiNewsListVo.java | 16 +++++
gc-sys/src/main/java/com/xzx/gc/system/dto/ApiNewsListDto.java | 11 +++
gc-sys/src/main/java/com/xzx/gc/system/dto/ApiBannerListDto.java | 11 +++
11 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java b/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java
new file mode 100644
index 0000000..52a4909
--- /dev/null
+++ b/gc-sys/src/main/java/com/xzx/gc/system/controller/ApiBannerNewsController.java
@@ -0,0 +1,55 @@
+package com.xzx.gc.system.controller;
+
+import com.xzx.gc.common.request.BaseController;
+import com.xzx.gc.model.JsonResult;
+import com.xzx.gc.system.dto.ApiBannerListDto;
+import com.xzx.gc.system.dto.ApiNewsListDto;
+import com.xzx.gc.system.service.BannerService;
+import com.xzx.gc.system.service.SysNewsService;
+import com.xzx.gc.system.vo.ApiBannerListVo;
+import com.xzx.gc.system.vo.ApiNewsListVo;
+import com.xzx.gc.system.vo.SysBannerListVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@Api(tags = {"广告Banner图--小程序"})
+@Slf4j
+public class ApiBannerNewsController extends BaseController {
+
+ @Autowired
+ private SysNewsService sysNewsService;
+
+ @Autowired
+ private BannerService bannerService;
+
+ @ApiOperation("banner图")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiBannerListVo.class)
+ })
+ @PostMapping(value = "/banner/bannerList")
+ public JsonResult<List<ApiBannerListVo>> bannerList(@RequestBody ApiBannerListDto apiBannerListDto, HttpServletRequest request) {
+ apiBannerListDto.setUserId(getUserId(request));
+ return JsonResult.success(bannerService.bannerList(apiBannerListDto));
+ }
+
+ @ApiOperation("广播通知")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiNewsListVo.class)
+ })
+ @PostMapping(value = "/news/newsList")
+ public JsonResult<List<ApiNewsListVo>> newsList(@RequestBody ApiNewsListDto apiNewsListDto, HttpServletRequest request) {
+ apiNewsListDto.setUserId(getUserId(request));
+ return JsonResult.success(sysNewsService.newsList(apiNewsListDto));
+ }
+}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/dto/ApiBannerListDto.java b/gc-sys/src/main/java/com/xzx/gc/system/dto/ApiBannerListDto.java
new file mode 100644
index 0000000..ddee800
--- /dev/null
+++ b/gc-sys/src/main/java/com/xzx/gc/system/dto/ApiBannerListDto.java
@@ -0,0 +1,11 @@
+package com.xzx.gc.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApiBannerListDto {
+
+ @ApiModelProperty(hidden = true)
+ private String userId;
+}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/dto/ApiNewsListDto.java b/gc-sys/src/main/java/com/xzx/gc/system/dto/ApiNewsListDto.java
new file mode 100644
index 0000000..2248d60
--- /dev/null
+++ b/gc-sys/src/main/java/com/xzx/gc/system/dto/ApiNewsListDto.java
@@ -0,0 +1,11 @@
+package com.xzx.gc.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApiNewsListDto {
+
+ @ApiModelProperty(hidden = true)
+ private String userId;
+}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/mapper/BannerMapper.java b/gc-sys/src/main/java/com/xzx/gc/system/mapper/BannerMapper.java
index 72040ac..99cce38 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/mapper/BannerMapper.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/mapper/BannerMapper.java
@@ -4,6 +4,7 @@
import com.xzx.gc.model.admin.BannerModel;
import com.xzx.gc.model.system.ConfigInfoVo;
import com.xzx.gc.system.dto.SysBannerListDto;
+import com.xzx.gc.system.vo.ApiBannerListVo;
import com.xzx.gc.system.vo.SysBannerListVo;
import com.xzx.gc.system.vo.ViewSysBannerVo;
import com.xzx.gc.util.GcMapper;
@@ -56,5 +57,7 @@
void delSysBannerById(@Param("id")long id);
void updateStatusById(@Param("id")long id, @Param("status")Integer status);
+
+ List<ApiBannerListVo> selectBannerList();
}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/mapper/SysNewsMapper.java b/gc-sys/src/main/java/com/xzx/gc/system/mapper/SysNewsMapper.java
index db8778f..e4b91b4 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/mapper/SysNewsMapper.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/mapper/SysNewsMapper.java
@@ -2,6 +2,7 @@
import com.xzx.gc.entity.SysNews;
import com.xzx.gc.system.dto.SysNewsListDto;
+import com.xzx.gc.system.vo.ApiNewsListVo;
import com.xzx.gc.system.vo.SysNewsListVo;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,5 @@
void updateSysNews(@Param("title")String title, @Param("content")String content,
@Param("sort")Integer sort, @Param("newsId")long id);
+ List<ApiNewsListVo> selectSysNews();
}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java b/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java
index 4ada7e8..00e083b 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java
@@ -11,6 +11,7 @@
import com.xzx.gc.model.admin.BannerModel;
import com.xzx.gc.system.dto.*;
import com.xzx.gc.system.mapper.BannerMapper;
+import com.xzx.gc.system.vo.ApiBannerListVo;
import com.xzx.gc.system.vo.SysBannerListVo;
import com.xzx.gc.system.vo.SysNewsListVo;
import com.xzx.gc.system.vo.ViewSysBannerVo;
@@ -152,4 +153,8 @@
public void onOffSysBanner(OnSysBannerDto model) {
bannerMapper.updateStatusById(model.getId(),model.getStatus());
}
+
+ public List<ApiBannerListVo> bannerList(ApiBannerListDto apiBannerListDto) {
+ return bannerMapper.selectBannerList();
+ }
}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java b/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java
index b61c0e9..706f7f6 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java
@@ -7,6 +7,7 @@
import com.xzx.gc.entity.SysNews;
import com.xzx.gc.system.dto.*;
import com.xzx.gc.system.mapper.SysNewsMapper;
+import com.xzx.gc.system.vo.ApiNewsListVo;
import com.xzx.gc.system.vo.SysNewsListVo;
import com.xzx.gc.system.vo.ViewSysNewsVo;
import lombok.extern.slf4j.Slf4j;
@@ -74,4 +75,8 @@
public void onOffSysNews(OnSysNewsDto model) {
sysNewsMapper.updateStatusById(model.getId(),model.getStatus());
}
+
+ public List<ApiNewsListVo> newsList(ApiNewsListDto apiNewsListDto) {
+ return sysNewsMapper.selectSysNews();
+ }
}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/vo/ApiBannerListVo.java b/gc-sys/src/main/java/com/xzx/gc/system/vo/ApiBannerListVo.java
new file mode 100644
index 0000000..b10727d
--- /dev/null
+++ b/gc-sys/src/main/java/com/xzx/gc/system/vo/ApiBannerListVo.java
@@ -0,0 +1,20 @@
+package com.xzx.gc.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiBannerListVo", description = "返回参数类")
+public class ApiBannerListVo {
+
+ @ApiModelProperty("id")
+ private Long id;
+
+ @ApiModelProperty("图片名称")
+ private String picName;
+
+ @ApiModelProperty("图片链接")
+ private String picUrl;
+
+}
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/vo/ApiNewsListVo.java b/gc-sys/src/main/java/com/xzx/gc/system/vo/ApiNewsListVo.java
new file mode 100644
index 0000000..22f6334
--- /dev/null
+++ b/gc-sys/src/main/java/com/xzx/gc/system/vo/ApiNewsListVo.java
@@ -0,0 +1,16 @@
+package com.xzx.gc.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiNewsListVo", description = "返回参数类")
+public class ApiNewsListVo {
+
+ @ApiModelProperty(value = "Id")
+ private long newsId;
+
+ @ApiModelProperty(value = "标题")
+ private String title;
+}
diff --git a/gc-sys/src/main/resources/mapper/system/BannerMapper.xml b/gc-sys/src/main/resources/mapper/system/BannerMapper.xml
index 26e2b90..7edcf1f 100644
--- a/gc-sys/src/main/resources/mapper/system/BannerMapper.xml
+++ b/gc-sys/src/main/resources/mapper/system/BannerMapper.xml
@@ -121,4 +121,12 @@
set status = #{status}
where id = #{id}
</update>
+
+
+
+ <select id="selectBannerList" resultType="com.xzx.gc.system.vo.ApiBannerListVo">
+ select * from xzx_sys_banner
+ where del_flag = 0 and status = 2
+ order by sort ASC
+ </select>
</mapper>
\ No newline at end of file
diff --git a/gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml b/gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml
index b72ea15..89955fe 100644
--- a/gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml
+++ b/gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml
@@ -35,5 +35,11 @@
where news_id = #{newsId}
</update>
+ <select id="selectSysNews" resultType="com.xzx.gc.system.vo.ApiNewsListVo">
+ select * from xzx_sys_news
+ where del_flag=0 and status = 2
+ order by sort ASC
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1