From 1ce0806c955e074e5c1e4bec277ef088378ca998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Wed, 7 Aug 2024 17:29:55 +0800 Subject: [PATCH] =?UTF-8?q?pc=E5=89=8D=E5=8F=B0=E5=85=B3=E4=BA=8E=E6=88=91?= =?UTF-8?q?=E4=BB=AC=E6=A8=A1=E5=9D=97=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/wyh/front/ZJFrontInterceptor.java | 2 +- .../front/controller/AboutDataController.java | 2 +- .../front/controller/ArticleController.java | 2 +- .../wyh/front/controller/IndexController.java | 2 +- .../wyh/front/controller/LoginController.java | 2 +- .../wyh/front/controller/LogsController.java | 2 +- .../wyh/front/controller/PayController.java | 2 +- .../wyh/front/controller/PcController.java | 2 +- .../front/controller/RechargeController.java | 2 +- .../front/controller/UploadController.java | 2 +- .../wyh/front/controller/UserController.java | 2 +- .../front/controller/WechatController.java | 2 +- .../basic/banner/BannerController.java | 2 +- .../bannerfront/BannerFrontController.java | 2 +- .../basic/company/AboutController.java | 2 +- .../basic/company/CaseController.java | 2 +- .../basic/company/ContactController.java | 2 +- .../basic/company/JrwmController.java | 2 +- .../front/service/impl/IndexServiceImpl.java | 40 ++++++++++++++----- .../java/com/wyh/front/vo/AboutDataVo.java | 5 ++- 20 files changed, 52 insertions(+), 29 deletions(-) diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/ZJFrontInterceptor.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/ZJFrontInterceptor.java index 89b0000..9e1663f 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/ZJFrontInterceptor.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/ZJFrontInterceptor.java @@ -47,7 +47,7 @@ public class ZJFrontInterceptor implements HandlerInterceptor { // 判断请求接口 response.setContentType("application/json;charset=utf-8"); String reqUri = request.getRequestURI(); - if (!(handler instanceof HandlerMethod) || !reqUri.startsWith("/api")) { + if (!(handler instanceof HandlerMethod) || !reqUri.startsWith("/front")) { return HandlerInterceptor.super.preHandle(request, response, handler); } diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/AboutDataController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/AboutDataController.java index 1de19a7..59b48b5 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/AboutDataController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/AboutDataController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @RestController -@RequestMapping("api/a") +@RequestMapping("front/aboutData") @Api(tags = "关于我们Tag") public class AboutDataController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/ArticleController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/ArticleController.java index 6f04c06..471127d 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/ArticleController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/ArticleController.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import java.util.List; @RestController -@RequestMapping("/api/article") +@RequestMapping("/front/article") //@Api(tags = "文章管理") @ApiIgnore public class ArticleController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/IndexController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/IndexController.java index 2f8cb3d..deaceb9 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/IndexController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/IndexController.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("api/index") +@RequestMapping("front/index") @Api(tags = "公共数据") public class IndexController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LoginController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LoginController.java index 43484dd..dcb1d32 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LoginController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LoginController.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; @Slf4j @RestController -@RequestMapping("/api/login") +@RequestMapping("/front/login") @Api(tags = "登录管理") public class LoginController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LogsController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LogsController.java index 691f43e..a9d7b3a 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LogsController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/LogsController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @RestController -@RequestMapping("/api/logs") +@RequestMapping("/front/logs") @Api(tags = "钱包管理") public class LogsController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PayController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PayController.java index 7ab3cf1..0dc57cf 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PayController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PayController.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.constraints.NotNull; @RestController -@RequestMapping("/api/pay") +@RequestMapping("/front/pay") //@Api(tags = "支付管理") @ApiIgnore public class PayController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PcController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PcController.java index 9c4976c..6d469f1 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PcController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/PcController.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/api/pc") +@RequestMapping("/front/pc") //@Api(tags = "电脑管理") @ApiIgnore public class PcController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/RechargeController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/RechargeController.java index 2eaa24a..64e0120 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/RechargeController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/RechargeController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; import java.util.Map; @RestController -@RequestMapping("/api/recharge") +@RequestMapping("/front/recharge") //@Api(tags = "充值管理") @ApiIgnore public class RechargeController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UploadController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UploadController.java index d4d754b..8695f24 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UploadController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UploadController.java @@ -18,7 +18,7 @@ import org.springframework.web.multipart.MultipartRequest; import javax.servlet.http.HttpServletRequest; @RestController -@RequestMapping("/api/upload") +@RequestMapping("/front/upload") @Api(tags = "上传管理") public class UploadController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UserController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UserController.java index 5bdc67f..b9f36c6 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UserController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/UserController.java @@ -16,7 +16,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/user") +@RequestMapping("front/user") @Api(tags = "用户管理") public class UserController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/WechatController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/WechatController.java index e4a6582..6c5b1f4 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/WechatController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/WechatController.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotEmpty; import java.util.Map; @RestController -@RequestMapping("api/wechat") +@RequestMapping("front/wechat") @Api(tags = "微信管理") @ApiIgnore public class WechatController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/banner/BannerController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/banner/BannerController.java index 4ccfc5c..09ff5d1 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/banner/BannerController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/banner/BannerController.java @@ -22,7 +22,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/banner") +@RequestMapping("front/banner") @Api(tags = "banner信息管理") @ApiIgnore public class BannerController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/bannerfront/BannerFrontController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/bannerfront/BannerFrontController.java index f1e7fb1..1817d47 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/bannerfront/BannerFrontController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/bannerfront/BannerFrontController.java @@ -21,7 +21,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/bannerfront") +@RequestMapping("front/bannerfront") @Api(tags = "小程序banner管理管理") @ApiIgnore public class BannerFrontController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/AboutController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/AboutController.java index 7484ca1..51d7285 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/AboutController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/AboutController.java @@ -21,7 +21,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/about") +@RequestMapping("front/about") @Api(tags = "关于中将信息管理") @ApiIgnore public class AboutController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/CaseController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/CaseController.java index 6e46a71..3c88a56 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/CaseController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/CaseController.java @@ -22,7 +22,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/case") +@RequestMapping("front/case") @Api(tags = "成功案例信息管理") @ApiIgnore public class CaseController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/ContactController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/ContactController.java index 9d883c7..46e0a08 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/ContactController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/ContactController.java @@ -22,7 +22,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/contact") +@RequestMapping("front/contact") @Api(tags = "联系我们管理") @ApiIgnore public class ContactController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/JrwmController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/JrwmController.java index 149a32d..6b13326 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/JrwmController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/basic/company/JrwmController.java @@ -22,7 +22,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; @RestController -@RequestMapping("api/jrwm") +@RequestMapping("front/jrwm") @Api(tags = "加入我们信息管理") @ApiIgnore public class JrwmController { diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/IndexServiceImpl.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/IndexServiceImpl.java index 6be3538..0f35ca4 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/IndexServiceImpl.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/IndexServiceImpl.java @@ -6,29 +6,25 @@ import com.wyh.common.config.GlobalConfig; import com.wyh.common.entity.article.Article; import com.wyh.common.entity.basic.banner.Banner; import com.wyh.common.entity.basic.bannerfront.BannerFront; -import com.wyh.common.entity.basic.company.About; -import com.wyh.common.entity.basic.company.Case; -import com.wyh.common.entity.basic.company.Contact; -import com.wyh.common.entity.basic.company.Jrwm; +import com.wyh.common.entity.basic.company.*; import com.wyh.common.entity.decorate.DecoratePage; import com.wyh.common.entity.decorate.DecorateTabbar; import com.wyh.common.entity.setting.HotSearch; import com.wyh.common.mapper.article.ArticleMapper; import com.wyh.common.mapper.basic.banner.BannerMapper; import com.wyh.common.mapper.basic.bannerfront.BannerFrontMapper; -import com.wyh.common.mapper.basic.company.AboutMapper; -import com.wyh.common.mapper.basic.company.CaseMapper; -import com.wyh.common.mapper.basic.company.ContactMapper; -import com.wyh.common.mapper.basic.company.JrwmMapper; +import com.wyh.common.mapper.basic.company.*; import com.wyh.common.mapper.decorate.DecoratePageMapper; import com.wyh.common.mapper.decorate.DecorateTabbarMapper; import com.wyh.common.mapper.setting.HotSearchMapper; +import com.wyh.common.vo.basic.company.CertificationListedVo; import com.wyh.front.service.IIndexService; import com.wyh.common.util.*; import com.wyh.front.vo.AboutDataVo; import com.wyh.front.vo.basic.banner.BannerListedVo; import com.wyh.front.vo.basic.bannerfront.BannerFrontListedVo; import com.wyh.front.vo.basic.company.AboutDetailVo; +import org.checkerframework.checker.units.qual.C; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -71,6 +67,12 @@ public class IndexServiceImpl implements IIndexService { @Resource AboutMapper aboutMapper; + @Resource + CertificationCateMapper certificationCateMapper; + + @Resource + CertificationMapper certificationMapper; + /** * 首页 * @@ -280,10 +282,28 @@ public class IndexServiceImpl implements IIndexService { // 案例 List cases = caseMapper.selectList(new QueryWrapper().eq("is_delete", 0).eq("is_show", 1).orderByDesc(Arrays.asList("sort", "id"))); aboutDataVo.setCaseList(cases); - // 荣誉 + // 资质 + List certifications = certificationMapper.selectList(new QueryWrapper().eq("is_delete", 0).eq("is_show", 1).orderByDesc(Arrays.asList("sort", "id"))); + LinkedList certificationListedVos = new LinkedList<>(); + for (Certification certification : certifications) { + CertificationListedVo certificationListedVo = new CertificationListedVo(); + BeanUtils.copyProperties(certification, certificationListedVo); + certificationListedVo.setImg(UrlUtils.toAbsoluteUrl(certification.getImg())); + certificationListedVo.setCreateTime(TimeUtils.timestampToDate(certification.getCreateTime())); + certificationListedVo.setUpdateTime(TimeUtils.timestampToDate(certification.getUpdateTime())); + if (certification.getCid() != null) { + CertificationCate c = certificationCateMapper.selectById(certification.getCid()); + if (c != null) { + certificationListedVo.setCName(c.getName()); + } + } + certificationListedVos.add(certificationListedVo); + } + + aboutDataVo.setCertification(certificationListedVos); // 联系我们 List contacts = contactMapper.selectList(new QueryWrapper().eq("is_delete", 0).eq("is_show", 1).orderByDesc(Arrays.asList("sort", "id"))); - aboutDataVo.setContactList(contacts); + aboutDataVo.setContact(contacts); return aboutDataVo; } diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/vo/AboutDataVo.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/vo/AboutDataVo.java index 9424eee..a26932b 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/vo/AboutDataVo.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/vo/AboutDataVo.java @@ -4,6 +4,8 @@ import com.wyh.common.entity.basic.company.About; import com.wyh.common.entity.basic.company.Case; import com.wyh.common.entity.basic.company.Contact; import com.wyh.common.entity.basic.company.Jrwm; +import com.wyh.common.vo.basic.company.CertificationCateListedVo; +import com.wyh.common.vo.basic.company.CertificationListedVo; import com.wyh.front.vo.basic.company.AboutDetailVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,5 +23,6 @@ public class AboutDataVo implements Serializable { private AboutDetailVo about; private List caseList; // private List jrwmList; - private List contactList; + private List contact; + private List certification; }