From 3cc4ba995307fe31ef867c8a2ac4609cdf23c8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Mon, 19 Aug 2024 15:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E6=96=B9=E6=A1=88=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZJ-java/.gitignore | 2 +- ZJ-java/DirectoryV2.xml | 12 +- .../controller/info/ClassInfoController.java | 68 ++++++ .../schme/IntegrationSchmeController.java | 69 ++++++ .../subject/SubjectInfoController.java | 76 +++++++ .../com/wyh/admin/service/IAboutService.java | 12 +- .../com/wyh/admin/service/IBannerService.java | 12 +- .../wyh/admin/service/IClassInfoService.java | 59 +++++ .../wyh/admin/service/IGoodsCateService.java | 12 +- .../com/wyh/admin/service/IGoodsService.java | 12 +- .../service/IIntegrationSchmeService.java | 60 +++++ .../com/wyh/admin/service/IJrwmService.java | 12 +- .../wyh/admin/service/INewsCateService.java | 12 +- .../com/wyh/admin/service/INewsService.java | 12 +- .../admin/service/ISubjectInfoService.java | 63 ++++++ .../admin/service/impl/AboutServiceImpl.java | 12 +- .../admin/service/impl/BannerServiceImpl.java | 12 +- .../service/impl/ClassInfoServiceImpl.java | 153 +++++++++++++ .../service/impl/GoodsCateServiceImpl.java | 12 +- .../admin/service/impl/GoodsServiceImpl.java | 42 +++- .../impl/IntegrationSchmeServiceImpl.java | 185 ++++++++++++++++ .../admin/service/impl/JrwmServiceImpl.java | 12 +- .../service/impl/NewsCateServiceImpl.java | 12 +- .../admin/service/impl/NewsServiceImpl.java | 12 +- .../service/impl/SubjectInfoServiceImpl.java | 165 ++++++++++++++ .../basic/banner/BannerUpdateValidate.java | 2 +- .../basic/company/AboutUpdateValidate.java | 2 +- .../basic/company/JrwmUpdateValidate.java | 2 +- .../goods/GoodsCateUpdateValidate.java | 2 +- .../validate/news/NewsCateUpdateValidate.java | 2 +- .../validate/news/NewsUpdateValidate.java | 2 +- .../wyh/common/entity/goods/GoodsExpand.java | 27 +++ .../com/wyh/common/entity/info/ClassInfo.java | 42 ++++ .../common/entity/schme/IntegrationSchme.java | 57 +++++ .../common/entity/subject/SubjectInfo.java | 36 +++ .../mapper/basic/banner/BannerMapper.java | 2 +- .../mapper/basic/company/AboutMapper.java | 2 +- .../mapper/basic/company/JrwmMapper.java | 2 +- .../common/mapper/goods/GoodsCateMapper.java | 2 +- .../mapper/goods/GoodsExpandMapper.java | 13 ++ .../wyh/common/mapper/goods/GoodsMapper.java | 2 +- .../common/mapper/info/ClassInfoMapper.java | 13 ++ .../common/mapper/news/NewsCateMapper.java | 2 +- .../wyh/common/mapper/news/NewsMapper.java | 2 +- .../mapper/schme/IntegrationSchmeMapper.java | 13 ++ .../mapper/subject/SubjectInfoMapper.java | 13 ++ .../goods/GoodsCateUpdateValidate.java | 2 +- .../validator/goods/GoodsCreateValidate.java | 5 + .../validator/goods/GoodsUpdateValidate.java | 7 +- .../info/ClassInfoCreateValidate.java | 28 +++ .../info/ClassInfoSearchValidate.java | 23 ++ .../info/ClassInfoUpdateValidate.java | 36 +++ .../news/NewsCateUpdateValidate.java | 2 +- .../validator/news/NewsUpdateValidate.java | 2 +- .../schme/IntegrationSchmeCreateValidate.java | 48 ++++ .../schme/IntegrationSchmeSearchValidate.java | 38 ++++ .../schme/IntegrationSchmeUpdateValidate.java | 57 +++++ .../subject/SubjectInfoCreateValidate.java | 20 ++ .../subject/SubjectInfoSearchValidate.java | 17 ++ .../subject/SubjectInfoUpdateValidate.java | 29 +++ .../wyh/common/vo/goods/GoodsDetailVo.java | 4 + .../wyh/common/vo/goods/GoodsListedVo.java | 3 + .../wyh/common/vo/info/ClassInfoDetailVo.java | 28 +++ .../wyh/common/vo/info/ClassInfoListedVo.java | 34 +++ .../vo/schme/IntegrationSchmeDetailVo.java | 43 ++++ .../vo/schme/IntegrationSchmeListedVo.java | 49 +++++ .../vo/subject/SubjectInfoDetailVo.java | 22 ++ .../vo/subject/SubjectInfoListedVo.java | 28 +++ .../wyh/front/controller/GoodsController.java | 14 ++ .../com/wyh/front/service/GoodsService.java | 6 + .../com/wyh/front/service/IAboutService.java | 12 +- .../com/wyh/front/service/IBannerService.java | 12 +- .../com/wyh/front/service/IJrwmService.java | 12 +- .../com/wyh/front/service/INewsService.java | 12 +- .../front/service/impl/AboutServiceImpl.java | 12 +- .../front/service/impl/BannerServiceImpl.java | 12 +- .../front/service/impl/GoodsServiceImpl.java | 47 ++++ .../front/service/impl/JrwmServiceImpl.java | 12 +- .../front/service/impl/NewsServiceImpl.java | 12 +- .../basic/banner/BannerUpdateValidate.java | 2 +- .../basic/company/AboutUpdateValidate.java | 2 +- .../basic/company/JrwmUpdateValidate.java | 2 +- .../src/main/resources/application.yml | 2 +- ZJ-java/pom.xml | 1 - admin/src/api/info.ts | 26 +++ admin/src/api/schme.ts | 26 +++ admin/src/api/subject.ts | 32 +++ admin/src/views/goods/edit.vue | 54 +++-- admin/src/views/info/edit.vue | 147 +++++++++++++ admin/src/views/info/index.vue | 138 ++++++++++++ admin/src/views/schme/edit.vue | 205 ++++++++++++++++++ admin/src/views/schme/index.vue | 177 +++++++++++++++ admin/src/views/subject/edit.vue | 101 +++++++++ admin/src/views/subject/index.vue | 104 +++++++++ 94 files changed, 2880 insertions(+), 177 deletions(-) create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/info/ClassInfoController.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/schme/IntegrationSchmeController.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/subject/SubjectInfoController.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IClassInfoService.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IIntegrationSchmeService.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ISubjectInfoService.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/ClassInfoServiceImpl.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/IntegrationSchmeServiceImpl.java create mode 100644 ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/SubjectInfoServiceImpl.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsExpand.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/info/ClassInfo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/schme/IntegrationSchme.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/subject/SubjectInfo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsExpandMapper.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/info/ClassInfoMapper.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/schme/IntegrationSchmeMapper.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/subject/SubjectInfoMapper.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoCreateValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoSearchValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoUpdateValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeCreateValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeSearchValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeUpdateValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoCreateValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoSearchValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoUpdateValidate.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoDetailVo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoListedVo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeDetailVo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeListedVo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoDetailVo.java create mode 100644 ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoListedVo.java create mode 100644 admin/src/api/info.ts create mode 100644 admin/src/api/schme.ts create mode 100644 admin/src/api/subject.ts create mode 100644 admin/src/views/info/edit.vue create mode 100644 admin/src/views/info/index.vue create mode 100644 admin/src/views/schme/edit.vue create mode 100644 admin/src/views/schme/index.vue create mode 100644 admin/src/views/subject/edit.vue create mode 100644 admin/src/views/subject/index.vue diff --git a/ZJ-java/.gitignore b/ZJ-java/.gitignore index da74356..7593800 100644 --- a/ZJ-java/.gitignore +++ b/ZJ-java/.gitignore @@ -32,5 +32,5 @@ rebel-remote.xml rebel.xml ### customize ### -/likeadmin-java.iml +/ZJ-java.iml /logs \ No newline at end of file diff --git a/ZJ-java/DirectoryV2.xml b/ZJ-java/DirectoryV2.xml index fe23f3f..b3cf0e6 100644 --- a/ZJ-java/DirectoryV2.xml +++ b/ZJ-java/DirectoryV2.xml @@ -20,17 +20,17 @@ - - - + + + - - - + + + diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/info/ClassInfoController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/info/ClassInfoController.java new file mode 100644 index 0000000..3600849 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/info/ClassInfoController.java @@ -0,0 +1,68 @@ +package com.wyh.admin.controller.info; + +import com.alibaba.fastjson2.JSONArray; +import com.wyh.admin.aop.Log; +import com.wyh.admin.service.IClassInfoService; +import com.wyh.admin.validate.commons.IdValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.AjaxResult; +import com.wyh.common.validator.annotation.IDMust; +import com.wyh.common.validator.info.ClassInfoCreateValidate; +import com.wyh.common.validator.info.ClassInfoSearchValidate; +import com.wyh.common.validator.info.ClassInfoUpdateValidate; +import com.wyh.common.vo.info.ClassInfoDetailVo; +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/info") +@Api(tags = "班级信息管理") +public class ClassInfoController { + + @Resource + IClassInfoService iClassInfoService; + + @GetMapping("/list") + @ApiOperation(value="班级信息列表") + public AjaxResult list(@Validated PageValidate pageValidate, + @Validated ClassInfoSearchValidate searchValidate) { + JSONArray list = iClassInfoService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + @GetMapping("/detail") + @ApiOperation(value="班级信息详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + ClassInfoDetailVo detail = iClassInfoService.detail(id); + return AjaxResult.success(detail); + } + + @Log(title = "班级信息新增") + @PostMapping("/add") + @ApiOperation(value="班级信息新增") + public AjaxResult add(@Validated @RequestBody ClassInfoCreateValidate createValidate) { + iClassInfoService.add(createValidate); + return AjaxResult.success(); + } + + @Log(title = "班级信息编辑") + @PostMapping("/edit") + @ApiOperation(value="班级信息编辑") + public AjaxResult edit(@Validated @RequestBody ClassInfoUpdateValidate updateValidate) { + iClassInfoService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "班级信息删除") + @PostMapping("/del") + @ApiOperation(value="班级信息删除") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iClassInfoService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/schme/IntegrationSchmeController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/schme/IntegrationSchmeController.java new file mode 100644 index 0000000..eb5a394 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/schme/IntegrationSchmeController.java @@ -0,0 +1,69 @@ +package com.wyh.admin.controller.schme; + +import com.wyh.admin.aop.Log; +import com.wyh.admin.service.IIntegrationSchmeService; +import com.wyh.admin.validate.commons.IdValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.AjaxResult; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.annotation.IDMust; +import com.wyh.common.validator.schme.IntegrationSchmeCreateValidate; +import com.wyh.common.validator.schme.IntegrationSchmeSearchValidate; +import com.wyh.common.validator.schme.IntegrationSchmeUpdateValidate; +import com.wyh.common.vo.schme.IntegrationSchmeDetailVo; +import com.wyh.common.vo.schme.IntegrationSchmeListedVo; +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/schme") +@Api(tags = "集成方案信息管理") +public class IntegrationSchmeController { + + @Resource + IIntegrationSchmeService iIntegrationSchmeService; + + @GetMapping("/list") + @ApiOperation(value="集成方案信息列表") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated IntegrationSchmeSearchValidate searchValidate) { + PageResult list = iIntegrationSchmeService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + @GetMapping("/detail") + @ApiOperation(value="集成方案信息详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + IntegrationSchmeDetailVo detail = iIntegrationSchmeService.detail(id); + return AjaxResult.success(detail); + } + + @Log(title = "集成方案信息新增") + @PostMapping("/add") + @ApiOperation(value="集成方案信息新增") + public AjaxResult add(@Validated @RequestBody IntegrationSchmeCreateValidate createValidate) { + iIntegrationSchmeService.add(createValidate); + return AjaxResult.success(); + } + + @Log(title = "集成方案信息编辑") + @PostMapping("/edit") + @ApiOperation(value="集成方案信息编辑") + public AjaxResult edit(@Validated @RequestBody IntegrationSchmeUpdateValidate updateValidate) { + iIntegrationSchmeService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "集成方案信息删除") + @PostMapping("/del") + @ApiOperation(value="集成方案信息删除") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iIntegrationSchmeService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/subject/SubjectInfoController.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/subject/SubjectInfoController.java new file mode 100644 index 0000000..f1ebd29 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/controller/subject/SubjectInfoController.java @@ -0,0 +1,76 @@ +package com.wyh.admin.controller.subject; + +import com.wyh.admin.aop.Log; +import com.wyh.admin.service.ISubjectInfoService; +import com.wyh.admin.validate.commons.IdValidate; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.AjaxResult; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.annotation.IDMust; +import com.wyh.common.validator.subject.SubjectInfoCreateValidate; +import com.wyh.common.validator.subject.SubjectInfoSearchValidate; +import com.wyh.common.validator.subject.SubjectInfoUpdateValidate; +import com.wyh.common.vo.subject.SubjectInfoDetailVo; +import com.wyh.common.vo.subject.SubjectInfoListedVo; +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; +import java.util.List; + +@RestController +@RequestMapping("api/subject") +@Api(tags = "集成方案属性管理") +public class SubjectInfoController { + + @Resource + ISubjectInfoService iSubjectInfoService; + + @GetMapping("/list") + @ApiOperation(value="集成方案属性列表") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated SubjectInfoSearchValidate searchValidate) { + PageResult list = iSubjectInfoService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + @GetMapping("/all") + @ApiOperation(value="集成方案属性全部") + public AjaxResult> all() { + List list = iSubjectInfoService.all(); + return AjaxResult.success(list); + } + @GetMapping("/detail") + @ApiOperation(value="集成方案属性详情") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SubjectInfoDetailVo detail = iSubjectInfoService.detail(id); + return AjaxResult.success(detail); + } + + @Log(title = "集成方案属性新增") + @PostMapping("/add") + @ApiOperation(value="集成方案属性新增") + public AjaxResult add(@Validated @RequestBody SubjectInfoCreateValidate createValidate) { + iSubjectInfoService.add(createValidate); + return AjaxResult.success(); + } + + @Log(title = "集成方案属性编辑") + @PostMapping("/edit") + @ApiOperation(value="集成方案属性编辑") + public AjaxResult edit(@Validated @RequestBody SubjectInfoUpdateValidate updateValidate) { + iSubjectInfoService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "集成方案属性删除") + @PostMapping("/del") + @ApiOperation(value="集成方案属性删除") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iSubjectInfoService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IAboutService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IAboutService.java index 596938c..5f0f62c 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IAboutService.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IAboutService.java @@ -11,14 +11,14 @@ import com.wyh.common.core.PageResult; /** * 关于中将信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IAboutService { /** * 关于中将信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -28,7 +28,7 @@ public interface IAboutService { /** * 关于中将信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return AboutDetailVo */ @@ -37,7 +37,7 @@ public interface IAboutService { /** * 关于中将信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(AboutCreateValidate createValidate); @@ -45,7 +45,7 @@ public interface IAboutService { /** * 关于中将信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(AboutUpdateValidate updateValidate); @@ -53,7 +53,7 @@ public interface IAboutService { /** * 关于中将信息删除 * - * @author LikeAdmin + * @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 index c9b0042..3d68e01 100644 --- 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 @@ -11,14 +11,14 @@ import com.wyh.common.core.PageResult; /** * banner信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IBannerService { /** * banner信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -28,7 +28,7 @@ public interface IBannerService { /** * banner信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return BannerDetailVo */ @@ -37,7 +37,7 @@ public interface IBannerService { /** * banner信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(BannerCreateValidate createValidate); @@ -45,7 +45,7 @@ public interface IBannerService { /** * banner信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(BannerUpdateValidate updateValidate); @@ -53,7 +53,7 @@ public interface IBannerService { /** * banner信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IClassInfoService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IClassInfoService.java new file mode 100644 index 0000000..25bea0d --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IClassInfoService.java @@ -0,0 +1,59 @@ +package com.wyh.admin.service; + +import com.alibaba.fastjson2.JSONArray; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.validator.info.ClassInfoCreateValidate; +import com.wyh.common.validator.info.ClassInfoSearchValidate; +import com.wyh.common.validator.info.ClassInfoUpdateValidate; +import com.wyh.common.vo.info.ClassInfoDetailVo; + +/** + * 班级信息服务接口类 + * @author wyh + */ +public interface IClassInfoService { + + /** + * 班级信息列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + JSONArray list(PageValidate pageValidate, ClassInfoSearchValidate searchValidate); + + /** + * 班级信息详情 + * + * @author wyh + * @param id 主键ID + * @return ClassInfoDetailVo + */ + ClassInfoDetailVo detail(Integer id); + + /** + * 班级信息新增 + * + * @author wyh + * @param createValidate 参数 + */ + void add(ClassInfoCreateValidate createValidate); + + /** + * 班级信息编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + void edit(ClassInfoUpdateValidate 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 3d58793..ae5b472 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 @@ -8,14 +8,14 @@ import com.wyh.admin.vo.goods.GoodsCateDetailVo; /** * 产品分类服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IGoodsCateService { /** * 产品分类列表 * - * @author LikeAdmin + * @author wyh * @param searchValidate 搜索参数 * @return JSONArray */ @@ -24,7 +24,7 @@ public interface IGoodsCateService { /** * 产品分类详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return GoodsCateDetailVo */ @@ -33,7 +33,7 @@ public interface IGoodsCateService { /** * 产品分类新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(GoodsCateCreateValidate createValidate); @@ -41,7 +41,7 @@ public interface IGoodsCateService { /** * 产品分类编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(GoodsCateUpdateValidate updateValidate); @@ -49,7 +49,7 @@ public interface IGoodsCateService { /** * 产品分类删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsService.java index deb47e3..3a0dc4d 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsService.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IGoodsService.java @@ -11,14 +11,14 @@ import com.wyh.common.vo.goods.GoodsListedVo; /** * 产品信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IGoodsService { /** * 产品信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -28,7 +28,7 @@ public interface IGoodsService { /** * 产品信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return GoodsDetailVo */ @@ -37,7 +37,7 @@ public interface IGoodsService { /** * 产品信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(GoodsCreateValidate createValidate); @@ -45,7 +45,7 @@ public interface IGoodsService { /** * 产品信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(GoodsUpdateValidate updateValidate); @@ -53,7 +53,7 @@ public interface IGoodsService { /** * 产品信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IIntegrationSchmeService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IIntegrationSchmeService.java new file mode 100644 index 0000000..e070a6d --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IIntegrationSchmeService.java @@ -0,0 +1,60 @@ +package com.wyh.admin.service; + +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.schme.IntegrationSchmeCreateValidate; +import com.wyh.common.validator.schme.IntegrationSchmeSearchValidate; +import com.wyh.common.validator.schme.IntegrationSchmeUpdateValidate; +import com.wyh.common.vo.schme.IntegrationSchmeDetailVo; +import com.wyh.common.vo.schme.IntegrationSchmeListedVo; + +/** + * 集成方案信息服务接口类 + * @author wyh + */ +public interface IIntegrationSchmeService { + + /** + * 集成方案信息列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, IntegrationSchmeSearchValidate searchValidate); + + /** + * 集成方案信息详情 + * + * @author wyh + * @param id 主键ID + * @return IntegrationSchmeDetailVo + */ + IntegrationSchmeDetailVo detail(Integer id); + + /** + * 集成方案信息新增 + * + * @author wyh + * @param createValidate 参数 + */ + void add(IntegrationSchmeCreateValidate createValidate); + + /** + * 集成方案信息编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + void edit(IntegrationSchmeUpdateValidate updateValidate); + + /** + * 集成方案信息删除 + * + * @author wyh + * @param id 主键ID + */ + void del(Integer id); + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IJrwmService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IJrwmService.java index ad360da..cada38a 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IJrwmService.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/IJrwmService.java @@ -10,14 +10,14 @@ import com.wyh.common.core.PageResult; /** * 加入我们信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IJrwmService { /** * 加入我们信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -27,7 +27,7 @@ public interface IJrwmService { /** * 加入我们信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return JrwmDetailVo */ @@ -36,7 +36,7 @@ public interface IJrwmService { /** * 加入我们信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(JrwmCreateValidate createValidate); @@ -44,7 +44,7 @@ public interface IJrwmService { /** * 加入我们信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(JrwmUpdateValidate updateValidate); @@ -52,7 +52,7 @@ public interface IJrwmService { /** * 加入我们信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsCateService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsCateService.java index e99bf56..baa1ee2 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsCateService.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsCateService.java @@ -13,14 +13,14 @@ import java.util.List; /** * 新闻分类服务接口类 - * @author LikeAdmin + * @author wyh */ public interface INewsCateService { /** * 新闻分类列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -30,7 +30,7 @@ public interface INewsCateService { /** * 新闻分类详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return NewsCateDetailVo */ @@ -39,7 +39,7 @@ public interface INewsCateService { /** * 新闻分类新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(NewsCateCreateValidate createValidate); @@ -47,7 +47,7 @@ public interface INewsCateService { /** * 新闻分类编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(NewsCateUpdateValidate updateValidate); @@ -55,7 +55,7 @@ public interface INewsCateService { /** * 新闻分类删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsService.java index ff3c256..bc16e91 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsService.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/INewsService.java @@ -10,14 +10,14 @@ import com.wyh.common.core.PageResult; /** * 新闻信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface INewsService { /** * 新闻信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -27,7 +27,7 @@ public interface INewsService { /** * 新闻信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return NewsDetailVo */ @@ -36,7 +36,7 @@ public interface INewsService { /** * 新闻信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(NewsCreateValidate createValidate); @@ -44,7 +44,7 @@ public interface INewsService { /** * 新闻信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(NewsUpdateValidate updateValidate); @@ -52,7 +52,7 @@ public interface INewsService { /** * 新闻信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ISubjectInfoService.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ISubjectInfoService.java new file mode 100644 index 0000000..355792b --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/ISubjectInfoService.java @@ -0,0 +1,63 @@ +package com.wyh.admin.service; + +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.PageResult; +import com.wyh.common.validator.subject.SubjectInfoCreateValidate; +import com.wyh.common.validator.subject.SubjectInfoSearchValidate; +import com.wyh.common.validator.subject.SubjectInfoUpdateValidate; +import com.wyh.common.vo.subject.SubjectInfoDetailVo; +import com.wyh.common.vo.subject.SubjectInfoListedVo; + +import java.util.List; + +/** + * 集成方案属性服务接口类 + * @author wyh + */ +public interface ISubjectInfoService { + + /** + * 集成方案属性列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, SubjectInfoSearchValidate searchValidate); + + /** + * 集成方案属性详情 + * + * @author wyh + * @param id 主键ID + * @return SubjectInfoDetailVo + */ + SubjectInfoDetailVo detail(Integer id); + + /** + * 集成方案属性新增 + * + * @author wyh + * @param createValidate 参数 + */ + void add(SubjectInfoCreateValidate createValidate); + + /** + * 集成方案属性编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + void edit(SubjectInfoUpdateValidate updateValidate); + + /** + * 集成方案属性删除 + * + * @author wyh + * @param id 主键ID + */ + void del(Integer id); + + List all(); +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/AboutServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/AboutServiceImpl.java index 924e4ef..8fb8c10 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/AboutServiceImpl.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/AboutServiceImpl.java @@ -29,7 +29,7 @@ import java.util.*; /** * 关于中将信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class AboutServiceImpl implements IAboutService { @@ -40,7 +40,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -83,7 +83,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return About */ @@ -105,7 +105,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -128,7 +128,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -158,7 +158,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override 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 index c44386b..f7fa181 100644 --- 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 @@ -28,7 +28,7 @@ import java.util.*; /** * banner信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class BannerServiceImpl implements IBannerService { @@ -39,7 +39,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -78,7 +78,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return Banner */ @@ -101,7 +101,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -120,7 +120,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -146,7 +146,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/ClassInfoServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/ClassInfoServiceImpl.java new file mode 100644 index 0000000..c981129 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/ClassInfoServiceImpl.java @@ -0,0 +1,153 @@ +package com.wyh.admin.service.impl; + +import com.alibaba.fastjson2.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.query.MPJQueryWrapper; +import com.wyh.admin.service.IClassInfoService; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.entity.info.ClassInfo; +import com.wyh.common.mapper.info.ClassInfoMapper; +import com.wyh.common.util.ListUtils; +import com.wyh.common.util.TimeUtils; +import com.wyh.common.validator.info.ClassInfoCreateValidate; +import com.wyh.common.validator.info.ClassInfoSearchValidate; +import com.wyh.common.validator.info.ClassInfoUpdateValidate; +import com.wyh.common.vo.info.ClassInfoDetailVo; +import com.wyh.common.vo.info.ClassInfoListedVo; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 班级信息实现类 + * @author wyh + */ +@Service +public class ClassInfoServiceImpl implements IClassInfoService { + + @Resource + ClassInfoMapper classInfoMapper; + + /** + * 班级信息列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public JSONArray list(PageValidate pageValidate, ClassInfoSearchValidate searchValidate) { + MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.selectAll(ClassInfo.class); + mpjQueryWrapper.eq("is_delete", 0); + mpjQueryWrapper.orderByDesc(Arrays.asList("sort", "id")); + + classInfoMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ + "like:name:str", + "=:pid:str", + "=:sort:str", + }); + + List array = classInfoMapper.selectJoinList( + ClassInfoListedVo.class, + mpjQueryWrapper); + + for(ClassInfoListedVo item : array) { + item.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + item.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + } + + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(array)); + return ListUtils.listToTree(jsonArray, "id", "pid", "children"); + } + + /** + * 班级信息详情 + * + * @author wyh + * @param id 主键参数 + * @return ClassInfo + */ + @Override + public ClassInfoDetailVo detail(Integer id) { + ClassInfo model = classInfoMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + ClassInfoDetailVo vo = new ClassInfoDetailVo(); + BeanUtils.copyProperties(model, vo); + return vo; + } + + /** + * 班级信息新增 + * + * @author wyh + * @param createValidate 参数 + */ + @Override + public void add(ClassInfoCreateValidate createValidate) { + ClassInfo model = new ClassInfo(); + model.setName(createValidate.getName()); + model.setPid(createValidate.getPid()); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(createValidate.getSort()); + classInfoMapper.insert(model); + } + + /** + * 班级信息编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + @Override + public void edit(ClassInfoUpdateValidate updateValidate) { + ClassInfo model = classInfoMapper.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.setPid(updateValidate.getPid()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setSort(updateValidate.getSort()); + classInfoMapper.updateById(model); + } + + /** + * 班级信息删除 + * + * @author wyh + * @param id 主键ID + */ + @Override + public void del(Integer id) { + ClassInfo model = classInfoMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + classInfoMapper.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 09e497b..24fc82b 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 @@ -23,7 +23,7 @@ import java.util.*; /** * 产品分类实现类 - * @author LikeAdmin + * @author wyh */ @Service public class GoodsCateServiceImpl implements IGoodsCateService { @@ -34,7 +34,7 @@ public class GoodsCateServiceImpl implements IGoodsCateService { /** * 产品分类列表 * - * @author LikeAdmin + * @author wyh * @param searchValidate 搜索参数 * @return JSONArray */ @@ -69,7 +69,7 @@ public class GoodsCateServiceImpl implements IGoodsCateService { /** * 产品分类详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return GoodsCate */ @@ -91,7 +91,7 @@ public class GoodsCateServiceImpl implements IGoodsCateService { /** * 产品分类新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -109,7 +109,7 @@ public class GoodsCateServiceImpl implements IGoodsCateService { /** * 产品分类编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -134,7 +134,7 @@ public class GoodsCateServiceImpl implements IGoodsCateService { /** * 产品分类删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsServiceImpl.java index dc88fcd..d032b0f 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsServiceImpl.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/GoodsServiceImpl.java @@ -11,7 +11,9 @@ import com.wyh.common.config.GlobalConfig; import com.wyh.common.core.PageResult; import com.wyh.common.entity.goods.Goods; import com.wyh.common.entity.goods.GoodsCate; +import com.wyh.common.entity.goods.GoodsExpand; import com.wyh.common.mapper.goods.GoodsCateMapper; +import com.wyh.common.mapper.goods.GoodsExpandMapper; import com.wyh.common.mapper.goods.GoodsMapper; import com.wyh.common.util.TimeUtils; import com.wyh.common.validator.goods.GoodsCreateValidate; @@ -19,12 +21,14 @@ import com.wyh.common.validator.goods.GoodsSearchValidate; import com.wyh.common.validator.goods.GoodsUpdateValidate; import com.wyh.common.vo.goods.GoodsDetailVo; import com.wyh.common.vo.goods.GoodsListedVo; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import javax.annotation.Resource; import java.util.Arrays; +import java.util.LinkedList; /** * 产品信息实现类 @@ -39,10 +43,13 @@ public class GoodsServiceImpl implements IGoodsService { @Resource GoodsCateMapper goodsCateMapper; + @Resource + GoodsExpandMapper goodsExpandMapper; + /** * 产品信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -87,7 +94,7 @@ public class GoodsServiceImpl implements IGoodsService { /** * 产品信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return Goods */ @@ -103,13 +110,19 @@ public class GoodsServiceImpl implements IGoodsService { GoodsDetailVo vo = new GoodsDetailVo(); BeanUtils.copyProperties(model, vo); + LinkedList goodsExpands = new LinkedList<>(goodsExpandMapper.selectList( + new QueryWrapper() + .eq("goods_id", id) + .last("limit 100") + )); + vo.setGoodsExpand(goodsExpands); return vo; } /** * 产品信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -126,13 +139,23 @@ public class GoodsServiceImpl implements IGoodsService { model.setIsDownload(createValidate.getIsDownload()); model.setSummary(createValidate.getSummary()); model.setCateId(createValidate.getCateId()); + goodsMapper.insert(model); + if (CollectionUtils.isNotEmpty(createValidate.getGoodsExpand())) { + for (GoodsExpand item : createValidate.getGoodsExpand()) { + GoodsExpand goodsExpand = new GoodsExpand(); + BeanUtils.copyProperties(item, goodsExpand); + goodsExpand.setGoodsId(model.getId()); + goodsExpandMapper.insert(goodsExpand); + } + + } } /** * 产品信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -157,12 +180,21 @@ public class GoodsServiceImpl implements IGoodsService { model.setSummary(updateValidate.getSummary()); model.setCateId(updateValidate.getCateId()); goodsMapper.updateById(model); + if (CollectionUtils.isNotEmpty(updateValidate.getGoodsExpand())) { + goodsExpandMapper.delete(Wrappers.lambdaQuery().eq(GoodsExpand::getGoodsId, model.getId())); + for (GoodsExpand item : updateValidate.getGoodsExpand()) { + GoodsExpand goodsExpand = new GoodsExpand(); + BeanUtils.copyProperties(item, goodsExpand); + goodsExpand.setGoodsId(model.getId()); + goodsExpandMapper.insert(goodsExpand); + } + } } /** * 产品信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/IntegrationSchmeServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/IntegrationSchmeServiceImpl.java new file mode 100644 index 0000000..1df9a46 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/IntegrationSchmeServiceImpl.java @@ -0,0 +1,185 @@ +package com.wyh.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wyh.admin.service.IIntegrationSchmeService; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.PageResult; +import com.wyh.common.entity.schme.IntegrationSchme; +import com.wyh.common.entity.subject.SubjectInfo; +import com.wyh.common.mapper.schme.IntegrationSchmeMapper; +import com.wyh.common.mapper.subject.SubjectInfoMapper; +import com.wyh.common.util.TimeUtils; +import com.wyh.common.validator.schme.IntegrationSchmeCreateValidate; +import com.wyh.common.validator.schme.IntegrationSchmeSearchValidate; +import com.wyh.common.validator.schme.IntegrationSchmeUpdateValidate; +import com.wyh.common.vo.schme.IntegrationSchmeDetailVo; +import com.wyh.common.vo.schme.IntegrationSchmeListedVo; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +/** + * 集成方案信息实现类 + * @author wyh + */ +@Service +public class IntegrationSchmeServiceImpl implements IIntegrationSchmeService { + + @Resource + IntegrationSchmeMapper integrationSchmeMapper; + + @Resource + SubjectInfoMapper subjectInfoMapper; + + /** + * 集成方案信息列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, IntegrationSchmeSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + + integrationSchmeMapper.setSearch(queryWrapper, searchValidate, new String[]{ + "like:name:str", + "=:schmeImg@schme_img:str", + "=:schmeListImg@schme_list_img:str", + "=:sort:int", + "=:content:str", + "=:type:int", + "=:isDownload@is_download:int", + "=:infoId@info_id:int", + }); + + IPage iPage = integrationSchmeMapper.selectPage(new Page<>(page, limit), queryWrapper); + + List list = new LinkedList<>(); + for(IntegrationSchme item : iPage.getRecords()) { + IntegrationSchmeListedVo vo = new IntegrationSchmeListedVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + + vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + if(item.getInfoId() != null){ + SubjectInfo subjectInfo = subjectInfoMapper.selectOne(Wrappers.lambdaQuery().eq(SubjectInfo::getId, item.getInfoId())); + if (subjectInfo != null) { + vo.setInfoName(subjectInfo.getName()); + } + } + list.add(vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + + /** + * 集成方案信息详情 + * + * @author wyh + * @param id 主键参数 + * @return IntegrationSchme + */ + @Override + public IntegrationSchmeDetailVo detail(Integer id) { + IntegrationSchme model = integrationSchmeMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + IntegrationSchmeDetailVo vo = new IntegrationSchmeDetailVo(); + BeanUtils.copyProperties(model, vo); + return vo; + } + + /** + * 集成方案信息新增 + * + * @author wyh + * @param createValidate 参数 + */ + @Override + public void add(IntegrationSchmeCreateValidate createValidate) { + IntegrationSchme model = new IntegrationSchme(); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setName(createValidate.getName()); + model.setSchmeImg(createValidate.getSchmeImg()); + model.setSchmeListImg(createValidate.getSchmeListImg()); + model.setSort(createValidate.getSort()); + model.setContent(createValidate.getContent()); + model.setType(createValidate.getType()); + model.setIsDownload(createValidate.getIsDownload()); + model.setInfoId(createValidate.getInfoId()); + integrationSchmeMapper.insert(model); + } + + /** + * 集成方案信息编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + @Override + public void edit(IntegrationSchmeUpdateValidate updateValidate) { + IntegrationSchme model = integrationSchmeMapper.selectOne( + new QueryWrapper() + .eq("id", updateValidate.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setId(updateValidate.getId()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setName(updateValidate.getName()); + model.setSchmeImg(updateValidate.getSchmeImg()); + model.setSchmeListImg(updateValidate.getSchmeListImg()); + model.setSort(updateValidate.getSort()); + model.setContent(updateValidate.getContent()); + model.setType(updateValidate.getType()); + model.setIsDownload(updateValidate.getIsDownload()); + model.setInfoId(updateValidate.getInfoId()); + integrationSchmeMapper.updateById(model); + } + + /** + * 集成方案信息删除 + * + * @author wyh + * @param id 主键ID + */ + @Override + public void del(Integer id) { + IntegrationSchme model = integrationSchmeMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + integrationSchmeMapper.updateById(model); + } + +} diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/JrwmServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/JrwmServiceImpl.java index 8b92113..17dee5a 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/JrwmServiceImpl.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/JrwmServiceImpl.java @@ -31,7 +31,7 @@ import java.util.*; /** * 加入我们信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class JrwmServiceImpl implements IJrwmService { @@ -45,7 +45,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -88,7 +88,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return Jrwm */ @@ -110,7 +110,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -128,7 +128,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -153,7 +153,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsCateServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsCateServiceImpl.java index 5e35251..18dc4ab 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsCateServiceImpl.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsCateServiceImpl.java @@ -30,7 +30,7 @@ import java.util.*; /** * 新闻分类实现类 - * @author LikeAdmin + * @author wyh */ @Service public class NewsCateServiceImpl implements INewsCateService { @@ -41,7 +41,7 @@ public class NewsCateServiceImpl implements INewsCateService { /** * 新闻分类列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -76,7 +76,7 @@ public class NewsCateServiceImpl implements INewsCateService { /** * 新闻分类详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return NewsCate */ @@ -98,7 +98,7 @@ public class NewsCateServiceImpl implements INewsCateService { /** * 新闻分类新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -113,7 +113,7 @@ public class NewsCateServiceImpl implements INewsCateService { /** * 新闻分类编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -135,7 +135,7 @@ public class NewsCateServiceImpl implements INewsCateService { /** * 新闻分类删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsServiceImpl.java index c1e805d..1002489 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsServiceImpl.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/NewsServiceImpl.java @@ -29,7 +29,7 @@ import java.util.*; /** * 新闻信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class NewsServiceImpl implements INewsService { @@ -42,7 +42,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -89,7 +89,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return News */ @@ -111,7 +111,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -132,7 +132,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -160,7 +160,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/SubjectInfoServiceImpl.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/SubjectInfoServiceImpl.java new file mode 100644 index 0000000..a9b06e2 --- /dev/null +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/service/impl/SubjectInfoServiceImpl.java @@ -0,0 +1,165 @@ +package com.wyh.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wyh.admin.service.ISubjectInfoService; +import com.wyh.admin.validate.commons.PageValidate; +import com.wyh.common.core.PageResult; +import com.wyh.common.entity.subject.SubjectInfo; +import com.wyh.common.mapper.subject.SubjectInfoMapper; +import com.wyh.common.util.TimeUtils; +import com.wyh.common.validator.subject.SubjectInfoCreateValidate; +import com.wyh.common.validator.subject.SubjectInfoSearchValidate; +import com.wyh.common.validator.subject.SubjectInfoUpdateValidate; +import com.wyh.common.vo.subject.SubjectInfoDetailVo; +import com.wyh.common.vo.subject.SubjectInfoListedVo; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.LinkedList; +import java.util.List; + +/** + * 集成方案属性实现类 + * @author wyh + */ +@Service +public class SubjectInfoServiceImpl implements ISubjectInfoService { + + @Resource + SubjectInfoMapper subjectInfoMapper; + + /** + * 集成方案属性列表 + * + * @author wyh + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, SubjectInfoSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc("id"); + + subjectInfoMapper.setSearch(queryWrapper, searchValidate, new String[]{ + "like:name:str", + }); + + IPage iPage = subjectInfoMapper.selectPage(new Page<>(page, limit), queryWrapper); + + List list = new LinkedList<>(); + for(SubjectInfo item : iPage.getRecords()) { + SubjectInfoListedVo vo = new SubjectInfoListedVo(); + BeanUtils.copyProperties(item, vo); + 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 SubjectInfo + */ + @Override + public SubjectInfoDetailVo detail(Integer id) { + SubjectInfo model = subjectInfoMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + SubjectInfoDetailVo vo = new SubjectInfoDetailVo(); + BeanUtils.copyProperties(model, vo); + return vo; + } + + /** + * 集成方案属性新增 + * + * @author wyh + * @param createValidate 参数 + */ + @Override + public void add(SubjectInfoCreateValidate createValidate) { + SubjectInfo model = new SubjectInfo(); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setName(createValidate.getName()); + subjectInfoMapper.insert(model); + } + + /** + * 集成方案属性编辑 + * + * @author wyh + * @param updateValidate 参数 + */ + @Override + public void edit(SubjectInfoUpdateValidate updateValidate) { + SubjectInfo model = subjectInfoMapper.selectOne( + new QueryWrapper() + .eq("id", updateValidate.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setId(updateValidate.getId()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + model.setName(updateValidate.getName()); + subjectInfoMapper.updateById(model); + } + + /** + * 集成方案属性删除 + * + * @author wyh + * @param id 主键ID + */ + @Override + public void del(Integer id) { + SubjectInfo model = subjectInfoMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + subjectInfoMapper.updateById(model); + } + + @Override + public List all() { + + List subjectInfos = subjectInfoMapper.selectList(null); + List list = new LinkedList<>(); + for(SubjectInfo item : subjectInfos) { + SubjectInfoListedVo vo = new SubjectInfoListedVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + list.add(vo); + } + return list; + } + +} 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 index a73d85b..a3b96af 100644 --- 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 @@ -9,7 +9,7 @@ import com.wyh.common.validator.annotation.IDMust; /** * banner信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("banner信息更新参数") diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/AboutUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/AboutUpdateValidate.java index 8831814..ef97739 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/AboutUpdateValidate.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/AboutUpdateValidate.java @@ -9,7 +9,7 @@ import com.wyh.common.validator.annotation.IDMust; /** * 关于中将信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("关于中将信息更新参数") diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/JrwmUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/JrwmUpdateValidate.java index 30bc3f9..6d02806 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/JrwmUpdateValidate.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/basic/company/JrwmUpdateValidate.java @@ -9,7 +9,7 @@ import com.wyh.common.validator.annotation.IDMust; /** * 加入我们信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("加入我们信息更新参数") 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 5831ee5..734f601 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 @@ -9,7 +9,7 @@ import com.wyh.common.validator.annotation.IDMust; /** * 产品分类参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("产品分类更新参数") diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsCateUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsCateUpdateValidate.java index c0b22a6..05cb9ed 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsCateUpdateValidate.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsCateUpdateValidate.java @@ -9,7 +9,7 @@ import com.wyh.common.validator.annotation.IDMust; /** * 新闻分类参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("新闻分类更新参数") diff --git a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsUpdateValidate.java b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsUpdateValidate.java index 40f8e3a..7b9e43f 100644 --- a/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsUpdateValidate.java +++ b/ZJ-java/ZJ-admin/src/main/java/com/wyh/admin/validate/news/NewsUpdateValidate.java @@ -9,7 +9,7 @@ import com.wyh.common.validator.annotation.IDMust; /** * 新闻信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("新闻信息更新参数") diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsExpand.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsExpand.java new file mode 100644 index 0000000..d353e3c --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/goods/GoodsExpand.java @@ -0,0 +1,27 @@ +package com.wyh.common.entity.goods; + +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 GoodsExpand implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + @ApiModelProperty(value = "主键id") + private Long id; + + @ApiModelProperty(value = "可完成课本及拓展实验") + private String name; + + @ApiModelProperty(value = "商品id") + private Integer goodsId; + +} \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/info/ClassInfo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/info/ClassInfo.java new file mode 100644 index 0000000..69f6419 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/info/ClassInfo.java @@ -0,0 +1,42 @@ +package com.wyh.common.entity.info; + +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 ClassInfo 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 = "上级菜单") + private Integer pid; + + @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; + +} \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/schme/IntegrationSchme.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/schme/IntegrationSchme.java new file mode 100644 index 0000000..79b2db8 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/schme/IntegrationSchme.java @@ -0,0 +1,57 @@ +package com.wyh.common.entity.schme; + +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 IntegrationSchme implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + @ApiModelProperty(value = "主键") + private Integer id; + + @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 String name; + + @ApiModelProperty(value = "集成方案主图") + private String schmeImg; + + @ApiModelProperty(value = "集成方案列表图") + private String schmeListImg; + + @ApiModelProperty(value = "排序") + private Integer sort; + + @ApiModelProperty(value = "实验室说明") + private String content; + + @ApiModelProperty(value = "是否上架0=否，1=是") + private Integer type; + + @ApiModelProperty(value = "是否下载") + private Integer isDownload; + + @ApiModelProperty(value = "所属id") + private Integer infoId; + +} \ No newline at end of file diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/subject/SubjectInfo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/subject/SubjectInfo.java new file mode 100644 index 0000000..25a5f58 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/entity/subject/SubjectInfo.java @@ -0,0 +1,36 @@ +package com.wyh.common.entity.subject; + +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 SubjectInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + @ApiModelProperty(value = "主键") + private Integer id; + + @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 String name; + +} \ 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 index ec63412..54a7489 100644 --- 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 @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * banner信息Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface BannerMapper extends IBaseMapper { diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/AboutMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/AboutMapper.java index 203a71e..1073b42 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/AboutMapper.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/AboutMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 关于中将信息Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface AboutMapper extends IBaseMapper { diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/JrwmMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/JrwmMapper.java index 7d9086b..e40bfce 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/JrwmMapper.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/basic/company/JrwmMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 加入我们信息Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface JrwmMapper 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 71fabc7..c98ff35 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 @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 产品分类Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface GoodsCateMapper extends IBaseMapper { diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsExpandMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsExpandMapper.java new file mode 100644 index 0000000..93dfc72 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsExpandMapper.java @@ -0,0 +1,13 @@ +package com.wyh.common.mapper.goods; + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.goods.GoodsExpand; +import org.apache.ibatis.annotations.Mapper; + +/** + * 产品拓展Mapper + * @author wyh + */ +@Mapper +public interface GoodsExpandMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsMapper.java index e5b246e..dee4cb7 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsMapper.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/goods/GoodsMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 产品信息Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface GoodsMapper extends IBaseMapper { diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/info/ClassInfoMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/info/ClassInfoMapper.java new file mode 100644 index 0000000..4603254 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/info/ClassInfoMapper.java @@ -0,0 +1,13 @@ +package com.wyh.common.mapper.info; + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.info.ClassInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 班级信息Mapper + * @author wyh + */ +@Mapper +public interface ClassInfoMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsCateMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsCateMapper.java index 6cbf439..b200c5e 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsCateMapper.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsCateMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 新闻分类Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface NewsCateMapper extends IBaseMapper { diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsMapper.java index a25d752..3418dc8 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsMapper.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/news/NewsMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 新闻信息Mapper - * @author LikeAdmin + * @author wyh */ @Mapper public interface NewsMapper extends IBaseMapper { diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/schme/IntegrationSchmeMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/schme/IntegrationSchmeMapper.java new file mode 100644 index 0000000..0ca4c5f --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/schme/IntegrationSchmeMapper.java @@ -0,0 +1,13 @@ +package com.wyh.common.mapper.schme; + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.schme.IntegrationSchme; +import org.apache.ibatis.annotations.Mapper; + +/** + * 集成方案信息Mapper + * @author wyh + */ +@Mapper +public interface IntegrationSchmeMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/subject/SubjectInfoMapper.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/subject/SubjectInfoMapper.java new file mode 100644 index 0000000..468a441 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/mapper/subject/SubjectInfoMapper.java @@ -0,0 +1,13 @@ +package com.wyh.common.mapper.subject; + +import com.wyh.common.core.basics.IBaseMapper; +import com.wyh.common.entity.subject.SubjectInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 集成方案属性Mapper + * @author wyh + */ +@Mapper +public interface SubjectInfoMapper extends IBaseMapper { +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCateUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCateUpdateValidate.java index e6685e8..f24cdb7 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCateUpdateValidate.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCateUpdateValidate.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * 产品分类参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("产品分类更新参数") diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCreateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCreateValidate.java index a88e815..2edbdd8 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCreateValidate.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsCreateValidate.java @@ -1,5 +1,6 @@ package com.wyh.common.validator.goods; +import com.wyh.common.entity.goods.GoodsExpand; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -7,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; @Data @ApiModel("产品信息创建参数") @@ -50,4 +52,7 @@ public class GoodsCreateValidate implements Serializable { @ApiModelProperty(value = "产品分类") private Integer cateId; + @ApiModelProperty(value = "产品扩展信息") + private List goodsExpand; + } diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsUpdateValidate.java index 8ea230f..2929182 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsUpdateValidate.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/goods/GoodsUpdateValidate.java @@ -1,5 +1,6 @@ package com.wyh.common.validator.goods; +import com.wyh.common.entity.goods.GoodsExpand; import com.wyh.common.validator.annotation.IDMust; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,10 +9,11 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** * 产品信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("产品信息更新参数") @@ -59,4 +61,7 @@ public class GoodsUpdateValidate implements Serializable { @ApiModelProperty(value = "产品分类") private Integer cateId; + @ApiModelProperty(value = "产品扩展信息") + private List goodsExpand; + } diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoCreateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoCreateValidate.java new file mode 100644 index 0000000..8e4fb25 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoCreateValidate.java @@ -0,0 +1,28 @@ +package com.wyh.common.validator.info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +@ApiModel("班级信息创建参数") +public class ClassInfoCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "name参数缺失") + @ApiModelProperty(value = "班级/科目名称") + private String name; + + @NotNull(message = "pid参数缺失") + @ApiModelProperty(value = "上级菜单") + private Integer pid; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoSearchValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoSearchValidate.java new file mode 100644 index 0000000..067f11d --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoSearchValidate.java @@ -0,0 +1,23 @@ +package com.wyh.common.validator.info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +@Data +@ApiModel("班级信息搜素参数") +public class ClassInfoSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "班级/科目名称") + private String name; + + @ApiModelProperty(value = "上级菜单") + private Integer pid; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoUpdateValidate.java new file mode 100644 index 0000000..1007c36 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/info/ClassInfoUpdateValidate.java @@ -0,0 +1,36 @@ +package com.wyh.common.validator.info; + +import com.wyh.common.validator.annotation.IDMust; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 班级信息参数 + * @author wyh + */ +@Data +@ApiModel("班级信息更新参数") +public class ClassInfoUpdateValidate 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 = "pid参数缺失") + @ApiModelProperty(value = "上级菜单") + private Integer pid; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序编号") + private Integer sort; +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsCateUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsCateUpdateValidate.java index 1e4adaa..279dd04 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsCateUpdateValidate.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsCateUpdateValidate.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * 新闻分类参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("新闻分类更新参数") diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsUpdateValidate.java index b8cca5e..31d083a 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsUpdateValidate.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/news/NewsUpdateValidate.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * 新闻信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("新闻信息更新参数") diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeCreateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeCreateValidate.java new file mode 100644 index 0000000..a7d09a8 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeCreateValidate.java @@ -0,0 +1,48 @@ +package com.wyh.common.validator.schme; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +@ApiModel("集成方案信息创建参数") +public class IntegrationSchmeCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "name参数缺失") + @ApiModelProperty(value = "集成方案名称") + private String name; + + @NotNull(message = "schmeImg参数缺失") + @ApiModelProperty(value = "集成方案主图") + private String schmeImg; + + @NotNull(message = "schmeListImg参数缺失") + @ApiModelProperty(value = "集成方案列表图") + private String schmeListImg; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序") + private Integer sort; + + @NotNull(message = "content参数缺失") + @ApiModelProperty(value = "实验室说明") + private String content; + + @NotNull(message = "type参数缺失") + @ApiModelProperty(value = "是否上架0=否，1=是") + private Integer type; + + @NotNull(message = "isDownload参数缺失") + @ApiModelProperty(value = "是否下载") + private Integer isDownload; + + @NotNull(message = "infoId参数缺失") + @ApiModelProperty(value = "所属id") + private Integer infoId; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeSearchValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeSearchValidate.java new file mode 100644 index 0000000..7937bb3 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeSearchValidate.java @@ -0,0 +1,38 @@ +package com.wyh.common.validator.schme; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +@Data +@ApiModel("集成方案信息搜素参数") +public class IntegrationSchmeSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "集成方案名称") + private String name; + + @ApiModelProperty(value = "集成方案主图") + private String schmeImg; + + @ApiModelProperty(value = "集成方案列表图") + private String schmeListImg; + + @ApiModelProperty(value = "排序") + private Integer sort; + + @ApiModelProperty(value = "实验室说明") + private String content; + + @ApiModelProperty(value = "是否上架0=否，1=是") + private Integer type; + + @ApiModelProperty(value = "是否下载") + private Integer isDownload; + + @ApiModelProperty(value = "所属id") + private Integer infoId; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeUpdateValidate.java new file mode 100644 index 0000000..3ebd91c --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/schme/IntegrationSchmeUpdateValidate.java @@ -0,0 +1,57 @@ +package com.wyh.common.validator.schme; + +import com.wyh.common.validator.annotation.IDMust; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 集成方案信息参数 + * @author wyh + */ +@Data +@ApiModel("集成方案信息更新参数") +public class IntegrationSchmeUpdateValidate 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 = "schmeImg参数缺失") + @ApiModelProperty(value = "集成方案主图") + private String schmeImg; + + @NotNull(message = "schmeListImg参数缺失") + @ApiModelProperty(value = "集成方案列表图") + private String schmeListImg; + + @NotNull(message = "sort参数缺失") + @ApiModelProperty(value = "排序") + private Integer sort; + + @NotNull(message = "content参数缺失") + @ApiModelProperty(value = "实验室说明") + private String content; + + @NotNull(message = "type参数缺失") + @ApiModelProperty(value = "是否上架0=否，1=是") + private Integer type; + + @NotNull(message = "isDownload参数缺失") + @ApiModelProperty(value = "是否下载") + private Integer isDownload; + + @NotNull(message = "infoId参数缺失") + @ApiModelProperty(value = "所属id") + private Integer infoId; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoCreateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoCreateValidate.java new file mode 100644 index 0000000..8bde423 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoCreateValidate.java @@ -0,0 +1,20 @@ +package com.wyh.common.validator.subject; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +@ApiModel("集成方案属性创建参数") +public class SubjectInfoCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "name参数缺失") + @ApiModelProperty(value = "科目名称") + private String name; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoSearchValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoSearchValidate.java new file mode 100644 index 0000000..039dfab --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoSearchValidate.java @@ -0,0 +1,17 @@ +package com.wyh.common.validator.subject; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +@Data +@ApiModel("集成方案属性搜素参数") +public class SubjectInfoSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "科目名称") + private String name; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoUpdateValidate.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoUpdateValidate.java new file mode 100644 index 0000000..0d18f20 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/validator/subject/SubjectInfoUpdateValidate.java @@ -0,0 +1,29 @@ +package com.wyh.common.validator.subject; + +import com.wyh.common.validator.annotation.IDMust; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 集成方案属性参数 + * @author wyh + */ +@Data +@ApiModel("集成方案属性更新参数") +public class SubjectInfoUpdateValidate 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; + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsDetailVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsDetailVo.java index 3d89048..72dea9f 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsDetailVo.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsDetailVo.java @@ -1,11 +1,13 @@ package com.wyh.common.vo.goods; +import com.wyh.common.entity.goods.GoodsExpand; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; @Data @ApiModel("产品信息详情Vo") @@ -43,5 +45,7 @@ public class GoodsDetailVo implements Serializable { @ApiModelProperty(value = "产品分类") private Integer cateId; + private List goodsExpand; + } diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsListedVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsListedVo.java index 56da04b..7bbb71b 100644 --- a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsListedVo.java +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/goods/GoodsListedVo.java @@ -52,4 +52,7 @@ public class GoodsListedVo implements Serializable { @ApiModelProperty(value = "产品分类名称") private String cateName; + @ApiModelProperty(value = "产品拓展") + private String goodsExpand; + } diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoDetailVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoDetailVo.java new file mode 100644 index 0000000..eea4313 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoDetailVo.java @@ -0,0 +1,28 @@ +package com.wyh.common.vo.info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("班级信息详情Vo") +public class ClassInfoDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "班级/科目名称") + private String name; + + @ApiModelProperty(value = "上级菜单") + private Integer pid; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoListedVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoListedVo.java new file mode 100644 index 0000000..6bcbd40 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/info/ClassInfoListedVo.java @@ -0,0 +1,34 @@ +package com.wyh.common.vo.info; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("班级信息列表Vo") +public class ClassInfoListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "班级/科目名称") + private String name; + + @ApiModelProperty(value = "上级菜单") + private Integer pid; + + @ApiModelProperty(value = "创建时间") + private String createTime; + + @ApiModelProperty(value = "更新时间") + private String updateTime; + + @ApiModelProperty(value = "排序编号") + private Integer sort; + + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeDetailVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeDetailVo.java new file mode 100644 index 0000000..368bbcd --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeDetailVo.java @@ -0,0 +1,43 @@ +package com.wyh.common.vo.schme; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("集成方案信息详情Vo") +public class IntegrationSchmeDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "集成方案名称") + private String name; + + @ApiModelProperty(value = "集成方案主图") + private String schmeImg; + + @ApiModelProperty(value = "集成方案列表图") + private String schmeListImg; + + @ApiModelProperty(value = "排序") + private Integer sort; + + @ApiModelProperty(value = "实验室说明") + private String content; + + @ApiModelProperty(value = "是否上架0=否，1=是") + private Integer type; + + @ApiModelProperty(value = "是否下载") + private Integer isDownload; + + @ApiModelProperty(value = "所属id") + private Integer infoId; + + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeListedVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeListedVo.java new file mode 100644 index 0000000..9186fb7 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/schme/IntegrationSchmeListedVo.java @@ -0,0 +1,49 @@ +package com.wyh.common.vo.schme; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("集成方案信息列表Vo") +public class IntegrationSchmeListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "创建时间") + private String createTime; + + @ApiModelProperty(value = "更新时间") + private String updateTime; + + @ApiModelProperty(value = "集成方案名称") + private String name; + + @ApiModelProperty(value = "集成方案主图") + private String schmeImg; + + @ApiModelProperty(value = "集成方案列表图") + private String schmeListImg; + + @ApiModelProperty(value = "排序") + private Integer sort; + + @ApiModelProperty(value = "是否上架0=否，1=是") + private Integer type; + + @ApiModelProperty(value = "是否下载") + private Integer isDownload; + + @ApiModelProperty(value = "所属id") + private Integer infoId; + + + private String infoName; + + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoDetailVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoDetailVo.java new file mode 100644 index 0000000..d413811 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoDetailVo.java @@ -0,0 +1,22 @@ +package com.wyh.common.vo.subject; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("集成方案属性详情Vo") +public class SubjectInfoDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "科目名称") + private String name; + + +} diff --git a/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoListedVo.java b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoListedVo.java new file mode 100644 index 0000000..825b0d8 --- /dev/null +++ b/ZJ-java/ZJ-common/src/main/java/com/wyh/common/vo/subject/SubjectInfoListedVo.java @@ -0,0 +1,28 @@ +package com.wyh.common.vo.subject; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("集成方案属性列表Vo") +public class SubjectInfoListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Integer id; + + @ApiModelProperty(value = "创建时间") + private String createTime; + + @ApiModelProperty(value = "更新时间") + private String updateTime; + + @ApiModelProperty(value = "科目名称") + private String name; + + +} diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/GoodsController.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/GoodsController.java index c458055..726b469 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/GoodsController.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/controller/GoodsController.java @@ -3,8 +3,12 @@ package com.wyh.front.controller; import com.alibaba.fastjson2.JSONArray; import com.wyh.common.aop.NotLogin; import com.wyh.common.core.AjaxResult; +import com.wyh.common.core.PageResult; import com.wyh.common.validator.goods.GoodsCateSearchValidate; +import com.wyh.common.validator.goods.GoodsSearchValidate; +import com.wyh.common.vo.goods.GoodsListedVo; import com.wyh.front.service.GoodsService; +import com.wyh.front.validate.common.PageValidate; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; @@ -28,4 +32,14 @@ public class GoodsController { JSONArray list = goodsService.cateTree(searchValidate); return AjaxResult.success(list); } + + @NotLogin + @RequestMapping("/list") + @ApiOperation(value = "产品列表", httpMethod = "GET" ) + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated GoodsSearchValidate searchValidate) { + PageResult list = goodsService.list( pageValidate, searchValidate); + return AjaxResult.success(list); + } + } diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/GoodsService.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/GoodsService.java index daf3683..626a39d 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/GoodsService.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/GoodsService.java @@ -1,8 +1,14 @@ package com.wyh.front.service; import com.alibaba.fastjson2.JSONArray; +import com.wyh.common.core.PageResult; import com.wyh.common.validator.goods.GoodsCateSearchValidate; +import com.wyh.common.validator.goods.GoodsSearchValidate; +import com.wyh.common.vo.goods.GoodsListedVo; +import com.wyh.front.validate.common.PageValidate; public interface GoodsService { JSONArray cateTree( GoodsCateSearchValidate searchValidate); + + PageResult list(PageValidate pageValidate, GoodsSearchValidate searchValidate); } diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IAboutService.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IAboutService.java index edcfbb0..11a0b5d 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IAboutService.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IAboutService.java @@ -12,14 +12,14 @@ import com.wyh.front.vo.basic.company.AboutListedVo; /** * 关于中将信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IAboutService { /** * 关于中将信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -29,7 +29,7 @@ public interface IAboutService { /** * 关于中将信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return AboutDetailVo */ @@ -38,7 +38,7 @@ public interface IAboutService { /** * 关于中将信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(AboutCreateValidate createValidate); @@ -46,7 +46,7 @@ public interface IAboutService { /** * 关于中将信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(AboutUpdateValidate updateValidate); @@ -54,7 +54,7 @@ public interface IAboutService { /** * 关于中将信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IBannerService.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IBannerService.java index 6593651..7fa78eb 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IBannerService.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IBannerService.java @@ -12,14 +12,14 @@ import com.wyh.front.vo.basic.banner.BannerListedVo; /** * banner信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IBannerService { /** * banner信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -29,7 +29,7 @@ public interface IBannerService { /** * banner信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return BannerDetailVo */ @@ -38,7 +38,7 @@ public interface IBannerService { /** * banner信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(BannerCreateValidate createValidate); @@ -46,7 +46,7 @@ public interface IBannerService { /** * banner信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(BannerUpdateValidate updateValidate); @@ -54,7 +54,7 @@ public interface IBannerService { /** * banner信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IJrwmService.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IJrwmService.java index 487ec46..c52edcd 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IJrwmService.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/IJrwmService.java @@ -11,14 +11,14 @@ import com.wyh.front.vo.basic.company.JrwmListedVo; /** * 加入我们信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface IJrwmService { /** * 加入我们信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -28,7 +28,7 @@ public interface IJrwmService { /** * 加入我们信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return JrwmDetailVo */ @@ -37,7 +37,7 @@ public interface IJrwmService { /** * 加入我们信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(JrwmCreateValidate createValidate); @@ -45,7 +45,7 @@ public interface IJrwmService { /** * 加入我们信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(JrwmUpdateValidate updateValidate); @@ -53,7 +53,7 @@ public interface IJrwmService { /** * 加入我们信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/INewsService.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/INewsService.java index db445c0..09f1eb2 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/INewsService.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/INewsService.java @@ -14,14 +14,14 @@ import java.util.List; /** * 新闻信息服务接口类 - * @author LikeAdmin + * @author wyh */ public interface INewsService { /** * 新闻信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -31,7 +31,7 @@ public interface INewsService { /** * 新闻信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键ID * @return NewsDetailVo */ @@ -40,7 +40,7 @@ public interface INewsService { /** * 新闻信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ void add(NewsCreateValidate createValidate); @@ -48,7 +48,7 @@ public interface INewsService { /** * 新闻信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ void edit(NewsUpdateValidate updateValidate); @@ -56,7 +56,7 @@ public interface INewsService { /** * 新闻信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ void del(Integer id); diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/AboutServiceImpl.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/AboutServiceImpl.java index 2cf0886..b67a3fe 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/AboutServiceImpl.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/AboutServiceImpl.java @@ -25,7 +25,7 @@ import java.util.List; /** * 关于中将信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class AboutServiceImpl implements IAboutService { @@ -36,7 +36,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -79,7 +79,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return About */ @@ -101,7 +101,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -124,7 +124,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -154,7 +154,7 @@ public class AboutServiceImpl implements IAboutService { /** * 关于中将信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/BannerServiceImpl.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/BannerServiceImpl.java index 7c18153..15f904a 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/BannerServiceImpl.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/BannerServiceImpl.java @@ -27,7 +27,7 @@ import java.util.List; /** * banner信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class BannerServiceImpl implements IBannerService { @@ -38,7 +38,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -77,7 +77,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return Banner */ @@ -100,7 +100,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -119,7 +119,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -145,7 +145,7 @@ public class BannerServiceImpl implements IBannerService { /** * banner信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/GoodsServiceImpl.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/GoodsServiceImpl.java index c7f5a32..8de5b12 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/GoodsServiceImpl.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/GoodsServiceImpl.java @@ -1,15 +1,24 @@ package com.wyh.front.service.impl; import com.alibaba.fastjson2.JSONArray; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; +import com.wyh.common.config.GlobalConfig; +import com.wyh.common.core.PageResult; +import com.wyh.common.entity.goods.Goods; import com.wyh.common.entity.goods.GoodsCate; import com.wyh.common.mapper.goods.GoodsCateMapper; import com.wyh.common.mapper.goods.GoodsMapper; import com.wyh.common.util.ListUtils; import com.wyh.common.util.TimeUtils; import com.wyh.common.validator.goods.GoodsCateSearchValidate; +import com.wyh.common.validator.goods.GoodsSearchValidate; import com.wyh.common.vo.goods.GoodsCateListedVo; +import com.wyh.common.vo.goods.GoodsListedVo; import com.wyh.front.service.GoodsService; +import com.wyh.front.validate.common.PageValidate; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -52,4 +61,42 @@ public class GoodsServiceImpl implements GoodsService { JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(array)); return ListUtils.listToTree(jsonArray, "id", "pid", "children"); } + + @Override + public PageResult list(PageValidate pageValidate, GoodsSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); + + MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.selectAll(Goods.class); + mpjQueryWrapper.innerJoin("?_goods_cate gc ON gc.id=t.cate_id".replace("?_", GlobalConfig.tablePrefix)); + mpjQueryWrapper.eq("t.is_delete", 0); + mpjQueryWrapper.orderByDesc(Arrays.asList("t.sort", "t.id")); + + goodsMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ + "like:goodsName@goods_name:str", + "=:cateId@cate_id:int", + }); + + IPage iPage = goodsMapper.selectJoinPage( + new Page<>(page, limit), + GoodsListedVo.class, + mpjQueryWrapper); + + for(GoodsListedVo item : iPage.getRecords()) { + item.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); + item.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + if (item.getCateId() != null) { + GoodsCate goodsCate = goodsCateMapper.selectOne(Wrappers.lambdaQuery().eq(GoodsCate::getId, item.getCateId()).eq(GoodsCate::getIsDelete, 0)); + + GoodsCate goodsCate1 = goodsCateMapper.selectOne(Wrappers.lambdaQuery().eq(GoodsCate::getId, (goodsCate.getPid())).eq(GoodsCate::getIsDelete, 0)); + + + item.setCateName(goodsCate1.getName() + "-" + goodsCate.getName()); + } + } + + return PageResult.iPageHandle(iPage); + + } } diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/JrwmServiceImpl.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/JrwmServiceImpl.java index 4bf5e33..988e24c 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/JrwmServiceImpl.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/JrwmServiceImpl.java @@ -26,7 +26,7 @@ import javax.annotation.Resource; /** * 加入我们信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class JrwmServiceImpl implements IJrwmService { @@ -40,7 +40,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -83,7 +83,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return Jrwm */ @@ -105,7 +105,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -123,7 +123,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -148,7 +148,7 @@ public class JrwmServiceImpl implements IJrwmService { /** * 加入我们信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/NewsServiceImpl.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/NewsServiceImpl.java index 98ff3fc..514aeb5 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/NewsServiceImpl.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/service/impl/NewsServiceImpl.java @@ -29,7 +29,7 @@ import java.util.List; /** * 新闻信息实现类 - * @author LikeAdmin + * @author wyh */ @Service public class NewsServiceImpl implements INewsService { @@ -43,7 +43,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息列表 * - * @author LikeAdmin + * @author wyh * @param pageValidate 分页参数 * @param searchValidate 搜索参数 * @return PageResult @@ -90,7 +90,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息详情 * - * @author LikeAdmin + * @author wyh * @param id 主键参数 * @return News */ @@ -118,7 +118,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息新增 * - * @author LikeAdmin + * @author wyh * @param createValidate 参数 */ @Override @@ -139,7 +139,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息编辑 * - * @author LikeAdmin + * @author wyh * @param updateValidate 参数 */ @Override @@ -167,7 +167,7 @@ public class NewsServiceImpl implements INewsService { /** * 新闻信息删除 * - * @author LikeAdmin + * @author wyh * @param id 主键ID */ @Override diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/banner/BannerUpdateValidate.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/banner/BannerUpdateValidate.java index a1aeb8a..f93ba28 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/banner/BannerUpdateValidate.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/banner/BannerUpdateValidate.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * banner信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("banner信息更新参数") diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/AboutUpdateValidate.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/AboutUpdateValidate.java index e89637a..c0e5cd5 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/AboutUpdateValidate.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/AboutUpdateValidate.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * 关于中将信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("关于中将信息更新参数") diff --git a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/JrwmUpdateValidate.java b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/JrwmUpdateValidate.java index a8f64da..a474394 100644 --- a/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/JrwmUpdateValidate.java +++ b/ZJ-java/ZJ-front/src/main/java/com/wyh/front/validate/basic/company/JrwmUpdateValidate.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * 加入我们信息参数 - * @author LikeAdmin + * @author wyh */ @Data @ApiModel("加入我们信息更新参数") diff --git a/ZJ-java/ZJ-front/src/main/resources/application.yml b/ZJ-java/ZJ-front/src/main/resources/application.yml index e155a44..a0af137 100644 --- a/ZJ-java/ZJ-front/src/main/resources/application.yml +++ b/ZJ-java/ZJ-front/src/main/resources/application.yml @@ -16,7 +16,7 @@ ZJ-java: # 服务配置 server: - port: 8084 + port: 2019 # servlet: # context-path: / diff --git a/ZJ-java/pom.xml b/ZJ-java/pom.xml index ef4ebbe..e58d1e3 100644 --- a/ZJ-java/pom.xml +++ b/ZJ-java/pom.xml @@ -31,7 +31,6 @@ 3.5.2 1.2.4 1.4.5 - 1.18.24 2.0.16 3.12.0 diff --git a/admin/src/api/info.ts b/admin/src/api/info.ts new file mode 100644 index 0000000..fb5573b --- /dev/null +++ b/admin/src/api/info.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 班级信息列表 +export function infoLists(params?: Record) { + return request.get({ url: '/info/list', params }) +} + +// 班级信息详情 +export function infoDetail(params: Record) { + return request.get({ url: '/info/detail', params }) +} + +// 班级信息新增 +export function infoAdd(params: Record) { + return request.post({ url: '/info/add', params }) +} + +// 班级信息编辑 +export function infoEdit(params: Record) { + return request.post({ url: '/info/edit', params }) +} + +// 班级信息删除 +export function infoDelete(params: Record) { + return request.post({ url: '/info/del', params }) +} diff --git a/admin/src/api/schme.ts b/admin/src/api/schme.ts new file mode 100644 index 0000000..448f6ad --- /dev/null +++ b/admin/src/api/schme.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 集成方案信息列表 +export function schmeLists(params?: Record) { + return request.get({ url: '/schme/list', params }) +} + +// 集成方案信息详情 +export function schmeDetail(params: Record) { + return request.get({ url: '/schme/detail', params }) +} + +// 集成方案信息新增 +export function schmeAdd(params: Record) { + return request.post({ url: '/schme/add', params }) +} + +// 集成方案信息编辑 +export function schmeEdit(params: Record) { + return request.post({ url: '/schme/edit', params }) +} + +// 集成方案信息删除 +export function schmeDelete(params: Record) { + return request.post({ url: '/schme/del', params }) +} diff --git a/admin/src/api/subject.ts b/admin/src/api/subject.ts new file mode 100644 index 0000000..6bc40d3 --- /dev/null +++ b/admin/src/api/subject.ts @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +// 集成方案属性列表 +export function infoLists(params?: Record) { + return request.get({ url: '/subject/list', params }) +} + +// 集成方案属性详情 +export function infoDetail(params: Record) { + return request.get({ url: '/subject/detail', params }) +} + +// 集成方案属性新增 +export function infoAdd(params: Record) { + return request.post({ url: '/subject/add', params }) +} + +// 集成方案属性编辑 +export function infoEdit(params: Record) { + return request.post({ url: '/subject/edit', params }) +} + +// 集成方案属性删除 +export function infoDelete(params: Record) { + return request.post({ url: '/subject/del', params }) +} + + +export function listAll() { + return request.get({ url: '/subject/all' }) +} + diff --git a/admin/src/views/goods/edit.vue b/admin/src/views/goods/edit.vue index 2c25fd0..68e4624 100644 --- a/admin/src/views/goods/edit.vue +++ b/admin/src/views/goods/edit.vue @@ -58,6 +58,18 @@ +
+ 新增 +
+ + + X + + +
+ + +
@@ -98,9 +110,11 @@ const formData = reactive({ type: '', isDownload: '', summary: '', - cateId :'' + cateId :'', + goodsExpand:[] }) + const formRules = { id: [ { @@ -174,25 +188,13 @@ const { optionsData } = useDictOptions<{ } }) -const getCate = async () => { - // optionsData = await cateLists() - // console.log( " ++++++++++++++",optionsData) - // const cate: any = { - // id: 0, - // name: '顶级分类', - // children: [] - // } - // cate.children = arrayToTree( - // treeToArray(data) - // ) - // cateOptions.value.push(cate) - // cateOptions.value.filter((item) => item.id != 0) - // console.log(cateOptions) -} const handleSubmit = async () => { await formRef.value?.validate() const data: any = { ...formData } + for (let i = 0; i < inputs.value.length; i++) { + formData.goodsExpand.push(inputs.value[i]); + } mode.value == 'edit' ? await goodsEdit(data) : await goodsAdd(data) popupRef.value?.close() feedback.msgSuccess('操作成功') @@ -218,17 +220,35 @@ const getDetail = async (row: Record) => { id: row.id }) setFormData(data) + for (let i = 0; i < data.goodsExpand.length; i++) { + inputs.value.push(data.goodsExpand[i]) + } } const handleClose = () => { + inputs.value.splice(0, inputs.value.length); emit('close') } -getCate() + + defineExpose({ open, setFormData, getDetail }) + + +const inputs = ref([]); + +function addInput() { + inputs.value.push({ name: '' }); + +} + +function removeInput(index) { + inputs.value.splice(index, 1); +} + diff --git a/admin/src/views/info/edit.vue b/admin/src/views/info/edit.vue new file mode 100644 index 0000000..2f05ecb --- /dev/null +++ b/admin/src/views/info/edit.vue @@ -0,0 +1,147 @@ + + diff --git a/admin/src/views/info/index.vue b/admin/src/views/info/index.vue new file mode 100644 index 0000000..abbcd0a --- /dev/null +++ b/admin/src/views/info/index.vue @@ -0,0 +1,138 @@ + + diff --git a/admin/src/views/schme/edit.vue b/admin/src/views/schme/edit.vue new file mode 100644 index 0000000..bb987a5 --- /dev/null +++ b/admin/src/views/schme/edit.vue @@ -0,0 +1,205 @@ + + diff --git a/admin/src/views/schme/index.vue b/admin/src/views/schme/index.vue new file mode 100644 index 0000000..5d82365 --- /dev/null +++ b/admin/src/views/schme/index.vue @@ -0,0 +1,177 @@ + + diff --git a/admin/src/views/subject/edit.vue b/admin/src/views/subject/edit.vue new file mode 100644 index 0000000..db35aa5 --- /dev/null +++ b/admin/src/views/subject/edit.vue @@ -0,0 +1,101 @@ + + diff --git a/admin/src/views/subject/index.vue b/admin/src/views/subject/index.vue new file mode 100644 index 0000000..44c9797 --- /dev/null +++ b/admin/src/views/subject/index.vue @@ -0,0 +1,104 @@ + +