1

src/main/java/com/fdkankan/fusion/controller/SceneApiController.java

@@ -1,31 +1,23 @@
 package com.fdkankan.fusion.controller;
 
-import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
-import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.request.ScenePram;
-import com.fdkankan.fusion.response.SceneVo;
 import com.fdkankan.fusion.service.IModelService;
-import com.fdkankan.fusion.service.ISceneService;
-import org.springframework.beans.BeanUtils;
+import com.fdkankan.fusion.service.ISceneCommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @RestController
 @RequestMapping("/api/scene")
 public class SceneApiController extends BaseController{
 
     @Autowired
-    ISceneService sceneService;
+    ISceneCommonService sceneService;
     @Autowired
     IModelService modelService;
 

src/main/java/com/fdkankan/fusion/controller/SceneController.java

@@ -9,7 +9,7 @@ import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.request.LaserSceneParam;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.FileInfoVo;
-import com.fdkankan.fusion.service.ISceneService;
+import com.fdkankan.fusion.service.ISceneCommonService;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ import java.io.OutputStream;
 public class SceneController extends BaseController{
 
     @Autowired
-    ISceneService sceneService;
+    ISceneCommonService sceneService;
 
     @PostMapping("/list")
     public ResultData list(@RequestBody ScenePram param){

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

@@ -4,11 +4,10 @@ import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.httpClient.request.LaserSceneParam;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.SceneVo;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-public interface ISceneService {
+public interface ISceneCommonService {
 
     PageInfo pageList(ScenePram param);
 

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.ResultCode;
-import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.PageInfo;
@@ -13,7 +12,6 @@ import com.fdkankan.fusion.mapper.ICaseMapper;
 import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.CaseVo;
-import com.fdkankan.fusion.response.HotVo;
 import com.fdkankan.fusion.response.SceneVo;
 import com.fdkankan.fusion.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,7 +20,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -38,7 +35,7 @@ import java.util.stream.Collectors;
 public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implements ICaseService {
 
     @Autowired
-    ISceneService sceneService;
+    ISceneCommonService sceneService;
     @Autowired
     ICaseNumService caseNumService;
     @Autowired

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -5,11 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
-import com.fdkankan.fusion.common.util.FileWriterUtil;
-import com.fdkankan.fusion.common.util.RedisKeyUtil;
-import com.fdkankan.fusion.common.util.ShellUtil;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.PageInfo;
@@ -18,7 +14,6 @@ import com.fdkankan.fusion.httpClient.client.FdKKClient;
 import com.fdkankan.fusion.httpClient.client.LaserClient;
 import com.fdkankan.fusion.httpClient.request.LaserSceneParam;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
-import com.fdkankan.fusion.httpClient.response.FdkkScenePlusVo;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.SceneProEntityVo;
 import com.fdkankan.fusion.response.SceneVo;
@@ -28,17 +23,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.File;
-import java.security.Security;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class SceneService implements ISceneService {
+public class SceneCommonService implements ISceneCommonService {
 
     @Resource
     FdKKClient fdKKClient;