分模块，移包

jeecg-module-system/jeecg-system-start/pom.xml

@@ -24,12 +24,32 @@
             <artifactId>jeecg-module-demo</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
-        <!-- jeecg_module_ems 模块 -->
+
+        <!-- 运维module_cmms -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>module_cmms</artifactId>
+            <version>${jeecgboot.version}</version>
+        </dependency>
+        <!-- module_tpm 模块 -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>module_tpm</artifactId>
+            <version>${jeecgboot.version}</version>
+        </dependency>
+        <!-- module_base 模块 -->
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg_module_ems</artifactId>
+            <artifactId>module_base</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
+        <!-- module_ems 模块 -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>module_ems</artifactId>
+            <version>${jeecgboot.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

jeecg_module_ems/pom.xml

@@ -9,13 +9,17 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jeecg_module_ems</artifactId>
+    <artifactId>module_base</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-biz</artifactId>
+        </dependency>
 
         <!--  mapstruct      -->
         <dependency>
@@ -23,7 +27,6 @@
             <artifactId>lombok-mapstruct-binding</artifactId>
             <version>0.2.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
@@ -34,10 +37,6 @@
             <artifactId>mapstruct-processor</artifactId>
             <version>${mapstruct.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-system-biz</artifactId>
-        </dependency>
     </dependencies>
 
     <properties>

jeecg_module_ems/src/main/java/org/jeecg/modules/baseSpace/controller/SpaceController.java

@@ -1,37 +1,33 @@
 package org.jeecg.modules.baseSpace.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.system.vo.SelectTreeModel;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.baseSpace.convert.SpaceConvert;
 import org.jeecg.modules.baseSpace.entity.Space;
 import org.jeecg.modules.baseSpace.service.ISpaceService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecg.modules.baseSpace.vo.SpaceTreeNodeVO;
-import org.jeecg.modules.tpmEquipmentTree.convert.TpmEquipmentTreeConvert;
-import org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree;
-import org.jeecg.modules.tpmEquipmentTree.vo.TpmEquipmentTreeNodeVO;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
  * @Description: 空间管理
  * @Author: jeecg-boot
  * @Date:   2024-01-10
@@ -220,7 +216,7 @@ public class SpaceController extends JeecgController<Space, ISpaceService>{
 	 */
 	@AutoLog(value = "空间管理-添加")
 	@ApiOperation(value="空间管理-添加", notes="空间管理-添加")
-    //@RequiresPermissions("org.jeecg.modules:ems_space:add")
+    //@RequiresPermissions("org.jeecg.modules:base_space:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Space space) {
 		//自动生成区域编码
@@ -239,7 +235,7 @@ public class SpaceController extends JeecgController<Space, ISpaceService>{
 	 */
 	@AutoLog(value = "空间管理-编辑")
 	@ApiOperation(value="空间管理-编辑", notes="空间管理-编辑")
-    //@RequiresPermissions("org.jeecg.modules:ems_space:edit")
+    //@RequiresPermissions("org.jeecg.modules:base_space:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Space space) {
 		//自动生成区域编码
@@ -258,7 +254,7 @@ public class SpaceController extends JeecgController<Space, ISpaceService>{
 	 */
 	@AutoLog(value = "空间管理-通过id删除")
 	@ApiOperation(value="空间管理-通过id删除", notes="空间管理-通过id删除")
-    //@RequiresPermissions("org.jeecg.modules:ems_space:delete")
+    //@RequiresPermissions("org.jeecg.modules:base_space:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		spaceService.deleteSpace(id);
@@ -273,7 +269,7 @@ public class SpaceController extends JeecgController<Space, ISpaceService>{
 	 */
 	@AutoLog(value = "空间管理-批量删除")
 	@ApiOperation(value="空间管理-批量删除", notes="空间管理-批量删除")
-    //@RequiresPermissions("org.jeecg.modules:ems_space:deleteBatch")
+    //@RequiresPermissions("org.jeecg.modules:base_space:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.spaceService.removeByIds(Arrays.asList(ids.split(",")));
@@ -303,7 +299,7 @@ public class SpaceController extends JeecgController<Space, ISpaceService>{
     * @param request
     * @param space
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_space:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:base_space:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Space space) {
 		return super.exportXls(request, space, Space.class, "空间管理");
@@ -316,7 +312,7 @@ public class SpaceController extends JeecgController<Space, ISpaceService>{
     * @param response
     * @return
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_space:importExcel")
+    //@RequiresPermissions("org.jeecg.modules:base_space:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		return super.importExcel(request, response, Space.class);

jeecg_module_ems/src/main/java/org/jeecg/modules/baseSpace/entity/Space.java

@@ -20,8 +20,8 @@ import io.swagger.annotations.ApiModelProperty;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_space")
-@ApiModel(value="ems_space对象", description="空间管理")
+@TableName("base_space")
+@ApiModel(value="base_space对象", description="空间管理")
 public class Space implements Serializable {
     private static final long serialVersionUID = 1L;
 

jeecg_module_ems/src/main/java/org/jeecg/modules/baseSpace/mapper/xml/SpaceMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.baseSpace.mapper.SpaceMapper">
 
 	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
-		update ems_space set has_child = #{status} where id = #{id}
+		update base_space set has_child = #{status} where id = #{id}
 	</update>
 
   	<!-- 【vue3专用】 -->
@@ -13,7 +13,7 @@
 		  name as "title",
 		  (case when has_child = '1' then 0 else 1 end) as isLeaf,
 		  parentid as parentId
-		from ems_space
+		from base_space
 		where parentid = #{pid}
 		<if test="query != null">
 			<foreach collection="query.entrySet()" item="value" index="key">

jeecg_module_ems/src/main/java/org/jeecg/modules/baseSpace/service/impl/SpaceServiceImpl.java

@@ -11,7 +11,6 @@ import org.jeecg.modules.baseSpace.entity.Space;
 import org.jeecg.modules.baseSpace.mapper.SpaceMapper;
 import org.jeecg.modules.baseSpace.service.ISpaceService;
 import org.jeecg.modules.baseSpace.vo.SpaceTreeNodeVO;
-import org.jeecg.modules.tpmEquipmentTree.convert.TpmEquipmentTreeConvert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

module_cmms/pom.xml

@@ -0,0 +1,58 @@
+<?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>jeecg-boot-parent</artifactId>
+        <groupId>org.jeecgframework.boot</groupId>
+        <version>3.4.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>module_cmms</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>module_base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>module_tpm</artifactId>
+        </dependency>
+
+        <!--  mapstruct      -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+            <version>0.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-biz</artifactId>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <!-- 版本依赖 -->
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>