修改包名

hx-common/client-util/pom.xml

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

hx-common/pom.xml

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

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

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

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

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

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

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

hx-service-api/pom.xml

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

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

@@ -3,7 +3,7 @@ package com.fjhx.constant;
 /**
  * 锁常量
  */
-public interface LockConstant {
+public interface ProductLibraryLockConstant {
 
     /**
      * 添加前缀，防止其他模块出现共用一把锁的情况

hx-service-api/storage-api/src/main/java/com/fjhx/entity/material/Material.java

@@ -1,183 +0,0 @@
-package com.fjhx.entity.material;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 物料
- * </p>
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class Material extends BaseEntity {
-
-
-    /**
-     * 软删除
-     */
-    @TableField("IsDelete")
-    private Boolean isdelete;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date createdtime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("UpdatedTime")
-    private Date updatedtime;
-
-    /**
-     * 物料名称
-     */
-    @TableField("Name")
-    private String name;
-
-    /**
-     * 编码
-     */
-    @TableField("Code")
-    private String code;
-
-    /**
-     * 克重
-     */
-    @TableField("UnitWeight")
-    private Float unitweight;
-
-    /**
-     * 单位编号
-     */
-    @TableField("MaterialUnitID")
-    private String materialunitid;
-
-    /**
-     * 库存单位id
-     */
-    @TableField("StockUnitID")
-    private String stockunitid;
-
-    /**
-     * 门幅
-     */
-    @TableField("Width")
-    private Float width;
-
-    /**
-     * 分类
-     */
-    @TableField("CategoryCode")
-    private String categorycode;
-
-    /**
-     * 安全库存
-     */
-    @TableField("SafetyStock")
-    private Integer safetystock;
-
-    /**
-     * 定时任务自动生成申购单时间
-     */
-    @TableField("AutoTaskTime")
-    private Date autotasktime;
-
-    /**
-     * 抽检⽐例
-     */
-    @TableField("CheckRate")
-    private BigDecimal checkrate;
-
-    /**
-     * 安全预警天数/采购周期
-     */
-    @TableField("SafetyWarnDay")
-    private Integer safetywarnday;
-
-    /**
-     * 规格
-     */
-    @TableField("Spec")
-    private String spec;
-
-    /**
-     * 放置区域
-     */
-    @TableField("PlaceAreaIds")
-    private String placeareaids;
-
-    /**
-     * 滞留周期（天）
-     */
-    @TableField("DelayPeriod")
-    private Integer delayperiod;
-
-    /**
-     * 维护人员
-     */
-    @TableField("CreateUser")
-    private String createuser;
-
-    /**
-     * 组织架构
-     */
-    @TableField("OR_ID")
-    private String orId;
-
-    /**
-     * 物料其他编码（模糊搜索使用）
-     */
-    @TableField("OtherCode")
-    private String othercode;
-
-    /**
-     * 备注
-     */
-    @TableField("Remark")
-    private String remark;
-
-    /**
-     * 标准价格
-     */
-    @TableField("Price")
-    private BigDecimal price;
-
-    /**
-     * 标准库存
-     */
-    @TableField("StockStandard")
-    private BigDecimal stockstandard;
-
-    /**
-     * 单位数量
-     */
-    @TableField("UnitNum")
-    private BigDecimal unitnum;
-
-    /**
-     * 用途
-     */
-    @TableField("Purpose")
-    private String purpose;
-
-    /**
-     * 工艺类型 （枚举定义：0=直喷，1=热转，2=打纸，3=墨水，4=其他）
-     */
-    @TableField("TechnologyType")
-    private Integer technologytype;
-
-
-}

hx-service-api/storage-api/src/main/java/com/fjhx/entity/u/UUser.java

@@ -1,125 +0,0 @@
-package com.fjhx.entity.u;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <p>
- * 管理员
- * </p>
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Data
-public class UUser {
-
-
-    /**
-     * 软删除
-     */
-    @TableField("IsDelete")
-    private Boolean isDelete;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CreatedTime")
-    private Date createdTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("UpdatedTime")
-    private Date updatedTime;
-
-    /**
-     * 手机号码
-     */
-    @TableField("Mobile")
-    private String mobile;
-
-    /**
-     * 真实姓名
-     */
-    @TableField("RealName")
-    private String realName;
-
-    /**
-     * 部门ID
-     */
-    @TableField("DepartmentIDStr")
-    private String departmentIdStr;
-
-    /**
-     * 用户状态 是否离职
-     */
-    @TableField("IsQuit")
-    private Boolean isQuit;
-
-    /**
-     * 离职时间
-     */
-    @TableField("QuitTime")
-    private Date quitTime;
-
-    @TableField("IsSuperAdmin")
-    private Boolean isSuperAdmin;
-
-    /**
-     * 工号
-     */
-    @TableField("JobNo")
-    private String jobNo;
-
-    /**
-     * 身份证
-     */
-    @TableField("IDCard")
-    private String idCard;
-
-    /**
-     * 是否是负责人
-     */
-    @TableField("IsLeader")
-    private Boolean isLeader;
-
-    /**
-     * 人脸照片
-     */
-    @TableField("FaceImagUrl")
-    private String faceImagUrl;
-
-    /**
-     * 第三方人脸id
-     */
-    @TableField("FaceID")
-    private String faceId;
-
-    /**
-     * 用户状态 是否在线可接单
-     */
-    @TableField("IsOnLine")
-    private Boolean isOnLine;
-
-    /**
-     * 性别 （枚举定义：0=未知，1=男，2=女）
-     */
-    @TableField("SexCode")
-    private Integer sexCode;
-
-    /**
-     * 角色ID
-     */
-    @TableField("RoleKey")
-    private String roleKey;
-
-    /**
-     * 部门ID
-     */
-    @TableField("DepartmentID")
-    private String departmentId;
-    
-}

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/MaterialEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.material;
-
-import com.fjhx.entity.material.Material;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 物料
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MaterialEx extends Material {
-
-}

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/MaterialVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.material;
-
-import com.fjhx.entity.material.Material;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 物料
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MaterialVo extends Material {
-
-}

hx-service-api/storage-api/src/main/java/com/fjhx/params/u/UUserEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.u;
-
-import com.fjhx.entity.u.UUser;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 管理员
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UUserEx extends UUser {
-
-}

hx-service-api/storage-api/src/main/java/com/fjhx/params/u/UUserVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.u;
-
-import com.fjhx.entity.u.UUser;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 管理员
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UUserVo extends UUser {
-
-}

hx-service/file-serve/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_serve.dev.url}
-    username: ${blade.datasource.file_serve.dev.username}
-    password: ${blade.datasource.file_serve.dev.password}

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

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

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

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

hx-service/file-serve/src/main/java/com/fjhx/FileServeApplication.java → hx-service/file-service/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-serve";
+    private static final String APP_NAME = "file-service";
 
     public static void main(String[] args) {
         BladeApplication.run(APP_NAME, FileServeApplication.class, args);

hx-service/file-service/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.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

@@ -0,0 +1,12 @@
+# 服务器端口
+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-serve-api</artifactId>
+            <artifactId>file-service-api</artifactId>
         </dependency>
 
     </dependencies>

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

@@ -1,8 +1,8 @@
-package com.fjhx.serve.bom.controller;
+package com.fjhx.bom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.bom.Bom;
-import com.fjhx.serve.bom.service.BomService;
+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;

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

@@ -1,10 +1,10 @@
-package com.fjhx.serve.bom.controller;
+package com.fjhx.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.serve.bom.service.BomDetailsService;
+import com.fjhx.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-service/iot-management/src/main/java/com/fjhx/serve/bom/mapper/BomDetailsMapper.java → hx-service/iot-management/src/main/java/com/fjhx/bom/mapper/BomDetailsMapper.java

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

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

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

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

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

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

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

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

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

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

@@ -1,13 +1,13 @@
-package com.fjhx.serve.bom.service.impl;
+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.bom.mapper.BomDetailsMapper;
 import com.fjhx.utils.WrapperUtil;
 import com.fjhx.entity.bom.BomDetails;
 import com.fjhx.params.bom.BomDetailsVo;
-import com.fjhx.serve.bom.mapper.BomDetailsMapper;
-import com.fjhx.serve.bom.service.BomDetailsService;
+import com.fjhx.bom.service.BomDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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

@@ -1,8 +1,9 @@
-package com.fjhx.serve.bom.service.impl;
+package com.fjhx.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.utils.FileClientUtil;
 import com.fjhx.utils.UserClientUtil;
 import com.fjhx.constants.StatusConstant;
@@ -10,8 +11,7 @@ import com.fjhx.entity.bom.Bom;
 import com.fjhx.enums.bom.BomTypeEnum;
 import com.fjhx.params.FileInfoParam;
 import com.fjhx.params.bom.BomVo;
-import com.fjhx.serve.bom.mapper.BomMapper;
-import com.fjhx.serve.bom.service.BomService;
+import com.fjhx.bom.service.BomService;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,8 +1,8 @@
-package com.fjhx.serve.production.controller;
+package com.fjhx.production.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.params.production.ProductionLineEx;
-import com.fjhx.serve.production.service.ProductionLineService;
+import com.fjhx.production.service.ProductionLineService;
 import com.fjhx.params.production.ProductionLineVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;

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

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

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

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

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

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

@@ -1,12 +1,12 @@
-package com.fjhx.serve.production.service.impl;
+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.entity.production.ProductionLine;
 import com.fjhx.params.production.ProductionLineEx;
-import com.fjhx.serve.production.mapper.ProductionLineMapper;
-import com.fjhx.serve.production.service.ProductionLineService;
+import com.fjhx.production.mapper.ProductionLineMapper;
+import com.fjhx.production.service.ProductionLineService;
 import com.fjhx.params.production.ProductionLineVo;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;

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

@@ -1,9 +1,9 @@
-package com.fjhx.serve.workshop.controller;
+package com.fjhx.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.serve.workshop.service.WorkshopService;
+import com.fjhx.workshop.service.WorkshopService;
 import com.fjhx.params.workshop.WorkshopVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.serve.workshop.service.impl;
+package com.fjhx.workshop.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -9,8 +9,8 @@ import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.workshop.Workshop;
 import com.fjhx.params.workshop.WorkshopEx;
 import com.fjhx.params.workshop.WorkshopVo;
-import com.fjhx.serve.workshop.mapper.WorkshopMapper;
-import com.fjhx.serve.workshop.service.WorkshopService;
+import com.fjhx.workshop.mapper.WorkshopMapper;
+import com.fjhx.workshop.service.WorkshopService;
 import com.fjhx.utils.HxBeanUtil;
 import com.fjhx.utils.WrapperUtil;
 import org.springblade.core.secure.utils.AuthUtil;

hx-service/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.serve.material.service.impl;
+package com.fjhx.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.serve.classify.service.ClassifyService;
-import com.fjhx.constant.LockConstant;
+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.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;
@@ -89,7 +89,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         String tenantId = AuthUtil.getTenantId();
 
         // 保证每个租户物料编码唯一
-        Boolean flag = redisLockClient.lockFair(LockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
+        Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
                 () -> {
                     // 判断物料编码不是唯一的
                     materialCodeOnly(tenantId, materialVo.getCode(), null);
@@ -105,7 +105,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         String tenantId = AuthUtil.getTenantId();
 
         // 保证每个租户物料编码唯一
-        Boolean flag = redisLockClient.lockFair(LockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
+        Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
                 () -> {
                     // 判断物料编码不是唯一的
                     materialCodeOnly(tenantId, materialVo.getCode(), materialVo.getId());

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

@@ -1,9 +1,9 @@
-package com.fjhx.serve.product.controller;
+package com.fjhx.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.serve.product.service.ProductService;
+import com.fjhx.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-service/product-library/src/main/java/com/fjhx/serve/product/mapper/ProductMapper.java → hx-service/product-library/src/main/java/com/fjhx/product/mapper/ProductMapper.java

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.serve.product.service.impl;
+package com.fjhx.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.serve.classify.service.ClassifyService;
-import com.fjhx.constant.LockConstant;
+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.serve.product.mapper.ProductMapper;
-import com.fjhx.serve.product.service.ProductService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import lombok.RequiredArgsConstructor;
@@ -64,7 +64,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         Assert.notEmpty(productVo.getCode(), "产品编码不能为空");
 
         String tenantId = AuthUtil.getTenantId();
-        Boolean flag = redisLockClient.lockFair(LockConstant.PRODUCT_CODE_ONLY_LOCK + tenantId, () -> {
+        Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.PRODUCT_CODE_ONLY_LOCK + tenantId, () -> {
             productCodeOnly(tenantId, productVo.getCode(), null);
             save(productVo);
             return true;
@@ -76,7 +76,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     public void edit(ProductVo productVo) {
         Assert.notEmpty(productVo.getId(), "产品id不能为空");
         String tenantId = AuthUtil.getTenantId();
-        Boolean flag = redisLockClient.lockFair(LockConstant.PRODUCT_CODE_ONLY_LOCK + tenantId, () -> {
+        Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.PRODUCT_CODE_ONLY_LOCK + tenantId, () -> {
             productCodeOnly(tenantId, productVo.getCode(), productVo.getId());
             updateById(productVo);
             return true;

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

@@ -1,7 +1,7 @@
-package com.fjhx.serve.stock.controller;
+package com.fjhx.stock.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.serve.stock.service.StockWaterService;
+import com.fjhx.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-service/storage/src/main/java/com/fjhx/serve/stock/mapper/StockWaterMapper.java → hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.fjhx.serve.stock.service.impl;
+package com.fjhx.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.serve.stock.service.StockWaterService;
-import com.fjhx.serve.stock.mapper.StockWaterMapper;
+import com.fjhx.stock.mapper.StockWaterMapper;
+import com.fjhx.stock.service.StockWaterService;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;