模块优化

文件工具类

hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java

@@ -79,7 +79,7 @@ public class CodeGenerator {
 
         // 包配置
         PackageConfig pc = new PackageConfig();
-        pc.setParent(parent);// 包路径
+        pc.setParent(parent + ".serve");// 包路径
         pc.setModuleName(moduleName); //模块名
         pc.setService("service");
         pc.setServiceImpl("service.impl");

hx-common/file-tool/pom.xml

@@ -0,0 +1,26 @@
+<?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-common</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>file-tool</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-tool</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

hx-common/file-tool/src/main/java/com/fjhx/controller/FileInfoController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.FileInfo;
+import com.fjhx.params.FileInfoVo;
+import com.fjhx.service.FileInfoService;
+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;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 文件 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+@RestController
+@RequestMapping("/fileInfo")
+public class FileInfoController {
+
+    @Autowired
+    private FileInfoService fileInfoService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition) {
+        Page<FileInfo> result = fileInfoService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody FileInfoVo fileInfoVo) {
+        fileInfoService.add(fileInfoVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody FileInfoVo fileInfoVo) {
+        fileInfoService.edit(fileInfoVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody FileInfoVo fileInfoVo) {
+        fileInfoService.delete(fileInfoVo);
+        return R.success();
+    }
+
+}
+

hx-common/file-tool/src/main/java/com/fjhx/entity/FileInfo.java

@@ -0,0 +1,61 @@
+package com.fjhx.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 文件
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FileInfo extends BaseEntity {
+
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件后缀
+     */
+    private String fileSuffix;
+
+    /**
+     * 文件类型
+     */
+    private Integer fileType;
+
+    /**
+     * 文件大小
+     */
+    private Long fileSize;
+
+    /**
+     * 业务id
+     */
+    private Long businessId;
+
+    /**
+     * 业务类型
+     */
+    private Integer businessType;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-common/file-tool/src/main/java/com/fjhx/mapper/FileInfoMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.entity.FileInfo;
+
+/**
+ * <p>
+ * 文件 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+public interface FileInfoMapper extends BaseMapper<FileInfo> {
+
+}

hx-serve/iot-management/src/main/java/com/fjhx/bom/mapper/BomDetailsMapper.xml → hx-common/file-tool/src/main/java/com/fjhx/mapper/FileInfoMapper.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.bom.mapper.BomDetailsMapper">
+<mapper namespace="com.fjhx.mapper.FileInfoMapper">
 
 </mapper>

hx-common/file-tool/src/main/java/com/fjhx/params/FileInfoEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params;
+
+import com.fjhx.entity.FileInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文件
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FileInfoEx extends FileInfo {
+
+}

hx-common/file-tool/src/main/java/com/fjhx/params/FileInfoVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params;
+
+import com.fjhx.entity.FileInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文件
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FileInfoVo extends FileInfo {
+
+}

hx-common/file-tool/src/main/java/com/fjhx/service/FileInfoService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.FileInfo;
+import com.fjhx.params.FileInfoVo;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 文件 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+public interface FileInfoService extends BaseService<FileInfo> {
+
+    Page<FileInfo> getPage(Map<String, String> condition);
+
+    void add(FileInfoVo fileInfoVo);
+
+    void edit(FileInfoVo fileInfoVo);
+
+    void delete(FileInfoVo fileInfoVo);
+
+}

hx-common/file-tool/src/main/java/com/fjhx/service/impl/FileInfoServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.FileInfo;
+import com.fjhx.mapper.FileInfoMapper;
+import com.fjhx.params.FileInfoVo;
+import com.fjhx.service.FileInfoService;
+import com.fjhx.utils.WrapperUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 文件 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-07
+ */
+@Service
+public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements FileInfoService {
+
+    @Override
+    public Page<FileInfo> getPage(Map<String, String> condition) {
+
+        QueryWrapper<FileInfo> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<FileInfo> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(FileInfoVo fileInfoVo) {
+        save(fileInfoVo);
+    }
+
+    @Override
+    public void edit(FileInfoVo fileInfoVo) {
+        updateById(fileInfoVo);
+    }
+
+    @Override
+    public void delete(FileInfoVo fileInfoVo) {
+        removeById(fileInfoVo.getId());
+    }
+
+}

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

@@ -29,10 +29,25 @@ public interface BaseService<T> extends IService<T> {
      * 获取分页
      */
     default Page<T> createPage(Map<String, String> condition) {
-        int pageNum = (condition.get("pageNum") == null || condition.get("pageNum").equals("")) ?
-                1 : Integer.parseInt(String.valueOf(condition.get("pageNum")));
-        int pageSize = (condition.get("pageSize") == null || condition.get("pageSize").equals("")) ?
-                10 : Integer.parseInt(String.valueOf(condition.get("pageSize")));
+        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);
+    }
+
+    /**
+     * 获取分页
+     */
+    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);
     }
 

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

@@ -23,6 +23,10 @@ public class UserClientUtil {
      * @return MAP<用户id, 用户名称>
      */
     public static Map<Long, String> getUserNameMap(List<Long> userIdList) {
+        if (userIdList == null || userIdList.size() == 0) {
+            return new HashMap<>();
+        }
+
         R<Map<Long, String>> r = userSearchClient.mapByUser(userIdList);
         if (r.getCode() == ResultCode.SUCCESS.getCode()) {
             return r.getData();
@@ -38,15 +42,10 @@ public class UserClientUtil {
      * @return MAP<用户id, 用户名称>
      */
     public static <T> Map<Long, String> getUserNameMapFunctionLong(List<T> list, Function<T, 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();
+        List<Long> userIdList = list.stream().map(mapper)
+                .distinct().filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        return getUserNameMap(userIdList);
     }
 
     /**
@@ -61,17 +60,12 @@ public class UserClientUtil {
         List<List<Long>> userIdsList = list.stream().map(mapper).collect(Collectors.toList());
 
         List<Long> userIdList = new ArrayList<>();
-        for (List<Long> item : userIdsList) {
-            userIdList.addAll(item);
-        }
-        userIdList = userIdList.stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
 
-        R<Map<Long, String>> r = userSearchClient.mapByUser(userIdList);
+        userIdsList.forEach(userIdList::addAll);
 
-        if (r.getCode() != ResultCode.SUCCESS.getCode()) {
-            return new HashMap<>();
-        }
-        return r.getData();
+        userIdList = userIdList.stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
+
+        return getUserNameMap(userIdList);
     }
 
 }

hx-common/pom.xml

@@ -15,6 +15,7 @@
     <modules>
         <module>code-generator</module>
         <module>hx-tool</module>
+        <module>file-tool</module>
     </modules>
 
     <properties>

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

@@ -1,8 +1,8 @@
-package com.fjhx.bom.controller;
+package com.fjhx.serve.bom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.bom.Bom;
-import com.fjhx.bom.service.BomService;
+import com.fjhx.serve.bom.service.BomService;
 import com.fjhx.params.bom.BomVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.bom.mapper;
+package com.fjhx.serve.bom.mapper;
 
 import com.fjhx.entity.bom.BomDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-serve/product-library/src/main/java/com/fjhx/classify/mapper/ClassifyMapper.xml → hx-serve/iot-management/src/main/java/com/fjhx/serve/bom/mapper/BomDetailsMapper.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.serve.bom.mapper.BomDetailsMapper">
 
 </mapper>

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

@@ -1,4 +1,4 @@
-package com.fjhx.bom.mapper;
+package com.fjhx.serve.bom.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-serve/iot-management/src/main/java/com/fjhx/bom/mapper/BomMapper.xml → hx-serve/iot-management/src/main/java/com/fjhx/serve/bom/mapper/BomMapper.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.bom.mapper.BomMapper">
+<mapper namespace="com.fjhx.serve.bom.mapper.BomMapper">
 
     <select id="getPage" resultType="com.fjhx.params.bom.BomVo">
         select b.id,

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

@@ -1,4 +1,4 @@
-package com.fjhx.bom.service;
+package com.fjhx.serve.bom.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.bom.BomDetails;

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

@@ -1,4 +1,4 @@
-package com.fjhx.bom.service;
+package com.fjhx.serve.bom.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.bom.Bom;

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

@@ -1,4 +1,4 @@
-package com.fjhx.bom.service.impl;
+package com.fjhx.serve.bom.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.utils.WrapperUtil;
 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.fjhx.serve.bom.mapper.BomDetailsMapper;
+import com.fjhx.serve.bom.service.BomDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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

@@ -1,10 +1,10 @@
-package com.fjhx.bom.service.impl;
+package com.fjhx.serve.bom.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.bom.mapper.BomMapper;
-import com.fjhx.bom.service.BomService;
+import com.fjhx.serve.bom.mapper.BomMapper;
+import com.fjhx.serve.bom.service.BomService;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.bom.Bom;
 import com.fjhx.enums.bom.BomTypeEnum;

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

@@ -1,9 +1,8 @@
-package com.fjhx.production.controller;
+package com.fjhx.serve.production.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.production.ProductionLine;
 import com.fjhx.params.production.ProductionLineEx;
-import com.fjhx.production.service.ProductionLineService;
+import com.fjhx.serve.production.service.ProductionLineService;
 import com.fjhx.params.production.ProductionLineVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,11 +52,5 @@ public class ProductionLineController {
         return R.success();
     }
 
-    @PostMapping("/detail")
-    public R detail(@RequestBody ProductionLineVo productionLineVo) {
-        ProductionLine result = productionLineService.detail(productionLineVo);
-        return R.success(result);
-    }
-
 }
 

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

@@ -1,4 +1,4 @@
-package com.fjhx.production.mapper;
+package com.fjhx.serve.production.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-serve/iot-management/src/main/java/com/fjhx/production/mapper/ProductionLineMapper.xml → hx-serve/iot-management/src/main/java/com/fjhx/serve/production/mapper/ProductionLineMapper.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.production.mapper.ProductionLineMapper">
+<mapper namespace="com.fjhx.serve.production.mapper.ProductionLineMapper">
 
     <select id="getPage" resultType="com.fjhx.params.production.ProductionLineEx">
         select pl.id,

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

@@ -1,4 +1,4 @@
-package com.fjhx.production.service;
+package com.fjhx.serve.production.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
@@ -26,6 +26,4 @@ public interface ProductionLineService extends BaseService<ProductionLine> {
 
     void delete(ProductionLineVo productionLineVo);
 
-    ProductionLine detail(ProductionLineVo productionLineVo);
-
 }

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

@@ -1,12 +1,12 @@
-package com.fjhx.production.service.impl;
+package com.fjhx.serve.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.entity.production.ProductionLine;
 import com.fjhx.params.production.ProductionLineEx;
-import com.fjhx.production.mapper.ProductionLineMapper;
-import com.fjhx.production.service.ProductionLineService;
+import com.fjhx.serve.production.mapper.ProductionLineMapper;
+import com.fjhx.serve.production.service.ProductionLineService;
 import com.fjhx.params.production.ProductionLineVo;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
@@ -52,10 +52,4 @@ public class ProductionLineServiceImpl extends ServiceImpl<ProductionLineMapper,
         removeById(productionLineVo.getId());
     }
 
-    @Override
-    public ProductionLine detail(ProductionLineVo productionLineVo) {
-        ProductionLine result = getById(productionLineVo.getId());
-        return result;
-    }
-
 }

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

@@ -1,9 +1,9 @@
-package com.fjhx.workshop.controller;
+package com.fjhx.serve.workshop.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.workshop.Workshop;
 import com.fjhx.params.workshop.WorkshopEx;
-import com.fjhx.workshop.service.WorkshopService;
+import com.fjhx.serve.workshop.service.WorkshopService;
 import com.fjhx.params.workshop.WorkshopVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,12 +54,6 @@ public class WorkshopController {
         return R.success();
     }
 
-    @PostMapping("/detail")
-    public R detail(@RequestBody WorkshopVo workshopVo) {
-        Workshop result = workshopService.detail(workshopVo);
-        return R.success(result);
-    }
-
     @PostMapping("/list")
     public R list() {
         List<Workshop> result = workshopService.getList();

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

@@ -1,4 +1,4 @@
-package com.fjhx.workshop.mapper;
+package com.fjhx.serve.workshop.mapper;
 
 import com.fjhx.entity.workshop.Workshop;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-serve/iot-management/src/main/java/com/fjhx/workshop/mapper/WorkshopMapper.xml → hx-serve/iot-management/src/main/java/com/fjhx/serve/workshop/mapper/WorkshopMapper.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.workshop.mapper.WorkshopMapper">
+<mapper namespace="com.fjhx.serve.workshop.mapper.WorkshopMapper">
 
 </mapper>

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

@@ -1,4 +1,4 @@
-package com.fjhx.workshop.service;
+package com.fjhx.serve.workshop.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.workshop.Workshop;
@@ -27,8 +27,6 @@ public interface WorkshopService extends BaseService<Workshop> {
 
     void delete(WorkshopVo workshopVo);
 
-    Workshop detail(WorkshopVo workshopVo);
-
     List<Workshop> getList();
 
 }

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

@@ -1,4 +1,4 @@
-package com.fjhx.workshop.service.impl;
+package com.fjhx.serve.workshop.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -11,8 +11,8 @@ import com.fjhx.params.workshop.WorkshopVo;
 import com.fjhx.utils.HxBeanUtil;
 import com.fjhx.utils.WrapperUtil;
 import com.fjhx.utils.feign.UserClientUtil;
-import com.fjhx.workshop.mapper.WorkshopMapper;
-import com.fjhx.workshop.service.WorkshopService;
+import com.fjhx.serve.workshop.mapper.WorkshopMapper;
+import com.fjhx.serve.workshop.service.WorkshopService;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 
@@ -70,12 +70,6 @@ public class WorkshopServiceImpl extends ServiceImpl<WorkshopMapper, Workshop> i
     }
 
     @Override
-    public Workshop detail(WorkshopVo workshopVo) {
-        Workshop result = getById(workshopVo.getId());
-        return result;
-    }
-
-    @Override
     public List<Workshop> getList() {
         return lambdaQuery()
                 .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())

hx-api/product-library-api/src/main/java/com/fjhx/constant/LockConstant.java → hx-serve/product-library/src/main/java/com/fjhx/constant/LockConstant.java

@@ -6,7 +6,7 @@ package com.fjhx.constant;
 public interface LockConstant {
 
     /**
-     * 添加前缀，防止其他模块出现公用一把锁的情况
+     * 添加前缀，防止其他模块出现共用一把锁的情况
      */
     String PREFIX = "productLibrary-";
 

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.classify.mapper;
+package com.fjhx.serve.classify.mapper;
 
 import com.fjhx.entity.classify.Classify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-serve/product-library/src/main/java/com/fjhx/serve/classify/mapper/ClassifyMapper.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.serve.classify.mapper.ClassifyMapper">
+
+</mapper>

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

@@ -1,4 +1,4 @@
-package com.fjhx.classify.service;
+package com.fjhx.serve.classify.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.classify.Classify;

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

@@ -1,17 +1,17 @@
-package com.fjhx.classify.service.impl;
+package com.fjhx.serve.classify.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.classify.mapper.ClassifyMapper;
-import com.fjhx.classify.service.ClassifyService;
+import com.fjhx.serve.classify.mapper.ClassifyMapper;
+import com.fjhx.serve.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.material.service.MaterialService;
+import com.fjhx.serve.material.service.MaterialService;
 import com.fjhx.params.classify.ClassifyVo;
-import com.fjhx.product.service.ProductService;
+import com.fjhx.serve.product.service.ProductService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.TreeUtil;
 import org.springblade.core.secure.utils.AuthUtil;

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.material.mapper;
+package com.fjhx.serve.material.mapper;
 
 import com.fjhx.entity.material.Material;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-serve/product-library/src/main/java/com/fjhx/material/mapper/MaterialMapper.xml → hx-serve/product-library/src/main/java/com/fjhx/serve/material/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.serve.material.mapper.MaterialMapper">
 
     <select id="getUnitList" resultType="java.lang.String">
         select distinct m.unit

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

@@ -1,4 +1,4 @@
-package com.fjhx.material.service;
+package com.fjhx.serve.material.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;

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

@@ -1,4 +1,4 @@
-package com.fjhx.material.service.impl;
+package com.fjhx.serve.material.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.serve.classify.service.ClassifyService;
 import com.fjhx.constant.LockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.material.Material;
-import com.fjhx.material.mapper.MaterialMapper;
-import com.fjhx.material.service.MaterialService;
+import com.fjhx.serve.material.mapper.MaterialMapper;
+import com.fjhx.serve.material.service.MaterialService;
 import com.fjhx.params.material.MaterialVo;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;

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

@@ -1,9 +1,9 @@
-package com.fjhx.product.controller;
+package com.fjhx.serve.product.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.serve.product.service.ProductService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -1,4 +1,4 @@
-package com.fjhx.product.mapper;
+package com.fjhx.serve.product.mapper;
 
 import com.fjhx.entity.product.Product;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-serve/product-library/src/main/java/com/fjhx/product/mapper/ProductMapper.xml → hx-serve/product-library/src/main/java/com/fjhx/serve/product/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.serve.product.mapper.ProductMapper">
 
     <select id="getUnitList" resultType="java.lang.String">
         select distinct p.unit

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

@@ -1,4 +1,4 @@
-package com.fjhx.product.service;
+package com.fjhx.serve.product.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.product.Product;

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

@@ -1,4 +1,4 @@
-package com.fjhx.product.service.impl;
+package com.fjhx.serve.product.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.serve.classify.service.ClassifyService;
 import com.fjhx.constant.LockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.product.Product;
 import com.fjhx.params.product.ProductVo;
-import com.fjhx.product.mapper.ProductMapper;
-import com.fjhx.product.service.ProductService;
+import com.fjhx.serve.product.mapper.ProductMapper;
+import com.fjhx.serve.product.service.ProductService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;

hx-serve/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java → hx-serve/storage/src/main/java/com/fjhx/serve/stock/controller/StockWaterController.java

@@ -1,7 +1,7 @@
-package com.fjhx.stock.controller;
+package com.fjhx.serve.stock.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.stock.service.StockWaterService;
+import com.fjhx.serve.stock.service.StockWaterService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-serve/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java → hx-serve/storage/src/main/java/com/fjhx/serve/stock/mapper/StockWaterMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.stock.mapper;
+package com.fjhx.serve.stock.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-serve/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml → hx-serve/storage/src/main/java/com/fjhx/serve/stock/mapper/StockWaterMapper.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.stock.mapper.StockWaterMapper">
+<mapper namespace="com.fjhx.serve.stock.mapper.StockWaterMapper">
 
     <select id="getPickingStatistics" resultType="java.util.Map">
         select uu.id                                                    userId,

hx-serve/storage/src/main/java/com/fjhx/stock/service/StockWaterService.java → hx-serve/storage/src/main/java/com/fjhx/serve/stock/service/StockWaterService.java

@@ -1,4 +1,4 @@
-package com.fjhx.stock.service;
+package com.fjhx.serve.stock.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.StockWater;

hx-serve/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java → hx-serve/storage/src/main/java/com/fjhx/serve/stock/service/impl/StockWaterServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.stock.service.impl;
+package com.fjhx.serve.stock.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -6,8 +6,8 @@ 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.entity.stock.StockWater;
-import com.fjhx.stock.mapper.StockWaterMapper;
-import com.fjhx.stock.service.StockWaterService;
+import com.fjhx.serve.stock.service.StockWaterService;
+import com.fjhx.serve.stock.mapper.StockWaterMapper;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;