Merge branch 'test-1.6.0-20231226' into dev-1.6.0

# Conflicts:
#	720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

720yun_fd_consumer/gis_consumer/src/main/resources/application-pro.yml

@@ -12,9 +12,9 @@ oss:
     domain: https://4dkk.4dage.com/
     file:
         path: 720yun_fd_manage/
-    key: LTAIUrvuHqj8pvry
+    key: LTAI5tSkKQbEmxxuTbPtHqK6
     point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    secrecy: JI21tOnZbJuqt5NDRcQq2qvAUA4KTf
     type: oss
 server:
     file:

720yun_fd_consumer/gis_consumer/src/main/resources/application-sit.yml

@@ -12,9 +12,9 @@ oss:
     domain: https://ossxiaoan.4dage.com/
     file:
         path: 720yun_fd_manage/
-    key: LTAIUrvuHqj8pvry
+    key: LTAI5tJwboCj3r4vUNkSmbyX
     point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    secrecy: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
     type: oss
 server:
     file:

720yun_fd_manage/gis_application/src/main/resources/application-pro.yml

@@ -20,9 +20,9 @@ oss:
     domain: https://4dkk.4dage.com/
     file:
         path: ${project.name}/
-    key: LTAIUrvuHqj8pvry
+    key: LTAI5tSkKQbEmxxuTbPtHqK6
     point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    secrecy: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+    secrecy: JI21tOnZbJuqt5NDRcQq2qvAUA4KTf
     type: oss
 server:
     domain: ''

720yun_fd_manage/gis_application/src/main/resources/data/someData.json

@@ -30,7 +30,32 @@
   "isRemind": 1,
   "name": "",
   "pcIcon": "",
-  "scenes": [],
+  "scenes": [
+                    {
+                        "customMask": {
+                            "sky": {
+                                "fodderId": "",
+                                "icon": "",
+                                "scale": 1,
+                                "antidistorted": true,
+                                "isShow": false
+                            },
+                            "earth": {
+                                "fodderId": "",
+                                "icon": "",
+                                "scale": 1,
+                                "antidistorted": true,
+                                "isShow": false
+                            }
+                        },
+                        "initVisual": {
+                            "vlookat": 0,
+                            "hlookat": 0,
+                            "vlookatmin": -90,
+                            "vlookatmax": 90
+                        }
+                    }
+                ],
   "isAuto": 1,
   "logo": "",
   "logoChange": false,
@@ -38,36 +63,38 @@
   "id": "",
   "remindTime": 1,
   "status": 0,
+  "isShowOpeningAnimation": true,
   "openingAnimationType": "小行星开场",
   "backgroundMusic": {
     "id": "",
     "name": "",
     "ossPath": ""
   },
-  "customMask": {
-    "earth": {
-      "icon": "",
-      "isShow": false
-    },
-    "sky": {
-      "icon": "",
-      "isShow": true
-    }
-  },
+
   "customButton": [
     {
       "type": "电话",
       "name": "电话",
       "value": "",
+      "openMethod": "弹出层打开",
       "isShow": false
     },
     {
       "type": "链接",
       "name": "链接",
       "value": "",
+      "openMethod": "弹出层打开",
       "isShow": false
     }
   ],
+
+
+
+  "coverPc":"",
+  "coverPcLoc":"",
+  "coverMo":"",
+  "coverSelect":"",
+
   "explanation": {
     "audioId": "",
     "audioName": "",

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkService.java

@@ -54,6 +54,7 @@ public interface WorkService extends IService<WorkEntity> {
     Result delOss(String ossPath);
 
     void fixSomeData(String workId,String active);
+    void fixSomeData2(String workId,String active);
 
     Result getServiceUpTip();
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -4,8 +4,10 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -102,8 +104,8 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     @Override
     public Result search(AgePageDto param, boolean isAdmin) {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
-        String userNameForToken = userRequest.getUserNameForToken();
+        startPage(param);
+        String userNameForToken = getUserNameForToken();
         if (isAdmin){
             userNameForToken = null;
         }
@@ -200,7 +202,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
         // 创建二维码、二维码url
         String shareUrl = configConstant.domain4dKK + "/panorama/showMobile.html?id=" + id;
-        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id,"zh");
+        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id);
         jsonObject.put("share", shareUrl);
         jsonObject.put("qrCode", qrCode);
 
@@ -531,40 +533,29 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
                 workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.coverInfo);
             }
             for (Object id : fodderId) {
-                saveOrEditFodder(entity, id,SomeDataConstant.coverInfo);
+                saveOrEditFodder(entity.getId(), id,SomeDataConstant.coverInfo);
             }
         }
 
 
-        JSONObject customMask = someDataJson.getJSONObject("customMask");
-        JSONObject earth= customMask.getJSONObject("earth");
-        JSONObject sky=customMask.getJSONObject("sky");
-        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.customMask_earth);
-        if (earth.containsKey("fodderId")&&ObjectUtil.isNotNull(earth.getLong("fodderId"))){
-                 saveOrEditFodder(entity, earth.getLong("fodderId"),SomeDataConstant.customMask_earth);
-        }
-        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.customMask_sky);
 
-        if (sky.containsKey("fodderId")&&ObjectUtil.isNotNull(sky.getLong("fodderId"))){
-                saveOrEditFodder(entity, sky.getLong("fodderId"),SomeDataConstant.customMask_sky);
-        }
 
         JSONObject backgroundMusic = someDataJson.getJSONObject("backgroundMusic");
         workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.backgroundMusic);
         if (backgroundMusic.containsKey("id")&&ObjectUtil.isNotNull(backgroundMusic.getLong("id"))){
-            saveOrEditFodder(entity, backgroundMusic.getLong("id"),SomeDataConstant.backgroundMusic);
+            saveOrEditFodder(entity.getId(), backgroundMusic.getLong("id"),SomeDataConstant.backgroundMusic);
         }
         workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.logo);
         if (someDataJson.containsKey("logoId")&&ObjectUtil.isNotNull(someDataJson.getLong("logoId"))){
-            saveOrEditFodder(entity, someDataJson.getLong("logoId"),SomeDataConstant.logo);
+            saveOrEditFodder(entity.getId(), someDataJson.getLong("logoId"),SomeDataConstant.logo);
         }
         workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.pcIcon);
         if (someDataJson.containsKey("pcIconId")&&ObjectUtil.isNotNull(someDataJson.getLong("pcIconId"))){
-            saveOrEditFodder(entity, someDataJson.getLong("pcIconId"),SomeDataConstant.pcIcon);
+            saveOrEditFodder(entity.getId(), someDataJson.getLong("pcIconId"),SomeDataConstant.pcIcon);
         }
         workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.appIcon);
         if (someDataJson.containsKey("appIconId")&&ObjectUtil.isNotNull(someDataJson.getLong("appIconId"))){
-            saveOrEditFodder(entity, someDataJson.getLong("appIconId"),SomeDataConstant.appIcon);
+            saveOrEditFodder(entity.getId(), someDataJson.getLong("appIconId"),SomeDataConstant.appIcon);
         }
 
 
@@ -591,16 +582,16 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     }
 
-    private void saveOrEditFodder(WorkEntity entity, Object id,String type) {
-        WorkHotsFodderEntity workHotsFodderEntity= workHotsFodderService.findByWorkIdAndFodderIdAndType(entity.getId(),Long.valueOf(String.valueOf(id)), type);
+    private void saveOrEditFodder(String workId, Object id,String type) {
+        WorkHotsFodderEntity workHotsFodderEntity= workHotsFodderService.findByWorkIdAndFodderIdAndType(workId,Long.valueOf(String.valueOf(id)), type);
         if (ObjectUtil.isNotNull(workHotsFodderEntity)){
             workHotsFodderEntity.setFodderId(Long.valueOf(String.valueOf(id)));
-            workHotsFodderEntity.setWorkId(entity.getId());
+            workHotsFodderEntity.setWorkId(workId);
             workHotsFodderService.updateById(workHotsFodderEntity);
         }else {
             workHotsFodderEntity=new WorkHotsFodderEntity();
             workHotsFodderEntity.setFodderId(Long.valueOf(String.valueOf(id)));
-            workHotsFodderEntity.setWorkId(entity.getId());
+            workHotsFodderEntity.setWorkId(workId);
             workHotsFodderEntity.setType(type);
             workHotsFodderService.save(workHotsFodderEntity);
         }
@@ -709,6 +700,30 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
                     }
                 }
             }
+            if (parse.containsKey("customMask")){
+                JSONObject customMask = parse.getJSONObject("customMask");
+                JSONObject earth= customMask.getJSONObject("earth");
+                JSONObject sky=customMask.getJSONObject("sky");
+                workHotsFodderService.removeByWorkIdAndType(workId, SomeDataConstant.customMask_earth);
+                if (earth.containsKey("fodderId")&&ObjectUtil.isNotNull(earth.getLong("fodderId"))){
+                    WorkHotsFodderEntity workHotsFodderEntity=new WorkHotsFodderEntity();
+                    workHotsFodderEntity.setSceneCode(sceneCode);
+                    workHotsFodderEntity.setFodderId(earth.getLong("fodderId"));
+                    workHotsFodderEntity.setWorkId(workId);
+                    workHotsFodderEntity.setType(SomeDataConstant.customMask_earth);
+                    workHotsFodderService.save(workHotsFodderEntity);
+
+                }
+                workHotsFodderService.removeByWorkIdAndType(workId, SomeDataConstant.customMask_sky);
+                if (sky.containsKey("fodderId")&&ObjectUtil.isNotNull(sky.getLong("fodderId"))){
+                    WorkHotsFodderEntity workHotsFodderEntity=new WorkHotsFodderEntity();
+                    workHotsFodderEntity.setSceneCode(sceneCode);
+                    workHotsFodderEntity.setFodderId(earth.getLong("fodderId"));
+                    workHotsFodderEntity.setWorkId(workId);
+                    workHotsFodderEntity.setType(SomeDataConstant.customMask_sky);
+                    workHotsFodderService.save(workHotsFodderEntity);
+                }
+            }
         }
     }
     /**
@@ -836,7 +851,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     @Override
     public Result select4dkk(PageDto param, String workId) {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
+        startPage(param);
 
         String url = configConstant.domain4dKK + "/api/user/scene/list";
         JSONObject reqParam = new JSONObject();
@@ -1038,6 +1053,96 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
     }
 
     @Override
+    public void fixSomeData2(String workId, String active) {
+        String URL="";
+        if (active.equalsIgnoreCase("sit")){
+            URL ="https://ossxiaoan.4dage.com/720yun_fd_manage/"+workId+"/someData.json?_= "+System.currentTimeMillis() ;
+
+        }else    if (active.equalsIgnoreCase("prod")){
+            URL ="https://4dkk.4dage.com/720yun_fd_manage/"+workId+"/someData.json?_= "+System.currentTimeMillis() ;
+        }
+        else    if (active.equalsIgnoreCase("sitaws")){
+            URL ="https://testeurs3.4dkankan.com/720yun_fd_manage/"+workId+"/someData.json?_= "+System.currentTimeMillis() ;
+        }
+        else    if (active.equalsIgnoreCase("prodaws")){
+            URL ="https://eurs3.4dkankan.com/720yun_fd_manage/"+workId+"/someData.json?_= "+System.currentTimeMillis() ;
+        }
+        if (StrUtil.isEmpty(URL)){
+            return;
+        }
+        cn.hutool.http.HttpResponse execute = HttpRequest.get(URL)
+                .timeout(20000)//超时，毫秒
+                .execute();
+        if (execute.getStatus()==200){
+            JSONObject res=JSONObject.parseObject(execute.body());
+            log.info("成功+---"+res);
+            if (res.containsKey("scenes")) {
+                    JSONArray scenes = res.getJSONArray("scenes");
+                for (int i = 0; i < scenes.size(); i++) {
+                    JSONObject parse = JSON.parseObject(scenes.get(i).toString());
+                    if (parse.containsKey("type")&&parse.getString("type").equalsIgnoreCase("pano")) {
+                        if (res.containsKey("customMask")) {
+                            JSONObject customMask = res.getJSONObject("customMask");
+                            JSONObject earth = customMask.getJSONObject("earth");
+                            JSONObject sky = customMask.getJSONObject("sky");
+                            JSONObject customMaskJson = new JSONObject();
+                            if (ObjectUtil.isNotNull(earth)&&earth.containsKey("icon")&&ObjectUtil.isNotNull(earth.getString("icon"))&&StrUtil.isNotEmpty(earth.getString("icon"))) {
+                                earth.put("antidistorted", true);
+                                earth.put("scale", 1);
+                                customMaskJson.put("earth", earth);
+                            } else {
+                                earth = new JSONObject();
+                                earth.put("fodderId", "");
+                                earth.put("icon", "");
+                                earth.put("antidistorted", true);
+                                earth.put("scale", 1);
+                                earth.put("isShow", 0);
+                                customMaskJson.put("earth", earth);
+                            }
+
+                            if (ObjectUtil.isNotNull(sky)&&sky.containsKey("icon")&&ObjectUtil.isNotNull(sky.getString("icon"))&&StrUtil.isNotEmpty(sky.getString("icon"))) {
+                                sky.put("antidistorted", true);
+                                sky.put("scale", 1);
+                                customMaskJson.put("sky", sky);
+                            } else {
+                                sky = new JSONObject();
+                                sky.put("fodderId", "");
+                                sky.put("icon", "");
+                                sky.put("antidistorted", true);
+                                sky.put("scale", 1);
+                                sky.put("isShow", true);
+                                customMaskJson.put("sky", sky);
+                            }
+                            parse.put("customMask", customMaskJson);
+                        }
+
+                        if (parse.containsKey("initVisual")) {
+                            JSONObject initVisual = parse.getJSONObject("initVisual");
+                            initVisual.put("vlookatmin", 90);
+                            initVisual.put("vlookatmax", -90);
+                            parse.put("initVisual", initVisual);
+                        } else {
+                            JSONObject initVisual = new JSONObject();
+                            initVisual.put("vlookat", 0);
+                            initVisual.put("hlookat", 0);
+                            initVisual.put("vlookatmin", 90);
+                            initVisual.put("vlookatmax", -90);
+                            parse.put("initVisual", initVisual);
+                        }
+                        scenes.set(i, parse);
+                        res.put("scenes", scenes);
+                    }
+                }
+                String str = JSON.toJSONString(res,
+                        SerializerFeature.DisableCircularReferenceDetect);
+                log.info("修改完成--{}",str);
+                editSomeData(JSONObject.parseObject(str), workId);
+                }
+
+        }
+    }
+
+    @Override
     public Result getServiceUpTip() {
         try {
             Result resultData = fdkkClient.getServiceUpTip();

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -329,12 +329,26 @@ public class TestController extends BaseController {
     }
 
 
+    /**
+     修复1.4.0版本somedata.json
+     * @return
+     */
+    @ApiOperation(value = "修复1.6.0版本somedata.json", notes = "修复1.4.0版本somedata.json")
+    @GetMapping("/fixSomeData16")
+    public Result fixSomeData16(String workId,String active) {
+        if (workId.equalsIgnoreCase("all")){
+            List<WorkEntity> all = workService.findAll();
+            for (WorkEntity workEntity : all) {
+                if (workEntity.getStatus()==1&&workEntity.getId().startsWith("WK")){
+                    workService.fixSomeData2(workEntity.getId(),active);
+                }
 
+            }
+        }else {
+            workService.fixSomeData2(workId,active);
 
-
-
-
-
-
+        }
+        return Result.success();
+    }
 
 }