Browse Source

修改包引用

tianboguang 3 years ago
parent
commit
f7f0e5b700

+ 6 - 0
pom.xml

@@ -78,6 +78,12 @@
 
     <dependency>
       <groupId>com.fdkankan</groupId>
+      <artifactId>4dkankan-common-web</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-app-push</artifactId>
       <version>3.0.0-SNAPSHOT</version>
     </dependency>

+ 1 - 1
src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -1,8 +1,8 @@
 package com.fdkankan.contro.controller;
 
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.contro.service.ISceneFileBuildService;
 import com.fdkankan.contro.vo.ResponseSceneFile;
+import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 1 - 1
src/main/java/com/fdkankan/contro/entity/RequestUser.java

@@ -1,6 +1,6 @@
 package com.fdkankan.contro.entity;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

+ 1 - 2
src/main/java/com/fdkankan/contro/service/ISceneFileBuildService.java

@@ -1,10 +1,9 @@
 package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.contro.entity.SceneFileBuild;
 import com.fdkankan.contro.vo.ResponseSceneFile;
-import org.springframework.web.multipart.MultipartFile;
+import com.fdkankan.web.response.ResultData;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/fdkankan/contro/service/IScenePlusService.java

@@ -1,8 +1,8 @@
 package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.contro.entity.ScenePlus;
+import com.fdkankan.web.response.ResultData;
 
 /**
  * <p>

+ 2 - 1
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.*;
 import com.fdkankan.contro.config.FileRouteConfig;
 import com.fdkankan.contro.entity.*;
@@ -28,6 +27,8 @@ import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.web.response.ResultData;
+import com.fdkankan.web.util.RSAEncrypt;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 3
src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -3,20 +3,18 @@ package com.fdkankan.contro.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
 import com.fdkankan.contro.mapper.IScenePlusMapper;
 import com.fdkankan.contro.service.ICameraDetailService;
 import com.fdkankan.contro.service.IScenePlusExtService;
 import com.fdkankan.contro.service.IScenePlusService;
+import com.fdkankan.web.response.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
-import org.springframework.validation.BindException;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/fdkankan/contro/vo/RebuildVedioSceneParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.contro.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/fdkankan/contro/vo/RequestCamera.java

@@ -1,6 +1,6 @@
 package com.fdkankan.contro.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/fdkankan/contro/vo/RequestCompany.java

@@ -1,6 +1,6 @@
 package com.fdkankan.contro.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

+ 1 - 1
src/main/java/com/fdkankan/contro/vo/ResponseUserIncrement.java

@@ -1,6 +1,6 @@
 package com.fdkankan.contro.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.util.Date;

+ 1 - 1
src/main/java/com/fdkankan/contro/vo/SceneParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.contro.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;