1111

pom.xml

@@ -68,12 +68,6 @@
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.fdkankan</groupId>-->
-<!--            <artifactId>4dkankan-utils-fyun</artifactId>-->
-<!--            <version>3.0.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-oss</artifactId>
@@ -87,6 +81,12 @@
         </dependency>
 
         <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-model</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>

src/main/java/com/fdkankan/scene/service/ISceneService.java

@@ -1,18 +0,0 @@
-//package com.fdkankan.scene.service;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.fdkankan.common.response.ResultData;
-//import com.fdkankan.scene.vo.SceneEditParamVO;
-//import com.fdkankan.scene.vo.SceneParamVO;
-//
-///**
-// * <p>
-// * 场景表 服务类
-// * </p>
-// *
-// * @author dengsixing
-// * @since 2021-12-23
-// */
-//public interface ISceneService extends IService<Scene>
-//{
-//}

src/main/java/com/fdkankan/scene/service/impl/FileConvertServiceImpl.java

@@ -4,11 +4,11 @@ import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.UUID;
-import com.fdkankan.common.constant.ConstantFileName;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.model.constants.ConstantFileName;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.CreateObjUtil;
+import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.scene.service.IFileConvertService;
 import java.io.BufferedInputStream;
 import java.io.File;

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -12,23 +12,23 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.FileBizType;
 import com.fdkankan.common.constant.OperationType;
 import com.fdkankan.common.constant.SceneFrom;
 import com.fdkankan.common.constant.SceneInfoReqType;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.constant.UploadFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.ComputerUtil;
-import com.fdkankan.common.util.CreateHouseJsonUtil;
-import com.fdkankan.common.util.CreateObjUtil;
+import com.fdkankan.model.utils.ComputerUtil;
+import com.fdkankan.model.utils.CreateHouseJsonUtil;
+import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.SceneUtil;
+import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.fyun.constant.FYunTypeEnum;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -9,7 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.UploadFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -9,17 +9,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ConstantFileName;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.model.constants.ConstantFileName;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.FileBizType;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.constant.UploadFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.ComputerUtil;
-import com.fdkankan.common.util.ConvertUtils;
-import com.fdkankan.common.util.CreateObjUtil;
+import com.fdkankan.model.utils.ComputerUtil;
+import com.fdkankan.model.utils.ConvertUtils;
+import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.OkHttpUtils;
 import com.fdkankan.fyun.constant.FYunTypeEnum;

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -2,7 +2,7 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;

src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.constant.UploadFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.BASE64DecodedMultipartFile;