24282 1 anno fa
parent
commit
10650e2a9b
38 ha cambiato i file con 1440 aggiunte e 49 eliminazioni
  1. 71 0
      sd-business/src/main/java/com/sd/business/controller/bom/BomClassifyController.java
  2. 71 0
      sd-business/src/main/java/com/sd/business/controller/bom/BomController.java
  3. 71 0
      sd-business/src/main/java/com/sd/business/controller/bom/BomOperatingLogController.java
  4. 71 0
      sd-business/src/main/java/com/sd/business/controller/bom/BomSpecController.java
  5. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomClassifyDto.java
  6. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomClassifySelectDto.java
  7. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomDto.java
  8. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomOperatingLogDto.java
  9. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomOperatingLogSelectDto.java
  10. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSelectDto.java
  11. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSpecDto.java
  12. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSpecSelectDto.java
  13. 126 0
      sd-business/src/main/java/com/sd/business/entity/bom/po/Bom.java
  14. 46 0
      sd-business/src/main/java/com/sd/business/entity/bom/po/BomClassify.java
  15. 31 0
      sd-business/src/main/java/com/sd/business/entity/bom/po/BomOperatingLog.java
  16. 88 0
      sd-business/src/main/java/com/sd/business/entity/bom/po/BomSpec.java
  17. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/vo/BomClassifyVo.java
  18. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/vo/BomOperatingLogVo.java
  19. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/vo/BomSpecVo.java
  20. 17 0
      sd-business/src/main/java/com/sd/business/entity/bom/vo/BomVo.java
  21. 26 0
      sd-business/src/main/java/com/sd/business/mapper/bom/BomClassifyMapper.java
  22. 26 0
      sd-business/src/main/java/com/sd/business/mapper/bom/BomMapper.java
  23. 26 0
      sd-business/src/main/java/com/sd/business/mapper/bom/BomOperatingLogMapper.java
  24. 26 0
      sd-business/src/main/java/com/sd/business/mapper/bom/BomSpecMapper.java
  25. 46 0
      sd-business/src/main/java/com/sd/business/service/bom/BomClassifyService.java
  26. 46 0
      sd-business/src/main/java/com/sd/business/service/bom/BomOperatingLogService.java
  27. 46 0
      sd-business/src/main/java/com/sd/business/service/bom/BomService.java
  28. 46 0
      sd-business/src/main/java/com/sd/business/service/bom/BomSpecService.java
  29. 57 0
      sd-business/src/main/java/com/sd/business/service/bom/impl/BomClassifyServiceImpl.java
  30. 57 0
      sd-business/src/main/java/com/sd/business/service/bom/impl/BomOperatingLogServiceImpl.java
  31. 57 0
      sd-business/src/main/java/com/sd/business/service/bom/impl/BomServiceImpl.java
  32. 57 0
      sd-business/src/main/java/com/sd/business/service/bom/impl/BomSpecServiceImpl.java
  33. 19 0
      sd-business/src/main/resources/mapper/bom/BomClassifyMapper.xml
  34. 35 0
      sd-business/src/main/resources/mapper/bom/BomMapper.xml
  35. 16 0
      sd-business/src/main/resources/mapper/bom/BomOperatingLogMapper.xml
  36. 27 0
      sd-business/src/main/resources/mapper/bom/BomSpecMapper.xml
  37. 47 48
      sd-framework/src/main/java/com/sd/framework/aspect/DataSourceAspect.java
  38. 1 1
      sd-starter/src/main/java/com/sd/SdApplication.java

+ 71 - 0
sd-business/src/main/java/com/sd/business/controller/bom/BomClassifyController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.bom.dto.BomClassifyDto;
+import com.sd.business.entity.bom.dto.BomClassifySelectDto;
+import com.sd.business.entity.bom.vo.BomClassifyVo;
+import com.sd.business.service.bom.BomClassifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * bom分类 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/bomClassify")
+public class BomClassifyController {
+
+    @Autowired
+    private BomClassifyService bomClassifyService;
+
+    /**
+     * bom分类分页
+     */
+    @PostMapping("/page")
+    public Page<BomClassifyVo> page(@RequestBody BomClassifySelectDto dto) {
+        return bomClassifyService.getPage(dto);
+    }
+
+    /**
+     * bom分类明细
+     */
+    @PostMapping("/detail")
+    public BomClassifyVo detail(@RequestBody BaseSelectDto dto) {
+        return bomClassifyService.detail(dto.getId());
+    }
+
+    /**
+     * bom分类新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody BomClassifyDto bomClassifyDto) {
+        bomClassifyService.add(bomClassifyDto);
+    }
+
+    /**
+     * bom分类编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody BomClassifyDto bomClassifyDto) {
+        bomClassifyService.edit(bomClassifyDto);
+    }
+
+    /**
+     * bom分类删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        bomClassifyService.delete(dto.getId());
+    }
+
+}

+ 71 - 0
sd-business/src/main/java/com/sd/business/controller/bom/BomController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.bom.dto.BomDto;
+import com.sd.business.entity.bom.dto.BomSelectDto;
+import com.sd.business.entity.bom.vo.BomVo;
+import com.sd.business.service.bom.BomService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * bom 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/bom")
+public class BomController {
+
+    @Autowired
+    private BomService bomService;
+
+    /**
+     * bom分页
+     */
+    @PostMapping("/page")
+    public Page<BomVo> page(@RequestBody BomSelectDto dto) {
+        return bomService.getPage(dto);
+    }
+
+    /**
+     * bom明细
+     */
+    @PostMapping("/detail")
+    public BomVo detail(@RequestBody BaseSelectDto dto) {
+        return bomService.detail(dto.getId());
+    }
+
+    /**
+     * bom新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody BomDto bomDto) {
+        bomService.add(bomDto);
+    }
+
+    /**
+     * bom编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody BomDto bomDto) {
+        bomService.edit(bomDto);
+    }
+
+    /**
+     * bom删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        bomService.delete(dto.getId());
+    }
+
+}

+ 71 - 0
sd-business/src/main/java/com/sd/business/controller/bom/BomOperatingLogController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.bom.dto.BomOperatingLogDto;
+import com.sd.business.entity.bom.dto.BomOperatingLogSelectDto;
+import com.sd.business.entity.bom.vo.BomOperatingLogVo;
+import com.sd.business.service.bom.BomOperatingLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * bom操作日志 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/bomOperatingLog")
+public class BomOperatingLogController {
+
+    @Autowired
+    private BomOperatingLogService bomOperatingLogService;
+
+    /**
+     * bom操作日志分页
+     */
+    @PostMapping("/page")
+    public Page<BomOperatingLogVo> page(@RequestBody BomOperatingLogSelectDto dto) {
+        return bomOperatingLogService.getPage(dto);
+    }
+
+    /**
+     * bom操作日志明细
+     */
+    @PostMapping("/detail")
+    public BomOperatingLogVo detail(@RequestBody BaseSelectDto dto) {
+        return bomOperatingLogService.detail(dto.getId());
+    }
+
+    /**
+     * bom操作日志新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody BomOperatingLogDto bomOperatingLogDto) {
+        bomOperatingLogService.add(bomOperatingLogDto);
+    }
+
+    /**
+     * bom操作日志编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody BomOperatingLogDto bomOperatingLogDto) {
+        bomOperatingLogService.edit(bomOperatingLogDto);
+    }
+
+    /**
+     * bom操作日志删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        bomOperatingLogService.delete(dto.getId());
+    }
+
+}

+ 71 - 0
sd-business/src/main/java/com/sd/business/controller/bom/BomSpecController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.bom.dto.BomSpecDto;
+import com.sd.business.entity.bom.dto.BomSpecSelectDto;
+import com.sd.business.entity.bom.vo.BomSpecVo;
+import com.sd.business.service.bom.BomSpecService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * bom规格 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/bomSpec")
+public class BomSpecController {
+
+    @Autowired
+    private BomSpecService bomSpecService;
+
+    /**
+     * bom规格分页
+     */
+    @PostMapping("/page")
+    public Page<BomSpecVo> page(@RequestBody BomSpecSelectDto dto) {
+        return bomSpecService.getPage(dto);
+    }
+
+    /**
+     * bom规格明细
+     */
+    @PostMapping("/detail")
+    public BomSpecVo detail(@RequestBody BaseSelectDto dto) {
+        return bomSpecService.detail(dto.getId());
+    }
+
+    /**
+     * bom规格新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody BomSpecDto bomSpecDto) {
+        bomSpecService.add(bomSpecDto);
+    }
+
+    /**
+     * bom规格编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody BomSpecDto bomSpecDto) {
+        bomSpecService.edit(bomSpecDto);
+    }
+
+    /**
+     * bom规格删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        bomSpecService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomClassifyDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.sd.business.entity.bom.po.BomClassify;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom分类新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomClassifyDto extends BomClassify {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomClassifySelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom分类列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomClassifySelectDto extends BaseSelectDto {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.sd.business.entity.bom.po.Bom;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomDto extends Bom {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomOperatingLogDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.sd.business.entity.bom.po.BomOperatingLog;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom操作日志新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomOperatingLogDto extends BomOperatingLog {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomOperatingLogSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom操作日志列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomOperatingLogSelectDto extends BaseSelectDto {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomSelectDto extends BaseSelectDto {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSpecDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.sd.business.entity.bom.po.BomSpec;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom规格新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomSpecDto extends BomSpec {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSpecSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom规格列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomSpecSelectDto extends BaseSelectDto {
+
+}

+ 126 - 0
sd-business/src/main/java/com/sd/business/entity/bom/po/Bom.java

@@ -0,0 +1,126 @@
+package com.sd.business.entity.bom.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * bom
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("bom")
+public class Bom extends BasePo {
+
+    /**
+     * bom分类id
+     */
+    private Long bomClassifyId;
+
+    /**
+     * 品号
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 定制记件标准 字典:bom_customPieceBasis
+     */
+    private String customPieceBasis;
+
+    /**
+     * 包装记件标准 字典:bom_packagePieceBasis
+     */
+    private String packagePieceBasis;
+
+    /**
+     * 发货记件标准 字典:bom_shipmentsPieceBasis
+     */
+    private String shipmentsPieceBasis;
+
+    /**
+     * 项目小类 字典:bom_itemSubclass
+     */
+    private String itemSubclass;
+
+    /**
+     * 种类 字典:bom_species
+     */
+    private String species;
+
+    /**
+     * 材质
+     */
+    private String material;
+
+    /**
+     * 型号
+     */
+    private String modelNumber;
+
+    /**
+     * 正面纹路 字典:bom_frontGrain
+     */
+    private String frontGrain;
+
+    /**
+     * 背面纹路 字典:bom_reverseGrain
+     */
+    private String reverseGrain;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * LOGO
+     */
+    private String logo;
+
+    /**
+     * 色层 字典:bom_chromatophore
+     */
+    private String chromatophore;
+
+    /**
+     * 售价体系 字典:bom_sellingPriceSystem
+     */
+    private String sellingPriceSystem;
+
+    /**
+     * 角度 字典:bom_angle
+     */
+    private String angle;
+
+    /**
+     * 配方
+     */
+    private String formula;
+
+    /**
+     * 压纹工艺 字典:bom_embossingProcess
+     */
+    private String embossingProcess;
+
+    /**
+     * 产品主图
+     */
+    private String mainImgUrl;
+
+    /**
+     * 详细描述
+     */
+    private String detailText;
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/entity/bom/po/BomClassify.java

@@ -0,0 +1,46 @@
+package com.sd.business.entity.bom.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * bom分类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("bom_classify")
+public class BomClassify extends BasePo {
+
+    /**
+     * 上级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 分类编码
+     */
+    private String code;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 31 - 0
sd-business/src/main/java/com/sd/business/entity/bom/po/BomOperatingLog.java

@@ -0,0 +1,31 @@
+package com.sd.business.entity.bom.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * bom操作日志
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("bom_operating_log")
+public class BomOperatingLog extends BasePo {
+
+    /**
+     * bom id
+     */
+    private Long bomId;
+
+    /**
+     * 类型 1新增 2修改 3删除
+     */
+    private Integer type;
+
+}

+ 88 - 0
sd-business/src/main/java/com/sd/business/entity/bom/po/BomSpec.java

@@ -0,0 +1,88 @@
+package com.sd.business.entity.bom.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * bom规格
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("bom_spec")
+public class BomSpec extends BasePo {
+
+    /**
+     * bom id
+     */
+    private Long bomId;
+
+    /**
+     * 图片路径
+     */
+    private String mainImgUrl;
+
+    /**
+     * 品名
+     */
+    private String name;
+
+    /**
+     * 品号
+     */
+    private String code;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
+     * 成本价
+     */
+    private BigDecimal costPrice;
+
+    /**
+     * 对内销售价(含税)
+     */
+    private BigDecimal internalSellingPrice;
+
+    /**
+     * 对外销售价(含税)
+     */
+    private BigDecimal externalSellingPrice;
+
+    /**
+     * 安全库存
+     */
+    private BigDecimal safetyStock;
+
+    /**
+     * 长 cm
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal width;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal height;
+
+    /**
+     * 净重 g
+     */
+    private BigDecimal netWeight;
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/vo/BomClassifyVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.vo;
+
+import com.sd.business.entity.bom.po.BomClassify;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom分类列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomClassifyVo extends BomClassify {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/vo/BomOperatingLogVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.vo;
+
+import com.sd.business.entity.bom.po.BomOperatingLog;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom操作日志列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomOperatingLogVo extends BomOperatingLog {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/vo/BomSpecVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.vo;
+
+import com.sd.business.entity.bom.po.BomSpec;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom规格列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomSpecVo extends BomSpec {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/bom/vo/BomVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.bom.vo;
+
+import com.sd.business.entity.bom.po.Bom;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * bom列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class BomVo extends Bom {
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/bom/BomClassifyMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.bom;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomClassify;
+import com.sd.business.entity.bom.vo.BomClassifyVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * bom分类 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomClassifyMapper extends BaseMapper<BomClassify> {
+
+    /**
+     * bom分类分页
+     */
+    Page<BomClassifyVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<BomClassify> wrapper);
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/bom/BomMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.bom;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.Bom;
+import com.sd.business.entity.bom.vo.BomVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * bom Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomMapper extends BaseMapper<Bom> {
+
+    /**
+     * bom分页
+     */
+    Page<BomVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Bom> wrapper);
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/bom/BomOperatingLogMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.bom;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomOperatingLog;
+import com.sd.business.entity.bom.vo.BomOperatingLogVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * bom操作日志 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomOperatingLogMapper extends BaseMapper<BomOperatingLog> {
+
+    /**
+     * bom操作日志分页
+     */
+    Page<BomOperatingLogVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<BomOperatingLog> wrapper);
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/bom/BomSpecMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.bom;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.bom.vo.BomSpecVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * bom规格 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomSpecMapper extends BaseMapper<BomSpec> {
+
+    /**
+     * bom规格分页
+     */
+    Page<BomSpecVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<BomSpec> wrapper);
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/bom/BomClassifyService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.bom.dto.BomClassifyDto;
+import com.sd.business.entity.bom.dto.BomClassifySelectDto;
+import com.sd.business.entity.bom.po.BomClassify;
+import com.sd.business.entity.bom.vo.BomClassifyVo;
+
+
+/**
+ * <p>
+ * bom分类 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomClassifyService extends BaseService<BomClassify> {
+
+    /**
+     * bom分类分页
+     */
+    Page<BomClassifyVo> getPage(BomClassifySelectDto dto);
+
+    /**
+     * bom分类明细
+     */
+    BomClassifyVo detail(Long id);
+
+    /**
+     * bom分类新增
+     */
+    void add(BomClassifyDto bomClassifyDto);
+
+    /**
+     * bom分类编辑
+     */
+    void edit(BomClassifyDto bomClassifyDto);
+
+    /**
+     * bom分类删除
+     */
+    void delete(Long id);
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/bom/BomOperatingLogService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.bom.dto.BomOperatingLogDto;
+import com.sd.business.entity.bom.dto.BomOperatingLogSelectDto;
+import com.sd.business.entity.bom.po.BomOperatingLog;
+import com.sd.business.entity.bom.vo.BomOperatingLogVo;
+
+
+/**
+ * <p>
+ * bom操作日志 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomOperatingLogService extends BaseService<BomOperatingLog> {
+
+    /**
+     * bom操作日志分页
+     */
+    Page<BomOperatingLogVo> getPage(BomOperatingLogSelectDto dto);
+
+    /**
+     * bom操作日志明细
+     */
+    BomOperatingLogVo detail(Long id);
+
+    /**
+     * bom操作日志新增
+     */
+    void add(BomOperatingLogDto bomOperatingLogDto);
+
+    /**
+     * bom操作日志编辑
+     */
+    void edit(BomOperatingLogDto bomOperatingLogDto);
+
+    /**
+     * bom操作日志删除
+     */
+    void delete(Long id);
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/bom/BomService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.bom.dto.BomDto;
+import com.sd.business.entity.bom.dto.BomSelectDto;
+import com.sd.business.entity.bom.po.Bom;
+import com.sd.business.entity.bom.vo.BomVo;
+
+
+/**
+ * <p>
+ * bom 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomService extends BaseService<Bom> {
+
+    /**
+     * bom分页
+     */
+    Page<BomVo> getPage(BomSelectDto dto);
+
+    /**
+     * bom明细
+     */
+    BomVo detail(Long id);
+
+    /**
+     * bom新增
+     */
+    void add(BomDto bomDto);
+
+    /**
+     * bom编辑
+     */
+    void edit(BomDto bomDto);
+
+    /**
+     * bom删除
+     */
+    void delete(Long id);
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/bom/BomSpecService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.bom;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.bom.dto.BomSpecDto;
+import com.sd.business.entity.bom.dto.BomSpecSelectDto;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.bom.vo.BomSpecVo;
+
+
+/**
+ * <p>
+ * bom规格 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface BomSpecService extends BaseService<BomSpec> {
+
+    /**
+     * bom规格分页
+     */
+    Page<BomSpecVo> getPage(BomSpecSelectDto dto);
+
+    /**
+     * bom规格明细
+     */
+    BomSpecVo detail(Long id);
+
+    /**
+     * bom规格新增
+     */
+    void add(BomSpecDto bomSpecDto);
+
+    /**
+     * bom规格编辑
+     */
+    void edit(BomSpecDto bomSpecDto);
+
+    /**
+     * bom规格删除
+     */
+    void delete(Long id);
+
+}

+ 57 - 0
sd-business/src/main/java/com/sd/business/service/bom/impl/BomClassifyServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.bom.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.dto.BomClassifyDto;
+import com.sd.business.entity.bom.dto.BomClassifySelectDto;
+import com.sd.business.entity.bom.po.BomClassify;
+import com.sd.business.entity.bom.vo.BomClassifyVo;
+import com.sd.business.mapper.bom.BomClassifyMapper;
+import com.sd.business.service.bom.BomClassifyService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * bom分类 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Service
+public class BomClassifyServiceImpl extends ServiceImpl<BomClassifyMapper, BomClassify> implements BomClassifyService {
+
+    @Override
+    public Page<BomClassifyVo> getPage(BomClassifySelectDto dto) {
+        IWrapper<BomClassify> wrapper = getWrapper();
+        wrapper.orderByDesc("bc", BomClassify::getId);
+        Page<BomClassifyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public BomClassifyVo detail(Long id) {
+        BomClassify BomClassify = this.getById(id);
+        BomClassifyVo result = BeanUtil.toBean(BomClassify, BomClassifyVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(BomClassifyDto bomClassifyDto) {
+        this.save(bomClassifyDto);
+    }
+
+    @Override
+    public void edit(BomClassifyDto bomClassifyDto) {
+        this.updateById(bomClassifyDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 57 - 0
sd-business/src/main/java/com/sd/business/service/bom/impl/BomOperatingLogServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.bom.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.dto.BomOperatingLogDto;
+import com.sd.business.entity.bom.dto.BomOperatingLogSelectDto;
+import com.sd.business.entity.bom.po.BomOperatingLog;
+import com.sd.business.entity.bom.vo.BomOperatingLogVo;
+import com.sd.business.mapper.bom.BomOperatingLogMapper;
+import com.sd.business.service.bom.BomOperatingLogService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * bom操作日志 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Service
+public class BomOperatingLogServiceImpl extends ServiceImpl<BomOperatingLogMapper, BomOperatingLog> implements BomOperatingLogService {
+
+    @Override
+    public Page<BomOperatingLogVo> getPage(BomOperatingLogSelectDto dto) {
+        IWrapper<BomOperatingLog> wrapper = getWrapper();
+        wrapper.orderByDesc("bol", BomOperatingLog::getId);
+        Page<BomOperatingLogVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public BomOperatingLogVo detail(Long id) {
+        BomOperatingLog BomOperatingLog = this.getById(id);
+        BomOperatingLogVo result = BeanUtil.toBean(BomOperatingLog, BomOperatingLogVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(BomOperatingLogDto bomOperatingLogDto) {
+        this.save(bomOperatingLogDto);
+    }
+
+    @Override
+    public void edit(BomOperatingLogDto bomOperatingLogDto) {
+        this.updateById(bomOperatingLogDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 57 - 0
sd-business/src/main/java/com/sd/business/service/bom/impl/BomServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.bom.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.dto.BomDto;
+import com.sd.business.entity.bom.dto.BomSelectDto;
+import com.sd.business.entity.bom.po.Bom;
+import com.sd.business.entity.bom.vo.BomVo;
+import com.sd.business.mapper.bom.BomMapper;
+import com.sd.business.service.bom.BomService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * bom 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Service
+public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomService {
+
+    @Override
+    public Page<BomVo> getPage(BomSelectDto dto) {
+        IWrapper<Bom> wrapper = getWrapper();
+        wrapper.orderByDesc("b", Bom::getId);
+        Page<BomVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public BomVo detail(Long id) {
+        Bom Bom = this.getById(id);
+        BomVo result = BeanUtil.toBean(Bom, BomVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(BomDto bomDto) {
+        this.save(bomDto);
+    }
+
+    @Override
+    public void edit(BomDto bomDto) {
+        this.updateById(bomDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 57 - 0
sd-business/src/main/java/com/sd/business/service/bom/impl/BomSpecServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.bom.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.dto.BomSpecDto;
+import com.sd.business.entity.bom.dto.BomSpecSelectDto;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.bom.vo.BomSpecVo;
+import com.sd.business.mapper.bom.BomSpecMapper;
+import com.sd.business.service.bom.BomSpecService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * bom规格 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Service
+public class BomSpecServiceImpl extends ServiceImpl<BomSpecMapper, BomSpec> implements BomSpecService {
+
+    @Override
+    public Page<BomSpecVo> getPage(BomSpecSelectDto dto) {
+        IWrapper<BomSpec> wrapper = getWrapper();
+        wrapper.orderByDesc("bs", BomSpec::getId);
+        Page<BomSpecVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public BomSpecVo detail(Long id) {
+        BomSpec BomSpec = this.getById(id);
+        BomSpecVo result = BeanUtil.toBean(BomSpec, BomSpecVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(BomSpecDto bomSpecDto) {
+        this.save(bomSpecDto);
+    }
+
+    @Override
+    public void edit(BomSpecDto bomSpecDto) {
+        this.updateById(bomSpecDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 19 - 0
sd-business/src/main/resources/mapper/bom/BomClassifyMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.bom.BomClassifyMapper">
+    <select id="getPage" resultType="com.sd.business.entity.bom.vo.BomClassifyVo">
+        select bc.id,
+               bc.parent_id,
+               bc.name,
+               bc.code,
+               bc.sort,
+               bc.remark,
+               bc.create_user,
+               bc.create_time,
+               bc.update_user,
+               bc.update_time
+        from bom_classify bc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 35 - 0
sd-business/src/main/resources/mapper/bom/BomMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.bom.BomMapper">
+    <select id="getPage" resultType="com.sd.business.entity.bom.vo.BomVo">
+        select b.id,
+               b.bom_classify_id,
+               b.code,
+               b.name,
+               b.custom_piece_basis,
+               b.package_piece_basis,
+               b.shipments_piece_basis,
+               b.item_subclass,
+               b.species,
+               b.material,
+               b.model_number,
+               b.front_grain,
+               b.reverse_grain,
+               b.unit,
+               b.logo,
+               b.chromatophore,
+               b.selling_price_system,
+               b.angle,
+               b.formula,
+               b.embossing_process,
+               b.main_img_url,
+               b.detail_text,
+               b.create_user,
+               b.create_time,
+               b.update_user,
+               b.update_time
+        from bom b
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 16 - 0
sd-business/src/main/resources/mapper/bom/BomOperatingLogMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.bom.BomOperatingLogMapper">
+    <select id="getPage" resultType="com.sd.business.entity.bom.vo.BomOperatingLogVo">
+        select bol.id,
+               bol.bom_id,
+               bol.type,
+               bol.create_user,
+               bol.create_time,
+               bol.update_user,
+               bol.update_time
+        from bom_operating_log bol
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 27 - 0
sd-business/src/main/resources/mapper/bom/BomSpecMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.bom.BomSpecMapper">
+    <select id="getPage" resultType="com.sd.business.entity.bom.vo.BomSpecVo">
+        select bs.id,
+               bs.bom_id,
+               bs.main_img_url,
+               bs.name,
+               bs.code,
+               bs.colour,
+               bs.cost_price,
+               bs.internal_selling_price,
+               bs.external_selling_price,
+               bs.safety_stock,
+               bs.length,
+               bs.width,
+               bs.height,
+               bs.netWeight,
+               bs.create_user,
+               bs.create_time,
+               bs.update_user,
+               bs.update_time
+        from bom_spec bs
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 47 - 48
sd-framework/src/main/java/com/sd/framework/aspect/DataSourceAspect.java

@@ -1,48 +1,47 @@
-// package com.sd.framework.aspect;
-//
-// import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-// import org.aspectj.lang.ProceedingJoinPoint;
-// import org.aspectj.lang.annotation.Around;
-// import org.aspectj.lang.annotation.Aspect;
-// import org.aspectj.lang.annotation.Pointcut;
-// import org.springframework.core.Ordered;
-// import org.springframework.core.annotation.Order;
-// import org.springframework.stereotype.Component;
-//
-// import java.util.Objects;
-//
-// @Aspect
-// @Component
-// @Order(Ordered.HIGHEST_PRECEDENCE)
-// public class DataSourceAspect {
-//
-//     @Pointcut("execution (* com.*.*.service.*.*.*(..))")
-//     public void pointcut() {
-//
-//     }
-//
-//     @Around(value = "pointcut()")
-//     public Object before(ProceedingJoinPoint point) throws Throwable {
-//         Object target = point.getTarget();
-//         String name = target.getClass().getName();
-//         String moduleName = name.split("\\.")[2];
-//
-//         String peek = DynamicDataSourceContextHolder.peek();
-//         if (Objects.equals(peek, moduleName)) {
-//             return point.proceed();
-//         }
-//
-//         if (moduleName.equals("")) {
-//             try {
-//                 DynamicDataSourceContextHolder.push(moduleName);
-//                 return point.proceed();
-//             } finally {
-//                 DynamicDataSourceContextHolder.poll();
-//             }
-//         } else {
-//             return point.proceed();
-//         }
-//     }
-//
-//
-// }
+package com.sd.framework.aspect;
+
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+@Aspect
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class DataSourceAspect {
+
+    @Pointcut("execution (* com.*.*.service.*.*.*(..))")
+    public void pointcut() {
+
+    }
+
+    @Around(value = "pointcut()")
+    public Object before(ProceedingJoinPoint point) throws Throwable {
+        Object target = point.getTarget();
+        String name = target.getClass().getName();
+        String moduleName = name.split("\\.")[2];
+
+        String peek = DynamicDataSourceContextHolder.peek();
+        if (Objects.equals(peek, moduleName)) {
+            return point.proceed();
+        }
+
+        if (moduleName.equals("")) {
+            try {
+                DynamicDataSourceContextHolder.push(moduleName);
+                return point.proceed();
+            } finally {
+                DynamicDataSourceContextHolder.poll();
+            }
+        } else {
+            return point.proceed();
+        }
+    }
+
+}

+ 1 - 1
sd-starter/src/main/java/com/sd/SdApplication.java

@@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @Slf4j
-@SpringBootApplication(scanBasePackages = {"com.sd.**", "com.ruoyi.**"})
+@SpringBootApplication(scanBasePackages = {"com.sd.**", "com.ruoyi.**", "com.sd.**"})
 public class SdApplication {
 
     public static void main(String[] args) {