模块重命名

bladex/blade-service/blade-system/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>blade-user-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-tool</artifactId>
+            <version>3.2.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -22,6 +22,7 @@ import org.springblade.system.entity.Tenant;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -73,4 +74,11 @@ public interface ITenantService extends BaseService<Tenant> {
 	 */
 	boolean setting(Integer accountNumber, Date expireTime, String ids);
 
+	/**
+	 * 分页列表包装，赋值租户开通站号数
+	 * @param pages
+	 * @return
+	 */
+    IPage<Map<String, Object>> listPackaging(IPage<Tenant> pages);
+
 }

hx-common/client-util/pom.xml

@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>file-service-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-common/hx-tool/src/main/java/com/fjhx/utils/HxBeanUtil.java

@@ -1,6 +1,7 @@
 package com.fjhx.utils;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.SneakyThrows;
 
@@ -18,7 +19,7 @@ public class HxBeanUtil {
      * @return 新 page <Map < String, Object> > 对象
      */
     @SneakyThrows
-    public static Page<Map<String, Object>> copyPageEx(Page<?> page) {
+    public static Page<Map<String, Object>> copyPageEx(IPage<?> page) {
         Page<Map<String, Object>> result = new Page<>();
         // 赋值分页对象基本属性
         copyPageInfo(result, page);
@@ -59,13 +60,10 @@ public class HxBeanUtil {
      * @param result 结果值
      * @param page   入参
      */
-    private static void copyPageInfo(Page<?> result, Page<?> page) {
+    private static void copyPageInfo(Page<?> result, IPage<?> page) {
         result.setTotal(page.getTotal());
         result.setSize(page.getSize());
         result.setCurrent(page.getCurrent());
-        result.setOrders(page.getOrders());
-        result.setCountId(page.getCountId());
-        result.setMaxLimit(page.getMaxLimit());
     }
 
 }

hx-common/pom.xml

@@ -73,7 +73,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>file-service-api</artifactId>
+                <artifactId>service-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

hx-service-api/iot-management-api/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>file-service-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
     </dependencies>
 

hx-service-api/pom.xml

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

hx-service-api/file-service-api/pom.xml → hx-service-api/service-file-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>file-service-api</artifactId>
+    <artifactId>service-file-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-service-api/file-service-api/src/main/java/com/fjhx/feign/IFileClient.java → hx-service-api/service-file-api/src/main/java/com/fjhx/feign/IFileClient.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * File Feign接口类
  */
-@FeignClient(value = "file-service")
+@FeignClient(value = "service-file")
 public interface IFileClient {
 
     String BINDING_FILE = ClientConstant.API_PREFIX + "/bindingFile";

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

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>product-library-api</artifactId>
+    <artifactId>service-product-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

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

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

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

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

hx-service/iot-management/pom.xml

@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>file-service-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
     </dependencies>

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

@@ -1,5 +1,6 @@
 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;
@@ -30,7 +31,7 @@ public class BomController {
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
-        Page<BomEx> result = bomService.getPage(condition);
+        IPage<BomEx> result = bomService.getPage(condition);
         return R.success(result);
     }
 

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

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

hx-service/pom.xml

@@ -23,8 +23,8 @@
     <modules>
         <module>iot-management</module>
         <module>storage</module>
-        <module>product-library</module>
-        <module>file-service</module>
+        <module>service-product</module>
+        <module>service-file</module>
     </modules>
 
     <dependencyManagement>
@@ -66,13 +66,13 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>product-library-api</artifactId>
+                <artifactId>service-product-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>file-service-api</artifactId>
+                <artifactId>service-file-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

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

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

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

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

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

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

hx-service/file-service/pom.xml → hx-service/service-file/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>file-service</artifactId>
+    <artifactId>service-file</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>file-service-api</artifactId>
+            <artifactId>service-file-api</artifactId>
         </dependency>
 
     </dependencies>

hx-service/file-service/src/main/java/com/fjhx/FileServeApplication.java → hx-service/service-file/src/main/java/com/fjhx/FileServeApplication.java

@@ -9,7 +9,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @SpringCloudApplication
 public class FileServeApplication {
 
-    private static final String APP_NAME = "file-service";
+    private static final String APP_NAME = "service-file";
 
     public static void main(String[] args) {
         BladeApplication.run(APP_NAME, FileServeApplication.class, args);

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

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

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

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

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

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>product-library</artifactId>
+    <artifactId>service-product</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>product-library-api</artifactId>
+            <artifactId>service-product-api</artifactId>
         </dependency>
 
     </dependencies>

hx-service/product-library/src/main/java/com/fjhx/ProductLibraryApplication.java → hx-service/service-product/src/main/java/com/fjhx/ProductApplication.java

@@ -7,12 +7,12 @@ import org.springframework.cloud.client.SpringCloudApplication;
  * 产品库模块启动器
  */
 @SpringCloudApplication
-public class ProductLibraryApplication {
+public class ProductApplication {
 
-    public static final String APP_NAME = "product-library";
+    public static final String APP_NAME = "service-product";
 
     public static void main(String[] args) {
-        BladeApplication.run(APP_NAME, ProductLibraryApplication.class, args);
+        BladeApplication.run(APP_NAME, ProductApplication.class, args);
     }
 
 }

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

@@ -0,0 +1,13 @@
+# 服务器端口
+server:
+  port: 8400
+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

@@ -0,0 +1,12 @@
+# 服务器端口
+server:
+  port: 8400
+
+# 数据源配置
+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

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