From 8304dbac297f7ba8f4551ee94ae05339a015436b Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Sat, 24 Aug 2024 20:56:11 +0800
Subject: [PATCH] --8--24
---
.../{ => constants}/EngineMaintenance.java | 2 +-
.../domain/{ => constants}/EngineVersion.java | 2 +-
.../domain/{ => constants}/PageResult.java | 2 +-
.../muyu/domain/{ => constants}/Result.java | 3 +-
.../com/muyu/domain/{ => constants}/Type.java | 2 +-
.../com/muyu/req/EngineVersionListResp.java | 3 +-
.../com/muyu/resp/EngineVersionListResp.java | 2 +-
.../com/muyu/controller/EngIneController.java | 4 +-
.../controller/EngineVersionController.java | 4 +-
.../com/muyu/controller/TypeController.java | 4 +-
.../java/com/muyu/mapper/EngineMapper.java | 2 +-
.../com/muyu/mapper/EngineVersionMapper.java | 2 +-
.../java/com/muyu/mapper/TypseMapper.java | 2 +-
.../java/com/muyu/service/EngIneService.java | 4 +-
.../muyu/service/EngineVersionService.java | 2 +-
.../java/com/muyu/service/TypeService.java | 4 +-
.../serviceImpl/EngIneServiceImpl.java | 9 +-
.../serviceImpl/EngineVersionServiceImpl.java | 2 +-
.../service/serviceImpl/TypeServiceImpl.java | 4 +-
.../main/resources/mapper/EngineMapper.xml | 2 +-
.../src/main/resources/mapper/TypseMapper.xml | 2 +-
logs/cloud-etl-engine/error.2024-08-22.log | 22 +-
logs/cloud-etl-engine/error.2024-08-23.log | 30 +-
logs/cloud-etl-engine/error.log | 442 ++++++++++++++++++
24 files changed, 496 insertions(+), 61 deletions(-)
rename cloud-etl-common/src/main/java/com/muyu/domain/{ => constants}/EngineMaintenance.java (99%)
rename cloud-etl-common/src/main/java/com/muyu/domain/{ => constants}/EngineVersion.java (99%)
rename cloud-etl-common/src/main/java/com/muyu/domain/{ => constants}/PageResult.java (95%)
rename cloud-etl-common/src/main/java/com/muyu/domain/{ => constants}/Result.java (96%)
rename cloud-etl-common/src/main/java/com/muyu/domain/{ => constants}/Type.java (90%)
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/EngineMaintenance.java
similarity index 99%
rename from cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java
rename to cloud-etl-common/src/main/java/com/muyu/domain/constants/EngineMaintenance.java
index 02264cc..d0730e6 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/EngineMaintenance.java
@@ -1,4 +1,4 @@
-package com.muyu.domain;
+package com.muyu.domain.constants;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/EngineVersion.java
similarity index 99%
rename from cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java
rename to cloud-etl-common/src/main/java/com/muyu/domain/constants/EngineVersion.java
index 74fe89e..8ced614 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/EngineVersion.java
@@ -1,4 +1,4 @@
-package com.muyu.domain;
+package com.muyu.domain.constants;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/PageResult.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java
similarity index 95%
rename from cloud-etl-common/src/main/java/com/muyu/domain/PageResult.java
rename to cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java
index 092678a..2f0d9ff 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/PageResult.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java
@@ -1,4 +1,4 @@
-package com.muyu.domain;
+package com.muyu.domain.constants;
import lombok.Data;
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/Result.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/Result.java
similarity index 96%
rename from cloud-etl-common/src/main/java/com/muyu/domain/Result.java
rename to cloud-etl-common/src/main/java/com/muyu/domain/constants/Result.java
index 22b08ac..fef3d63 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/Result.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/Result.java
@@ -1,6 +1,5 @@
-package com.muyu.domain;
+package com.muyu.domain.constants;
-import com.muyu.domain.constants.Constants;
import lombok.Data;
import java.io.Serializable;
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/Type.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/Type.java
similarity index 90%
rename from cloud-etl-common/src/main/java/com/muyu/domain/Type.java
rename to cloud-etl-common/src/main/java/com/muyu/domain/constants/Type.java
index 0013b45..d189dc2 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/Type.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/Type.java
@@ -1,4 +1,4 @@
-package com.muyu.domain;
+package com.muyu.domain.constants;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java
index 8296768..efbd8db 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java
@@ -1,7 +1,6 @@
package com.muyu.req;
-import com.muyu.common.core.web.domain.BaseEntity;
-import com.muyu.domain.EngineVersion;
+import com.muyu.domain.constants.EngineVersion;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java b/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java
index d27dc01..f407698 100644
--- a/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java
+++ b/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java
@@ -1,5 +1,5 @@
package com.muyu.resp;
-import com.muyu.domain.EngineVersion;
+import com.muyu.domain.constants.EngineVersion;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java
index 3ca38fc..ab547e9 100644
--- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java
+++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java
@@ -2,8 +2,8 @@ package com.muyu.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.domain.EngineMaintenance;
-import com.muyu.domain.PageResult;
+import com.muyu.domain.constants.EngineMaintenance;
+import com.muyu.domain.constants.PageResult;
import com.muyu.req.EngineMaintenanceQueryReq;
import com.muyu.req.EngineVersionListResp;
import com.muyu.service.EngIneService;
diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java
index a7f751a..e8761a2 100644
--- a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java
+++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java
@@ -2,9 +2,7 @@ package com.muyu.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.domain.EngineVersion;
-import com.muyu.domain.model.TestData;
+import com.muyu.domain.constants.EngineVersion;
import com.muyu.req.EngineVersionQueryReq;
import com.muyu.resp.EngineConfigScopeResp;
import com.muyu.service.EngineVersionService;
diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java b/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java
index fbf97ae..55f45fd 100644
--- a/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java
+++ b/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java
@@ -1,7 +1,7 @@
package com.muyu.controller;
-import com.muyu.domain.Result;
-import com.muyu.domain.Type;
+import com.muyu.domain.constants.Result;
+import com.muyu.domain.constants.Type;
import com.muyu.service.TypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java
index 9f93483..192a9a7 100644
--- a/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java
+++ b/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java
@@ -1,7 +1,7 @@
package com.muyu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.domain.EngineMaintenance;
+import com.muyu.domain.constants.EngineMaintenance;
import com.muyu.req.EngineMaintenanceQueryReq;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/EngineVersionMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/EngineVersionMapper.java
index 853e5ff..3ab6596 100644
--- a/cloud-etl-server/src/main/java/com/muyu/mapper/EngineVersionMapper.java
+++ b/cloud-etl-server/src/main/java/com/muyu/mapper/EngineVersionMapper.java
@@ -1,7 +1,7 @@
package com.muyu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.domain.EngineVersion;
+import com.muyu.domain.constants.EngineVersion;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java
index 05bb976..8f14d2a 100644
--- a/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java
+++ b/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java
@@ -1,6 +1,6 @@
package com.muyu.mapper;
-import com.muyu.domain.Type;
+import com.muyu.domain.constants.Type;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java
index d7af3b3..4bbb872 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java
@@ -2,8 +2,8 @@ package com.muyu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.core.domain.Result;
-import com.muyu.domain.EngineMaintenance;
-import com.muyu.domain.PageResult;
+import com.muyu.domain.constants.EngineMaintenance;
+import com.muyu.domain.constants.PageResult;
import com.muyu.req.EngineMaintenanceQueryReq;
import com.muyu.req.EngineVersionListResp;
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java
index ad9183f..05d78a8 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java
@@ -2,7 +2,7 @@ package com.muyu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.core.domain.Result;
-import com.muyu.domain.EngineVersion;
+import com.muyu.domain.constants.EngineVersion;
import com.muyu.resp.EngineConfigScopeResp;
import java.util.List;
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java b/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java
index 7012dbb..1683125 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java
@@ -1,7 +1,7 @@
package com.muyu.service;
-import com.muyu.domain.Result;
-import com.muyu.domain.Type;
+import com.muyu.domain.constants.Result;
+import com.muyu.domain.constants.Type;
import java.util.List;
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java
index fe92ce3..367298d 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java
@@ -1,16 +1,13 @@
package com.muyu.service.serviceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.domain.EngineMaintenance;
-import com.muyu.domain.EngineVersion;
-import com.muyu.domain.PageResult;
+import com.muyu.domain.constants.EngineMaintenance;
+import com.muyu.domain.constants.EngineVersion;
+import com.muyu.domain.constants.PageResult;
import com.muyu.mapper.EngineMapper;
import com.muyu.req.EngineMaintenanceQueryReq;
import com.muyu.req.EngineVersionListResp;
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java
index 2d4b7b3..8ff176c 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
-import com.muyu.domain.EngineVersion;
+import com.muyu.domain.constants.EngineVersion;
import com.muyu.domain.constants.ConfigCodeConstants;
import com.muyu.mapper.EngineVersionMapper;
import com.muyu.resp.EngineConfigScopeResp;
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java
index 19e4bf2..a92a52b 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java
@@ -1,7 +1,7 @@
package com.muyu.service.serviceImpl;
-import com.muyu.domain.Result;
-import com.muyu.domain.Type;
+import com.muyu.domain.constants.Result;
+import com.muyu.domain.constants.Type;
import com.muyu.mapper.TypseMapper;
import com.muyu.service.TypeService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml b/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml
index c93c5df..0fa0fec 100644
--- a/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml
+++ b/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml
@@ -37,7 +37,7 @@
delete from engine_maintenance where id = #{id}
-