|
@@ -14,26 +14,15 @@ import com.fdkankan.ucenter.common.constants.UploadFilePath;
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
import com.fdkankan.ucenter.bean.SceneJsonBean;
|
|
import com.fdkankan.ucenter.bean.SceneJsonBean;
|
|
-import com.fdkankan.ucenter.entity.CameraDetail;
|
|
|
|
-import com.fdkankan.ucenter.entity.SceneEditControls;
|
|
|
|
-import com.fdkankan.ucenter.entity.SceneEditInfo;
|
|
|
|
-import com.fdkankan.ucenter.entity.SceneEditInfoExt;
|
|
|
|
-import com.fdkankan.ucenter.entity.ScenePlus;
|
|
|
|
-import com.fdkankan.ucenter.entity.ScenePlusExt;
|
|
|
|
|
|
+import com.fdkankan.ucenter.entity.*;
|
|
import com.fdkankan.ucenter.mapper.IScenePlusMapper;
|
|
import com.fdkankan.ucenter.mapper.IScenePlusMapper;
|
|
-import com.fdkankan.ucenter.service.ICameraDetailService;
|
|
|
|
-import com.fdkankan.ucenter.service.ISceneCopyLogService;
|
|
|
|
-import com.fdkankan.ucenter.service.ISceneEditControlsService;
|
|
|
|
-import com.fdkankan.ucenter.service.ISceneEditInfoExtService;
|
|
|
|
-import com.fdkankan.ucenter.service.ISceneEditInfoService;
|
|
|
|
-import com.fdkankan.ucenter.service.IScenePlusExtService;
|
|
|
|
-import com.fdkankan.ucenter.service.IScenePlusService;
|
|
|
|
-import com.fdkankan.ucenter.service.ISceneProService;
|
|
|
|
|
|
+import com.fdkankan.ucenter.service.*;
|
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Objects;
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
import com.fdkankan.ucenter.vo.SceneEditControlsVO;
|
|
import com.fdkankan.ucenter.vo.SceneEditControlsVO;
|
|
@@ -67,7 +56,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
@Autowired
|
|
@Autowired
|
|
private ICameraDetailService cameraDetailService;
|
|
private ICameraDetailService cameraDetailService;
|
|
@Autowired
|
|
@Autowired
|
|
- private ISceneCopyLogService sceneCopyLogService;
|
|
|
|
|
|
+ private ISurveillanceService surveillanceService;
|
|
@Autowired
|
|
@Autowired
|
|
private ISceneProService sceneProService;
|
|
private ISceneProService sceneProService;
|
|
@Resource
|
|
@Resource
|
|
@@ -233,6 +222,15 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
sceneEditControls.setEditInfoId(sceneEditInfo.getId());
|
|
sceneEditControls.setEditInfoId(sceneEditInfo.getId());
|
|
sceneEditControlsService.save(sceneEditControls);
|
|
sceneEditControlsService.save(sceneEditControls);
|
|
|
|
|
|
|
|
+ List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
|
|
|
|
+ if (!Objects.isNull(list)) {
|
|
|
|
+ list.stream().forEach(item -> {
|
|
|
|
+ item.setNum(newNum);
|
|
|
|
+ item.setId(null);
|
|
|
|
+ surveillanceService.save(item);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
// 生成scene.json
|
|
// 生成scene.json
|
|
SceneJsonBean sceneJson = new SceneJsonBean();
|
|
SceneJsonBean sceneJson = new SceneJsonBean();
|
|
BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
|
|
BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
|
|
@@ -261,7 +259,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
|
|
redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
|
|
|
|
|
|
// 生成二维码
|
|
// 生成二维码
|
|
- String sceneUrl = mainUrl + "/" + sceneProNewUrl;
|
|
|
|
|
|
+ String sceneUrl = mainUrl + sceneProNewUrl;
|
|
String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + newNum + ".png";
|
|
String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + newNum + ".png";
|
|
String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + newNum + "_en.png";
|
|
String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + newNum + "_en.png";
|
|
MatrixToImageWriterUtil.createQRCode(sceneUrl + newNum, outPathZh, false,null);
|
|
MatrixToImageWriterUtil.createQRCode(sceneUrl + newNum, outPathZh, false,null);
|