Merge remote-tracking branch 'origin/dev' into dev

base-server/src/main/resources/application-dev.yml

@@ -105,7 +105,3 @@ justauth:
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
-erp:
-   address: hana-dev.yncic.com
-   sapsys: ZTDEV203
-

base-server/src/main/resources/application.yml

@@ -114,8 +114,8 @@ zt:
       - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
       - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
   swagger:
-    title: 管理后台
+    title: Base 模块
-    description: 提供管理员管理的所有功能
+    description: 提供基础管理模块的所有功能
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true

deployment.yaml

@@ -61,7 +61,13 @@ spec:
   selector:
     app: base-server
   ports:
-    - protocol: TCP
+    - name: http
+      protocol: TCP
       port: 48100
       targetPort: 48100
       nodePort: 30097
+    - name: xxl-job
+      protocol: TCP
+      port: 9999
+      targetPort: 9999
+      nodePort: 30197

pom.xml

@@ -20,7 +20,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.39</revision>
+        <revision>3.0.42</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -212,6 +212,12 @@
                 <config.namespace>liss</config.namespace>
             </properties>
         </profile>
+        <profile>
+            <id>qsj</id>
+            <properties>
+                <config.namespace>qsj</config.namespace>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/BaseApi.java

@@ -0,0 +1,26 @@
+package com.zt.plat.module.api;
+
+import com.zt.plat.module.api.dto.AccountDTO;
+import com.zt.plat.module.api.dto.MaterialOtherDTO;
+import com.zt.plat.module.base.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - base")
+public interface BaseApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/base";
+
+    @GetMapping(PREFIX + "/getAccountNoPage")
+    @Operation(summary = "账户条款数据不分页查询")
+    List<AccountDTO> getAccountNoPage(AccountDTO respVO);
+
+    @GetMapping(PREFIX + "/getMaterialOtherNoPage")
+    @Operation(summary = "物料拓展关系数据不分页查询")
+    List<MaterialOtherDTO> getMaterialOtherNoPage(MaterialOtherDTO respVO);
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/AccountDTO.java

@@ -0,0 +1,35 @@
+package com.zt.plat.module.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "RPC 服务 DTO")
+@Data
+public class AccountDTO {
+    private Long id;
+
+    private String type;
+
+    private String accountName;
+
+    private String bankAccount;
+
+    private String accountNumber;
+
+    private String taxNumber;
+
+    private LocalDateTime createTime;
+
+    private String isEnable;
+
+    private String customerNumber;
+
+    private String customerName;
+
+    private String address;
+
+    private String phone;
+
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/api/dto/MaterialOtherDTO.java

@@ -0,0 +1,53 @@
+package com.zt.plat.module.api.dto;
+
+import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 物料拓展数据分页 Request VO")
+@Data
+public class MaterialOtherDTO extends PageParam {
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "物料名称", example = "王五")
+    private String materialName;
+
+    @Schema(description = "ERP物料编码")
+    private String erpMaterialNumber;
+
+    @Schema(description = "ERP物料名称", example = "李四")
+    private String erpMaterialName;
+
+    @Schema(description = "ERP物料计量单位")
+    private String unit;
+
+    @Schema(description = "金属元素缩写")
+    private String abbreviation;
+
+    @Schema(description = "金属元素名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "金属元素编码")
+    private String coding;
+
+    @Schema(description = "品位单位")
+    private String gradeUnit;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "小数位数")
+    private Long decimalValue;
+
+    @Schema(description = "是否启用")
+    private String isEnable;
+
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ApiConstants.java

@@ -0,0 +1,24 @@
+package com.zt.plat.module.base.enums;
+
+import com.zt.plat.framework.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author ZT
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "base-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/base";
+
+    public static final String VERSION = "1.0.0";
+
+    public static final String TABLE_FIELD_SPLY_ERP_CPN_NUM = "NUM";
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/enums/ErrorCodeConstants.java

@@ -4,9 +4,7 @@ import com.zt.plat.framework.common.exception.ErrorCode;
 
 /**
  * base 错误码枚举类
- *
  * base 系统，使用 1-xxx-xxx-xxx 段
- *
  * @author ZT
  */
 public interface ErrorCodeConstants {
@@ -21,5 +19,14 @@ public interface ErrorCodeConstants {
     ErrorCode COMPANY_RELATIVITY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
     ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
     ErrorCode FACTORY_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
+    ErrorCode TAX_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
+
+
+    ErrorCode BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_027_100_001, "规则模型不存在");
+    ErrorCode BUSINESS_ALGORITHM_NOT_EXISTS  = new ErrorCode(1_027_100_002, "算法模型不存在");
+    ErrorCode BUSINESS_DIMENSION_NOT_EXISTS = new ErrorCode(1_027_200_001, "经营指标维度不存在");
+    ErrorCode BUSINESS_INDICATOR_NOT_EXISTS = new ErrorCode(1_027_200_002, "经营指标不存在");
+    ErrorCode BUSINESS_DICTIONARY_TYPE_NOT_EXISTS = new ErrorCode(1_027_200_003, "业务字典类型不存在");
+    ErrorCode BUSINESS_DEPARTMENT_INDICATOR_NOT_EXISTS = new ErrorCode(1_027_200_004, "部门持有指标不存在");
 
 }

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/DeleteStatusEnum.java

@@ -7,7 +7,8 @@ public enum DeleteStatusEnum {
 
     STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
-    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>());
+    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>(){{add(TmplStsEnum.STOPPED.getCode());}}),
+    STATUS_START(TmplStsEnum.START.getCode(), new HashSet<>());
 
 
     private final String code;