Merge branch 'task-lyh-sg' into test

src/main/java/com/fdkankan/ucenter/httpClient/client/LaserClient.java

@@ -19,7 +19,7 @@ public interface LaserClient {
      * 根据用户获取激光相机数量
      */
     @Post("/laser/4dage/getSceneNum")
-    Result getSceneNum(@Header("fdToken") String token);
+    Result getSceneNum(@Header("fdToken") String token,@JSONBody Map<String, Object> param);
     /**
      * 获取相机场景数
      * @param param

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -54,10 +54,12 @@ public class LaserService {
      * 根据用户获取激光相机数量
      * @param token
      */
-    public SceneNumVo getLaserSceneNumByUser(String token) {
+    public SceneNumVo getLaserSceneNumByUser(String token,Integer sceneSource) {
         SceneNumVo sceneNumVo = new SceneNumVo();
         try {
-            Result sceneNum = laserClient.getSceneNum(token);
+            HashMap<String,Object> param = new HashMap<>();
+            param.put("sceneSource",sceneSource);
+            Result sceneNum = laserClient.getSceneNum(token,param);
             if(sceneNum != null && sceneNum.getCode() == 200){
                 sceneNumVo = JSONObject.parseObject(JSONObject.toJSONString(sceneNum.getData()), SceneNumVo.class);
                 sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -142,14 +142,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         sceneNumVoKk.setTotalNum(oldNum + sceneNumVoKk.getTotalNum());
 
         SceneNumVo sceneNumVoKj = getSceneNumVoByType(Collections.singletonList(3), user.getId());
-        SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token);
 
+        SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token,4);
         SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
+
+        SceneNumVo sceneNumVoSG = fdkkLaserService.getLaserSceneNumByUser(token,5);
+        SceneNumVo sceneNumVoSGObj = getSceneNumVoByObjType(Arrays.asList(5), user.getId());
         HashMap<String, SceneNumVo> hashMap = new HashMap<>();
         hashMap.put("kk",sceneNumVoKk);
         hashMap.put("kJ",sceneNumVoKj);
         hashMap.put("SS",sceneNumVoSS);
         hashMap.put("SS_OBJ",sceneNumVoSSObj);
+        hashMap.put("SG",sceneNumVoSG);
+        hashMap.put("SG_OBJ",sceneNumVoSGObj);
         return hashMap;
     }