将系统服务中的算法商品移到了商品服务中

sys-api-feign/src/main/java/com/xy/feign/AlgorithmGoodsFeign.java

@@ -1,21 +0,0 @@
-package com.xy.feign;
-
-import com.xy.FeignInterceptor;
-import com.xy.consts.ServiceConsts;
-import com.xy.service.AlgorithmGoodsService;
-import io.swagger.annotations.Api;
-import org.springframework.cloud.openfeign.FeignClient;
-
-/**
- * <p>
- * 算法平台商品库 feign
- * </p>
- *
- * @author hechunping
- * @since 2023-01-13
- */
-@Api(tags = "算法平台商品库feign")
-@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
-public interface AlgorithmGoodsFeign extends AlgorithmGoodsService {
-
-}

sys-api-service/src/main/java/com/xy/entity/AlgorithmGoods.java

@@ -1,43 +0,0 @@
-package com.xy.entity;
-
-import com.xy.base.BaseEntity2;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * <p>
- * 算法平台商品库实体类
- * </p>
- *
- * @author hechunping
- */
-@Data
-public class AlgorithmGoods extends BaseEntity2<AlgorithmGoods> {
-
-    @ApiModelProperty(value = "算法平台ID")
-    private Long algorithmId;
-
-    @ApiModelProperty(value = "条形码")
-    private String barcode;
-
-    @ApiModelProperty(value = "算法平台商品ID")
-    private String skuId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String skuName;
-
-    @ApiModelProperty(value = "库类型")
-    private String skuType;
-
-    @ApiModelProperty(value = "商品图片")
-    private String imgUrls;
-
-    @ApiModelProperty(value = "建模商户ID")
-    private Long mercId;
-
-    @ApiModelProperty("状态;true=显示,false=隐藏")
-    private Boolean status;
-
-}
-

sys-api-service/src/main/java/com/xy/mapper/AlgorithmGoodsMapper.java

@@ -1,15 +0,0 @@
-package com.xy.mapper;
-
-import com.xy.entity.AlgorithmGoods;
-import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
-
-/**
- * <p>
- * 算法平台商品库Mapper
- * </p>
- *
- * @author hechunping
- * @since 2023/1/13
- */
-public interface AlgorithmGoodsMapper extends JoinBaseMapper<AlgorithmGoods> {
-}

sys-api-service/src/main/java/com/xy/service/AlgorithmGoodsServiceImpl.java

@@ -1,82 +0,0 @@
-package com.xy.service;
-
-import cn.hutool.core.collection.CollStreamUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.dto.AlgorithmDto;
-import com.xy.dto.AlgorithmGoodsDto;
-import com.xy.entity.AlgorithmGoods;
-import com.xy.mapper.AlgorithmGoodsMapper;
-import com.xy.utils.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.xy.utils.PlusBeans.toIPage;
-import static com.xy.utils.PlusBeans.toPageBean;
-
-
-/**
- * <p>
- * 算法平台商品库 服务实现类
- * </p>
- *
- * @author hechunping
- * @since 2023/1/13
- */
-@Service
-@Api(tags = "算法平台商品库")
-@AllArgsConstructor
-public class AlgorithmGoodsServiceImpl extends ServiceImpl<AlgorithmGoodsMapper, AlgorithmGoods> implements AlgorithmGoodsService {
-
-    private final AlgorithmService algorithmService;
-
-    @ApiOperation("分页查询")
-    @Override
-    public R<PageBean<AlgorithmGoodsDto.Vo>> page(@RequestBody AlgorithmGoodsDto.Page page) {
-        //获取算法平台列表
-        Map<Long, String> algorithmMap = CollStreamUtil.toMap(algorithmService.ListNameId().getData(),
-                AlgorithmDto.ListNameId::getId,AlgorithmDto.ListNameId::getName);
-        //查询商品分页
-        PageBean pageBean = page.getPage();
-        LambdaQueryWrapper<AlgorithmGoods> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, AlgorithmGoods.class)
-                .ge(AlgorithmGoods::getCreateTime, page.getCreateTimeStart())
-                .le(AlgorithmGoods::getCreateTime, page.getCreateTimeEnd())
-                .like(AlgorithmGoods::getSkuName)
-                .build();
-        IPage<AlgorithmGoods> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
-        PageBean<AlgorithmGoodsDto.Vo> dtoPageBean = toPageBean(AlgorithmGoodsDto.Vo.class, iPage);
-        //设置平台名称
-        dtoPageBean.setRecords(
-                dtoPageBean.getRecords().stream().map(
-                        item -> item.setAlgorithmName(algorithmMap.get(item.getAlgorithmId()))
-                ).collect(Collectors.toList())
-        );
-        return R.ok(dtoPageBean);
-    }
-
-    @ApiOperation("新增")
-    @Override
-    public R save(@RequestBody @Validated AlgorithmGoodsDto.Save save) {
-        AlgorithmGoods saveInfo = PlusBeans.copy(AlgorithmGoods.class, save);
-        saveInfo.createUserTime(AuthorizeUtils.getLoginId(Long.class)).createId();
-        save(saveInfo);
-        return R.ok();
-    }
-
-    @ApiOperation("修改")
-    @Override
-    public R update(@RequestBody @Validated AlgorithmGoodsDto.Update update) {
-        AlgorithmGoods updateInfo = PlusBeans.copy(AlgorithmGoods.class, update);
-        updateInfo.updateUserTime(AuthorizeUtils.getLoginId(Long.class));
-        updateById(updateInfo);
-        return R.ok();
-    }
-}

sys-api/src/main/java/com/xy/dto/AlgorithmGoodsDto.java

@@ -1,125 +0,0 @@
-package com.xy.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xy.utils.PageBean;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 算法平台商品库DTO
- * </p>
- *
- * @author hechunping
- * @since 2023-01-13
- */
-public class AlgorithmGoodsDto {
-
-    @Data
-    @Accessors(chain = true)
-    public static class Page extends Vo{
-        @ApiModelProperty(value = "分页对象", required = true)
-        private PageBean page;
-
-        @ApiModelProperty(value = "创建时间开始")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        private LocalDateTime createTimeStart;
-
-        @ApiModelProperty(value = "创建时间结束")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        private LocalDateTime createTimeEnd;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Save {
-        @NotNull(message = "算法平台ID不能为空")
-        @ApiModelProperty(value = "算法平台ID")
-        private Long algorithmId;
-
-        @ApiModelProperty(value = "条形码")
-        private String barcode;
-
-        @NotBlank(message = "算法平台商品ID不能为空")
-        @ApiModelProperty(value = "算法平台商品ID")
-        private String skuId;
-
-        @NotBlank(message = "商品名称不能为空")
-        @ApiModelProperty(value = "商品名称")
-        private String skuName;
-
-        @ApiModelProperty(value = "库类型")
-        private String skuType;
-
-        @ApiModelProperty(value = "商品图片")
-        private String imgUrls;
-
-        @ApiModelProperty(value = "建模商户ID")
-        private Long mercId;
-
-        @ApiModelProperty("状态;true=显示,false=隐藏")
-        private Boolean status;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Update extends Save{
-        @NotNull
-        @ApiModelProperty(value = "ID")
-        private Long id;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Vo {
-        @ApiModelProperty("算法平台名称")
-        private String algorithmName;
-
-        @ApiModelProperty(value = "ID")
-        private Long id;
-
-        @ApiModelProperty(value = "算法平台ID")
-        private Long algorithmId;
-
-        @ApiModelProperty(value = "条形码")
-        private String barcode;
-
-        @ApiModelProperty(value = "算法平台商品ID")
-        private String skuId;
-
-        @ApiModelProperty(value = "商品名称")
-        private String skuName;
-
-        @ApiModelProperty(value = "库类型")
-        private String skuType;
-
-        @ApiModelProperty(value = "商品图片")
-        private String imgUrls;
-
-        @ApiModelProperty(value = "建模商户ID")
-        private Long mercId;
-
-        @ApiModelProperty("状态;true=显示,false=隐藏")
-        private Boolean status;
-
-        @ApiModelProperty(value = "创建人")
-        private Long createUser;
-
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        @ApiModelProperty(value = "创建时间")
-        private LocalDateTime createTime;
-
-        @ApiModelProperty(value = "更新人")
-        private Long updateUser;
-
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        @ApiModelProperty(value = "更新时间")
-        private LocalDateTime updateTime;
-    }
-
-}

sys-api/src/main/java/com/xy/service/AlgorithmGoodsService.java

@@ -1,29 +0,0 @@
-package com.xy.service;
-
-import com.xy.annotate.RestMappingController;
-import com.xy.dto.AlgorithmGoodsDto;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 算法平台商品库 服务类
- * </p>
- *
- * @author hechunping
- * @since 2023-01-13
- */
-@RestMappingController("algorithmGoods")
-public interface AlgorithmGoodsService {
-    @PostMapping("page")
-    R<PageBean<AlgorithmGoodsDto.Vo>> page(@RequestBody AlgorithmGoodsDto.Page page);
-
-    @PostMapping("save")
-    R save(@RequestBody @Validated AlgorithmGoodsDto.Save save);
-
-    @PostMapping("update")
-    R update(@RequestBody @Validated AlgorithmGoodsDto.Update update);
-}