diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/banner/BannerController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/banner/BannerController.java new file mode 100644 index 0000000..0b0f3e4 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/banner/BannerController.java @@ -0,0 +1,71 @@ +package com.wyh.admin.controller.basic.banner; + +import com.wyh.admin.aop.Log; +import com.wyh.admin.service.IBannerService; +import com.wyh.admin.validate.basic.banner.BannerCreateValidate; +import com.wyh.admin.validate.basic.banner.BannerSearchValidate; +import com.wyh.admin.validate.basic.banner.BannerUpdateValidate; +import com.wyh.admin.validate.commons.IdValidate; + +import com.wyh.admin.validate.commons.PageValidate; + +import com.wyh.admin.vo.basic.banner.BannerDetailVo; +import com.wyh.admin.vo.basic.banner.BannerListedVo; +import com.wyh.common.core.AjaxResult; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.annotation.IDMust; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("api/banner") +@Api(tags = "banner信息管理") +public class BannerController { + + @Resource + IBannerService iBannerService; + + @GetMapping("/list") + @ApiOperation(value="banner信息列表") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated BannerSearchValidate searchValidate) { + PageResult list = iBannerService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + @GetMapping("/detail") + @ApiOperation(value="banner信息详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + BannerDetailVo detail = iBannerService.detail(id); + return AjaxResult.success(detail); + } + + @Log(title = "banner信息新增") + @PostMapping("/add") + @ApiOperation(value="banner信息新增") + public AjaxResult add(@Validated @RequestBody BannerCreateValidate createValidate) { + iBannerService.add(createValidate); + return AjaxResult.success(); + } + + @Log(title = "banner信息编辑") + @PostMapping("/edit") + @ApiOperation(value="banner信息编辑") + public AjaxResult edit(@Validated @RequestBody BannerUpdateValidate updateValidate) { + iBannerService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "banner信息删除") + @PostMapping("/del") + @ApiOperation(value="banner信息删除") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iBannerService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/bannerfront/BannerFrontController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/bannerfront/BannerFrontController.java new file mode 100644 index 0000000..98b1c82 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/bannerfront/BannerFrontController.java @@ -0,0 +1,70 @@ +package com.wyh.admin.controller.basic.bannerfront; + +import com.wyh.admin.aop.Log; +import com.wyh.admin.service.IBannerFrontService; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontCreateValidate; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontSearchValidate; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontUpdateValidate; +import com.wyh.admin.validate.commons.IdValidate; +import com.wyh.admin.validate.commons.PageValidate; + +import com.wyh.admin.vo.basic.bannerfront.BannerFrontDetailVo; +import com.wyh.admin.vo.basic.bannerfront.BannerFrontListedVo; +import com.wyh.common.core.AjaxResult; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.annotation.IDMust; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("api/bannerfront") +@Api(tags = "小程序banner管理管理") +public class BannerFrontController { + + @Resource + IBannerFrontService iBannerFrontService; + + @GetMapping("/list") + @ApiOperation(value="小程序banner管理列表") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated BannerFrontSearchValidate searchValidate) { + PageResult list = iBannerFrontService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + @GetMapping("/detail") + @ApiOperation(value="小程序banner管理详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + BannerFrontDetailVo detail = iBannerFrontService.detail(id); + return AjaxResult.success(detail); + } + + @Log(title = "小程序banner管理新增") + @PostMapping("/add") + @ApiOperation(value="小程序banner管理新增") + public AjaxResult add(@Validated @RequestBody BannerFrontCreateValidate createValidate) { + iBannerFrontService.add(createValidate); + return AjaxResult.success(); + } + + @Log(title = "小程序banner管理编辑") + @PostMapping("/edit") + @ApiOperation(value="小程序banner管理编辑") + public AjaxResult edit(@Validated @RequestBody BannerFrontUpdateValidate updateValidate) { + iBannerFrontService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "小程序banner管理删除") + @PostMapping("/del") + @ApiOperation(value="小程序banner管理删除") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iBannerFrontService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/company/CaseController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/company/CaseController.java new file mode 100644 index 0000000..842965f --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/basic/company/CaseController.java @@ -0,0 +1,69 @@ +package com.wyh.admin.controller.basic.company; + +import com.wyh.admin.aop.Log; +import com.wyh.admin.service.ICaseService; +import com.wyh.admin.validate.basic.company.CaseCreateValidate; +import com.wyh.admin.validate.basic.company.CaseSearchValidate; +import com.wyh.admin.validate.basic.company.CaseUpdateValidate; +import com.wyh.admin.validate.commons.IdValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.admin.vo.basic.company.CaseDetailVo; +import com.wyh.admin.vo.basic.company.CaseListedVo; +import com.wyh.common.core.AjaxResult; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.annotation.IDMust; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("api/case") +@Api(tags = "成功案例信息管理") +public class CaseController { + + @Resource + ICaseService iCaseService; + + @GetMapping("/list") + @ApiOperation(value="成功案例信息列表") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated CaseSearchValidate searchValidate) { + PageResult list = iCaseService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + @GetMapping("/detail") + @ApiOperation(value="成功案例信息详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + CaseDetailVo detail = iCaseService.detail(id); + return AjaxResult.success(detail); + } + + @Log(title = "成功案例信息新增") + @PostMapping("/add") + @ApiOperation(value="成功案例信息新增") + public AjaxResult add(@Validated @RequestBody CaseCreateValidate createValidate) { + iCaseService.add(createValidate); + return AjaxResult.success(); + } + + @Log(title = "成功案例信息编辑") + @PostMapping("/edit") + @ApiOperation(value="成功案例信息编辑") + public AjaxResult edit(@Validated @RequestBody CaseUpdateValidate updateValidate) { + iCaseService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "成功案例信息删除") + @PostMapping("/del") + @ApiOperation(value="成功案例信息删除") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iCaseService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/goods/GoodsCateController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/goods/GoodsCateController.java index f018298..6a8ebb9 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/goods/GoodsCateController.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/goods/GoodsCateController.java @@ -4,10 +4,10 @@ import com.alibaba.fastjson2.JSONArray; import com.wyh.admin.aop.Log; import com.wyh.admin.service.IGoodsCateService; import com.wyh.admin.validate.commons.IdValidate; -import com.wyh.admin.validate.GoodsCateCreateValidate; import com.wyh.admin.validate.GoodsCateUpdateValidate; import com.wyh.admin.validate.GoodsCateSearchValidate; -import com.wyh.admin.vo.GoodsCateDetailVo; +import com.wyh.admin.validate.goods.GoodsCateCreateValidate; +import com.wyh.admin.vo.goods.GoodsCateDetailVo; import com.wyh.common.core.AjaxResult; import com.wyh.common.validator.annotation.IDMust; import io.swagger.annotations.Api; diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IBannerFrontService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IBannerFrontService.java new file mode 100644 index 0000000..9fb330f --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IBannerFrontService.java @@ -0,0 +1,61 @@ +package com.wyh.admin.service; + +import com.wyh.admin.validate.basic.bannerfront.BannerFrontCreateValidate; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontSearchValidate; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontUpdateValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.admin.vo.basic.bannerfront.BannerFrontDetailVo; +import com.wyh.admin.vo.basic.bannerfront.BannerFrontListedVo; +import com.wyh.common.core.PageResult; + + +/** + * 小程序banner管理服务接口类 + * @author wyh + */ +public interface IBannerFrontService { + + /** + * 小程序banner管理列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, BannerFrontSearchValidate searchValidate); + + /** + * 小程序banner管理详情 + * + * @author wyh + * @param id 主键ID + * @return BannerFrontDetailVo + */ + BannerFrontDetailVo detail(Integer id); + + /** + * 小程序banner管理新增 + * + * @author wyh + * @param createValidate 参数 + */ + void add(BannerFrontCreateValidate createValidate); + + /** + * 小程序banner管理编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + void edit(BannerFrontUpdateValidate updateValidate); + + /** + * 小程序banner管理删除 + * + * @author wyh + * @param id 主键ID + */ + void del(Integer id); + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IBannerService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IBannerService.java new file mode 100644 index 0000000..c9b0042 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IBannerService.java @@ -0,0 +1,61 @@ +package com.wyh.admin.service; + +import com.wyh.admin.validate.basic.banner.BannerCreateValidate; +import com.wyh.admin.validate.basic.banner.BannerSearchValidate; +import com.wyh.admin.validate.basic.banner.BannerUpdateValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.admin.vo.basic.banner.BannerDetailVo; +import com.wyh.admin.vo.basic.banner.BannerListedVo; +import com.wyh.common.core.PageResult; + + +/** + * banner信息服务接口类 + * @author LikeAdmin + */ +public interface IBannerService { + + /** + * banner信息列表 + * + * @author LikeAdmin + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, BannerSearchValidate searchValidate); + + /** + * banner信息详情 + * + * @author LikeAdmin + * @param id 主键ID + * @return BannerDetailVo + */ + BannerDetailVo detail(Integer id); + + /** + * banner信息新增 + * + * @author LikeAdmin + * @param createValidate 参数 + */ + void add(BannerCreateValidate createValidate); + + /** + * banner信息编辑 + * + * @author LikeAdmin + * @param updateValidate 参数 + */ + void edit(BannerUpdateValidate updateValidate); + + /** + * banner信息删除 + * + * @author LikeAdmin + * @param id 主键ID + */ + void del(Integer id); + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ICaseService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ICaseService.java new file mode 100644 index 0000000..eef9ab6 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ICaseService.java @@ -0,0 +1,61 @@ +package com.wyh.admin.service; + +import com.wyh.admin.validate.basic.company.CaseCreateValidate; +import com.wyh.admin.validate.basic.company.CaseSearchValidate; +import com.wyh.admin.validate.basic.company.CaseUpdateValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.admin.vo.basic.company.CaseDetailVo; +import com.wyh.admin.vo.basic.company.CaseListedVo; +import com.wyh.common.core.PageResult; + + +/** + * 成功案例信息服务接口类 + * @author wyh + */ +public interface ICaseService { + + /** + * 成功案例信息列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, CaseSearchValidate searchValidate); + + /** + * 成功案例信息详情 + * + * @author wyh + * @param id 主键ID + * @return CaseDetailVo + */ + CaseDetailVo detail(Integer id); + + /** + * 成功案例信息新增 + * + * @author wyh + * @param createValidate 参数 + */ + void add(CaseCreateValidate createValidate); + + /** + * 成功案例信息编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + void edit(CaseUpdateValidate updateValidate); + + /** + * 成功案例信息删除 + * + * @author wyh + * @param id 主键ID + */ + void del(Integer id); + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsCateService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsCateService.java index cf3051b..3d58793 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsCateService.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsCateService.java @@ -1,10 +1,10 @@ package com.wyh.admin.service; import com.alibaba.fastjson2.JSONArray; -import com.wyh.admin.validate.GoodsCateCreateValidate; import com.wyh.admin.validate.GoodsCateUpdateValidate; import com.wyh.admin.validate.GoodsCateSearchValidate; -import com.wyh.admin.vo.GoodsCateDetailVo; +import com.wyh.admin.validate.goods.GoodsCateCreateValidate; +import com.wyh.admin.vo.goods.GoodsCateDetailVo; /** * 产品分类服务接口类 diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/BannerFrontServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/BannerFrontServiceImpl.java new file mode 100644 index 0000000..83e82a7 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/BannerFrontServiceImpl.java @@ -0,0 +1,168 @@ +package com.wyh.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.query.MPJQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wyh.admin.service.IBannerFrontService; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontCreateValidate; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontSearchValidate; +import com.wyh.admin.validate.basic.bannerfront.BannerFrontUpdateValidate; +import com.wyh.admin.validate.commons.PageValidate; + +import com.wyh.admin.vo.basic.bannerfront.BannerFrontDetailVo; +import com.wyh.admin.vo.basic.bannerfront.BannerFrontListedVo; +import com.wyh.common.config.GlobalConfig; +import com.wyh.common.core.PageResult; + +import com.wyh.common.entity.basic.bannerfront.BannerFront; +import com.wyh.common.mapper.basic.bannerfront.BannerFrontMapper; +import com.wyh.common.util.ListUtils; +import com.wyh.common.util.TimeUtils; +import com.wyh.common.util.UrlUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 小程序banner管理实现类 + * @author wyh + */ +@Service +public class BannerFrontServiceImpl implements IBannerFrontService { + + @Resource + BannerFrontMapper bannerFrontMapper; + + /** + * 小程序banner管理列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, BannerFrontSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + + bannerFrontMapper.setSearch(queryWrapper, searchValidate, new String[]{ + "like:title:str", + "=:isShow@is_show:int", + "like:linkAddress@link_address:int", + + }); + + IPage iPage = bannerFrontMapper.selectPage(new Page<>(page, limit), queryWrapper); + + List list = new LinkedList<>(); + for(BannerFront item : iPage.getRecords()) { + BannerFrontListedVo vo = new BannerFrontListedVo(); + BeanUtils.copyProperties(item, vo); + vo.setImg(UrlUtils.toAbsoluteUrl(item.getImg())); + vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + list.add(vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + + /** + * 小程序banner管理详情 + * + * @author wyh + * @param id 主键参数 + * @return BannerFront + */ + @Override + public BannerFrontDetailVo detail(Integer id) { + BannerFront model = bannerFrontMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + BannerFrontDetailVo vo = new BannerFrontDetailVo(); + BeanUtils.copyProperties(model, vo); + vo.setImg(UrlUtils.toAbsoluteUrl(model.getImg())); + return vo; + } + + /** + * 小程序banner管理新增 + * + * @author wyh + * @param createValidate 参数 + */ + @Override + public void add(BannerFrontCreateValidate createValidate) { + BannerFront model = new BannerFront(); + model.setTitle(createValidate.getTitle()); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(createValidate.getSort()); + model.setIsShow(createValidate.getIsShow()); + model.setImg(UrlUtils.toRelativeUrl(createValidate.getImg())); + model.setLinkAddress(createValidate.getLinkAddress()); + bannerFrontMapper.insert(model); + } + + /** + * 小程序banner管理编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + @Override + public void edit(BannerFrontUpdateValidate updateValidate) { + BannerFront model = bannerFrontMapper.selectOne( + new QueryWrapper() + .eq("id", updateValidate.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setId(updateValidate.getId()); + model.setTitle(updateValidate.getTitle()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(updateValidate.getSort()); + model.setIsShow(updateValidate.getIsShow()); + model.setImg(UrlUtils.toRelativeUrl(updateValidate.getImg())); + model.setLinkAddress(updateValidate.getLinkAddress()); + bannerFrontMapper.updateById(model); + } + + /** + * 小程序banner管理删除 + * + * @author wyh + * @param id 主键ID + */ + @Override + public void del(Integer id) { + BannerFront model = bannerFrontMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + bannerFrontMapper.updateById(model); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/BannerServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/BannerServiceImpl.java new file mode 100644 index 0000000..c44386b --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/BannerServiceImpl.java @@ -0,0 +1,167 @@ +package com.wyh.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.query.MPJQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wyh.admin.service.IBannerService; +import com.wyh.admin.validate.basic.banner.BannerCreateValidate; +import com.wyh.admin.validate.basic.banner.BannerSearchValidate; +import com.wyh.admin.validate.basic.banner.BannerUpdateValidate; +import com.wyh.admin.validate.commons.PageValidate; + +import com.wyh.admin.vo.basic.banner.BannerDetailVo; +import com.wyh.admin.vo.basic.banner.BannerListedVo; +import com.wyh.common.config.GlobalConfig; +import com.wyh.common.core.PageResult; + +import com.wyh.common.entity.basic.banner.Banner; +import com.wyh.common.mapper.basic.banner.BannerMapper; +import com.wyh.common.util.TimeUtils; +import com.wyh.common.util.UrlUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.*; + +/** + * banner信息实现类 + * @author LikeAdmin + */ +@Service +public class BannerServiceImpl implements IBannerService { + + @Resource + BannerMapper bannerMapper; + + /** + * banner信息列表 + * + * @author LikeAdmin + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, BannerSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + + bannerMapper.setSearch(queryWrapper, searchValidate, new String[]{ + "like:title:str", + "=:sort:str", + "=:isShow@is_show:int", + "like:linkAddress@link_address:str", + }); + + IPage iPage = bannerMapper.selectPage(new Page<>(page, limit), queryWrapper); + + List list = new LinkedList<>(); + for(Banner item : iPage.getRecords()) { + BannerListedVo vo = new BannerListedVo(); + BeanUtils.copyProperties(item, vo); + vo.setImg(UrlUtils.toAbsoluteUrl(item.getImg())); + vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + list.add(vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + + /** + * banner信息详情 + * + * @author LikeAdmin + * @param id 主键参数 + * @return Banner + */ + @Override + public BannerDetailVo detail(Integer id) { + Banner model = bannerMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + BannerDetailVo vo = new BannerDetailVo(); + BeanUtils.copyProperties(model, vo); + vo.setImg(UrlUtils.toAbsoluteUrl(model.getImg())); + return vo; + } + + /** + * banner信息新增 + * + * @author LikeAdmin + * @param createValidate 参数 + */ + @Override + public void add(BannerCreateValidate createValidate) { + Banner model = new Banner(); + model.setTitle(createValidate.getTitle()); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(createValidate.getSort()); + model.setIsShow(createValidate.getIsShow()); + model.setImg(UrlUtils.toRelativeUrl(createValidate.getImg())); + model.setLinkAddress(createValidate.getLinkAddress()); + bannerMapper.insert(model); + } + + /** + * banner信息编辑 + * + * @author LikeAdmin + * @param updateValidate 参数 + */ + @Override + public void edit(BannerUpdateValidate updateValidate) { + Banner model = bannerMapper.selectOne( + new QueryWrapper() + .eq("id", updateValidate.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setId(updateValidate.getId()); + model.setTitle(updateValidate.getTitle()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(updateValidate.getSort()); + model.setIsShow(updateValidate.getIsShow()); + model.setImg(UrlUtils.toRelativeUrl(updateValidate.getImg())); + model.setLinkAddress(updateValidate.getLinkAddress()); + bannerMapper.updateById(model); + } + + /** + * banner信息删除 + * + * @author LikeAdmin + * @param id 主键ID + */ + @Override + public void del(Integer id) { + Banner model = bannerMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + bannerMapper.updateById(model); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/CaseServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/CaseServiceImpl.java new file mode 100644 index 0000000..c46bb0b --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/CaseServiceImpl.java @@ -0,0 +1,166 @@ +package com.wyh.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.query.MPJQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wyh.admin.service.ICaseService; +import com.wyh.admin.validate.basic.company.CaseCreateValidate; +import com.wyh.admin.validate.basic.company.CaseSearchValidate; +import com.wyh.admin.validate.basic.company.CaseUpdateValidate; +import com.wyh.admin.validate.commons.PageValidate; + +import com.wyh.admin.vo.basic.company.CaseDetailVo; +import com.wyh.admin.vo.basic.company.CaseListedVo; +import com.wyh.common.config.GlobalConfig; +import com.wyh.common.core.PageResult; + +import com.wyh.common.entity.basic.company.Case; +import com.wyh.common.mapper.basic.company.CaseMapper; +import com.wyh.common.util.ListUtils; +import com.wyh.common.util.TimeUtils; +import com.wyh.common.util.UrlUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 成功案例信息实现类 + * @author wyh + */ +@Service +public class CaseServiceImpl implements ICaseService { + + @Resource + CaseMapper caseMapper; + + /** + * 成功案例信息列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, CaseSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + + caseMapper.setSearch(queryWrapper, searchValidate, new String[]{ + "like:name:int", + "=:isShow@is_show:int", + }); + + IPage iPage = caseMapper.selectPage(new Page<>(page, limit), queryWrapper); + + List list = new LinkedList<>(); + for(Case item : iPage.getRecords()) { + CaseListedVo vo = new CaseListedVo(); + BeanUtils.copyProperties(item, vo); + vo.setImg(UrlUtils.toAbsoluteUrl(item.getImg())); + vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + list.add(vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + + /** + * 成功案例信息详情 + * + * @author wyh + * @param id 主键参数 + * @return Case + */ + @Override + public CaseDetailVo detail(Integer id) { + Case model = caseMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + CaseDetailVo vo = new CaseDetailVo(); + BeanUtils.copyProperties(model, vo); + vo.setImg(UrlUtils.toAbsoluteUrl(model.getImg())); + return vo; + } + + /** + * 成功案例信息新增 + * + * @author wyh + * @param createValidate 参数 + */ + @Override + public void add(CaseCreateValidate createValidate) { + Case model = new Case(); + model.setName(createValidate.getName()); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(createValidate.getSort()); + model.setIsShow(createValidate.getIsShow()); + model.setImg(UrlUtils.toRelativeUrl(createValidate.getImg())); + model.setContent(createValidate.getContent()); + caseMapper.insert(model); + } + + /** + * 成功案例信息编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + @Override + public void edit(CaseUpdateValidate updateValidate) { + Case model = caseMapper.selectOne( + new QueryWrapper() + .eq("id", updateValidate.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setId(updateValidate.getId()); + model.setName(updateValidate.getName()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(updateValidate.getSort()); + model.setIsShow(updateValidate.getIsShow()); + model.setImg(UrlUtils.toRelativeUrl(updateValidate.getImg())); + model.setContent(updateValidate.getContent()); + caseMapper.updateById(model); + } + + /** + * 成功案例信息删除 + * + * @author wyh + * @param id 主键ID + */ + @Override + public void del(Integer id) { + Case model = caseMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + caseMapper.updateById(model); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsCateServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsCateServiceImpl.java index 280efc2..09e497b 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsCateServiceImpl.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsCateServiceImpl.java @@ -4,14 +4,13 @@ import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; import com.wyh.admin.service.IGoodsCateService; -import com.wyh.admin.validate.GoodsCateCreateValidate; import com.wyh.admin.validate.GoodsCateUpdateValidate; import com.wyh.admin.validate.GoodsCateSearchValidate; +import com.wyh.admin.validate.goods.GoodsCateCreateValidate; import com.wyh.admin.vo.GoodsCateListedVo; -import com.wyh.admin.vo.GoodsCateDetailVo; -import com.wyh.common.config.GlobalConfig; -import com.wyh.common.entity.GoodsCate; -import com.wyh.common.mapper.GoodsCateMapper; +import com.wyh.admin.vo.goods.GoodsCateDetailVo; +import com.wyh.common.entity.goods.GoodsCate; +import com.wyh.common.mapper.goods.GoodsCateMapper; import com.wyh.common.util.ListUtils; import com.wyh.common.util.TimeUtils; import com.wyh.common.util.UrlUtils; diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerCreateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerCreateValidate.java new file mode 100644 index 0000000..6fbb944 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerCreateValidate.java @@ -0,0 +1,35 @@ +package com.wyh.admin.validate.basic.banner; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import javax.validation.constraints.*; + +@Data +@ApiModel("banner信息创建参数") +public class BannerCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "title参数缺失") + @ApiModelProperty(value = "标题") + private String title; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @NotNull(message = "isShow参数缺失") + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @NotNull(message = "img参数缺失") + @ApiModelProperty(value = "banner图") + private String img; + + @NotNull(message = "linkAddress参数缺失") + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerSearchValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerSearchValidate.java new file mode 100644 index 0000000..774eff5 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerSearchValidate.java @@ -0,0 +1,26 @@ +package com.wyh.admin.validate.basic.banner; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +@Data +@ApiModel("banner信息搜素参数") +public class BannerSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerUpdateValidate.java new file mode 100644 index 0000000..a73d85b --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/banner/BannerUpdateValidate.java @@ -0,0 +1,44 @@ +package com.wyh.admin.validate.basic.banner; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import javax.validation.constraints.*; +import com.wyh.common.validator.annotation.IDMust; + +/** + * banner信息参数 + * @author LikeAdmin + */ +@Data +@ApiModel("banner信息更新参数") +public class BannerUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + @ApiModelProperty(value = "主键") + private Integer id; + + @NotNull(message = "title参数缺失") + @ApiModelProperty(value = "标题") + private String title; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @NotNull(message = "isShow参数缺失") + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @NotNull(message = "img参数缺失") + @ApiModelProperty(value = "banner图") + private String img; + + @NotNull(message = "linkAddress参数缺失") + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontCreateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontCreateValidate.java new file mode 100644 index 0000000..416bf15 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontCreateValidate.java @@ -0,0 +1,35 @@ +package com.wyh.admin.validate.basic.bannerfront; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import javax.validation.constraints.*; + +@Data +@ApiModel("小程序banner管理创建参数") +public class BannerFrontCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "title参数缺失") + @ApiModelProperty(value = "banner标题") + private String title; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @NotNull(message = "isShow参数缺失") + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @NotNull(message = "img参数缺失") + @ApiModelProperty(value = "banner图") + private String img; + + @NotNull(message = "linkAddress参数缺失") + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontSearchValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontSearchValidate.java new file mode 100644 index 0000000..fe25577 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontSearchValidate.java @@ -0,0 +1,23 @@ +package com.wyh.admin.validate.basic.bannerfront; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +@Data +@ApiModel("小程序banner管理搜素参数") +public class BannerFrontSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "banner标题") + private String title; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontUpdateValidate.java new file mode 100644 index 0000000..6fb5b4f --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/bannerfront/BannerFrontUpdateValidate.java @@ -0,0 +1,44 @@ +package com.wyh.admin.validate.basic.bannerfront; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import javax.validation.constraints.*; +import com.wyh.common.validator.annotation.IDMust; + +/** + * 小程序banner管理参数 + * @author wyh + */ +@Data +@ApiModel("小程序banner管理更新参数") +public class BannerFrontUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + @ApiModelProperty(value = "主键") + private Integer id; + + @NotNull(message = "title参数缺失") + @ApiModelProperty(value = "banner标题") + private String title; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @NotNull(message = "isShow参数缺失") + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @NotNull(message = "img参数缺失") + @ApiModelProperty(value = "banner图") + private String img; + + @NotNull(message = "linkAddress参数缺失") + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseCreateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseCreateValidate.java new file mode 100644 index 0000000..552eac1 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseCreateValidate.java @@ -0,0 +1,33 @@ +package com.wyh.admin.validate.basic.company; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import javax.validation.constraints.*; + +@Data +@ApiModel("成功案例信息创建参数") +public class CaseCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "name参数缺失") + @ApiModelProperty(value = "案例名称") + private String name; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @NotNull(message = "isShow参数缺失") + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @NotNull(message = "img参数缺失") + @ApiModelProperty(value = "案例图片") + private String img; + + @ApiModelProperty(value = "案例内容") + private String content; +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseSearchValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseSearchValidate.java new file mode 100644 index 0000000..0fb6a21 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseSearchValidate.java @@ -0,0 +1,20 @@ +package com.wyh.admin.validate.basic.company; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +@Data +@ApiModel("成功案例信息搜素参数") +public class CaseSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "案例名称") + private String name; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseUpdateValidate.java new file mode 100644 index 0000000..201dd7d --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/CaseUpdateValidate.java @@ -0,0 +1,43 @@ +package com.wyh.admin.validate.basic.company; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import javax.validation.constraints.*; +import com.wyh.common.validator.annotation.IDMust; + +/** + * 成功案例信息参数 + * @author wyh + */ +@Data +@ApiModel("成功案例信息更新参数") +public class CaseUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + @ApiModelProperty(value = "主键") + private Integer id; + + @NotNull(message = "name参数缺失") + @ApiModelProperty(value = "案例名称") + private String name; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @NotNull(message = "isShow参数缺失") + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @NotNull(message = "img参数缺失") + @ApiModelProperty(value = "案例图片") + private String img; + + @ApiModelProperty(value = "案例内容") + private String content; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateCreateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateCreateValidate.java index 8b23ec8..63a0cc1 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateCreateValidate.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateCreateValidate.java @@ -1,4 +1,4 @@ -package com.wyh.admin.validate; +package com.wyh.admin.validate.goods; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -18,14 +18,14 @@ public class GoodsCateCreateValidate implements Serializable { @NotNull(message = "pid参数缺失") @ApiModelProperty(value = "上级菜单") - private String pid; + private Integer pid; @NotNull(message = "sort参数缺失") @ApiModelProperty(value = "排序编号") - private String sort; + private Integer sort; @NotNull(message = "isShow参数缺失") @ApiModelProperty(value = "是否显示: 0=否, 1=是") - private String isShow; + private Integer isShow; } diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateUpdateValidate.java index 1768bb7..5831ee5 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateUpdateValidate.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/goods/GoodsCateUpdateValidate.java @@ -19,7 +19,7 @@ public class GoodsCateUpdateValidate implements Serializable { @IDMust(message = "id参数必传且需大于0") @ApiModelProperty(value = "主键") - private String id; + private Integer id; @NotNull(message = "name参数缺失") @ApiModelProperty(value = "产品分类名称") @@ -27,14 +27,14 @@ public class GoodsCateUpdateValidate implements Serializable { @NotNull(message = "pid参数缺失") @ApiModelProperty(value = "上级菜单") - private String pid; + private Integer pid; @NotNull(message = "sort参数缺失") @ApiModelProperty(value = "排序编号") - private String sort; + private Integer sort; @NotNull(message = "isShow参数缺失") @ApiModelProperty(value = "是否显示: 0=否, 1=是") - private String isShow; + private Integer isShow; } diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/banner/BannerDetailVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/banner/BannerDetailVo.java new file mode 100644 index 0000000..4685261 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/banner/BannerDetailVo.java @@ -0,0 +1,34 @@ +package com.wyh.admin.vo.basic.banner; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("banner信息详情Vo") +public class BannerDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @ApiModelProperty(value = "banner图") + private String img; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/banner/BannerListedVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/banner/BannerListedVo.java new file mode 100644 index 0000000..bfd7850 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/banner/BannerListedVo.java @@ -0,0 +1,40 @@ +package com.wyh.admin.vo.basic.banner; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("banner信息列表Vo") +public class BannerListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "创建时间") + private String createTime; + + @ApiModelProperty(value = "更新时间") + private String updateTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @ApiModelProperty(value = "banner图") + private String img; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/bannerfront/BannerFrontDetailVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/bannerfront/BannerFrontDetailVo.java new file mode 100644 index 0000000..9445be8 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/bannerfront/BannerFrontDetailVo.java @@ -0,0 +1,34 @@ +package com.wyh.admin.vo.basic.bannerfront; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("小程序banner管理详情Vo") +public class BannerFrontDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "banner标题") + private String title; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "banner图") + private String img; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/bannerfront/BannerFrontListedVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/bannerfront/BannerFrontListedVo.java new file mode 100644 index 0000000..2d85543 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/bannerfront/BannerFrontListedVo.java @@ -0,0 +1,40 @@ +package com.wyh.admin.vo.basic.bannerfront; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("小程序banner管理列表Vo") +public class BannerFrontListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "banner标题") + private String title; + + @ApiModelProperty(value = "创建时间") + private String createTime; + + @ApiModelProperty(value = "更新时间") + private String updateTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "banner图") + private String img; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/company/CaseDetailVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/company/CaseDetailVo.java new file mode 100644 index 0000000..5b25dc4 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/company/CaseDetailVo.java @@ -0,0 +1,33 @@ +package com.wyh.admin.vo.basic.company; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("成功案例信息详情Vo") +public class CaseDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "案例名称") + private String name; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "案例图片") + private String img; + + @ApiModelProperty(value = "案例内容") + private String content; + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/company/CaseListedVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/company/CaseListedVo.java new file mode 100644 index 0000000..17dd1f2 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/basic/company/CaseListedVo.java @@ -0,0 +1,38 @@ +package com.wyh.admin.vo.basic.company; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("成功案例信息列表Vo") +public class CaseListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "案例名称") + private String name; + + @ApiModelProperty(value = "创建时间") + private String createTime; + + @ApiModelProperty(value = "更新时间") + private String updateTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "案例图片") + private String img; + + @ApiModelProperty(value = "案例内容") + private String content; +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateDetailVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateDetailVo.java index 3df82df..bbeeb59 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateDetailVo.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateDetailVo.java @@ -1,4 +1,4 @@ -package com.wyh.admin.vo; +package com.wyh.admin.vo.goods; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -13,19 +13,19 @@ public class GoodsCateDetailVo implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") - private String id; + private Integer id; @ApiModelProperty(value = "产品分类名称") private String name; @ApiModelProperty(value = "上级菜单") - private String pid; + private Integer pid; @ApiModelProperty(value = "排序编号") - private String sort; + private Integer sort; @ApiModelProperty(value = "是否显示: 0=否, 1=是") - private String isShow; + private Integer isShow; } diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateListedVo.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateListedVo.java index 20b8d13..5f7343a 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateListedVo.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/vo/goods/GoodsCateListedVo.java @@ -13,13 +13,13 @@ public class GoodsCateListedVo implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") - private String id; + private Integer id; @ApiModelProperty(value = "产品分类名称") private String name; @ApiModelProperty(value = "上级菜单") - private String pid; + private Integer pid; @ApiModelProperty(value = "创建时间") private String createTime; @@ -28,10 +28,10 @@ public class GoodsCateListedVo implements Serializable { private String updateTime; @ApiModelProperty(value = "排序编号") - private String sort; + private Integer sort; @ApiModelProperty(value = "是否显示: 0=否, 1=是") - private String isShow; + private Integer isShow; } diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/banner/Banner.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/banner/Banner.java new file mode 100644 index 0000000..83c4b35 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/banner/Banner.java @@ -0,0 +1,48 @@ +package com.wyh.common.entity.basic.banner; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("banner信息实体") +public class Banner implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "是否删除") + private Integer isDelete; + + @ApiModelProperty(value = "创建时间") + private Long createTime; + + @ApiModelProperty(value = "更新时间") + private Long updateTime; + + @ApiModelProperty(value = "删除时间") + private Long deleteTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @ApiModelProperty(value = "banner图") + private String img; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/bannerfront/BannerFront.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/bannerfront/BannerFront.java new file mode 100644 index 0000000..700acb5 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/bannerfront/BannerFront.java @@ -0,0 +1,48 @@ +package com.wyh.common.entity.basic.bannerfront; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("小程序banner管理实体") +public class BannerFront implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "banner标题") + private String title; + + @ApiModelProperty(value = "是否删除: 0=否, 1=是") + private Integer isDelete; + + @ApiModelProperty(value = "创建时间") + private Long createTime; + + @ApiModelProperty(value = "更新时间") + private Long updateTime; + + @ApiModelProperty(value = "删除时间") + private Long deleteTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "banner图") + private String img; + + @ApiModelProperty(value = "链接地址") + private String linkAddress; + +} \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/company/Case.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/company/Case.java new file mode 100644 index 0000000..245c7d9 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/basic/company/Case.java @@ -0,0 +1,47 @@ +package com.wyh.common.entity.basic.company; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("成功案例信息实体") +public class Case implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "案例名称") + private String name; + + @ApiModelProperty(value = "是否删除: 0=否, 1=是") + private Integer isDelete; + + @ApiModelProperty(value = "创建时间") + private Long createTime; + + @ApiModelProperty(value = "更新时间") + private Long updateTime; + + @ApiModelProperty(value = "删除时间") + private Long deleteTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + @ApiModelProperty(value = "是否显示: 0=否, 1=是") + private Integer isShow; + + @ApiModelProperty(value = "案例图片") + private String img; + + @ApiModelProperty(value = "案例内容") + private String content; +} \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsCate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsCate.java index c20ec90..ff3285f 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsCate.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsCate.java @@ -1,4 +1,4 @@ -package com.wyh.common.entity; +package com.wyh.common.entity.goods; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -16,13 +16,13 @@ public class GoodsCate implements Serializable { @TableId(value="id", type= IdType.AUTO) @ApiModelProperty(value = "主键") - private String id; + private Integer id; @ApiModelProperty(value = "产品分类名称") private String name; @ApiModelProperty(value = "上级菜单") - private String pid; + private Integer pid; @ApiModelProperty(value = "是否删除: 0=否, 1=是") private Integer isDelete; @@ -37,9 +37,9 @@ public class GoodsCate implements Serializable { private Long deleteTime; @ApiModelProperty(value = "排序编号") - private String sort; + private Integer sort; @ApiModelProperty(value = "是否显示: 0=否, 1=是") - private String isShow; + private Integer isShow; } \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/banner/BannerMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/banner/BannerMapper.java new file mode 100644 index 0000000..ec63412 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/banner/BannerMapper.java @@ -0,0 +1,14 @@ +package com.wyh.common.mapper.basic.banner; + + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.basic.banner.Banner; +import org.apache.ibatis.annotations.Mapper; + +/** + * banner信息Mapper + * @author LikeAdmin + */ +@Mapper +public interface BannerMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/bannerfront/BannerFrontMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/bannerfront/BannerFrontMapper.java new file mode 100644 index 0000000..f454272 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/bannerfront/BannerFrontMapper.java @@ -0,0 +1,14 @@ +package com.wyh.common.mapper.basic.bannerfront; + + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.basic.bannerfront.BannerFront; +import org.apache.ibatis.annotations.Mapper; + +/** + * 小程序banner管理Mapper + * @author wyh + */ +@Mapper +public interface BannerFrontMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/CaseMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/CaseMapper.java new file mode 100644 index 0000000..e2929e0 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/CaseMapper.java @@ -0,0 +1,14 @@ +package com.wyh.common.mapper.basic.company; + + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.basic.company.Case; +import org.apache.ibatis.annotations.Mapper; + +/** + * 成功案例信息Mapper + * @author wyh + */ +@Mapper +public interface CaseMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsCateMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsCateMapper.java index c25dc53..71fabc7 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsCateMapper.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsCateMapper.java @@ -1,7 +1,8 @@ -package com.wyh.common.mapper; +package com.wyh.common.mapper.goods; + import com.wyh.common.core.basics.IBaseMapper; -import com.wyh.common.entity.GoodsCate; +import com.wyh.common.entity.goods.GoodsCate; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/config/SwaggerConfig.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/config/SwaggerConfig.java index 7374ce1..7821806 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/config/SwaggerConfig.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/config/SwaggerConfig.java @@ -28,6 +28,7 @@ public class SwaggerConfig { .enable(enabled) .select() .apis(RequestHandlerSelectors.basePackage("com.wyh.front")) + .build() .groupName("中将业务接口【前台】"); } 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 45a2605..cfe9dc0 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 @@ -16,6 +16,7 @@ import com.wyh.front.service.IIndexService; import com.wyh.front.validate.common.SmsValidate; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -61,7 +62,8 @@ public class IndexController { @NotLogin @GetMapping("/policy") - @ApiOperation(value="政策协议") + @ApiOperation(value="政策协议",notes="类型 service=服务协议,privacy=隐私协议") + @ApiParam(name="type",value="类型 service=服务协议,privacy=隐私协议") public AjaxResult> policy(@RequestParam String type) { Map map = iIndexService.policy(type); return AjaxResult.success(map); diff --git a/admin/package-lock.json b/admin/package-lock.json index b249308..1315bbd 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "license": "MIT", "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.6", "@highlightjs/vue-plugin": "^2.1.0", "@wangeditor/editor": "^5.1.12", @@ -58,6 +59,11 @@ "vue-tsc": "^0.38.1" } }, + "node_modules/@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -7260,6 +7266,11 @@ } }, "dependencies": { + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz", diff --git a/admin/package.json b/admin/package.json index 25c05ad..e5d0f64 100644 --- a/admin/package.json +++ b/admin/package.json @@ -10,6 +10,7 @@ "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.6", "@highlightjs/vue-plugin": "^2.1.0", "@wangeditor/editor": "^5.1.12", diff --git a/admin/src/api/banner.ts b/admin/src/api/banner.ts new file mode 100644 index 0000000..7fb1ab3 --- /dev/null +++ b/admin/src/api/banner.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// banner信息列表 +export function bannerLists(params?: Record) { + return request.get({ url: '/banner/list', params }) +} + +// banner信息详情 +export function bannerDetail(params: Record) { + return request.get({ url: '/banner/detail', params }) +} + +// banner信息新增 +export function bannerAdd(params: Record) { + return request.post({ url: '/banner/add', params }) +} + +// banner信息编辑 +export function bannerEdit(params: Record) { + return request.post({ url: '/banner/edit', params }) +} + +// banner信息删除 +export function bannerDelete(params: Record) { + return request.post({ url: '/banner/del', params }) +} diff --git a/admin/src/api/bannerfront.ts b/admin/src/api/bannerfront.ts new file mode 100644 index 0000000..59f78e0 --- /dev/null +++ b/admin/src/api/bannerfront.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 小程序banner管理列表 +export function bannerfrontLists(params?: Record) { + return request.get({ url: '/bannerfront/list', params }) +} + +// 小程序banner管理详情 +export function bannerfrontDetail(params: Record) { + return request.get({ url: '/bannerfront/detail', params }) +} + +// 小程序banner管理新增 +export function bannerfrontAdd(params: Record) { + return request.post({ url: '/bannerfront/add', params }) +} + +// 小程序banner管理编辑 +export function bannerfrontEdit(params: Record) { + return request.post({ url: '/bannerfront/edit', params }) +} + +// 小程序banner管理删除 +export function bannerfrontDelete(params: Record) { + return request.post({ url: '/bannerfront/del', params }) +} diff --git a/admin/src/api/case.ts b/admin/src/api/case.ts new file mode 100644 index 0000000..51fede7 --- /dev/null +++ b/admin/src/api/case.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 成功案例信息列表 +export function caseLists(params?: Record) { + return request.get({ url: '/case/list', params }) +} + +// 成功案例信息详情 +export function caseDetail(params: Record) { + return request.get({ url: '/case/detail', params }) +} + +// 成功案例信息新增 +export function caseAdd(params: Record) { + return request.post({ url: '/case/add', params }) +} + +// 成功案例信息编辑 +export function caseEdit(params: Record) { + return request.post({ url: '/case/edit', params }) +} + +// 成功案例信息删除 +export function caseDelete(params: Record) { + return request.post({ url: '/case/del', params }) +} diff --git a/admin/src/components/map/MapContainer.vue b/admin/src/components/map/MapContainer.vue new file mode 100644 index 0000000..e69de29 diff --git a/admin/src/components/material/index.vue b/admin/src/components/material/index.vue index 137dbef..b126cf0 100644 --- a/admin/src/components/material/index.vue +++ b/admin/src/components/material/index.vue @@ -207,8 +207,6 @@ - -
diff --git a/admin/src/views/basic/banner/edit.vue b/admin/src/views/basic/banner/edit.vue new file mode 100644 index 0000000..1357c75 --- /dev/null +++ b/admin/src/views/basic/banner/edit.vue @@ -0,0 +1,154 @@ + + diff --git a/admin/src/views/basic/banner/index.vue b/admin/src/views/basic/banner/index.vue new file mode 100644 index 0000000..3950bd9 --- /dev/null +++ b/admin/src/views/basic/banner/index.vue @@ -0,0 +1,160 @@ + + diff --git a/admin/src/views/basic/bannerfront/edit.vue b/admin/src/views/basic/bannerfront/edit.vue new file mode 100644 index 0000000..0bbf95b --- /dev/null +++ b/admin/src/views/basic/bannerfront/edit.vue @@ -0,0 +1,153 @@ + + diff --git a/admin/src/views/basic/bannerfront/index.vue b/admin/src/views/basic/bannerfront/index.vue new file mode 100644 index 0000000..037cd0d --- /dev/null +++ b/admin/src/views/basic/bannerfront/index.vue @@ -0,0 +1,150 @@ + + diff --git a/admin/src/views/basic/company/case/edit.vue b/admin/src/views/basic/company/case/edit.vue new file mode 100644 index 0000000..6e6dc25 --- /dev/null +++ b/admin/src/views/basic/company/case/edit.vue @@ -0,0 +1,146 @@ + + diff --git a/admin/src/views/basic/company/case/index.vue b/admin/src/views/basic/company/case/index.vue new file mode 100644 index 0000000..863f603 --- /dev/null +++ b/admin/src/views/basic/company/case/index.vue @@ -0,0 +1,129 @@ + + diff --git a/admin/src/views/goods/cate/edit.vue b/admin/src/views/goods/cate/edit.vue index ae3cd7f..3e3f90a 100644 --- a/admin/src/views/goods/cate/edit.vue +++ b/admin/src/views/goods/cate/edit.vue @@ -27,22 +27,16 @@ - +
数值越大越排前
- + - - {{ item.name }} - + 显示 + 不显示 @@ -73,8 +67,8 @@ const popupTitle = computed(() => { const formData = reactive({ id: '', name: '', - pid: '', - sort: '', + pid: 0, + sort: 0, isShow: '', }) diff --git a/admin/src/views/goods/cate/index.vue b/admin/src/views/goods/cate/index.vue index 5cab267..2a99859 100644 --- a/admin/src/views/goods/cate/index.vue +++ b/admin/src/views/goods/cate/index.vue @@ -13,7 +13,7 @@ > @@ -112,15 +112,15 @@ const lists = ref([]) const queryParams = reactive({ name: '', - pid: '', - sort: '', - isShow: '', + pid: null, + sort: null, + isShow: null, }) const { dictData } = useDictData<{ - Boolean: any[] -}>(['Boolean']) + Integer: any[] +}>(['Integer']) const getLists = async () => { loading.value = true diff --git a/admin/yarn.lock b/admin/yarn.lock index 341255b..13134c2 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@amap/amap-jsapi-loader@^1.0.1": + version "1.0.1" + resolved "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz" + integrity sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw== + "@ampproject/remapping@^2.1.0": version "2.2.0" resolved "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz"