From 2bb0a82d57e632c5570d17345cdeff0c2f018b5c Mon Sep 17 00:00:00 2001 From: Yen Date: Sun, 23 Apr 2023 18:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/model/enums/SystemModule.java | 3 +- .../controller/BmsCostCenterController.java | 2 +- .../BmsSupplierContactsController.java | 1 - .../BmsSupplierVisitAddressController.java | 73 +++------- .../BmsSupplierVisitFormController.java | 2 +- .../modules/bms/entity/BmsCostCenter.java | 2 +- .../bms/entity/so/BmsSupplierContactsSo.java | 2 + .../controller/GoodsCategoryController.java | 18 ++- .../goods/service/GoodsCategoryService.java | 2 + .../impl/GoodsCategoryServiceImpl.java | 65 ++++++++- .../tag/controller/TagCategoryController.java | 135 ++++++++++++++++++ .../tag/controller/TagDataController.java | 55 +++++++ .../tag/controller/TagInfoController.java | 126 ++++++++++++++++ .../serve/modules/tag/entity/TagCategory.java | 97 +++++++++++++ .../qs/serve/modules/tag/entity/TagData.java | 101 +++++++++++++ .../qs/serve/modules/tag/entity/TagInfo.java | 97 +++++++++++++ .../modules/tag/entity/bo/TagInfoBo.java | 71 +++++++++ .../modules/tag/entity/so/TagInfoSo.java | 68 +++++++++ .../tag/entity/vo/TagCategoryTreeVo.java | 15 ++ .../modules/tag/mapper/TagCategoryMapper.java | 14 ++ .../modules/tag/mapper/TagDataMapper.java | 14 ++ .../modules/tag/mapper/TagInfoMapper.java | 14 ++ .../qs/serve/modules/tag/package-info.java | 1 + .../tag/service/TagCategoryService.java | 20 +++ .../modules/tag/service/TagDataService.java | 14 ++ .../modules/tag/service/TagInfoService.java | 14 ++ .../service/impl/TagCategoryServiceImpl.java | 29 ++++ .../tag/service/impl/TagDataServiceImpl.java | 22 +++ .../tag/service/impl/TagInfoServiceImpl.java | 22 +++ .../controller/TbsCostContractController.java | 8 +- 30 files changed, 1031 insertions(+), 76 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java create mode 100644 src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java create mode 100644 src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java create mode 100644 src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java create mode 100644 src/main/java/com/qs/serve/modules/tag/entity/TagData.java create mode 100644 src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java create mode 100644 src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBo.java create mode 100644 src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java create mode 100644 src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java create mode 100644 src/main/java/com/qs/serve/modules/tag/mapper/TagCategoryMapper.java create mode 100644 src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java create mode 100644 src/main/java/com/qs/serve/modules/tag/mapper/TagInfoMapper.java create mode 100644 src/main/java/com/qs/serve/modules/tag/package-info.java create mode 100644 src/main/java/com/qs/serve/modules/tag/service/TagCategoryService.java create mode 100644 src/main/java/com/qs/serve/modules/tag/service/TagDataService.java create mode 100644 src/main/java/com/qs/serve/modules/tag/service/TagInfoService.java create mode 100644 src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java create mode 100644 src/main/java/com/qs/serve/modules/tag/service/impl/TagDataServiceImpl.java create mode 100644 src/main/java/com/qs/serve/modules/tag/service/impl/TagInfoServiceImpl.java diff --git a/src/main/java/com/qs/serve/common/model/enums/SystemModule.java b/src/main/java/com/qs/serve/common/model/enums/SystemModule.java index d3975978..f7f6a631 100644 --- a/src/main/java/com/qs/serve/common/model/enums/SystemModule.java +++ b/src/main/java/com/qs/serve/common/model/enums/SystemModule.java @@ -21,7 +21,8 @@ public enum SystemModule { BASE("bms","基础档案"), GOODS("goods","商品"), SYSTEM("sys","系统"), - UMS("ums","手机用户"); + UMS("ums","手机用户"), + Tag("tag","标签"); String code; diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java index d5dc11ec..2fb5ad55 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java @@ -149,7 +149,7 @@ public class BmsCostCenterController { BmsCostCenter bmsCostCenter = bmsCostCenterService.getById(id); if(bmsCostCenter.getPid()!=null&&!bmsCostCenter.getPid().equals(0L)){ BmsCostCenter parentCostCenter = bmsCostCenterService.getById(bmsCostCenter.getPid()); - bmsCostCenter.setParentNode(parentCostCenter); + bmsCostCenter.setParentInfo(parentCostCenter); } return R.ok(bmsCostCenter); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java index 0031991e..a776f79c 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java @@ -49,7 +49,6 @@ public class BmsSupplierContactsController { public R> getList(BmsSupplierContactsSo param){ BmsSupplierContacts entity = CopierUtil.copy(param,new BmsSupplierContacts()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - PageUtil.startPage(); List list = bmsSupplierContactsService.list(lqw); return R.ok(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java index d633804b..c632a1b7 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -54,62 +54,6 @@ public class BmsSupplierVisitAddressController { private HisUserSupplierMapper hisUserSupplierMapper; private BazVisitFlowService bazVisitFlowService; - /** - * 列表 - * @param param - * @return - */ - //@GetMapping("/list") - @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") - public R> getList(BmsSupplierVisitAddress param){ - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); - PageUtil.startPage(); - List list = bmsSupplierVisitAddressService.list(lqw); - return R.ok(list); - } - - /** - * 翻页查询，过滤当前用户负责数据 - * @param param - * @return - */ - @PostMapping("/getListForVisit") - public R> getListForVisit(@Valid @RequestBody BmsSupplierVisitSo param){ - String userId = AuthContextUtils.getSysUserId(); - hisUserSupplierService.initByUserId(userId,false); - HisUserSupplier userSupplier = new HisUserSupplier(); - userSupplier.setUserId(userId); - userSupplier.setSupplierName(param.getSupplierName()); - userSupplier.setSupplierCode(param.getSupplierCode()); - userSupplier.setQueryAddress(param.getAddress()); - userSupplier.setQueryValue(param.getSearchValue()); - userSupplier.setLocalX(param.getLocalX()); - userSupplier.setLocalY(param.getLocalY()); - List list = hisUserSupplierMapper.selectHisUserSupplierAddressList(userSupplier); - List supplierIds = list.stream().map(HisUserSupplierAddressVo::getSupplierId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(supplierIds)){ - List supplierList = bmsSupplierService.listByIds(supplierIds); - for (HisUserSupplierAddressVo addressVo : list) { - for (BmsSupplier supplier : supplierList) { - if(addressVo.getSupplierId().equals(supplier.getId())){ - addressVo.setSupplierCode(supplier.getCode()); - addressVo.setSupplierName(supplier.getName()); - BmsSupplierVisitAddress visitAddress = bmsSupplierVisitAddressService.getById(addressVo.getAddressId()); - //BmsSupplierVisit visitInfo = bmsSupplierVisitService.getOne(new LambdaQueryWrapper().eq(BmsSupplierVisit::getSupplierId,supplier.getId()),false); - addressVo.setAddressInfo(visitAddress); - LambdaQueryWrapper visitInfoLqw = new LambdaQueryWrapper<>(); - visitInfoLqw.eq(BazVisitInfo::getTargetType, BazTargetTypeConsts.CUSTOMER); - visitInfoLqw.eq(BazVisitInfo::getTargetId,supplier.getId()); - visitInfoLqw.eq(BazVisitInfo::getUserId,userId); - BazVisitInfo visitInfo = bazVisitInfoService.getOne(visitInfoLqw,false); - addressVo.setVisitInfo(visitInfo); - break; - } - } - } - } - return R.ok(list); - } /** * 翻页查询，过滤当前用户负责数据 @@ -176,6 +120,23 @@ public class BmsSupplierVisitAddressController { return R.byPageHelperList(list); } + /** + * 列表 + * @param param + * @return + */ + @GetMapping("/list") + public R> getList(BmsSupplierVisitAddress param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + List list = bmsSupplierVisitAddressService.list(lqw); + for (BmsSupplierVisitAddress visitAddress : list) { + BmsSupplier supplier = bmsSupplierService.getById(visitAddress.getSupplierId()); + visitAddress.setSupplierName(supplier.getName()); + visitAddress.setSupplierCode(supplier.getCode()); + } + return R.ok(list); + } + /** * ID查询 * @param id diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java index d010866e..e55ab5f9 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java @@ -102,7 +102,7 @@ public class BmsSupplierVisitFormController { @PreAuthorize("hasRole('bms:supplierVisitForm:insert')") public R save(@RequestBody @Valid BmsSupplierVisitForm param){ boolean result = bmsSupplierVisitFormService.save(param); - return R.isTrue(result); + return R.ok(param); } /** diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java index 22e908ef..211d993c 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java @@ -91,7 +91,7 @@ public class BmsCostCenter implements Serializable { /** 父级节点 */ @TableField(exist = false) - private Object parentNode; + private Object parentInfo; } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierContactsSo.java b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierContactsSo.java index e99a6cac..c511ae2c 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierContactsSo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierContactsSo.java @@ -28,6 +28,8 @@ public class BmsSupplierContactsSo implements Serializable { /** 经销商名称 */ private String supplierName; + private Long supplierId; + /** 经销商编码 */ private String supplierCode; diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 4f62f858..e37a2fe8 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -86,7 +86,8 @@ public class GoodsCategoryController { */ @GetMapping("/enableTree") public R> getPage(GoodsCategory param,Integer loadAll){ - if(loadAll==null||!loadAll.equals(1)){ + boolean loadFlag = loadAll!=null&&loadAll.equals(1); + if(!loadFlag){ param.setEnable(1); } return this.getTree(param); @@ -102,7 +103,7 @@ public class GoodsCategoryController { public R> getTree(GoodsCategory param){ final boolean loadSpuData = param.getLoadSpuData()!=null&¶m.getLoadSpuData().equals(1); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); - param.setEnable(1); + //param.setEnable(1); List list = goodsCategoryService.list(lqw); List treeVoList = list.stream().map(cate->{ GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo()); @@ -150,15 +151,17 @@ public class GoodsCategoryController { /** * 根据ID更新基本信息 - * @param param + * @param category * @return */ @PostMapping("/updateById") @SysLog(module = SystemModule.GOODS, title = "分类", biz = BizType.UPDATE) @PreAuthorize("hasRole('goods:category:update')") - public R updateById(@RequestBody @Valid GoodsCategoryBo param){ - GoodsCategory category = CopierUtil.copy(param,new GoodsCategory()); - goodsCategoryService.updateById(category); + public R updateById(@RequestBody @Valid GoodsCategory category){ + if(category.getId()==null){ + return R.error(); + } + goodsCategoryService.modify(category); return R.ok(); } @@ -189,7 +192,8 @@ public class GoodsCategoryController { if(goodsCategoryService.count(lqw)>0){ Assert.throwEx("存在重复编码，不能新增！"); } - goodsCategoryService.add(param); + param.setId(null); + goodsCategoryService.modify(param); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java index dcf8bcc1..74c88e42 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java @@ -15,6 +15,8 @@ public interface GoodsCategoryService extends IService { GoodsCategory getByName(String code,Integer level); + void modify(GoodsCategory category); + void add(GoodsCategory category); void modifyLevel(GoodsCategoryLevelBo category); diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java index 4f8b6695..cbd7c7d8 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java @@ -17,6 +17,7 @@ import com.qs.serve.modules.goods.mapper.GoodsCategoryMapper; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 分类 服务实现类 @@ -44,19 +45,71 @@ public class GoodsCategoryServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); + lqw.and(v1->{ + v1.eq(GoodsCategory::getLevelPath,dbData.getLevelPath()) + .or().likeRight(GoodsCategory::getLevelPath,dbData.getLevelPath()+"_"); + }); + List childList = this.list(lqw); + int diffLevel = dbData.getLevel()-category.getLevel(); + List categoryList = childList.stream().map(obj->{ + GoodsCategory par = new GoodsCategory(); + par.setId(obj.getId()); + par.setLevel(obj.getLevel()+diffLevel); + par.setLevelPathNames(obj.getLevelPathNames().replace(dbData.getLevelPathNames(),category.getLevelPathNames())); + par.setLevelPath(obj.getLevelPath().replace(dbData.getLevelPath(),category.getLevelPath())); + return par; + }).collect(Collectors.toList()); + this.updateBatchById(categoryList); + }else { + //不进行更新 + category.setParentId(null); + category.setLevel(null); + category.setLevelPathNames(null); + category.setLevelPath(null); + } + this.updateById(category); + } + + } + + @Override + public void add(GoodsCategory category) { +// else { +// GoodsCategory parent = this.getById(category.getParentId()); +// this.updateLevel(parent,category); +// } } @Override diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java new file mode 100644 index 00000000..1c3c148d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java @@ -0,0 +1,135 @@ +package com.qs.serve.modules.tag.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.TreeUtil; +import com.qs.serve.modules.tag.entity.TagData; +import com.qs.serve.modules.tag.entity.TagInfo; +import com.qs.serve.modules.tag.entity.vo.TagCategoryTreeVo; +import com.qs.serve.modules.tag.service.TagInfoService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.tag.entity.TagCategory; +import com.qs.serve.modules.tag.service.TagCategoryService; + +import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 标签 标签分类 + * @author YenHex + * @since 2023-04-23 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("tag/category") +public class TagCategoryController { + + private TagCategoryService tagCategoryService; + private TagInfoService tagInfoService; + + /** + * 树列表 + * @param param + * @return + */ + @GetMapping("/tree") + public R> getList(TagCategory param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + List list = tagCategoryService.list(lqw); + List treeVoList = list.stream().map(cate->{ + TagCategoryTreeVo treeVo = new TagCategoryTreeVo(); + treeVo.setCategoryName(cate.getCategoryName()); + treeVo.setId(cate.getId()); + treeVo.setParentId(cate.getPid()); + treeVo.setSort(0); + treeVo.setCategoryName(cate.getCategoryName()); + return treeVo; + }).collect(Collectors.toList()); + treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING); + return R.ok(treeVoList); + } + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(TagCategory param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = tagCategoryService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + @GetMapping("/getById/{id}") + public R getById(@PathVariable("id") String id){ + TagCategory tagCategory = tagCategoryService.getById(id); + return R.ok(tagCategory); + } + + /** + * 更新 + * @param param + * @return + */ + @PostMapping("/updateById") + @SysLog(module = SystemModule.Tag, title = "标签分类", biz = BizType.UPDATE) + @PreAuthorize("hasRole('tag:category:update')") + public R updateById(@RequestBody @Valid TagCategory param){ + tagCategoryService.modify(param); + return R.ok(); + } + + /** + * 新增 + * @param param + * @return + */ + @PostMapping("/save") + @SysLog(module = SystemModule.Tag, title = "标签分类", biz = BizType.INSERT) + @PreAuthorize("hasRole('tag:category:insert')") + public R save(@RequestBody @Valid TagCategory param){ + tagCategoryService.modify(param); + return R.ok(); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.Tag, title = "标签分类", biz = BizType.DELETE) + @PreAuthorize("hasRole('tag:category:delete')") + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(TagInfo::getTagCategroyId,idsLong); + if(tagInfoService.count(lqw)>0){ + return R.error("含有标签的类目无法删除"); + } + boolean result = tagCategoryService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java new file mode 100644 index 00000000..f51a28cd --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java @@ -0,0 +1,55 @@ +package com.qs.serve.modules.tag.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.tag.entity.TagInfo; +import com.qs.serve.modules.tag.entity.bo.TagInfoBo; +import com.qs.serve.modules.tag.entity.so.TagInfoSo; +import com.qs.serve.modules.tag.service.TagInfoService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 标签 标签信息 + * @author YenHex + * @since 2023-04-23 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("tag/data") +public class TagDataController { + + private TagInfoService tagInfoService; + + + /** + * 新增 + * @param param + * @return + */ + //@PostMapping("/save") + @SysLog(module = SystemModule.Tag, title = "标签信息", biz = BizType.INSERT) + @PreAuthorize("hasRole('tag:info:insert')") + public R save(@RequestBody @Valid TagInfoBo param){ + TagInfo entity = CopierUtil.copy(param,new TagInfo()); + boolean result = tagInfoService.save(entity); + return R.isTrue(result); + } + + + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java new file mode 100644 index 00000000..8f55dd54 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java @@ -0,0 +1,126 @@ +package com.qs.serve.modules.tag.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.tag.entity.so.TagInfoSo; +import com.qs.serve.modules.tag.entity.bo.TagInfoBo; +import com.qs.serve.modules.tag.entity.TagInfo; +import com.qs.serve.modules.tag.service.TagInfoService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 标签 标签信息 + * @author YenHex + * @since 2023-04-23 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("tag/info") +public class TagInfoController { + + private TagInfoService tagInfoService; + + /** + * 列表 + * @param param + * @return + */ + //@GetMapping("/list") + @PreAuthorize("hasRole('tag:info:query')") + public R> getList(TagInfoSo param){ + TagInfo entity = CopierUtil.copy(param,new TagInfo()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + PageUtil.startPage(); + List list = tagInfoService.list(lqw); + return R.ok(list); + } + + /** + * 翻页 + * @param param + * @return + */ + //@GetMapping("/page") + @PreAuthorize("hasRole('tag:info:query')") + public R> getPage(TagInfoSo param){ + TagInfo entity = CopierUtil.copy(param,new TagInfo()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + PageUtil.startPage(); + List list = tagInfoService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + //@GetMapping("/getById/{id}") + @SysLog(module = SystemModule.Tag, title = "标签信息", biz = BizType.QUERY) + @PreAuthorize("hasRole('tag:info:query')") + public R getById(@PathVariable("id") String id){ + TagInfo tagInfo = tagInfoService.getById(id); + return R.ok(tagInfo); + } + + + + /** + * 更新 + * @param param + * @return + */ + //@PostMapping("/updateById") + @SysLog(module = SystemModule.Tag, title = "标签信息", biz = BizType.UPDATE) + @PreAuthorize("hasRole('tag:info:update')") + public R updateById(@RequestBody @Valid TagInfoBo param){ + TagInfo entity = CopierUtil.copy(param,new TagInfo()); + boolean result = tagInfoService.updateById(entity); + return R.isTrue(result); + } + + /** + * 新增 + * @param param + * @return + */ + //@PostMapping("/save") + @SysLog(module = SystemModule.Tag, title = "标签信息", biz = BizType.INSERT) + @PreAuthorize("hasRole('tag:info:insert')") + public R save(@RequestBody @Valid TagInfoBo param){ + TagInfo entity = CopierUtil.copy(param,new TagInfo()); + boolean result = tagInfoService.save(entity); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.Tag, title = "标签信息", biz = BizType.DELETE) + @PreAuthorize("hasRole('tag:info:delete')") + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = tagInfoService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java b/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java new file mode 100644 index 00000000..5aad5a8d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagCategory.java @@ -0,0 +1,97 @@ +package com.qs.serve.modules.tag.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 标签分类 实体类 + * @author YenHex + * @since 2023-04-23 + */ +@Data +@TableName("tag_category") +public class TagCategory implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 标签名 */ + @Length(max = 255,message = "标签名长度不能超过255字") + private String categoryName; + + /** 上级标签类目id */ + private String pid; + + /** */ + @Length(max = 255,message = "长度不能超过255字") + private String pathIds; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + + public static TagCategory toNewObject(TagCategory source){ + TagCategory category = new TagCategory(); + category.setId(source.getId()); + category.setCategoryName(source.getCategoryName()); + category.setPid(source.getPid()); + category.setPathIds(source.getPathIds()); + category.setRemark(source.getRemark()); + category.setCreateTime(source.getCreateTime()); + category.setUpdateTime(source.getUpdateTime()); + category.setCreateBy(source.getCreateBy()); + category.setUpdateBy(source.getUpdateBy()); + category.setTenantId(source.getTenantId()); + category.setDelFlag(source.getDelFlag()); + return category; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagData.java b/src/main/java/com/qs/serve/modules/tag/entity/TagData.java new file mode 100644 index 00000000..c0c0feaa --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagData.java @@ -0,0 +1,101 @@ +package com.qs.serve.modules.tag.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 标签数据 实体类 + * @author YenHex + * @since 2023-04-23 + */ +@Data +@TableName("tag_data") +public class TagData implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 标签名 */ + @Length(max = 255,message = "标签名长度不能超过255字") + private String tagName; + + /** 标签id */ + private Long tagId; + + /** 业务类型 */ + @Length(max = 30,message = "业务类型长度不能超过30字") + private String businessType; + + /** 目标id */ + private Long businessTargetId; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + + public static TagData toNewObject(TagData source){ + TagData data = new TagData(); + data.setId(source.getId()); + data.setTagName(source.getTagName()); + data.setTagId(source.getTagId()); + data.setBusinessType(source.getBusinessType()); + data.setBusinessTargetId(source.getBusinessTargetId()); + data.setRemark(source.getRemark()); + data.setCreateTime(source.getCreateTime()); + data.setUpdateTime(source.getUpdateTime()); + data.setCreateBy(source.getCreateBy()); + data.setUpdateBy(source.getUpdateBy()); + data.setTenantId(source.getTenantId()); + data.setDelFlag(source.getDelFlag()); + return data; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java new file mode 100644 index 00000000..fd425727 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java @@ -0,0 +1,97 @@ +package com.qs.serve.modules.tag.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 标签信息 实体类 + * @author YenHex + * @since 2023-04-23 + */ +@Data +@TableName("tag_info") +public class TagInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 标签名 */ + @Length(max = 255,message = "标签名长度不能超过255字") + private String tagName; + + /** 标签类目id */ + private Long tagCategroyId; + + /** 标签类目名称 */ + @Length(max = 255,message = "标签类目名称长度不能超过255字") + private String tagCategoryName; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + + public static TagInfo toNewObject(TagInfo source){ + TagInfo info = new TagInfo(); + info.setId(source.getId()); + info.setTagName(source.getTagName()); + info.setTagCategroyId(source.getTagCategroyId()); + info.setTagCategoryName(source.getTagCategoryName()); + info.setRemark(source.getRemark()); + info.setCreateTime(source.getCreateTime()); + info.setUpdateTime(source.getUpdateTime()); + info.setCreateBy(source.getCreateBy()); + info.setUpdateBy(source.getUpdateBy()); + info.setTenantId(source.getTenantId()); + info.setDelFlag(source.getDelFlag()); + return info; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBo.java b/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBo.java new file mode 100644 index 00000000..306f43f3 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBo.java @@ -0,0 +1,71 @@ +package com.qs.serve.modules.tag.entity.bo; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 标签信息 Bo + * @author YenHex + * @since 2023-04-23 + */ +@Data +public class TagInfoBo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 标签名 */ + @Length(max = 255,message = "标签名长度不能超过255字") + private String tagName; + + /** 标签类目id */ + private Long tagCategroyId; + + /** 标签类目名称 */ + @Length(max = 255,message = "标签类目名称长度不能超过255字") + private String tagCategoryName; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + /** 创建人 */ + private String createBy; + + /** 更新人 */ + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java b/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java new file mode 100644 index 00000000..c6c88dd2 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java @@ -0,0 +1,68 @@ +package com.qs.serve.modules.tag.entity.so; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 标签信息 查询参数 + * @author YenHex + * @since 2023-04-23 + */ +@Data +public class TagInfoSo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 标签名 */ + private String tagName; + + /** 标签类目id */ + private Long tagCategroyId; + + /** 标签类目名称 */ + private String tagCategoryName; + + /** 备注 */ + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + /** 创建人 */ + private String createBy; + + /** 更新人 */ + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java b/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java new file mode 100644 index 00000000..4c9bc9fb --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java @@ -0,0 +1,15 @@ +package com.qs.serve.modules.tag.entity.vo; + +import com.qs.serve.common.model.dto.TreeNode; +import lombok.Data; + +/** + * @author YenHex + * @since 2023/4/23 + */ +@Data +public class TagCategoryTreeVo extends TreeNode { + + private String categoryName; + +} diff --git a/src/main/java/com/qs/serve/modules/tag/mapper/TagCategoryMapper.java b/src/main/java/com/qs/serve/modules/tag/mapper/TagCategoryMapper.java new file mode 100644 index 00000000..383053f6 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/mapper/TagCategoryMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.tag.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.tag.entity.TagCategory; + +/** + * 标签分类 Mapper + * @author YenHex + * @date 2023-04-23 + */ +public interface TagCategoryMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java b/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java new file mode 100644 index 00000000..95617361 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.tag.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.tag.entity.TagData; + +/** + * 标签数据 Mapper + * @author YenHex + * @date 2023-04-23 + */ +public interface TagDataMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/mapper/TagInfoMapper.java b/src/main/java/com/qs/serve/modules/tag/mapper/TagInfoMapper.java new file mode 100644 index 00000000..afb71667 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/mapper/TagInfoMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.tag.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.tag.entity.TagInfo; + +/** + * 标签信息 Mapper + * @author YenHex + * @date 2023-04-23 + */ +public interface TagInfoMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/package-info.java b/src/main/java/com/qs/serve/modules/tag/package-info.java new file mode 100644 index 00000000..3dfcef3d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/package-info.java @@ -0,0 +1 @@ +package com.qs.serve.modules.tag; diff --git a/src/main/java/com/qs/serve/modules/tag/service/TagCategoryService.java b/src/main/java/com/qs/serve/modules/tag/service/TagCategoryService.java new file mode 100644 index 00000000..ed55829d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/service/TagCategoryService.java @@ -0,0 +1,20 @@ +package com.qs.serve.modules.tag.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.tag.entity.TagCategory; + +/** + * 标签分类 服务接口 + * @author YenHex + * @date 2023-04-23 + */ +public interface TagCategoryService extends IService { + + /** + * 编辑 + * @param category + */ + void modify(TagCategory category); + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/service/TagDataService.java b/src/main/java/com/qs/serve/modules/tag/service/TagDataService.java new file mode 100644 index 00000000..0ef30fae --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/service/TagDataService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.tag.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.tag.entity.TagData; + +/** + * 标签数据 服务接口 + * @author YenHex + * @date 2023-04-23 + */ +public interface TagDataService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/service/TagInfoService.java b/src/main/java/com/qs/serve/modules/tag/service/TagInfoService.java new file mode 100644 index 00000000..1f626a94 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/service/TagInfoService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.tag.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.tag.entity.TagInfo; + +/** + * 标签信息 服务接口 + * @author YenHex + * @date 2023-04-23 + */ +public interface TagInfoService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java b/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java new file mode 100644 index 00000000..758327f9 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.qs.serve.modules.tag.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.tag.entity.TagCategory; +import com.qs.serve.modules.tag.service.TagCategoryService; +import com.qs.serve.modules.tag.mapper.TagCategoryMapper; + +/** + * 标签分类 服务实现类 + * @author YenHex + * @since 2023-04-23 + */ +@Slf4j +@Service +@AllArgsConstructor +public class TagCategoryServiceImpl extends ServiceImpl implements TagCategoryService { + + @Override + public void modify(TagCategory category) { + String id = category.getId(); + + } + + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/service/impl/TagDataServiceImpl.java b/src/main/java/com/qs/serve/modules/tag/service/impl/TagDataServiceImpl.java new file mode 100644 index 00000000..2c93612b --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/service/impl/TagDataServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.tag.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.tag.entity.TagData; +import com.qs.serve.modules.tag.service.TagDataService; +import com.qs.serve.modules.tag.mapper.TagDataMapper; + +/** + * 标签数据 服务实现类 + * @author YenHex + * @since 2023-04-23 + */ +@Slf4j +@Service +@AllArgsConstructor +public class TagDataServiceImpl extends ServiceImpl implements TagDataService { + +} + diff --git a/src/main/java/com/qs/serve/modules/tag/service/impl/TagInfoServiceImpl.java b/src/main/java/com/qs/serve/modules/tag/service/impl/TagInfoServiceImpl.java new file mode 100644 index 00000000..14a15a44 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tag/service/impl/TagInfoServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.tag.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.tag.entity.TagInfo; +import com.qs.serve.modules.tag.service.TagInfoService; +import com.qs.serve.modules.tag.mapper.TagInfoMapper; + +/** + * 标签信息 服务实现类 + * @author YenHex + * @since 2023-04-23 + */ +@Slf4j +@Service +@AllArgsConstructor +public class TagInfoServiceImpl extends ServiceImpl implements TagInfoService { + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java index 07b5a86d..31b3f56e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java @@ -147,8 +147,12 @@ public class TbsCostContractController { contract.setSignTime(param.getSignTime()); contract.setExpireTime(param.getExpireTime()); } - boolean result = tbsCostContractService.saveOrUpdate(contract); - return R.isTrue(result); + if(contract.getId()==null){ + tbsCostContractService.save(contract); + }else { + tbsCostContractService.updateById(contract); + } + return R.ok(); } /**