产品库改为依赖包形式

bladex/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -41,66 +41,75 @@ import java.util.Date;
 @ApiModel(value = "Tenant对象", description = "Tenant对象")
 public class Tenant extends BaseEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantId;
-	/**
-	 * 租户名称
-	 */
-	@ApiModelProperty(value = "租户名称")
-	private String tenantName;
-	/**
-	 * 域名地址
-	 */
-	@ApiModelProperty(value = "域名地址")
-	private String domain;
-	/**
-	 * 系统背景
-	 */
-	@ApiModelProperty(value = "系统背景")
-	private String backgroundUrl;
-	/**
-	 * 联系人
-	 */
-	@ApiModelProperty(value = "联系人")
-	private String linkman;
-	/**
-	 * 联系电话
-	 */
-	@ApiModelProperty(value = "联系电话")
-	private String contactNumber;
-	/**
-	 * 联系地址
-	 */
-	@ApiModelProperty(value = "联系地址")
-	private String address;
-	/**
-	 * 账号额度
-	 */
-	@ApiModelProperty(value = "账号额度")
-	private Integer accountNumber;
-	/**
-	 * 过期时间
-	 */
-	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
-	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
-	@ApiModelProperty(value = "过期时间")
-	private Date expireTime;
-	/**
-	 * 数据源ID
-	 */
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	@ApiModelProperty(value = "数据源ID")
-	private Long datasourceId;
-	/**
-	 * 授权码
-	 */
-	@ApiModelProperty(value = "授权码")
-	private String licenseKey;
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
+    /**
+     * 租户名称
+     */
+    @ApiModelProperty(value = "租户名称")
+    private String tenantName;
+    /**
+     * 域名地址
+     */
+    @ApiModelProperty(value = "域名地址")
+    private String domain;
+    /**
+     * 系统背景
+     */
+    @ApiModelProperty(value = "系统背景")
+    private String backgroundUrl;
+    /**
+     * 联系人
+     */
+    @ApiModelProperty(value = "联系人")
+    private String linkman;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    private String contactNumber;
+    /**
+     * 联系地址
+     */
+    @ApiModelProperty(value = "联系地址")
+    private String address;
+    /**
+     * 账号额度
+     */
+    @ApiModelProperty(value = "账号额度")
+    private Integer accountNumber;
+    /**
+     * 过期时间
+     */
+    @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
+    @JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
+    @ApiModelProperty(value = "过期时间")
+    private Date expireTime;
+    /**
+     * 数据源ID
+     */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "数据源ID")
+    private Long datasourceId;
+    /**
+     * 授权码
+     */
+    @ApiModelProperty(value = "授权码")
+    private String licenseKey;
+
+    /**
+     * 国家id
+     */
+    private Long countryId;
+    /**
+     * 省份id
+     */
+    private Long provinceId;
 
 
 }

bladex/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -86,10 +86,15 @@ public class TenantController extends BladeController {
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "分页", notes = "传入tenant")
     @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-    public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
+    public R<IPage<Map<String, Object>>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
         QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
-        IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
-        return R.data(pages);
+        IPage<Tenant> pages = tenantService.page(Condition.getPage(query),
+                (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID))
+                        ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+
+        IPage<Map<String, Object>> result = tenantService.listPackaging(pages);
+
+        return R.data(result);
     }
 
     /**

bladex/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -19,6 +19,8 @@ package org.springblade.system.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.HxBeanUtil;
 import lombok.AllArgsConstructor;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -41,10 +43,7 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.springblade.common.constant.TenantConstant.*;
@@ -198,6 +197,15 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 		return true;
 	}
 
+	@Override
+	public IPage<Map<String, Object>> listPackaging(IPage<Tenant> pages) {
+
+		Page<Map<String, Object>> mapPage = HxBeanUtil.copyPageEx(pages);
+
+
+		return mapPage;
+	}
+
 	private String getTenantId(List<String> codes) {
 		String code = tenantId.generate();
 		if (codes.contains(code)) {

hx-common/hx-tool/src/main/java/com/fjhx/base/BaseService.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 
 import java.util.Collection;
@@ -18,15 +17,6 @@ import java.util.Map;
 public interface BaseService<T> extends IService<T> {
 
     /**
-     * 乐观锁
-     */
-    default void optimisticLock(boolean flag) {
-        if (!flag) {
-            throw new ServiceException("系统繁忙，请稍候再试");
-        }
-    }
-
-    /**
      * 获取分页
      */
     default Page<T> createPage(Map<String, String> condition) {
@@ -40,20 +30,6 @@ public interface BaseService<T> extends IService<T> {
     }
 
     /**
-     * 获取分页
-     */
-    default Page<Map<String, Object>> createPageMap(Map<String, String> condition) {
-        String pageNumStr = condition.get("pageNum");
-        String pageSizeStr = condition.get("pageSize");
-
-        int pageNum = ObjectUtil.isEmpty(pageNumStr) ? 1 : Integer.parseInt(pageNumStr);
-        int pageSize = ObjectUtil.isEmpty(pageSizeStr) ? 10 : Integer.parseInt(pageSizeStr);
-
-        return new Page<>(pageNum, pageSize);
-    }
-
-
-    /**
      * 执行分页查询
      *
      * @param condition    条件
@@ -62,7 +38,7 @@ public interface BaseService<T> extends IService<T> {
      */
     default Page<T> page(Map<String, String> condition, Wrapper<T> queryWrapper) {
         Page<T> page = createPage(condition);
-        return getBaseMapper().selectPage(page, queryWrapper);
+        return page(page, queryWrapper);
     }
 
     /**
@@ -76,7 +52,7 @@ public interface BaseService<T> extends IService<T> {
      * 条件查询
      */
     default T getOne(SFunction<T, ?> column, Object val) {
-        return lambdaQuery().eq(column, val).one();
+        return lambdaQuery().eq(column, val).last("limit 1").one();
     }
 
     /**

hx-common/pom.xml

@@ -16,6 +16,7 @@
         <module>code-generator</module>
         <module>hx-tool</module>
         <module>client-util</module>
+        <module>product-library</module>
     </modules>
 
     <properties>

hx-service/service-product/pom.xml → hx-common/product-library/pom.xml

@@ -3,13 +3,13 @@
          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">
     <parent>
-        <artifactId>hx-service</artifactId>
+        <artifactId>hx-common</artifactId>
         <groupId>com.fjhx</groupId>
         <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-product</artifactId>
+    <artifactId>product-library</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -18,9 +18,10 @@
 
     <dependencies>
 
+        <!-- 工具模块 -->
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>service-product-api</artifactId>
+            <artifactId>hx-tool</artifactId>
         </dependency>
 
     </dependencies>

hx-service/service-product/src/main/java/com/fjhx/classify/controller/ClassifyController.java → hx-common/product-library/src/main/java/com/fjhx/controller/ClassifyController.java

@@ -1,7 +1,7 @@
-package com.fjhx.classify.controller;
+package com.fjhx.controller;
 
-import com.fjhx.classify.service.ClassifyService;
-import com.fjhx.params.classify.ClassifyVo;
+import com.fjhx.params.ClassifyVo;
+import com.fjhx.service.ClassifyService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service/service-product/src/main/java/com/fjhx/material/controller/MaterialController.java → hx-common/product-library/src/main/java/com/fjhx/controller/MaterialController.java

@@ -1,9 +1,9 @@
-package com.fjhx.material.controller;
+package com.fjhx.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.material.Material;
-import com.fjhx.material.service.MaterialService;
-import com.fjhx.params.material.MaterialVo;
+import com.fjhx.entity.Material;
+import com.fjhx.params.MaterialVo;
+import com.fjhx.service.MaterialService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service/service-product/src/main/java/com/fjhx/product/controller/ProductController.java → hx-common/product-library/src/main/java/com/fjhx/controller/ProductController.java

@@ -1,9 +1,9 @@
-package com.fjhx.product.controller;
+package com.fjhx.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.product.Product;
-import com.fjhx.params.product.ProductVo;
-import com.fjhx.product.service.ProductService;
+import com.fjhx.entity.Product;
+import com.fjhx.params.ProductVo;
+import com.fjhx.service.ProductService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service-api/service-product-api/src/main/java/com/fjhx/entity/classify/Classify.java → hx-common/product-library/src/main/java/com/fjhx/entity/Classify.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.classify;
+package com.fjhx.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.Version;

hx-service-api/service-product-api/src/main/java/com/fjhx/entity/material/Material.java → hx-common/product-library/src/main/java/com/fjhx/entity/Material.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.material;
+package com.fjhx.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;

hx-service-api/service-product-api/src/main/java/com/fjhx/entity/product/Product.java → hx-common/product-library/src/main/java/com/fjhx/entity/Product.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.product;
+package com.fjhx.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.Version;

hx-service-api/service-product-api/src/main/java/com/fjhx/enums/classify/ClassifyTypeEnum.java → hx-common/product-library/src/main/java/com/fjhx/enums/ClassifyTypeEnum.java

@@ -1,4 +1,4 @@
-package com.fjhx.enums.classify;
+package com.fjhx.enums;
 
 import lombok.Getter;
 

hx-service/service-product/src/main/java/com/fjhx/classify/mapper/ClassifyMapper.java → hx-common/product-library/src/main/java/com/fjhx/mapper/ClassifyMapper.java

@@ -1,6 +1,6 @@
-package com.fjhx.classify.mapper;
+package com.fjhx.mapper;
 
-import com.fjhx.entity.classify.Classify;
+import com.fjhx.entity.Classify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hx-service/service-product/src/main/java/com/fjhx/classify/mapper/ClassifyMapper.xml → hx-common/product-library/src/main/java/com/fjhx/mapper/ClassifyMapper.xml

@@ -1,5 +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.classify.mapper.ClassifyMapper">
+<mapper namespace="com.fjhx.mapper.ClassifyMapper">
 
 </mapper>

hx-service/service-product/src/main/java/com/fjhx/material/mapper/MaterialMapper.java → hx-common/product-library/src/main/java/com/fjhx/mapper/MaterialMapper.java

@@ -1,6 +1,6 @@
-package com.fjhx.material.mapper;
+package com.fjhx.mapper;
 
-import com.fjhx.entity.material.Material;
+import com.fjhx.entity.Material;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

hx-service/service-product/src/main/java/com/fjhx/material/mapper/MaterialMapper.xml → hx-common/product-library/src/main/java/com/fjhx/mapper/MaterialMapper.xml

@@ -1,6 +1,6 @@
 <?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.material.mapper.MaterialMapper">
+<mapper namespace="com.fjhx.mapper.MaterialMapper">
 
     <select id="getUnitList" resultType="java.lang.String">
         select distinct m.unit

hx-service/service-product/src/main/java/com/fjhx/product/mapper/ProductMapper.java → hx-common/product-library/src/main/java/com/fjhx/mapper/ProductMapper.java

@@ -1,6 +1,6 @@
-package com.fjhx.product.mapper;
+package com.fjhx.mapper;
 
-import com.fjhx.entity.product.Product;
+import com.fjhx.entity.Product;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

hx-service/service-product/src/main/java/com/fjhx/product/mapper/ProductMapper.xml → hx-common/product-library/src/main/java/com/fjhx/mapper/ProductMapper.xml

@@ -1,6 +1,6 @@
 <?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.product.mapper.ProductMapper">
+<mapper namespace="com.fjhx.mapper.ProductMapper">
 
     <select id="getUnitList" resultType="java.lang.String">
         select distinct p.unit

hx-service-api/service-product-api/src/main/java/com/fjhx/params/classify/ClassifyEx.java → hx-common/product-library/src/main/java/com/fjhx/params/ClassifyEx.java

@@ -1,6 +1,6 @@
-package com.fjhx.params.classify;
+package com.fjhx.params;
 
-import com.fjhx.entity.classify.Classify;
+import com.fjhx.entity.Classify;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/service-product-api/src/main/java/com/fjhx/params/classify/ClassifyVo.java → hx-common/product-library/src/main/java/com/fjhx/params/ClassifyVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.params.classify;
+package com.fjhx.params;
 
-import com.fjhx.entity.classify.Classify;
+import com.fjhx.entity.Classify;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/service-product-api/src/main/java/com/fjhx/params/material/MaterialEx.java → hx-common/product-library/src/main/java/com/fjhx/params/MaterialEx.java

@@ -1,6 +1,6 @@
-package com.fjhx.params.material;
+package com.fjhx.params;
 
-import com.fjhx.entity.material.Material;
+import com.fjhx.entity.Material;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/service-product-api/src/main/java/com/fjhx/params/material/MaterialVo.java → hx-common/product-library/src/main/java/com/fjhx/params/MaterialVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.params.material;
+package com.fjhx.params;
 
-import com.fjhx.entity.material.Material;
+import com.fjhx.entity.Material;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/service-product-api/src/main/java/com/fjhx/params/product/ProductEx.java → hx-common/product-library/src/main/java/com/fjhx/params/ProductEx.java

@@ -1,6 +1,6 @@
-package com.fjhx.params.product;
+package com.fjhx.params;
 
-import com.fjhx.entity.product.Product;
+import com.fjhx.entity.Product;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/service-product-api/src/main/java/com/fjhx/params/product/ProductVo.java → hx-common/product-library/src/main/java/com/fjhx/params/ProductVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.params.product;
+package com.fjhx.params;
 
-import com.fjhx.entity.product.Product;
+import com.fjhx.entity.Product;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service/service-product/src/main/java/com/fjhx/classify/service/ClassifyService.java → hx-common/product-library/src/main/java/com/fjhx/service/ClassifyService.java

@@ -1,8 +1,7 @@
-package com.fjhx.classify.service;
+package com.fjhx.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.classify.Classify;
-import com.fjhx.params.classify.ClassifyVo;
+import com.fjhx.entity.Classify;
+import com.fjhx.params.ClassifyVo;
 import com.fjhx.base.BaseService;
 
 import java.util.List;

hx-service/service-product/src/main/java/com/fjhx/material/service/MaterialService.java → hx-common/product-library/src/main/java/com/fjhx/service/MaterialService.java

@@ -1,9 +1,9 @@
-package com.fjhx.material.service;
+package com.fjhx.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
-import com.fjhx.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
+import com.fjhx.entity.Material;
+import com.fjhx.params.MaterialVo;
 
 import java.util.List;
 import java.util.Map;

hx-service/service-product/src/main/java/com/fjhx/product/service/ProductService.java → hx-common/product-library/src/main/java/com/fjhx/service/ProductService.java

@@ -1,8 +1,8 @@
-package com.fjhx.product.service;
+package com.fjhx.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.product.Product;
-import com.fjhx.params.product.ProductVo;
+import com.fjhx.entity.Product;
+import com.fjhx.params.ProductVo;
 import com.fjhx.base.BaseService;
 
 import java.util.List;

hx-service/service-product/src/main/java/com/fjhx/classify/service/impl/ClassifyServiceImpl.java → hx-common/product-library/src/main/java/com/fjhx/service/impl/ClassifyServiceImpl.java

@@ -1,17 +1,17 @@
-package com.fjhx.classify.service.impl;
+package com.fjhx.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.material.service.MaterialService;
-import com.fjhx.classify.mapper.ClassifyMapper;
-import com.fjhx.classify.service.ClassifyService;
-import com.fjhx.entity.classify.Classify;
-import com.fjhx.entity.material.Material;
-import com.fjhx.entity.product.Product;
-import com.fjhx.enums.classify.ClassifyTypeEnum;
-import com.fjhx.params.classify.ClassifyVo;
-import com.fjhx.product.service.ProductService;
+import com.fjhx.entity.Classify;
+import com.fjhx.entity.Material;
+import com.fjhx.entity.Product;
+import com.fjhx.enums.ClassifyTypeEnum;
+import com.fjhx.mapper.ClassifyMapper;
+import com.fjhx.params.ClassifyVo;
+import com.fjhx.service.ClassifyService;
+import com.fjhx.service.MaterialService;
+import com.fjhx.service.ProductService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.TreeUtil;
 import org.springblade.core.secure.utils.AuthUtil;

hx-service/service-product/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java → hx-common/product-library/src/main/java/com/fjhx/service/impl/MaterialServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.service.impl;
+package com.fjhx.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.classify.service.ClassifyService;
-import com.fjhx.material.mapper.MaterialMapper;
-import com.fjhx.material.service.MaterialService;
 import com.fjhx.constant.ProductLibraryLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.StatusConstant;
-import com.fjhx.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
+import com.fjhx.entity.Material;
+import com.fjhx.mapper.MaterialMapper;
+import com.fjhx.params.MaterialVo;
+import com.fjhx.service.ClassifyService;
+import com.fjhx.service.MaterialService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;

hx-service/service-product/src/main/java/com/fjhx/product/service/impl/ProductServiceImpl.java → hx-common/product-library/src/main/java/com/fjhx/service/impl/ProductServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.product.service.impl;
+package com.fjhx.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.classify.service.ClassifyService;
-import com.fjhx.product.mapper.ProductMapper;
-import com.fjhx.product.service.ProductService;
 import com.fjhx.constant.ProductLibraryLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
-import com.fjhx.entity.product.Product;
-import com.fjhx.params.product.ProductVo;
+import com.fjhx.entity.Product;
+import com.fjhx.mapper.ProductMapper;
+import com.fjhx.params.ProductVo;
+import com.fjhx.service.ClassifyService;
+import com.fjhx.service.ProductService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;

hx-service-api/pom.xml

@@ -24,7 +24,6 @@
     <modules>
         <module>iot-management-api</module>
         <module>storage-api</module>
-        <module>service-product-api</module>
         <module>service-file-api</module>
     </modules>
 

hx-service-api/service-product-api/pom.xml

@@ -1,19 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>hx-service-api</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>service-product-api</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
-</project>

hx-service/iot-management/pom.xml

@@ -25,6 +25,11 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
+            <artifactId>product-library</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
             <artifactId>iot-management-api</artifactId>
         </dependency>
 

hx-service/iot-management/src/main/java/com/fjhx/bom/controller/BomController.java

@@ -1,6 +1,5 @@
 package com.fjhx.bom.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.bom.service.BomService;
 import com.fjhx.params.bom.BomEx;
@@ -31,7 +30,7 @@ public class BomController {
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
-        IPage<BomEx> result = bomService.getPage(condition);
+        Page<BomEx> result = bomService.getPage(condition);
         return R.success(result);
     }
 

hx-service/iot-management/src/main/java/com/fjhx/bom/service/BomService.java

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public interface BomService extends BaseService<Bom> {
 
-    IPage<BomEx> getPage(Map<String, String> condition);
+    Page<BomEx> getPage(Map<String, String> condition);
 
     void add(BomVo bomVo);
 

hx-service/iot-management/src/main/java/com/fjhx/bom/service/impl/BomServiceImpl.java

@@ -1,7 +1,6 @@
 package com.fjhx.bom.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
@@ -35,7 +34,7 @@ import java.util.stream.Collectors;
 public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomService {
 
     @Override
-    public IPage<BomEx> getPage(Map<String, String> condition) {
+    public Page<BomEx> getPage(Map<String, String> condition) {
 
         QueryWrapper<?> wrapper = WrapperUtil.init(condition)
                 .eq("p.classif_id", "classifId") // 分类查询
@@ -48,7 +47,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
         wrapper.eq("b.current_edition", StatusConstant.YES); // 当前版本
         wrapper.orderByAsc("p.code"); // 产品编码排序
 
-        IPage<BomEx> result = baseMapper.getPage(createPage(condition), wrapper);
+        Page<BomEx> result = baseMapper.getPage(createPage(condition), wrapper);
         List<BomEx> records = result.getRecords();
 
         // 赋值最后修改人

hx-service/pom.xml

@@ -23,7 +23,6 @@
     <modules>
         <module>iot-management</module>
         <module>storage</module>
-        <module>service-product</module>
         <module>service-file</module>
     </modules>
 
@@ -54,19 +53,19 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>iot-management-api</artifactId>
+                <artifactId>product-library</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>storage-api</artifactId>
+                <artifactId>iot-management-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>service-product-api</artifactId>
+                <artifactId>storage-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

hx-service/service-product/src/main/java/com/fjhx/ServiceProductApplication.java

@@ -1,18 +0,0 @@
-package com.fjhx;
-
-import org.springblade.core.launch.BladeApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-
-/**
- * 产品库模块启动器
- */
-@SpringCloudApplication
-public class ServiceProductApplication {
-
-    public static final String APP_NAME = "service-product";
-
-    public static void main(String[] args) {
-        BladeApplication.run(APP_NAME, ServiceProductApplication.class, args);
-    }
-
-}

hx-service/service-product/src/main/resources/application-dev.yml

@@ -1,13 +0,0 @@
-# 服务器端口
-server:
-  port: 8002
-logging:
-  level:
-    org.springframework.data.mongodb.core: DEBUG
-# 数据源配置
-spring:
-  # 数据库
-  datasource:
-    url: ${blade.datasource.service_product.dev.url}
-    username: ${blade.datasource.service_product.dev.username}
-    password: ${blade.datasource.service_product.dev.password}

hx-service/service-product/src/main/resources/application-prod.yml

@@ -1,12 +0,0 @@
-# 服务器端口
-server:
-  port: 8002
-
-# 数据源配置
-spring:
-  # 数据库
-  datasource:
-    url: ${blade.datasource.service_product.prod.url}
-    username: ${blade.datasource.service_product.prod.username}
-    password: ${blade.datasource.service_product.prod.password}
-

hx-service/service-product/src/main/resources/application-test.yml

@@ -1,11 +0,0 @@
-# 服务器端口
-server:
-  port: 8002
-
-# 数据源配置
-spring:
-  # 数据库
-  datasource:
-    url: ${blade.datasource.service_product.test.url}
-    username: ${blade.datasource.service_product.test.username}
-    password: ${blade.datasource.service_product.test.password}