Merge remote-tracking branch 'origin/master'

src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -24,21 +24,21 @@ public class WebAppConfig implements WebMvcConfigurer {
 				.excludePathPatterns(
 						//"/user/virtualOrder/**",
 						"/**/sso/**",
-						"/app/**",
-						"/test/**",
-						"/_inner/**",
+						"/**/app/**",
+						"/**/test/**",
+						"/**/_inner/**",
 						"/**/fusion/**",
 						"/**/scene/**",
-						"/intercomMessage/**",
-						"/order/pay/**",
-						"/article/**",
-						"/goods/version/**",
-						"/inner/**",
-						"/_manage/**",
-						"/agentAduit/**",
-						"/laser/**",
-						"/vaild/cameras",
-						"/hot/shop/**"
+						"/**/intercomMessage/**",
+						"/**/order/pay/**",
+						"/**/article/**",
+						"/**/goods/version/**",
+						"/**/inner/**",
+						"/**/_manage/**",
+						"/**/agentAduit/**",
+						"/**/laser/**",
+						"/**/vaild/cameras",
+						"/**/hot/shop/**"
 				);
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -80,7 +80,15 @@ public class SceneController extends BaseController {
         String username = JwtUtil.getUsername(token);
         param.setHasFolder(0);
         JSONObject jsonObject = sceneProService.newList(param, username);
-        return Result.success(jsonObject.getJSONObject("pageInfo"));
+        JSONObject pageInfo = jsonObject.getJSONObject("pageInfo");
+        pageInfo.put("endRow",0);
+        pageInfo.put("firstPage",param.getPageNum());
+        pageInfo.put("hasNextPage",false);
+        pageInfo.put("isLastPage",0);
+        pageInfo.put("size",pageInfo.get("total"));
+        Integer pages = pageInfo.getInteger("total") / param.getPageSize();
+        pageInfo.put("pages",pageInfo.getInteger("total") % param.getPageSize() == 0 ? pages : pages + 1);
+        return Result.success(pageInfo);
     }
 
     /**

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -422,7 +422,7 @@ public class SceneApiController extends BaseController {
      * 查询场景资源路径
      */
     @GetMapping("/querySceneDataSource")
-    public Result querySceneDataSource(String num){
+    public String querySceneDataSource(String num){
         return innerService.querySceneDataSource(num);
     }
 

src/main/java/com/fdkankan/ucenter/controller/decorate/DecorateSceneController.java

@@ -0,0 +1,96 @@
+package com.fdkankan.ucenter.controller.decorate;
+
+import com.fdkankan.common.constant.SceneConstant;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.BaseController;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.service.*;
+import com.fdkankan.ucenter.vo.request.RequestScene;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Log4j2
+/**随心装接口*/
+@RequestMapping("/api/decorate/scene/")
+public class DecorateSceneController extends BaseController {
+
+    @Autowired
+    private ISceneService sceneService;
+
+    @Autowired
+    private ISceneProService sceneProService;
+
+    @Autowired
+    IScenePlusService scenePlusService;
+
+    @Autowired
+    ISceneEditInfoService sceneEditInfoService;
+
+    @Autowired
+    private ISceneProEditService sceneProEditService;
+
+    @Autowired
+    IUserService userService;
+
+    /**
+     * 获取用户场景记录
+     * @param param
+     * @return
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result getScenes(@RequestBody RequestScene param) throws Exception {
+        User user = userService.getByToken(getToken());
+        if(user == null){
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
+        }
+        param.setUserId(user.getId());
+        return Result.success(sceneService.getDecorateScenes( param));
+
+    }
+
+
+    /**
+     *
+     * 随心装场景码同步
+     */
+    @RequestMapping(value = "/synsencecode", method = RequestMethod.POST)
+    public Result synsencecode(@RequestBody Map<String,String> params) throws Exception{
+        if(StringUtils.isEmpty(getToken())){
+            throw new BusinessException(3004, "无token参数");
+        }
+        User user = userService.getByToken(getToken());
+        if(user == null){
+            throw new BusinessException(3004, "token参数不正确");
+        }
+
+        String sceneNum = params.get("sceneNum");
+        if(StringUtils.isEmpty(sceneNum)){
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
+        }
+
+        ScenePro sceneProEntity = sceneProService.getByNum(sceneNum);
+        if(sceneProEntity == null){
+            throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
+        }
+
+        SceneProEdit editEntity = sceneProEditService.getByProId(sceneProEntity.getId());
+
+        if(editEntity == null){
+            throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
+        }
+        editEntity.setVrNum(params.get("vrSceneNum"));
+        editEntity.setVrThumb(params.get("vrThumb"));
+        sceneProEditService.updateById(editEntity);
+        return Result.success();
+    }
+}

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -44,33 +44,33 @@ public class FdUserCameraController extends BaseController {
     /**
      * 用户添加设备
      */
-//    @RequestMapping(value = "/add", method = RequestMethod.POST)
-//    public Result addCamera(@RequestBody JSONObject param) throws Exception {
-//        if(ObjectUtils.isEmpty(param.getString("snCode"))){
-//            throw new BusinessException(-1,"缺少必要参数");
-//        }
-//        String snCode = param.getString("snCode");
-//        Camera cameraEntity = cameraService.getBySnCode(snCode);
-//        if(ObjectUtils.isEmpty(cameraEntity)){
-//            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
-//        }
-//        CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
-//        if(ObjectUtils.isEmpty(cameraDetailEntity)){
-//            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
-//        }
-//        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId())) {
-//            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
-//        }
-//
-//        if(cameraDetailEntity.getUserId() != null){
-//            throw new BusinessException(AppConstant.FAILURE_CODE_4011, AppConstant.FAILURE_MSG_4011);
-//        }
-//
-//        // 绑定相机
-//        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), JwtUtil.getUsername(getToken()));
-//
-//        return Result.success();
-//    }
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Result addCamera(@RequestBody JSONObject param) throws Exception {
+        if(ObjectUtils.isEmpty(param.getString("snCode"))){
+            throw new BusinessException(-1,"缺少必要参数");
+        }
+        String snCode = param.getString("snCode");
+        Camera cameraEntity = cameraService.getBySnCode(snCode);
+        if(ObjectUtils.isEmpty(cameraEntity)){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
+        }
+        CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
+        if(ObjectUtils.isEmpty(cameraDetailEntity)){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
+        }
+        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId())) {
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
+        }
+
+        if(cameraDetailEntity.getUserId() != null){
+            throw new BusinessException(AppConstant.FAILURE_CODE_4011, AppConstant.FAILURE_MSG_4011);
+        }
+
+        // 绑定相机
+        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), JwtUtil.getUsername(getToken()));
+
+        return Result.success();
+    }
 
     /**
      * 获取用户设备

src/main/java/com/fdkankan/ucenter/controller/inner/InnerController.java

@@ -43,7 +43,7 @@ public class InnerController extends BaseController {
      */
     @CheckInnerApiPermit
     @GetMapping("/querySceneDataSource")
-    public Result querySceneDataSource(String num){
+    public String querySceneDataSource(String num){
         return innerService.querySceneDataSource(num);
     }
 

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

@@ -167,7 +167,7 @@ public class LaserService {
 
 
     public void copy(Long camaraId, String createTime, String newNum, Integer status,
-                     String  path, String sceneKey, String sceneName, Long userId){
+                     String  path, String sceneKey, String sceneName, Long userId,String version){
         String phone = null;
         String snCode = null;
         if(userId != null){
@@ -190,6 +190,7 @@ public class LaserService {
         params.put("userId", userId);
         params.put("isCopy", true);
         params.put("path",path);
+        params.put("version",version);
         Result result = laserClient.saveOrEdit(newNum, params);
         if( result.getCode() != HttpStatus.OK.value()){
             log.error("激光场景状态同步失败!");

src/main/java/com/fdkankan/ucenter/mapper/ISceneMapper.java

@@ -7,6 +7,9 @@ import com.fdkankan.ucenter.vo.request.RequestScene;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.SceneVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -20,4 +23,6 @@ import org.apache.ibatis.annotations.Mapper;
 public interface ISceneMapper extends BaseMapper<Scene> {
 
     Page<SceneVo> getSceneList(Page<Object> page, RequestScene param);
+
+    Page<SceneVo> getDecorateScenes(Page<Object> page,RequestScene param);
 }

src/main/java/com/fdkankan/ucenter/service/IInnerService.java

@@ -14,7 +14,7 @@ public interface IInnerService {
 
     Result createTokenByNum(String num);
 
-    Result querySceneDataSource(String num);
+    String querySceneDataSource(String num);
 
     String getSceneNumVersion(String num);
 

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.CameraDetail;
 import com.fdkankan.ucenter.entity.ScenePlus;

src/main/java/com/fdkankan/ucenter/service/ISceneService.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.Scene;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.ResponseScene;
@@ -33,4 +34,6 @@ public interface ISceneService extends IService<Scene> {
     Scene getByNum(String sceneNum);
 
     Page<SceneVo> getSceneList(RequestScene param);
+
+    PageInfo getDecorateScenes(RequestScene param);
 }

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

@@ -105,37 +105,40 @@ public class AppSceneService {
                 record.setStatus(-1);
             }
             if(record.getCameraId() == null){
-                record.setSceneSourceType(record.getUserId().longValue() ==param.getUserId() ? 1 : 2);
+                record.setSceneSourceType(record.getUserId().longValue() == param.getUserId() ? 1 : 2);
             }else {
+                record.setSceneSourceType(0);
                 Camera camera = cameraHashMap.get(record.getCameraId());
-                if(ObjectUtils.isEmpty(camera)){
+                if(camera == null){
+                    continue;
+                }
+                CameraDetail cameraDetail = detailHashMap.get(camera.getId());
+                if(cameraDetail == null){
                     continue;
                 }
                 record.setChildName(camera.getChildName());
                 record.setSnCode(camera.getSnCode());
                 if(cooperationNumList.contains(record.getNum())){
                     record.setSceneSourceType(2);
-                    continue;
-                }
-                CameraDetail cameraDetail = detailHashMap.get(camera.getId());
-                if(ObjectUtils.isEmpty(cameraDetail)){
-                    continue;
+                    continue ;
                 }
                 //相机的userId为空，表示相机的场景
-                if (cameraDetail.getUserId() == null || param.getUserId() == null) {
+                if (cameraDetail.getUserId() == null || param.getUserId() == null || param.getCameraId() == null) {
                     record.setSceneSourceType(0);
-                } else if (cameraDetail.getUserId().longValue() == param.getUserId().longValue()) {
+                    continue;
+                }
+                if (cameraDetail.getUserId().equals(param.getUserId())) {
                     //相机用户id等于该用户id，既为用户的场景
                     record.setSceneSourceType(1);
-                } else if (camera.getId() != null && cameraDetail.getCameraId().longValue() == camera.getId().longValue()) {
+                    continue;
+                }
+                if (cameraDetail.getCameraId().equals(param.getCameraId())) {
                     if (cameraDetail.getCooperationUser() == null) {
                         //场景相机id等于该相机id
                         record.setSceneSourceType(0);
-                    } else if (cameraDetail.getCooperationUser().longValue() == param.getUserId().longValue()) {
+                    } else if (cameraDetail.getCooperationUser().equals(param.getUserId())) {
                         record.setSceneSourceType(2);
                     }
-                } else {
-                    record.setSceneSourceType(0);
                 }
             }
 

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

@@ -83,6 +83,7 @@ public class AppService {
         UserVo userVo = new UserVo();
         userVo.setCameraCount(count);
         userVo.setSceneCount(sceneProCount + scenePlusCount);
+        userVo.setPassword(SecurityUtil.MD5(user.getPassword()));
         BeanUtils.copyProperties(user,userVo);
         LoginVo vo = new LoginVo();
         vo.setToken(token);

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

@@ -91,21 +91,21 @@ public class InnerServiceImpl implements IInnerService {
     }
 
     @Override
-    public Result querySceneDataSource(String num) {
+    public String querySceneDataSource(String num) {
 
         String dataSource = null;
         ScenePro scenePro = sceneProService.getByNum(num);
         if(Objects.isNull(scenePro)){
             ScenePlus scenePlus = scenePlusService.getByNum(num);
             if(Objects.isNull(scenePlus)){
-                return Result.failure(ErrorCode.FAILURE_CODE_5005.code(), ErrorCode.FAILURE_CODE_5005.message());
+                return Result.failure(ErrorCode.FAILURE_CODE_5005.code(), ErrorCode.FAILURE_CODE_5005.message()).toString();
             }
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             dataSource = scenePlusExt.getDataSource();
         }else{
             dataSource = scenePro.getDataSource();
         }
-        return Result.success("成功", dataSource);
+        return  dataSource;
     }
 
     @Override

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

@@ -143,10 +143,13 @@ public class LoginService {
 
     public void register(RegisterParam param) {
         if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum()) ||
-                StringUtils.isEmpty(param.getMsgAuthCode()) || StringUtils.isEmpty(param.getCountry())
+                StringUtils.isEmpty(param.getMsgAuthCode())
                 || StringUtils.isEmpty(param.getConfirmPwd())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
+        if(StringUtils.isBlank(param.getCountry())){
+            param.setCountry("86");
+        }
         String password ;
         if(StringUtils.isNotBlank(param.getClear()) && param.getClear().equals("YES")){
             password = param.getPassword();

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

@@ -231,7 +231,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                     laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId());
+                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
                 }
 
                 List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
@@ -283,7 +283,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                     laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
-                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId());
+                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
                 }
                 sceneCopyLogService.saveByNum(num,newNum,scenePlus.getUserId());
 

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

@@ -652,7 +652,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.save(oldScene);
         if(oldScene.getSceneSource() == 4){  //深时复制
             laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,0,null,
-                    oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId());
+                    oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3");
         }
         //更新video
         Map map = new HashMap();
@@ -722,7 +722,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(oldScene.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(preDataSource,oldScene.getDataSource());
                     laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,2,laserPath,
-                            oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId());
+                            oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3");
                 }
                 sceneCopyLogService.saveByNum(oldNum,newNum,oldScene.getUserId());
 

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

@@ -12,6 +12,7 @@ import com.fdkankan.ucenter.entity.ScenePro;
 import com.fdkankan.ucenter.mapper.ISceneMapper;
 import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.ResponseScene;
 import com.fdkankan.ucenter.vo.request.RequestScene;
 import com.fdkankan.ucenter.vo.request.SceneParam;
@@ -117,4 +118,15 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     public Page<SceneVo> getSceneList(RequestScene param) {
         return this.getBaseMapper().getSceneList(new Page<>(param.getPageNum(),param.getPageSize()),param);
     }
+
+    @Override
+    public PageInfo getDecorateScenes( RequestScene param) {
+        Page<SceneVo> page = this.getBaseMapper().getDecorateScenes(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        for (SceneVo record : page.getRecords()) {
+            if(StringUtils.isNotBlank(record.getCreateTime())){
+                record.setCreateTime(DateUserUtil.getDayTime(record.getCreateTime()));
+            }
+        }
+        return PageInfo.PageInfo(page);
+    }
 }

src/main/java/com/fdkankan/ucenter/vo/response/SceneVo.java

@@ -39,6 +39,12 @@ public class SceneVo {
     private Integer sceneType;
     private String userName;
 
+    private Long userId;
+    private String sceneScheme;
+    private String shootCount;
+    private String space;
+    private String recommend;
+
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);
     }

src/main/resources/mapper/ucenter/SceneMapper.xml

@@ -51,6 +51,7 @@
         ) as scene_tb
     </select>
 
+
     <sql id="commonWhere">
         and p.user_id =#{param.userId} and pay_status = 1
         <if test="param.snCode !=null and param.snCode != '' ">
@@ -68,5 +69,27 @@
         LEFT JOIN t_camera c on p.camera_id = c.id
     </sql>
 
+    <select id="getDecorateScenes" resultType="com.fdkankan.ucenter.vo.response.SceneVo">
+    select a.* from (
 
+        select id,scene_name, scene_dec, web_site, thumb, scene_type,
+        create_time, status, user_id, pay_status, camera_id, num, scene_scheme, shoot_count,
+        rec_status, space, recommend, view_count, 'V1' AS build_type,1 as  scene_source from `t_scene` s
+        WHERE rec_status = 'A'  and user_id = #{param.userId}
+        and (status = -2 or status = 1)
+         <if test= 'searchKey != null'>
+          and s.scene_name like CONCAT('%',#{searchKey},'%') or s.num = #{searchKey}
+         </if>
+    union
+        SELECT s.id,s.scene_name, s.scene_dec, s.web_site, s.thumb, s.scene_type,
+        s.create_time, s.status, s.user_id, s.pay_status, s.camera_id, s.num, s.scene_scheme, s.shoot_count,
+        s.rec_status, s.space, s.recommend, s.view_count, s.build_type,s.scene_source FROM `t_scene_pro` s
+        WHERE rec_status = 'A' and scene_type != 99 and scene_source !=4 and user_id = #{param.userId}
+        and (status = -2 or status = 1)
+        <if test= 'searchKey != null'>
+            and s.scene_name like CONCAT('%',#{searchKey},'%') or s.num = #{searchKey}
+        </if>
+  ) a
+     order by create_time desc
+    </select>
 </mapper>