优化项目结构

bladex-tool/blade-core-tool/src/main/java/org/springblade/core/tool/api/R.java

@@ -230,9 +230,7 @@ public class R<T> implements Serializable {
     }
 
     public static <T> R<T> success(T data) {
-        R<T> result = R.success(BladeConstant.DEFAULT_SUCCESS_MESSAGE);
-        result.setData(data);
-        return result;
+        return data(data, BladeConstant.DEFAULT_SUCCESS_MESSAGE);
     }
 
 }

bladex/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserSearchClient.java

@@ -83,10 +83,10 @@ public interface IUserSearchClient {
     /**
      * 根据用户id查询用户名称
      *
-     * @param userId 用户id
+     * @param userIdList 用户id
      * @return MAP<用户id, 用户名称>
      */
     @GetMapping(MAP_BY_USER)
-    R<Map<Long, String>> mapByUser(@RequestParam("userId") String userId);
+    R<Map<Long, String>> mapByUser(@RequestParam("userIdList") List<Long> userIdList);
 
 }

bladex/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserSearchClient.java

@@ -38,35 +38,35 @@ import java.util.Map;
 @AllArgsConstructor
 public class UserSearchClient implements IUserSearchClient {
 
-	private final IUserSearchService service;
+    private final IUserSearchService service;
 
-	@Override
-	@GetMapping(LIST_BY_USER)
-	public R<List<User>> listByUser(String userId) {
-		return R.data(service.listByUser(Func.toLongList(userId)));
-	}
+    @Override
+    @GetMapping(LIST_BY_USER)
+    public R<List<User>> listByUser(String userId) {
+        return R.data(service.listByUser(Func.toLongList(userId)));
+    }
 
-	@Override
-	@GetMapping(LIST_BY_DEPT)
-	public R<List<User>> listByDept(String deptId) {
-		return R.data(service.listByDept(Func.toLongList(deptId)));
-	}
+    @Override
+    @GetMapping(LIST_BY_DEPT)
+    public R<List<User>> listByDept(String deptId) {
+        return R.data(service.listByDept(Func.toLongList(deptId)));
+    }
 
-	@Override
-	@GetMapping(LIST_BY_POST)
-	public R<List<User>> listByPost(String postId) {
-		return R.data(service.listByPost(Func.toLongList(postId)));
-	}
+    @Override
+    @GetMapping(LIST_BY_POST)
+    public R<List<User>> listByPost(String postId) {
+        return R.data(service.listByPost(Func.toLongList(postId)));
+    }
 
-	@Override
-	@GetMapping(LIST_BY_ROLE)
-	public R<List<User>> listByRole(String roleId) {
-		return R.data(service.listByRole(Func.toLongList(roleId)));
-	}
+    @Override
+    @GetMapping(LIST_BY_ROLE)
+    public R<List<User>> listByRole(String roleId) {
+        return R.data(service.listByRole(Func.toLongList(roleId)));
+    }
 
-	@Override
-	@GetMapping(MAP_BY_USER)
-	public R<Map<Long, String>> mapByUser(String userId) {
-		return R.data(service.mapByUser(Func.toLongList(userId)));
-	}
+    @Override
+    @GetMapping(MAP_BY_USER)
+    public R<Map<Long, String>> mapByUser(List<Long> userIdList) {
+        return R.data(service.mapByUser(userIdList));
+    }
 }

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

@@ -20,14 +20,17 @@ package org.springblade.system.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.mapper.UserMapper;
 import org.springblade.system.user.service.IUserSearchService;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -67,7 +70,18 @@ public class UserSearchServiceImpl extends BaseServiceImpl<UserMapper, User> imp
 
     @Override
     public Map<Long, String> mapByUser(List<Long> idList) {
-        List<User> list = lambdaQuery().select(User::getId, User::getName).in(User::getId, idList).list();
+        if (idList == null) {
+            return new HashMap<>();
+        }
+
+        idList = idList.stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
+
+        if (idList.size() == 0) {
+            return new HashMap<>();
+        }
+
+        List<User> list = lambdaQuery().select(BaseEntity::getId, User::getName).in(User::getId, idList).list();
         return list.stream().collect(Collectors.toMap(User::getId, User::getName));
     }
+
 }

hx-entity/iot-management-entity/pom.xml → hx-api/iot-management-api/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-entity</artifactId>
+        <artifactId>hx-api</artifactId>
         <groupId>com.fjhx</groupId>
         <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>iot-management-entity</artifactId>
+    <artifactId>iot-management-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-entity/iot-management-entity/src/main/java/com/fjhx/bom/entity/Bom.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/bom/Bom.java

@@ -1,4 +1,4 @@
-package com.fjhx.bom.entity;
+package com.fjhx.entity.bom;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.Version;
@@ -44,6 +44,11 @@ public class Bom extends BaseEntity {
     private Integer currentEdition;
 
     /**
+     * bom说明
+     */
+    private String introduce;
+
+    /**
      * 备注
      */
     private String remarks;

hx-entity/iot-management-entity/src/main/java/com/fjhx/bom/entity/BomDetails.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/bom/BomDetails.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/classif/entity/Classif.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/classif/Classif.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/material/entity/Material.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/material/Material.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.entity;
+package com.fjhx.entity.material;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

hx-entity/iot-management-entity/src/main/java/com/fjhx/product/entity/Product.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/product/Product.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/production/entity/ProductionLine.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionLine.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/workshop/entity/Workshop.java → hx-api/iot-management-api/src/main/java/com/fjhx/entity/workshop/Workshop.java

@@ -1,4 +1,4 @@
-package com.fjhx.workshop.entity;
+package com.fjhx.entity.workshop;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

hx-api/iot-management-api/src/main/java/com/fjhx/enums/bom/BomTypeEnum.java

@@ -0,0 +1,20 @@
+package com.fjhx.enums.bom;
+
+import lombok.Getter;
+
+@Getter
+public enum BomTypeEnum {
+
+    PRODUCT_TYPE(1, "产品BOM"),
+    MATERIAL_TYPE(2, "包装BOM");
+
+    private final Integer code;
+
+    private final String message;
+
+    BomTypeEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}

hx-entity/iot-management-entity/src/main/java/com/fjhx/classif/enums/ClassifTypeEnum.java → hx-api/iot-management-api/src/main/java/com/fjhx/enums/classif/ClassifTypeEnum.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/bom/vo/BomDetailsVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/bom/BomDetailsVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.bom.vo;
+package com.fjhx.params.bom;
 
-import com.fjhx.bom.entity.BomDetails;
+import com.fjhx.entity.bom.BomDetails;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-entity/iot-management-entity/src/main/java/com/fjhx/bom/vo/BomVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/bom/BomVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.bom.vo;
+package com.fjhx.params.bom;
 
-import com.fjhx.bom.entity.Bom;
+import com.fjhx.entity.bom.Bom;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,4 +14,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class BomVo extends Bom {
 
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+
 }

hx-entity/iot-management-entity/src/main/java/com/fjhx/classif/vo/ClassifVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/classif/ClassifVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.classif.vo;
+package com.fjhx.params.classif;
 
-import com.fjhx.classif.entity.Classif;
+import com.fjhx.entity.classif.Classif;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-entity/iot-management-entity/src/main/java/com/fjhx/material/ex/MaterialEx.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/material/MaterialEx.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/material/vo/MaterialVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/material/MaterialVo.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/product/vo/ProductVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/product/ProductVo.java

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

hx-entity/iot-management-entity/src/main/java/com/fjhx/production/ex/ProductionLineEx.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionLineEx.java

@@ -1,6 +1,6 @@
-package com.fjhx.production.ex;
+package com.fjhx.params.production;
 
-import com.fjhx.production.entity.ProductionLine;
+import com.fjhx.entity.production.ProductionLine;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-entity/iot-management-entity/src/main/java/com/fjhx/production/vo/ProductionLineVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionLineVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.production.vo;
+package com.fjhx.params.production;
 
-import com.fjhx.production.entity.ProductionLine;
+import com.fjhx.entity.production.ProductionLine;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-entity/iot-management-entity/src/main/java/com/fjhx/workshop/ex/WorkshopEx.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/workshop/WorkshopEx.java

@@ -1,6 +1,6 @@
-package com.fjhx.workshop.ex;
+package com.fjhx.params.workshop;
 
-import com.fjhx.workshop.entity.Workshop;
+import com.fjhx.entity.workshop.Workshop;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-entity/iot-management-entity/src/main/java/com/fjhx/workshop/vo/WorkshopVo.java → hx-api/iot-management-api/src/main/java/com/fjhx/params/workshop/WorkshopVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.workshop.vo;
+package com.fjhx.params.workshop;
 
-import com.fjhx.workshop.entity.Workshop;
+import com.fjhx.entity.workshop.Workshop;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-entity/pom.xml → hx-api/pom.xml

@@ -9,7 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hx-entity</artifactId>
+    <artifactId>hx-api</artifactId>
+
+    <packaging>pom</packaging>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -19,10 +21,8 @@
         <bladex.version>2.8.2.RELEASE</bladex.version>
     </properties>
 
-    <packaging>pom</packaging>
-
     <modules>
-        <module>iot-management-entity</module>
+        <module>iot-management-api</module>
     </modules>
 
     <dependencyManagement>

hx-common/hx-tool/src/main/java/com/fjhx/fileUpload/FileBaseEntity.java

@@ -0,0 +1,9 @@
+package com.fjhx.fileUpload;
+
+import com.fjhx.base.BaseEntity;
+
+public class FileBaseEntity extends BaseEntity {
+
+
+
+}

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

@@ -17,10 +17,11 @@ public class HxUtils {
      * @param list list
      * @return 用 , 拼接list的数组
      */
-    public static String ListToStr(List<?> list) {
+    public static String listToStr(List<?> list) {
         StringJoiner joiner = new StringJoiner(",");
         list.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList())
                 .forEach(item -> joiner.add(item.toString()));
+
         return joiner.toString();
     }
 

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

@@ -1,6 +1,5 @@
 package com.fjhx.utils.feign;
 
-import com.fjhx.utils.HxUtils;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.SpringUtil;
@@ -9,6 +8,9 @@ import org.springblade.system.user.feign.IUserSearchClient;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class UserClientUtil {
 
@@ -21,11 +23,30 @@ public class UserClientUtil {
      * @return MAP<用户id, 用户名称>
      */
     public static Map<Long, String> getUserNameMap(List<Long> userIdList) {
-        R<Map<Long, String>> r = userSearchClient.mapByUser(HxUtils.ListToStr(userIdList));
+        R<Map<Long, String>> r = userSearchClient.mapByUser(userIdList);
         if (r.getCode() == ResultCode.SUCCESS.getCode()) {
             return r.getData();
         }
         return new HashMap<>();
     }
 
+    /**
+     * 通过userId获取
+     *
+     * @param list   数组
+     * @param mapper Lambda方法
+     * @return MAP<用户id, 用户名称>
+     */
+    public static <T> Map<Long, String> getUserNameMap(List<T> list, Function<? super T, ? extends Long> mapper) {
+
+        List<Long> userIdList = list.stream().map(mapper).distinct().filter(Objects::nonNull).collect(Collectors.toList());
+
+        R<Map<Long, String>> r = userSearchClient.mapByUser(userIdList);
+
+        if (r.getCode() != ResultCode.SUCCESS.getCode()) {
+            return new HashMap<>();
+        }
+        return r.getData();
+    }
+
 }

hx-feign/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>fjhx-cloud</artifactId>
-        <groupId>com.fjhx</groupId>
-        <version>3.2.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hx-feign</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
-</project>

hx-serve/iot-management/pom.xml

@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>iot-management-entity</artifactId>
+            <artifactId>iot-management-api</artifactId>
         </dependency>
 
     </dependencies>

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

@@ -1,10 +1,10 @@
 package com.fjhx.bom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.bom.entity.Bom;
-import com.fjhx.bom.vo.BomVo;
+import com.fjhx.entity.bom.Bom;
 import com.fjhx.bom.service.BomService;
+import com.fjhx.params.bom.BomVo;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,31 +29,31 @@ public class BomController {
     private BomService bomService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
-        Page<Bom> result = bomService.getPage(condition);
+    public R page(@RequestBody Map<String, Object> condition) {
+        Page<BomVo> result = bomService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody BomVo bomVo){
+    public R add(@RequestBody BomVo bomVo) {
         bomService.add(bomVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody BomVo bomVo){
+    public R edit(@RequestBody BomVo bomVo) {
         bomService.edit(bomVo);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody BomVo bomVo){
+    public R delete(@RequestBody BomVo bomVo) {
         bomService.delete(bomVo);
         return R.success();
     }
 
     @PostMapping("/detail")
-    public R detail(@RequestBody BomVo bomVo){
+    public R detail(@RequestBody BomVo bomVo) {
         Bom result = bomService.detail(bomVo);
         return R.success(result);
     }

hx-serve/iot-management/src/main/java/com/fjhx/bom/controller/BomDetailsController.java

@@ -2,8 +2,8 @@ package com.fjhx.bom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.core.tool.api.R;
-import com.fjhx.bom.entity.BomDetails;
-import com.fjhx.bom.vo.BomDetailsVo;
+import com.fjhx.entity.bom.BomDetails;
+import com.fjhx.params.bom.BomDetailsVo;
 import com.fjhx.bom.service.BomDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-serve/iot-management/src/main/java/com/fjhx/bom/mapper/BomDetailsMapper.java

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

hx-serve/iot-management/src/main/java/com/fjhx/bom/mapper/BomMapper.java

@@ -1,7 +1,11 @@
 package com.fjhx.bom.mapper;
 
-import com.fjhx.bom.entity.Bom;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.bom.Bom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.params.bom.BomVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BomMapper extends BaseMapper<Bom> {
 
+    Page<BomVo> getPage(@Param("page") Page<Bom> page, @Param("ew") QueryWrapper<?> wrapper);
+
 }

hx-serve/iot-management/src/main/java/com/fjhx/bom/mapper/BomMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.bom.mapper.BomMapper">
 
+    <select id="getPage" resultType="com.fjhx.params.bom.BomVo">
+        select b.id,
+               b.edition,
+               b.introduce,
+               b.update_user,
+               b.update_time,
+               p.id   productId,
+               p.name productName,
+               p.code productCode
+        from bom b
+                 inner join product p on b.product_id = p.id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>

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

@@ -1,8 +1,8 @@
 package com.fjhx.bom.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.bom.entity.BomDetails;
-import com.fjhx.bom.vo.BomDetailsVo;
+import com.fjhx.entity.bom.BomDetails;
+import com.fjhx.params.bom.BomDetailsVo;
 import com.fjhx.base.BaseService;
 
 import java.util.Map;

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

@@ -1,8 +1,8 @@
 package com.fjhx.bom.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.bom.entity.Bom;
-import com.fjhx.bom.vo.BomVo;
+import com.fjhx.entity.bom.Bom;
+import com.fjhx.params.bom.BomVo;
 import com.fjhx.base.BaseService;
 
 import java.util.Map;
@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface BomService extends BaseService<Bom> {
 
-    Page<Bom> getPage(Map<String, Object> condition);
+    Page<BomVo> getPage(Map<String, Object> condition);
 
     void add(BomVo bomVo);
 

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.utils.WrapperUtil;
-import com.fjhx.bom.entity.BomDetails;
-import com.fjhx.bom.vo.BomDetailsVo;
+import com.fjhx.entity.bom.BomDetails;
+import com.fjhx.params.bom.BomDetailsVo;
 import com.fjhx.bom.mapper.BomDetailsMapper;
 import com.fjhx.bom.service.BomDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -1,14 +1,16 @@
 package com.fjhx.bom.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
-import com.fjhx.bom.entity.Bom;
-import com.fjhx.bom.vo.BomVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.bom.Bom;
+import com.fjhx.enums.bom.BomTypeEnum;
 import com.fjhx.bom.mapper.BomMapper;
 import com.fjhx.bom.service.BomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.params.bom.BomVo;
+import com.fjhx.constants.CommonConstant;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.utils.feign.UserClientUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -25,20 +27,29 @@ import java.util.Map;
 public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomService {
 
     @Override
-    public Page<Bom> getPage(Map<String, Object> condition) {
+    public Page<BomVo> getPage(Map<String, Object> condition) {
 
-        QueryWrapper<Bom> wrapper = Wrappers.query();
+        QueryWrapper<?> wrapper = WrapperUtil.init(condition)
+                .eq("p.classif_id", "classifId") // 分类查询
+                .keyword("p.name", "p.code") // 关键字查询
+                .eqTenantId("b") // 租户id
+                .getWrapper();
 
-        WrapperUtil.init(condition, wrapper)
-                .eqTenantId()
-                .createTimeDesc();
+        wrapper.eq("b.type", BomTypeEnum.PRODUCT_TYPE.getCode()); // 产品bom
+        wrapper.eq("b.current_edition", CommonConstant.YES); // 当前版本
+        wrapper.orderByAsc("p.code"); // 产品编码排序
 
-        Page<Bom> page = page(condition, wrapper);
-        return page;
+        Page<BomVo> result = baseMapper.getPage(createPage(condition), wrapper);
+
+        // 赋值最后修改人
+        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(result.getRecords(), Bom::getUpdateUser);
+        result.getRecords().forEach(item -> item.setUpdateUserName(userNameMap.get(item.getUpdateUser())));
+        return result;
     }
 
     @Override
     public void add(BomVo bomVo) {
+
         save(bomVo);
     }
 

hx-serve/iot-management/src/main/java/com/fjhx/classif/controller/ClassifController.java

@@ -1,8 +1,8 @@
 package com.fjhx.classif.controller;
 
-import com.fjhx.classif.entity.Classif;
+import com.fjhx.entity.classif.Classif;
 import com.fjhx.classif.service.ClassifService;
-import com.fjhx.classif.vo.ClassifVo;
+import com.fjhx.params.classif.ClassifVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-serve/iot-management/src/main/java/com/fjhx/classif/mapper/ClassifMapper.java

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

hx-serve/iot-management/src/main/java/com/fjhx/classif/service/ClassifService.java

@@ -1,8 +1,8 @@
 package com.fjhx.classif.service;
 
 import com.fjhx.base.BaseService;
-import com.fjhx.classif.entity.Classif;
-import com.fjhx.classif.vo.ClassifVo;
+import com.fjhx.entity.classif.Classif;
+import com.fjhx.params.classif.ClassifVo;
 
 import java.util.List;
 import java.util.Map;

hx-serve/iot-management/src/main/java/com/fjhx/classif/service/impl/ClassifServiceImpl.java

@@ -2,14 +2,14 @@ package com.fjhx.classif.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.classif.entity.Classif;
-import com.fjhx.classif.enums.ClassifTypeEnum;
+import com.fjhx.entity.classif.Classif;
+import com.fjhx.enums.classif.ClassifTypeEnum;
 import com.fjhx.classif.mapper.ClassifMapper;
 import com.fjhx.classif.service.ClassifService;
-import com.fjhx.classif.vo.ClassifVo;
-import com.fjhx.material.entity.Material;
+import com.fjhx.params.classif.ClassifVo;
+import com.fjhx.entity.material.Material;
 import com.fjhx.material.service.MaterialService;
-import com.fjhx.product.entity.Product;
+import com.fjhx.entity.product.Product;
 import com.fjhx.product.service.ProductService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.TreeUtil;

hx-serve/iot-management/src/main/java/com/fjhx/material/controller/MaterialController.java

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

hx-serve/iot-management/src/main/java/com/fjhx/material/mapper/MaterialMapper.java

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

hx-serve/iot-management/src/main/java/com/fjhx/material/service/MaterialService.java

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

hx-serve/iot-management/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java

@@ -10,10 +10,10 @@ import com.fjhx.classif.service.ClassifService;
 import com.fjhx.constants.CommonConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.lock.IotManagementLockConstant;
-import com.fjhx.material.entity.Material;
+import com.fjhx.entity.material.Material;
 import com.fjhx.material.mapper.MaterialMapper;
 import com.fjhx.material.service.MaterialService;
-import com.fjhx.material.vo.MaterialVo;
+import com.fjhx.params.material.MaterialVo;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;
@@ -58,7 +58,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         Object classifId = condition.get("classifId");
         if (ObjectUtil.isNotEmpty(classifId)) {
             List<Long> childrenIdList = classifService.getChildrenIdList(Long.valueOf(classifId.toString()));
-            wrapper.in("classifId", childrenIdList);
+            wrapper.in("classif_id", childrenIdList);
         }
 
         Page<Material> page = page(condition, wrapper);

hx-serve/iot-management/src/main/java/com/fjhx/product/controller/ProductController.java

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

hx-serve/iot-management/src/main/java/com/fjhx/product/mapper/ProductMapper.java

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

hx-serve/iot-management/src/main/java/com/fjhx/product/service/ProductService.java

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

hx-serve/iot-management/src/main/java/com/fjhx/product/service/impl/ProductServiceImpl.java

@@ -9,10 +9,10 @@ import com.fjhx.base.BaseEntity;
 import com.fjhx.classif.service.ClassifService;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.lock.IotManagementLockConstant;
-import com.fjhx.product.entity.Product;
+import com.fjhx.entity.product.Product;
 import com.fjhx.product.mapper.ProductMapper;
 import com.fjhx.product.service.ProductService;
-import com.fjhx.product.vo.ProductVo;
+import com.fjhx.params.product.ProductVo;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;
@@ -52,7 +52,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         Object classifId = condition.get("classifId");
         if (ObjectUtil.isNotEmpty(classifId)) {
             List<Long> childrenIdList = classifService.getChildrenIdList(Long.valueOf(classifId.toString()));
-            wrapper.in("classifId", childrenIdList);
+            wrapper.in("classif_id", childrenIdList);
         }
 
         Page<Product> page = page(condition, wrapper);

hx-serve/iot-management/src/main/java/com/fjhx/production/controller/ProductionLineController.java

@@ -1,10 +1,10 @@
 package com.fjhx.production.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.production.entity.ProductionLine;
-import com.fjhx.production.ex.ProductionLineEx;
+import com.fjhx.entity.production.ProductionLine;
+import com.fjhx.params.production.ProductionLineEx;
 import com.fjhx.production.service.ProductionLineService;
-import com.fjhx.production.vo.ProductionLineVo;
+import com.fjhx.params.production.ProductionLineVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-serve/iot-management/src/main/java/com/fjhx/production/mapper/ProductionLineMapper.java

@@ -2,9 +2,9 @@ package com.fjhx.production.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.production.entity.ProductionLine;
+import com.fjhx.entity.production.ProductionLine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.production.ex.ProductionLineEx;
+import com.fjhx.params.production.ProductionLineEx;
 import org.apache.ibatis.annotations.Param;
 
 /**

hx-serve/iot-management/src/main/java/com/fjhx/production/mapper/ProductionLineMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.production.mapper.ProductionLineMapper">
 
-    <select id="getPage" resultType="com.fjhx.production.ex.ProductionLineEx">
+    <select id="getPage" resultType="com.fjhx.params.production.ProductionLineEx">
         select pl.id,
                pl.workshop_id,
                pl.name,

hx-serve/iot-management/src/main/java/com/fjhx/production/service/ProductionLineService.java

@@ -2,9 +2,9 @@ package com.fjhx.production.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
-import com.fjhx.production.entity.ProductionLine;
-import com.fjhx.production.ex.ProductionLineEx;
-import com.fjhx.production.vo.ProductionLineVo;
+import com.fjhx.entity.production.ProductionLine;
+import com.fjhx.params.production.ProductionLineEx;
+import com.fjhx.params.production.ProductionLineVo;
 
 import java.util.Map;
 

hx-serve/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionLineServiceImpl.java

@@ -3,11 +3,11 @@ package com.fjhx.production.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.production.entity.ProductionLine;
-import com.fjhx.production.ex.ProductionLineEx;
+import com.fjhx.entity.production.ProductionLine;
+import com.fjhx.params.production.ProductionLineEx;
 import com.fjhx.production.mapper.ProductionLineMapper;
 import com.fjhx.production.service.ProductionLineService;
-import com.fjhx.production.vo.ProductionLineVo;
+import com.fjhx.params.production.ProductionLineVo;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 

hx-serve/iot-management/src/main/java/com/fjhx/workshop/controller/WorkshopController.java

@@ -1,10 +1,10 @@
 package com.fjhx.workshop.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.workshop.entity.Workshop;
-import com.fjhx.workshop.ex.WorkshopEx;
+import com.fjhx.entity.workshop.Workshop;
+import com.fjhx.params.workshop.WorkshopEx;
 import com.fjhx.workshop.service.WorkshopService;
-import com.fjhx.workshop.vo.WorkshopVo;
+import com.fjhx.params.workshop.WorkshopVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-serve/iot-management/src/main/java/com/fjhx/workshop/mapper/WorkshopMapper.java

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

hx-serve/iot-management/src/main/java/com/fjhx/workshop/service/WorkshopService.java

@@ -1,9 +1,9 @@
 package com.fjhx.workshop.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.workshop.entity.Workshop;
-import com.fjhx.workshop.ex.WorkshopEx;
-import com.fjhx.workshop.vo.WorkshopVo;
+import com.fjhx.entity.workshop.Workshop;
+import com.fjhx.params.workshop.WorkshopEx;
+import com.fjhx.params.workshop.WorkshopVo;
 import com.fjhx.base.BaseService;
 
 import java.util.List;

hx-serve/iot-management/src/main/java/com/fjhx/workshop/service/impl/WorkshopServiceImpl.java

@@ -8,11 +8,11 @@ import com.fjhx.base.BaseEntity;
 import com.fjhx.utils.HxBeanUtil;
 import com.fjhx.utils.WrapperUtil;
 import com.fjhx.utils.feign.UserClientUtil;
-import com.fjhx.workshop.entity.Workshop;
-import com.fjhx.workshop.ex.WorkshopEx;
+import com.fjhx.entity.workshop.Workshop;
+import com.fjhx.params.workshop.WorkshopEx;
 import com.fjhx.workshop.mapper.WorkshopMapper;
 import com.fjhx.workshop.service.WorkshopService;
-import com.fjhx.workshop.vo.WorkshopVo;
+import com.fjhx.params.workshop.WorkshopVo;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 

hx-serve/pom.xml

@@ -45,7 +45,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>iot-management-entity</artifactId>
+                <artifactId>iot-management-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

pom.xml

@@ -11,9 +11,8 @@
     <modules>
         <module>bladex</module>
         <module>bladex-tool</module>
+        <module>hx-api</module>
         <module>hx-common</module>
-        <module>hx-feign</module>
-        <module>hx-entity</module>
         <module>hx-serve</module>
     </modules>
     <packaging>pom</packaging>