浏览代码

数据传输处理

caozj 2 年之前
父节点
当前提交
00d3e8248c
共有 21 个文件被更改,包括 740 次插入5 次删除
  1. 4 0
      hx-admin/src/main/resources/application-dev.yml
  2. 5 0
      hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java
  3. 54 0
      hx-data/pom.xml
  4. 36 0
      hx-data/src/main/java/com/fjhx/data/controller/BaseController.java
  5. 52 0
      hx-data/src/main/java/com/fjhx/data/entity/classify/ProductClassify.java
  6. 17 0
      hx-data/src/main/java/com/fjhx/data/entity/t/dto/TErpProductDto.java
  7. 17 0
      hx-data/src/main/java/com/fjhx/data/entity/t/dto/TErpProductSelectDto.java
  8. 262 0
      hx-data/src/main/java/com/fjhx/data/entity/t/po/TErpProduct.java
  9. 17 0
      hx-data/src/main/java/com/fjhx/data/entity/t/vo/TErpProductVo.java
  10. 16 0
      hx-data/src/main/java/com/fjhx/data/mapper/classify/ProductClassifyMapper.java
  11. 25 0
      hx-data/src/main/java/com/fjhx/data/mapper/t/TErpProductMapper.java
  12. 19 0
      hx-data/src/main/java/com/fjhx/data/service/classify/ProductClassifyService.java
  13. 74 0
      hx-data/src/main/java/com/fjhx/data/service/classify/impl/ProductClassifyServiceImpl.java
  14. 16 0
      hx-data/src/main/java/com/fjhx/data/service/t/TErpProductService.java
  15. 92 0
      hx-data/src/main/java/com/fjhx/data/service/t/impl/TErpProductServiceImpl.java
  16. 5 0
      hx-data/src/main/resources/mapper/classify/ProductClassifyMapper.xml
  17. 10 0
      hx-data/src/main/resources/mapper/t/TErpProductMapper.xml
  18. 0 0
      hx-item/src/main/java/com/fjhx/item/a-json/TErpProductApi.json
  19. 1 4
      hx-item/src/main/java/com/fjhx/item/controller/product/ProductClassifyController.java
  20. 11 1
      hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductClassifyServiceImpl.java
  21. 7 0
      pom.xml

+ 4 - 0
hx-admin/src/main/resources/application-dev.yml

@@ -73,6 +73,10 @@ spring:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                     password: 3PN-Mzn#vnP&q6d
+                data:
+                    url: jdbc:mysql://36.134.91.96:17330/yf_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
 
     # redis 配置
     # redis 配置
     redis:
     redis:

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -39,4 +39,9 @@ public interface SourceConstant {
 
 
     String DINGDING = "dingding";
     String DINGDING = "dingding";
 
 
+    /**
+     * 数据处理
+     */
+    String DATA = "data";
+
 }
 }

+ 54 - 0
hx-data/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>hx-data</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-item</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-supply</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-wms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-account</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-customer</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

+ 36 - 0
hx-data/src/main/java/com/fjhx/data/controller/BaseController.java

@@ -0,0 +1,36 @@
+package com.fjhx.data.controller;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.data.service.t.TErpProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 产品信息表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+@DS(SourceConstant.DATA)
+@RestController
+@RequestMapping("/base/transfer")
+public class BaseController {
+
+    @Autowired
+    private TErpProductService tErpProductService;
+
+    /**
+     * 产品数据传输
+     */
+    @GetMapping("/transferProduct")
+    public void transferProduct() {
+        tErpProductService.transferProduct();
+    }
+
+}

+ 52 - 0
hx-data/src/main/java/com/fjhx/data/entity/classify/ProductClassify.java

@@ -0,0 +1,52 @@
+package com.fjhx.data.entity.classify;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 产品分类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-15
+ */
+@Getter
+@Setter
+@TableName("product_classify")
+public class ProductClassify extends BasePo {
+
+    /**
+     * 定义 1产品 2物料
+     */
+    @NotNull(message = "定义不能为空")
+    private Integer definition;
+
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 父级分类id集合,用,拼接
+     */
+    private String parentIdSet;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    private String yunfanParentId;
+
+    private String yunfanId;
+
+    private String cu;
+
+    private String uu;
+
+}

+ 17 - 0
hx-data/src/main/java/com/fjhx/data/entity/t/dto/TErpProductDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.data.entity.t.dto;
+
+import com.fjhx.data.entity.t.po.TErpProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 产品信息表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+@Getter
+@Setter
+public class TErpProductDto extends TErpProduct {
+
+}

+ 17 - 0
hx-data/src/main/java/com/fjhx/data/entity/t/dto/TErpProductSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.data.entity.t.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 产品信息表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+@Getter
+@Setter
+public class TErpProductSelectDto extends BaseSelectDto {
+
+}

+ 262 - 0
hx-data/src/main/java/com/fjhx/data/entity/t/po/TErpProduct.java

@@ -0,0 +1,262 @@
+package com.fjhx.data.entity.t.po;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 产品信息表
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+@Getter
+@Setter
+public class TErpProduct {
+
+    private String id;
+    /**
+     * 产品分类id
+     */
+    private String categoryId;
+
+    /**
+     * (外贸)合同ID(新增客户产品时有值)
+     */
+    private String contractId;
+
+    /**
+     * 产品编码
+     */
+    private String code;
+
+    /**
+     * 产品代码
+     */
+    private String dmCode;
+
+    /**
+     * 产品名称(中文)
+     */
+    private String nameChinese;
+
+    /**
+     * (外贸)产品名称(英文)
+     */
+    private String nameEnglish;
+
+    /**
+     * (外贸)产品销售指导价
+     */
+    private BigDecimal price;
+
+    /**
+     * (外贸)产品成本价
+     */
+    private BigDecimal costPrice;
+
+    /**
+     * 【作废】样品销售指导价
+     */
+    private BigDecimal samplePrice;
+
+    /**
+     * (外贸)材质(英文)
+     */
+    private String material;
+
+    /**
+     * 材质(中文)
+     */
+    private String materialChinese;
+
+    /**
+     * (外贸)产品型号(英文)
+     */
+    private String productModel;
+
+    /**
+     * 产品型号(中文)
+     */
+    private String productModelChinese;
+
+    /**
+     * 产品尺寸:长(单位cm)
+     */
+    private Object productLong;
+
+    /**
+     * 产品尺寸:宽(单位cm)
+     */
+    private Object productWide;
+
+    /**
+     * 产品尺寸:高(单位cm)
+     */
+    private Object productHigh;
+
+    /**
+     * 装箱尺寸:长(单位cm)
+     */
+    private Object packagLong;
+
+    /**
+     * 装箱尺寸:宽(单位cm)
+     */
+    private Object packagWide;
+
+    /**
+     * 装箱尺寸:高(单位cm)
+     */
+    private Object packagHigh;
+
+    /**
+     * (外贸)内包装方式,多个逗号隔开(字典表key)
+     */
+    private String innerPackMethod;
+
+    /**
+     * (外贸)外包装方式(字典表key)
+     */
+    private String outerPackMethod;
+
+    /**
+     * 净重(单位g)
+     */
+    private Object netWeight;
+
+    /**
+     * 毛重(单位g)
+     */
+    private Object grossWeight;
+
+    /**
+     * (外贸)海关编码
+     */
+    private String customsCode;
+
+    /**
+     * 采购/销售单位
+     */
+    private String unit;
+
+    /**
+     * (云仓)出入库单位
+     */
+    private String issueReceiptUnit;
+
+    /**
+     * (云仓)换算比例:1采购单位/1出入库单位
+     */
+    private Object conversionScale;
+
+    /**
+     * (云仓)安全库存
+     */
+    private BigDecimal safetyStock;
+
+    /**
+     * (云仓)采购周期(单位:天)
+     */
+    private Integer procurementCycle;
+
+    /**
+     * (云仓)质检合格率
+     */
+    private BigDecimal qualityQualifiedRate;
+
+    /**
+     * (云仓)出入库规则:0、不启用;1、一物一码;2、一物一码&先入先出
+     */
+    private Boolean firstInFirstOut;
+
+    /**
+     * 【作废】样品订货交付时间(单位:天)
+     */
+    private Integer sampleDeliverTime;
+
+    /**
+     * (外贸)MOQ(最低订购量)
+     */
+    private Integer moq;
+
+    /**
+     * 【作废】入箱数量
+     */
+    private String theBoxQuantity;
+
+    /**
+     * 产品描述
+     */
+    private String remark;
+
+    /**
+     * 客户id,0:公司产品
+     */
+    private String customerId;
+
+    /**
+     * 状态:0、启用;1、禁用
+     */
+    private Integer status;
+
+    /**
+     * 评估状态,0:草稿、1:待评估、2:待确认、3:具备、4:不具备
+     */
+    private Integer assessStatus;
+
+    /**
+     * 数据来源,0:产品知识库新增、1:产品评估新增、2:定制产品库移入
+     */
+    private Integer source;
+
+    /**
+     * 生产评估审核通过时间
+     */
+    private Date approvedDate;
+
+    /**
+     * 流程id
+     */
+    private String processInstanceId;
+
+    /**
+     * 下个节点名称
+     */
+    private String processInstanceName;
+
+    /**
+     * 下个节点处理人id
+     */
+    private String processInstanceUserId;
+
+    /**
+     * 下个节点处理人名称
+     */
+    private String processInstanceUserName;
+
+    private String yfTenantId;
+
+
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

+ 17 - 0
hx-data/src/main/java/com/fjhx/data/entity/t/vo/TErpProductVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.data.entity.t.vo;
+
+import com.fjhx.data.entity.t.po.TErpProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 产品信息表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+@Getter
+@Setter
+public class TErpProductVo extends TErpProduct {
+
+}

+ 16 - 0
hx-data/src/main/java/com/fjhx/data/mapper/classify/ProductClassifyMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.data.mapper.classify;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.data.entity.classify.ProductClassify;
+
+/**
+ * <p>
+ * 产品分类 Mapper 接口
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-15
+ */
+public interface ProductClassifyMapper extends BaseMapper<ProductClassify> {
+
+}

+ 25 - 0
hx-data/src/main/java/com/fjhx/data/mapper/t/TErpProductMapper.java

@@ -0,0 +1,25 @@
+package com.fjhx.data.mapper.t;
+
+import com.fjhx.data.entity.t.po.TErpProduct;
+import com.ruoyi.common.annotation.TenantIgnore;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 产品信息表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+public interface TErpProductMapper {
+
+    /**
+     * 产品信息表分页
+     */
+    @TenantIgnore
+    List<TErpProduct> getList();
+
+}

+ 19 - 0
hx-data/src/main/java/com/fjhx/data/service/classify/ProductClassifyService.java

@@ -0,0 +1,19 @@
+package com.fjhx.data.service.classify;
+
+import com.fjhx.data.entity.classify.ProductClassify;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 产品分类 服务类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-15
+ */
+public interface ProductClassifyService extends BaseService<ProductClassify> {
+
+    void transferClass();
+
+}

+ 74 - 0
hx-data/src/main/java/com/fjhx/data/service/classify/impl/ProductClassifyServiceImpl.java

@@ -0,0 +1,74 @@
+package com.fjhx.data.service.classify.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.data.entity.classify.ProductClassify;
+import com.fjhx.data.mapper.classify.ProductClassifyMapper;
+import com.fjhx.data.service.classify.ProductClassifyService;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 产品分类 服务实现类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-15
+ */
+@DS(SourceConstant.DATA)
+@Service
+public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMapper, ProductClassify> implements ProductClassifyService {
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    /**
+     * 分类数据传输
+     */
+    @Override
+    public void transferClass() {
+        List<ProductClassify> list = this.list();
+        Map<String,Long> map = list.stream().distinct().collect(Collectors.toMap(ProductClassify::getYunfanId,ProductClassify::getId));
+        List<SysUser> userList = iSysUserService.list(Wrappers.<SysUser>query().lambda().isNotNull(SysUser::getYfUserId));
+        Map<String,Long> userMap = userList.stream().distinct().collect(Collectors.toMap(SysUser::getYfUserId,SysUser::getUserId));
+        for(ProductClassify p : list){
+            if(StringUtils.equals(p.getYunfanParentId(),"0")){
+                p.setParentId(0L);
+            }else{
+                p.setParentId(map.get(p.getYunfanParentId()));
+            }
+            if(StringUtils.isNotEmpty(p.getParentIdSet())){
+                List<String> strList = Arrays.asList(p.getParentIdSet().split(","));
+                for(String s : strList){
+                    StringBuilder stringBuilder = new StringBuilder();
+                    if(s.equals("0")){
+                        stringBuilder.append("0");
+                    }else{
+                        stringBuilder.append(map.get(s));
+                    }
+                    p.setParentIdSet(stringBuilder.toString());
+                }
+            }
+            if(StringUtils.isNotEmpty(p.getCu())){
+                p.setCreateUser(userMap.get(p.getCu()));
+            }
+            if(StringUtils.isNotEmpty(p.getUu())){
+                p.setUpdateUser(userMap.get(p.getUu()));
+            }
+        }
+        this.updateBatchById(list);
+    }
+
+}

+ 16 - 0
hx-data/src/main/java/com/fjhx/data/service/t/TErpProductService.java

@@ -0,0 +1,16 @@
+package com.fjhx.data.service.t;
+
+
+/**
+ * <p>
+ * 产品信息表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+public interface TErpProductService{
+
+
+    void  transferProduct();
+}

+ 92 - 0
hx-data/src/main/java/com/fjhx/data/service/t/impl/TErpProductServiceImpl.java

@@ -0,0 +1,92 @@
+package com.fjhx.data.service.t.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fjhx.data.entity.t.po.TErpProduct;
+import com.fjhx.data.mapper.t.TErpProductMapper;
+import com.fjhx.data.service.t.TErpProductService;
+import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.item.service.product.ProductClassifyService;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 产品信息表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-06
+ */
+@Service
+public class TErpProductServiceImpl implements TErpProductService {
+
+    @Autowired
+    private ProductClassifyService productClassifyService;
+
+    @Autowired
+    private ProductInfoService productInfoService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @Autowired
+    private TErpProductMapper tErpProductMapper;
+
+
+    @Override
+    public void transferProduct() {
+        List<TErpProduct> list = tErpProductMapper.getList();
+//        List<ProductClassify> classifyList = productClassifyService.list();
+//        Map<String,Long> map = classifyList.stream().distinct().collect(Collectors.toMap(ProductClassify::getYunfanId,ProductClassify::getId));
+//        List<SysUser> userList = iSysUserService.list(Wrappers.<SysUser>query().lambda().isNotNull(SysUser::getYfUserId));
+//        Map<String,Long> userMap = userList.stream().distinct().collect(Collectors.toMap(SysUser::getYfUserId,SysUser::getUserId));
+        List<ProductInfo> productInfoList = new ArrayList<>();
+        for(TErpProduct p:list){
+            ProductInfo productInfo = new ProductInfo();
+            productInfo.setDefinition(1);
+//            productInfo.setProductClassifyId(map.getOrDefault(p.getCategoryId(),null));
+            productInfo.setCode(p.getCode());
+            productInfo.setCustomCode(p.getCustomsCode());
+            productInfo.setName(p.getNameChinese());
+            productInfo.setSpec(p.getProductModelChinese());
+            productInfo.setUnit(p.getUnit());
+            productInfo.setRemark(p.getRemark());
+//            productInfo.setYfId(p.getId());
+//            productInfo.setYfTenantId(p.getYfTenantId());
+            productInfo.setType("finish");
+            productInfo.setCreateTime(p.getCreateTime());
+            productInfo.setUpdateTime(p.getUpdateTime());
+//            if(ObjectUtils.isNotEmpty(p.getCreateUser())){
+//                productInfo.setCu(userMap.getOrDefault(p.getCreateUser(),null));
+//            }
+//            if(StringUtils.isNotEmpty(p.getUpdateUser())){
+//                productInfo.setUu(userMap.getOrDefault(p.getUpdateUser(),null));
+//            }
+            Map<String,Object> standard_json = new HashMap<>();
+            standard_json.put("englishName",p.getNameEnglish());
+            standard_json.put("code",p.getCode());
+            standard_json.put("netWeight",p.getNetWeight());
+            standard_json.put("customsCode",p.getCustomsCode());
+            productInfo.setStandardJson(JSON.toJSONString(standard_json));
+//            Map<String,Object> ehsd_json = new HashMap<>();
+//            ehsd_json.put("status",p.getStatus());
+//            ehsd_json.put("assessStatus",p.getAssessStatus());
+//            ehsd_json.put("customerId",p.getCustomerId());
+//            productInfo.setEhsdJson(JSON.toJSONString(ehsd_json));
+            if(StringUtils.equals(p.getYfTenantId(),"TIANHONG")||StringUtils.equals(p.getYfTenantId(),"GOLDSUN")){
+                productInfoList.add(productInfo);
+            }
+        }
+        productInfoService.saveBatch(productInfoList);
+    }
+
+}

+ 5 - 0
hx-data/src/main/resources/mapper/classify/ProductClassifyMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.data.mapper.classify.ProductClassifyMapper">
+
+</mapper>

+ 10 - 0
hx-data/src/main/resources/mapper/t/TErpProductMapper.xml

@@ -0,0 +1,10 @@
+<?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.fjhx.data.mapper.t.TErpProductMapper">
+    <select id="getList" resultType="com.fjhx.data.entity.t.po.TErpProduct">
+        select
+            *
+        from t_erp_product
+    </select>
+
+</mapper>

文件差异内容过多而无法显示
+ 0 - 0
hx-item/src/main/java/com/fjhx/item/a-json/TErpProductApi.json


+ 1 - 4
hx-item/src/main/java/com/fjhx/item/controller/product/ProductClassifyController.java

@@ -9,10 +9,7 @@ import com.fjhx.item.service.product.ProductClassifyService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
-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;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 11 - 1
hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductClassifyServiceImpl.java

@@ -3,17 +3,25 @@ package com.fjhx.item.service.product.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.dto.ProductClassifyDto;
 import com.fjhx.item.entity.product.dto.ProductClassifyDto;
 import com.fjhx.item.entity.product.po.ProductClassify;
 import com.fjhx.item.entity.product.po.ProductClassify;
 import com.fjhx.item.mapper.product.ProductClassifyMapper;
 import com.fjhx.item.mapper.product.ProductClassifyMapper;
 import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductClassifyService;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.TreeUtil;
 import com.ruoyi.common.utils.TreeUtil;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 
 
 /**
 /**
@@ -28,6 +36,9 @@ import java.util.List;
 @Service
 @Service
 public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMapper, ProductClassify> implements ProductClassifyService {
 public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMapper, ProductClassify> implements ProductClassifyService {
 
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     @Override
     @Override
     public List<JSONObject> tree(ProductClassify productClassify) {
     public List<JSONObject> tree(ProductClassify productClassify) {
         // 分类名称
         // 分类名称
@@ -79,7 +90,6 @@ public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMappe
     public void delete(Long id) {
     public void delete(Long id) {
         this.removeById(id);
         this.removeById(id);
     }
     }
-
     /**
     /**
      * 保证同级名称不重复
      * 保证同级名称不重复
      */
      */

+ 7 - 0
pom.xml

@@ -29,6 +29,7 @@
         <module>hx-sale</module>
         <module>hx-sale</module>
         <module>hx-victoriatourist</module>
         <module>hx-victoriatourist</module>
         <module>hx-dingding</module>
         <module>hx-dingding</module>
+        <module>hx-data</module>
     </modules>
     </modules>
 
 
     <properties>
     <properties>
@@ -149,6 +150,12 @@
                 <version>${hx.version}</version>
                 <version>${hx.version}</version>
             </dependency>
             </dependency>
 
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-data</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
         </dependencies>
     </dependencyManagement>
     </dependencyManagement>
 
 

部分文件因为文件数量过多而无法显示