1111

src/main/java/com/fdkankan/contro/httpclient/MjHttpClient.java

@@ -1,30 +0,0 @@
-package com.fdkankan.contro.httpclient;
-
-import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.annotation.Address;
-import com.dtflys.forest.annotation.JSONBody;
-import com.dtflys.forest.annotation.Post;
-import com.fdkankan.contro.common.Result;
-import com.fdkankan.contro.httpclient.address.MjAddressSource;
-
-
-/**
- * 获取新闻公告
- */
-@Address(source = MjAddressSource.class)
-public interface MjHttpClient {
-
-
-    /**
-     * 分页查询内容发布
-     */
-    @Post("/wzapi/distributeDetail/notify")
-    Result notify(@JSONBody JSONObject param);
-
-
-    /**
-     *根据ID查询内容发布信息
-     */
-    @Post("/wzapi/distributeDetail/done")
-    Result done(@JSONBody JSONObject param);
-}

src/main/java/com/fdkankan/contro/httpclient/address/MjAddressSource.java

@@ -1,26 +0,0 @@
-package com.fdkankan.contro.httpclient.address;
-
-import com.dtflys.forest.callback.AddressSource;
-import com.dtflys.forest.http.ForestAddress;
-import com.dtflys.forest.http.ForestRequest;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MjAddressSource implements AddressSource {
-
-    @Value("${bd.api.scheme:http}")
-    private String scheme;
-
-    @Value("${bd.api.scheme:http}")
-    private String host;
-
-    @Value("${bd.api.port}")
-    private Integer port;
-
-
-    @Override
-    public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress(scheme,host,port,"");
-    }
-}

src/main/java/com/fdkankan/contro/service/ISceneOrigBdService.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISceneOrigBdService extends IService<SceneOrigBd> {
 
-    SceneOrigBd getEnableOne(String filename);
+//    SceneOrigBd getEnableOne(String filename);
 
 
 }

src/main/java/com/fdkankan/contro/service/IScenePlusService.java

@@ -3,10 +3,6 @@ package com.fdkankan.contro.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.web.response.ResultData;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +25,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     Long sumUsedSpaceByCameraId(Long cameraId, String spaceTypeStr);
 
     String getRyIdByNum(String num);
+
+    ScenePlus getByTaskId(String taskId);
 }

src/main/java/com/fdkankan/contro/service/MjService.java

@@ -4,6 +4,5 @@ public interface MjService {
 
     void bd();
 
-    void distributeDetailDone(String status, String filename);
 
 }

src/main/java/com/fdkankan/contro/service/impl/MjServiceImpl.java

@@ -15,7 +15,6 @@ import com.fdkankan.contro.entity.SceneFileBuild;
 import com.fdkankan.contro.entity.SceneOrigBd;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.httpclient.CustomHttpClient;
-import com.fdkankan.contro.httpclient.MjHttpClient;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.local.constant.LocalConstants;
@@ -47,8 +46,6 @@ public class MjServiceImpl implements MjService {
     @Autowired
     private ISceneFilenameService sceneFilenameService;
     @Resource
-    private MjHttpClient mjHttpClient;
-    @Resource
     private CustomHttpClient httpClient;
 
 
@@ -128,14 +125,6 @@ public class MjServiceImpl implements MjService {
         }
     }
 
-    @Override
-    public void distributeDetailDone(String status, String filename) {
-        JSONObject param = new JSONObject();
-        param.put("data", status);
-        param.put("filename", filename);
-//        mjHttpClient.done(param);
-    }
-
     public static void main(String[] args) {
         ZipUtil.unzip(new File("D:\\Downloads\\916ed6689_202501101516307030\\916ed6689_202501101516307030.zip"), new File("D:\\Downloads\\aaa\\bbb"));
     }

src/main/java/com/fdkankan/contro/service/impl/SceneOrigBdServiceImpl.java

@@ -1,11 +1,9 @@
 package com.fdkankan.contro.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.common.constant.CommonSuccessStatus;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.contro.entity.SceneOrigBd;
 import com.fdkankan.contro.mapper.ISceneOrigBdMapper;
 import com.fdkankan.contro.service.ISceneOrigBdService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,8 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneOrigBdServiceImpl extends ServiceImpl<ISceneOrigBdMapper, SceneOrigBd> implements ISceneOrigBdService {
 
-    @Override
-    public SceneOrigBd getEnableOne(String filename) {
-        return this.getOne(new LambdaQueryWrapper<SceneOrigBd>().eq(SceneOrigBd::getFilename, filename).eq(SceneOrigBd::getStatus, CommonSuccessStatus.WAITING.code()));
-    }
+//    @Override
+//    public SceneOrigBd getEnableOne(String filename) {
+//        return this.getOne(new LambdaQueryWrapper<SceneOrigBd>().eq(SceneOrigBd::getFilename, filename).eq(SceneOrigBd::getStatus, CommonSuccessStatus.WAITING.code()));
+//    }
 }

src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -1,7 +1,6 @@
 package com.fdkankan.contro.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.*;
@@ -20,8 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Objects;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -152,4 +149,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         JyUser jyUser = jyUserService.getByUserId(userId);
         return jyUser.getRyId();
     }
+
+    @Override
+    public ScenePlus getByTaskId(String taskId) {
+        return this.getOne(new LambdaQueryWrapper<ScenePlus>().eq(ScenePlus::getTaskId, taskId));
+    }
 }