pc前台关于我们模块完成
parent
caa960c90a
commit
1ce0806c95
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("api/index")
|
||||
@RequestMapping("front/index")
|
||||
@Api(tags = "公共数据")
|
||||
public class IndexController {
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import java.util.regex.Pattern;
|
|||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/login")
|
||||
@RequestMapping("/front/login")
|
||||
@Api(tags = "登录管理")
|
||||
public class LoginController {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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<Case> cases = caseMapper.selectList(new QueryWrapper<Case>().eq("is_delete", 0).eq("is_show", 1).orderByDesc(Arrays.asList("sort", "id")));
|
||||
aboutDataVo.setCaseList(cases);
|
||||
// 荣誉
|
||||
// 资质
|
||||
List<Certification> certifications = certificationMapper.selectList(new QueryWrapper<Certification>().eq("is_delete", 0).eq("is_show", 1).orderByDesc(Arrays.asList("sort", "id")));
|
||||
LinkedList<CertificationListedVo> 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<Contact> contacts = contactMapper.selectList(new QueryWrapper<Contact>().eq("is_delete", 0).eq("is_show", 1).orderByDesc(Arrays.asList("sort", "id")));
|
||||
aboutDataVo.setContactList(contacts);
|
||||
aboutDataVo.setContact(contacts);
|
||||
return aboutDataVo;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Case> caseList;
|
||||
// private List<Jrwm> jrwmList;
|
||||
private List<Contact> contactList;
|
||||
private List<Contact> contact;
|
||||
private List<CertificationListedVo> certification;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue