四川日报压缩包推送

src/main/java/com/fdkankan/external/generate/Codegen.java

@@ -17,7 +17,7 @@ public class Codegen {
         dataSource.setUsername("root");
         dataSource.setPassword("4Dage@4Dage#@168");
 
-        String[] tables = new String[]{"t_scene_edit_info"};//,"t_scene_offline_package_push","t_department_camera"
+        String[] tables = new String[]{"t_camera_detail"};//,"t_scene_offline_package_push","t_department_camera"
 
                 //创建配置内容，两种风格都可以。
         GlobalConfig globalConfig = createGlobalConfigUseStyle1(tables);
@@ -141,4 +141,4 @@ public class Codegen {
 
         return globalConfig;
     }
-}
+}

src/main/java/com/fdkankan/external/service/impl/ScrbServiceImpl.java

@@ -5,12 +5,14 @@ import cn.hutool.core.util.ZipUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.external.entity.*;
 import com.fdkankan.external.httpclient.HttpClient;
 import com.fdkankan.external.service.*;
 import com.fdkankan.external.util.ScrbObsUtil;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.mybatisflex.core.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +48,10 @@ public class ScrbServiceImpl implements IScrbService {
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
     private IDepartmentService departmentService;
+    @Autowired
+    private ICameraService cameraService;
+    @Autowired
+    private ICameraDetailService cameraDetailService;
 
     @Override
     public void packageScene(JSONObject jsonObject) {
@@ -69,6 +75,12 @@ public class ScrbServiceImpl implements IScrbService {
         FileUtil.writeUtf8String(JSON.toJSONString(sceneEditInfo), sourcePath + "sceneEditInfo.txt");
         FileUtil.writeUtf8String(JSON.toJSONString(sceneEditInfoExt), sourcePath + "sceneEditInfoExt.txt");
         FileUtil.writeUtf8String(JSON.toJSONString(sceneEditControls), sourcePath + "sceneEditControls.txt");
+        Camera camera = cameraService.getById(scenePlus.getCameraId());
+        CameraDetail cameraDetail = cameraDetailService.getOne(QueryWrapper.create().eq(CameraDetail::getCameraId, scenePlus.getCameraId()));
+        JSONObject cameraObj = new JSONObject();
+        cameraObj.put("snCode", camera.getSnCode());
+        cameraObj.put("cameraType", cameraDetail.getType());
+        FileUtil.writeUtf8String(cameraObj.toJSONString(), sourcePath + "camera.txt");
 
         //下载scene_view_data
         String viewPath = "scene_view_data/" + num + "/";