Merge branch 'dev' into de_wangfs_202511

王富生
2 parents 0d47d0fb 11e7e889
Showing 5 changed files with 161 additions and 7 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java
urbanops-module-workorder/pom.xml
@@ -4,9 +4,32 @@ package com.zteits.urbanops.module.garden.enums;
 import com.zteits.urbanops.framework.common.exception.ErrorCode;
 /**
- * ERP 错误码枚举类
- * <p>
- * erp 系统，使用 1-100-000-000 段
+ * 一共10位 分四段
+ * 第一段： 1位，类型
+ *        1 - 业务模块
+ *        2 - 框架模块
+ * 第二段：3位， 系统类型
+ *      001 - 用户系统
+ *      002 - 商品系统
+ *      003 - 订单系统
+ *      004 - 支付系统
+ *      005 - 优惠卷系统
+ *      100 - 园林系统
+ * 第三段：3位， 模块
+ *      001 - 派单
+ *      002 - 派单
+ *      003 - 人机材
+ *      004 - 物料
+ *      005 - 古树
+ *      006 - 养护
+ *      007 - 巡检
+ *      010 - 12345
+ *
+ * 第四段：3位， 错误码
+ *       不限规则，每个模块自增
+ *
+ *
+ * garden系统，使用 1-100-000-000 段
  */
 public interface ErrorCodeConstants {
@@ -33,7 +56,7 @@ public interface ErrorCodeConstants {
     ErrorCode COST_FEE_NOT_EXISTS_001 = new ErrorCode(1-100-003-001, "未找到对应的导入类");
     // ========== 部门费用费用 ==========
-    ErrorCode DEPARTMENT_COST_NOT_EXISTS_01 = new ErrorCode(1-100-003-001, "部门费用为空");
+    ErrorCode DEPARTMENT_COST_NOT_EXISTS = new ErrorCode(1-100-003-001, "部门费用为空");
     // ========== 人员费用 ==========
     ErrorCode PERSONAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-002, "人员费用为空");
@@ -90,7 +90,7 @@ public class DepartmentCostServiceImpl implements DepartmentCostService {
     private void validateDepartmentCostExists(Long id) {
         if (departmentCostMapper.selectById(id) == null) {
-            throw exception(DEPARTMENT_COST_NOT_EXISTS_01);
+            throw exception(DEPARTMENT_COST_NOT_EXISTS);
         }
     }
@@ -19,7 +19,7 @@ import java.util.List;
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.MATERIAL_INVENTORY_NOT_EXISTS;
+import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 /**
  * 物料库存 Service 实现类
@@ -19,7 +19,7 @@ import java.util.List;
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.MATERIAL_INVENTORY_OUT_NOT_EXISTS;
+import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 /**
  * 物料出库 Service 实现类
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.zteits.boot</groupId>
+        <artifactId>urbanops</artifactId>
+        <version>${revision}</version> <!-- 1. 修改 version 为 ${revision} -->
+    </parent>
+
+    <artifactId>urbanops-module-workorder</artifactId>
+    <packaging>jar</packaging> <!-- 2. 新增 packaging 为 jar -->
+    <name>${project.artifactId}</name> <!-- 3. 新增 name 为 ${project.artifactId} -->
+
+    <description>
+        工单管理模块 园林 市政 物业
+    </description>
+
+    <dependencies>
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId> <!-- 代码生成器，使用它解析表结构 -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-redis</artifactId>
+        </dependency>
+
+        <!-- Config 配置中心相关 -->
+
+        <!-- Job 定时任务相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-job</artifactId>
+        </dependency>
+
+        <!-- 消息队列相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-mq</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId> <!-- 实现代码生成 -->
+        </dependency>
+
+        <!-- OkHttp 用于设备接口对接 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.9</version>
+        </dependency>
+
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-spring-boot-starter-monitor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
+            <optional>true</optional>
+        </dependency>
+
+        <!-- 三方云服务相关 -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId> <!-- 文件客户端：解决 ftp 连接 -->
+        </dependency>
+        <dependency>
+            <groupId>com.github.mwiede</groupId>
+            <artifactId>jsch</artifactId> <!-- 文件客户端：解决 sftp 连接 -->
+        </dependency>
+        <!-- 文件客户端：解决阿里云、腾讯云、minio 等 S3 连接 -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId> <!-- 文件客户端：文件类型的识别 -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.zteits.boot</groupId>
+            <artifactId>urbanops-module-system</artifactId>
+            <version>${revision}</version>
+        </dependency>
+    </dependencies>
+
+</project>