修改pom.xml优化

hx-api/pom.xml

@@ -49,12 +49,6 @@
                 <version>${hx.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>iot-management-entity</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 

hx-common/code-generator/pom.xml

@@ -28,7 +28,6 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <version>2.3</version>
         </dependency>
 
         <!-- mysql数据库驱动 -->
@@ -43,7 +42,6 @@
             <artifactId>hx-tool</artifactId>
         </dependency>
 
-
     </dependencies>
 
 </project>

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

@@ -20,6 +20,10 @@ import java.util.HashMap;
  * 后端代码生成工具
  * <p>
  * 只为代码生成，不被任何模块关联
+ * <p>
+ * 使用：创建generator同级文件夹modular
+ * 赋值public static字段
+ * 执行execute()方法
  */
 public class CodeGenerator {
 

hx-common/pom.xml

@@ -24,6 +24,7 @@
         <bladex.version>2.8.2.RELEASE</bladex.version>
         <hx.version>3.2.0</hx.version>
         <hutool.version>5.8.3</hutool.version>
+        <velocity.version>2.3</velocity.version>
     </properties>
 
     <dependencyManagement>
@@ -37,10 +38,9 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- blade -->
             <dependency>
-                <groupId>org.springblade.platform</groupId>
-                <artifactId>blade-bom</artifactId>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-common</artifactId>
                 <version>${bladex.version}</version>
             </dependency>
 
@@ -50,22 +50,24 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <!-- hutool 工具包 -->
             <dependency>
-                <groupId>org.springblade</groupId>
-                <artifactId>blade-user-api</artifactId>
-                <version>${bladex.version}</version>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool.version}</version>
             </dependency>
 
+            <!-- myBatis-plus代码自动生成模板引擎 -->
             <dependency>
-                <groupId>org.springblade</groupId>
-                <artifactId>blade-common</artifactId>
-                <version>${bladex.version}</version>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>${velocity.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool.version}</version>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-user-api</artifactId>
+                <version>${bladex.version}</version>
             </dependency>
 
         </dependencies>

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

@@ -1,33 +0,0 @@
-package com.fjhx.material.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
-import com.fjhx.material.service.MaterialService;
-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-04
- */
-@RestController
-@RequestMapping("/material")
-public class MaterialController {
-
-    @Autowired
-    private MaterialService materialService;
-
-
-}
-

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

@@ -1,16 +0,0 @@
-package com.fjhx.material.mapper;
-
-import com.fjhx.entity.material.Material;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 物料 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-07-04
- */
-public interface MaterialMapper extends BaseMapper<Material> {
-
-}

hx-serve/storage/src/main/java/com/fjhx/material/mapper/MaterialMapper.xml

@@ -1,5 +0,0 @@
-<?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>

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

@@ -1,21 +0,0 @@
-package com.fjhx.material.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 物料 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-04
- */
-public interface MaterialService extends BaseService<Material> {
-
-
-}

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

@@ -1,28 +0,0 @@
-package com.fjhx.material.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.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
-import com.fjhx.material.mapper.MaterialMapper;
-import com.fjhx.material.service.MaterialService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * <p>
- * 物料 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-07-04
- */
-@Service
-public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
-
-
-}

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

@@ -20,7 +20,7 @@ import java.util.Map;
  * @since 2022-07-04
  */
 @RestController
-@RequestMapping("/stockWater")
+@RequestMapping("/cloudApi/stockWater")
 public class StockWaterController {
 
     @Autowired