场景逻辑修改为从管理后台获取

platform-shop/src/main/java/com/platform/controller/SceneController.java

@@ -1,36 +1,20 @@
 package com.platform.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.platform.annotation.CanUserUpdateRecord;
 import com.platform.entity.BrandEntity;
 import com.platform.entity.Result;
 import com.platform.entity.SceneEntity;
-import com.platform.entity.SysUserEntity;
-import com.platform.exception.CommonBaseException;
 import com.platform.service.BrandService;
-import com.platform.service.SceneService;
-import com.platform.service.SysDeptService;
-import com.platform.service.SysUserService;
 import com.platform.service.impl.ZhiHouseService;
-import com.platform.utils.Constant;
-import com.platform.utils.DepartmentUtils;
-import com.platform.vos.CurrentUserLoginVo;
 import com.platform.vos.RequestScene;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Controller
@@ -44,220 +28,13 @@ import java.util.stream.Collectors;
 @RequestMapping("scene")
 @Slf4j
 public class SceneController extends AbstractController{
-    @Autowired
-    private SceneService sceneService;
 
     @Autowired
     private BrandService brandService;
 
     @Autowired
-    private SysUserService sysUserService;
-
-    @Autowired
-    private SysDeptService sysDeptService;
-
-    @Autowired
-    private DepartmentUtils departmentUtils;
-
-    @Autowired
     private ZhiHouseService zhiHouseService;
 
-    public List<Long> getAllSubDeptIds(Long deptId) {
-        if (null == deptId) {
-            log.info("部门ID为空");
-            return new ArrayList<>();
-        }
-        List<Long> allDeptIdList = new ArrayList<>();
-        int leve = 0;
-        leve = findDeptIdByParent(deptId, 0, allDeptIdList);
-        log.info("获取到当前部门以及所有子部门(10层嵌套以内)的id为:{}，部门层级为:{}",
-                JSON.toJSONString(allDeptIdList) , leve);
-        return allDeptIdList;
-    }
-
-    private int findDeptIdByParent(long deptId, int level, List<Long> deptIdList) {
-
-        if (level > 10) {
-            log.info("嵌套层数超过了10层");
-            return level;
-        }
-        deptIdList.add(deptId);
-        //获取所有子部门的id
-        List<Long> subDeptIdList = sysDeptService.queryDetpIdList(deptId);
-        if (CollectionUtils.isEmpty(subDeptIdList)) {
-            //自己算一层，没有子部门，要先加上自己这一层
-            return level + 1;
-        }
-        int maxLevel = 0;
-        for(Long id : subDeptIdList){
-            //遍历所有子部门的子部门，并记下子部门中嵌套最深的层数
-            int tmpLevel = findDeptIdByParent(id, level, deptIdList);
-            if(tmpLevel > maxLevel){
-                maxLevel = tmpLevel;
-            }
-        }
-        //添加子部门的id
-        deptIdList.addAll(subDeptIdList);
-        //叠加子部门的最大层级
-        level += maxLevel;
-        //加上自己这一层
-        level += 1;
-        return level;
-    }
-
-    /**
-     * 查看列表
-     */
-    @PostMapping("/list")
-    @RequiresPermissions("brand:list")
-    public Result list(@RequestBody RequestScene requestScene) {
-        //查询列表数据
-        if (null == requestScene || org.apache.commons.lang3.StringUtils.isBlank(requestScene.getToken())) {
-            return  Result.failure("缺少必要参数");
-        }
-        if(!ObjectUtils.isEmpty(requestScene.getPage())){
-            requestScene.setPageNum(requestScene.getPage());
-        }
-        //看看的页码从1开始算起
-        if(requestScene.getPageNum()==0){
-            requestScene.setPageNum(1L);
-        }
-        if (!ObjectUtils.isEmpty(requestScene.getLimit())) {
-            requestScene.setPageSize(requestScene.getLimit());
-        }
-        if(!ObjectUtils.isEmpty(requestScene.getName())){
-            requestScene.setSceneName(requestScene.getName());
-        }
-        Long userId = getUserId();
-        boolean geratedable = false;
-        if(Constant.SUPER_ADMIN == userId){
-            requestScene.setUserId(-1L);
-        } else {
-            CurrentUserLoginVo user = getUser();
-            if (user.getRoleId() == 6) {
-                geratedable = true;
-                // 获取该公司下所有员工手机号
-                List<Long> subDeptIds = getAllSubDeptIds(getDeptId());
-                List<SysUserEntity> users = sysUserService.getSysUserListByDeptIds(subDeptIds);
-                requestScene.setPhone(users.stream().map(SysUserEntity::getMobile).collect(Collectors.joining(";")));
-            } else if (user.getRoleId() == 8) {
-                if ((ObjectUtils.isEmpty(user.getIsPlatformStreamer()) || !user.getIsPlatformStreamer())) {
-                    requestScene.setPhone(user.getMobile());
-                } else {
-                    requestScene.setUserId(-1L);
-                }
-            }
-        }
-        JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
-        if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
-            return Result.success(null);
-        }
-
-        List<Object> mySceneList = mySceneJsonData.getJSONArray("list");
-        if (ObjectUtils.isEmpty(mySceneList)) {
-            return Result.success(mySceneJsonData);
-        }
-        boolean finalGeratedable = geratedable;
-        mySceneList = mySceneList.parallelStream().map(Object -> JSONObject.parseObject(JSONObject.toJSONString(Object)))
-                .peek(object -> {
-                    object.put("sceneUrl", object.getString("webSite"));
-                    object.put("name",object.getString("sceneName"));
-                    // 查找本地记录
-                    String sceneNum = object.getString("num");
-                    SceneEntity sceneEntity = sceneService.queryByScene(sceneNum);
-                    object.put("id",null);
-                    if(!ObjectUtils.isEmpty(sceneEntity)){
-                        object.put("id",sceneEntity.getId());
-                        object.put("appListPicUrl",sceneEntity.getAppListPicUrl());
-                        object.put("isShow",sceneEntity.getIsShow());
-                        object.put("sceneUrl",sceneEntity.getSceneUrl());
-                        object.put("name",sceneEntity.getName());
-                        // 判断名称是否修改，如果修改，则同步到本地
-                        if (!object.get("sceneName").toString().equals(sceneEntity.getName())) {
-                            sceneEntity.setName(object.get("sceneName").toString());
-                            sceneService.update(sceneEntity,true);
-                        }
-                    }
-                    object.put("lived", true);
-                    if(finalGeratedable){
-                        // 查找是否生成直播间记录
-                        BrandEntity brandEntity = brandService.queryByScene(sceneNum);
-                        if (ObjectUtils.isEmpty(brandEntity)) {
-                            object.put("lived", false);
-                        }
-                    }
-                }).collect(Collectors.toList());
-        mySceneJsonData.put("list", mySceneList);
-        return Result.success(mySceneJsonData);
-    }
-
-    /**
-     * 查看信息
-     */
-    @PostMapping("/info")
-    @RequiresPermissions("brand:info")
-    public Result info(@RequestBody SceneEntity SceneEntity) {
-        if(!ObjectUtils.isEmpty(SceneEntity.getId())){
-            SceneEntity scene = sceneService.queryObject(SceneEntity.getId().intValue());
-            return Result.success( scene);
-        }
-        String token = SceneEntity.getToken();
-        if(ObjectUtils.isEmpty(token)){
-            return Result.failure("请传递token信息");
-        }
-        // 获取情景信息
-        RequestScene requestScene = new RequestScene();
-        requestScene.setToken(token);
-        requestScene.setNums("'"+SceneEntity.getSceneNum()+"'");
-        requestScene.setUserId(-1L);
-        JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
-        if(ObjectUtils.isEmpty(mySceneJsonData) || !mySceneJsonData.containsKey("list")){
-            return Result.failure("场景码错误！");
-        }
-
-        List<Object> mySceneList = mySceneJsonData.getJSONArray("list");
-        if (ObjectUtils.isEmpty(mySceneList)) {
-            return Result.failure("场景码错误！");
-        }
-        JSONObject scene = JSONObject.parseObject(JSONObject.toJSONString(mySceneList.get(0)));
-        SceneEntity.setSceneUrl(scene.getString("webSite"));
-        SceneEntity.setName(scene.getString("sceneName"));
-        return Result.success(SceneEntity);
-    }
-
-
-    /**
-     * 删除
-     */
-    @CanUserUpdateRecord
-    @RequestMapping("/delete")
-    @RequiresPermissions("brand:delete")
-    @Transactional(rollbackFor = Exception.class)
-    public Result delete(@RequestBody Integer[] ids) {
-        List<SceneEntity> brandEntityList = new ArrayList<>();
-        if(ObjectUtils.isEmpty(ids)){
-            return Result.success();
-        }
-        sceneService.deleteBatch(ids);
-        return Result.success();
-    }
-
-    /**
-     * 同步四维看看数据
-     */
-    @GetMapping("/sync4dkkSceneData")
-    @Transactional(rollbackFor = Exception.class)
-    public Result sync4dkkSceneData() {
-        CurrentUserLoginVo user = getUser();
-        String mobile = user.getMobile();
-        SysUserEntity userEntity = sysUserService.queryByUserMobile(mobile);
-        if(ObjectUtils.isEmpty(userEntity.getFdkkUser())){
-            throw new CommonBaseException(500, "请绑定四维看看账号！");
-        }
-        sceneService.sync4dkkSceneData(mobile,user.getUserId());
-        return Result.success();
-    }
-
     /**
      * 删除
      */
@@ -288,32 +65,4 @@ public class SceneController extends AbstractController{
         }
         return Result.success("生成直播间功能，请前往直播间查看。");
     }
-
-    @ApiOperation(value = "获取客户所有的非直播间场景数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "用户登录的token", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "body", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "body", required = true, dataType = "Long")}
-    )
-    @PostMapping("/getAllScene")
-    @ResponseBody
-    public Result getAllScene(@RequestBody @ApiParam(name = "四维看看场景请求体", value = "传入json格式", required = true) RequestScene requestScene) {
-
-        // 排除已绑定直播间的数据
-        List<String> sceneNums = brandService.queryAllLiveSceneNum();
-        List<Long> deptIds = null;
-
-        Long userId = getUserId();
-        if(Constant.SUPER_ADMIN != userId){
-            //通过部门ID过滤数据
-            if(null == getDeptId()){
-                return Result.success( new ArrayList<>());
-            }
-            deptIds = departmentUtils.getAllSubDeptIds(getDeptId());
-        }
-        List<SceneEntity> brandList = sceneService.selectByDeptIdsAndExceptSceneNums(deptIds,sceneNums);
-        Map<String ,Object> result = new HashMap<>();
-        result.put("myScene" , brandList);
-        return Result.success( result);
-    }
 }

platform-shop/src/main/java/com/platform/controller/SysUserController.java

@@ -58,18 +58,6 @@ public class SysUserController extends AbstractController {
     @Autowired
     private RestTemplate restTemplate;
 
-    @Autowired
-    private ZhiHouseService zhiHouseService;
-
-    @Autowired
-    private SceneService sceneService;
-
-    @Autowired
-    private BrandService brandService;
-
-    @Autowired
-    private GoodsService goodsService;
-
     @Value("${scenePath}")
     private String scenePath;
 
@@ -200,64 +188,6 @@ public class SysUserController extends AbstractController {
     }
 
     /**
-     * 修改登录用户密码
-     */
-    @SysLog("修改密码")
-    @PostMapping("/bind4dkkUser")
-    public Result bind4dkkUser(@RequestHeader String token, String fdkkPassword, String fdkkUser) {
-        Assert.isBlank(fdkkUser, "手机号不为能空");
-        Assert.isBlank(fdkkPassword, "密码不为能空");
-        //更新密码
-        sysUserService.updatePassword(getUser().getMobile(), null, fdkkPassword, fdkkUser);
-
-        fdkkPassword = Base64Converter.decode(Base64Converter.subText(fdkkPassword));
-
-        // 更新指房宝的密码
-        zhiHouseService.bind4dkkUser(fdkkUser,fdkkPassword,token);
-
-        // 同步数据
-        sceneService.sync4dkkSceneData(getUser().getMobile(),getUserId());
-        return Result.success();
-    }
-
-    /**
-     * 修改登录用户密码
-     */
-    @SysLog("修改密码")
-    @PostMapping("/unBind4dkkUser")
-    public Result unBind4dkkUser(@RequestHeader String token,String fdkkUser) {
-        Assert.isBlank(fdkkUser, "手机号不为能空");
-        //更新密码
-        sysUserService.updatePassword(getUser().getMobile(), null, null, fdkkUser);
-
-        // 指房宝解绑
-        zhiHouseService.bind4dkkUser(fdkkUser,null,token);
-
-        Long currentUserId = getUserId();
-
-        List<SceneEntity> scenes = sceneService.queryByUserId(currentUserId);
-        scenes.parallelStream().filter(scene -> !ObjectUtils.isEmpty(scene.getSceneUrl()))
-                .filter(scene -> scene.getSceneUrl().contains("www.4dkankan.com")
-                        || scene.getSceneUrl().contains("test.4dkankan.com"))
-                .forEach(scene -> {
-                    // 四维看看场景数据解绑
-                    scene.setCreateUserId(null);
-                    sceneService.update(scene, false);
-                    // 四维看看场景直播间数据解绑
-                    BrandEntity brandEntity = brandService.queryByScene(scene.getSceneNum());
-                    if (ObjectUtils.isEmpty(brandEntity)) {
-                        return;
-                    }
-                    brandService.unbindUser(null, brandEntity.getId().intValue());
-                    // 删除直播间
-                    brandService.delete(brandEntity.getId().intValue());
-                    // 直播间商品删除
-                    goodsService.deleteByBrandId(brandEntity.getId());
-                });
-        return Result.success();
-    }
-
-    /**
      * 用户信息
      */
     @GetMapping("/info/{userId}")

platform-shop/src/main/java/com/platform/controller/TokenController.java

@@ -5,7 +5,6 @@ import com.platform.entity.Result;
 import com.platform.entity.SysUserEntity;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
-import com.platform.service.SceneService;
 import com.platform.service.SysUserService;
 import com.platform.service.impl.FdkkService;
 import com.platform.service.impl.ZhiHouseService;
@@ -26,8 +25,6 @@ import java.util.Map;
 public class TokenController extends AbstractController{
 
     protected Logger log = LoggerFactory.getLogger(this.getClass());
-    @Autowired
-    private SceneService sceneService;
 
     @Autowired
     private FdkkService fdkkService;

platform-shop/src/main/java/com/platform/dao/SceneDao.java

@@ -1,26 +0,0 @@
-package com.platform.dao;
-
-import com.platform.entity.SceneEntity;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * Dao
- *
- * @author lipengjun
- * @email 939961241@qq.com
- * @date 2017-08-19 17:59:15
- */
-public interface SceneDao extends BaseDao<SceneEntity> {
-
-    SceneEntity findByName(String sceneName);
-
-    SceneEntity queryBySceneNum(String sceneNum);
-
-    List<SceneEntity> selectByDeptIdsAndExceptSceneNums(@Param("deptIds") List<Long> deptIds, @Param("sceneNums")List<String> sceneNums);
-
-    void updateSceneUser(@Param("fromUserId") Long fromUserId, @Param("toUserId") Long toUserId,@Param("updateUserId") Long updateUserId);
-
-    List<SceneEntity> queryByUserId(Long userId);
-}

platform-shop/src/main/java/com/platform/service/SceneService.java

@@ -1,87 +0,0 @@
-package com.platform.service;
-
-import com.platform.entity.Result;
-import com.platform.entity.SceneEntity;
-
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service接口
- *
- * @author lipengjun
- * @email 939961241@qq.com
- * @date 2017-08-19 17:59:15
- */
-public interface SceneService {
-
-    /**
-     * 根据主键查询实体
-     *
-     * @param id 主键
-     * @return 实体
-     */
-    SceneEntity queryObject(Integer id);
-
-    /**
-     * 分页查询
-     *
-     * @param map 参数
-     * @return list
-     */
-    List<SceneEntity> queryList(Map<String, Object> map);
-
-
-
-    /**
-     * 分页统计总数
-     *
-     * @param map 参数
-     * @return 总数
-     */
-    int queryTotal(Map<String, Object> map);
-
-    /**
-     * 保存实体
-     *
-     * @param brand 实体
-     * @return 保存条数
-     */
-    int save(SceneEntity brand,boolean checkName);
-
-    /**
-     * 根据主键更新实体
-     *
-     * @param brand 实体
-     * @return 更新条数
-     */
-    Result update(SceneEntity brand, boolean checkName);
-
-    /**
-     * 根据主键删除
-     *
-     * @param id
-     * @return 删除条数
-     */
-    int delete(Integer id);
-
-    /**
-     * 根据主键批量删除
-     *
-     * @param ids
-     * @return 删除条数
-     */
-    int deleteBatch(Integer[] ids);
-
-
-    SceneEntity queryByScene(String sceneNum);
-
-    List<SceneEntity> selectByDeptIdsAndExceptSceneNums(List<Long> deptIds, List<String> sceneNums);
-
-    void updateSceneUser(Long fromUserId,Long toUserId,Long currentUserId);
-
-    List<SceneEntity> queryByUserId(Long userId);
-
-    void sync4dkkSceneData(String mobile,Long userId);
-}

platform-shop/src/main/java/com/platform/service/impl/BrandServiceImpl.java

@@ -9,14 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.platform.dao.BrandDao;
 import com.platform.entity.*;
 import com.platform.service.BrandService;
-import com.platform.service.SceneService;
 import com.platform.service.SysUserService;
 import com.platform.service.custom.MySysUserBrandService;
 import com.platform.service.custom.TmBrandTypeService;
 import com.platform.utils.*;
 import com.platform.vo.BrandBindUserVo;
 import com.platform.vos.CurrentUserLoginVo;
-import com.platform.vos.RequestScene;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +48,7 @@ public class BrandServiceImpl implements BrandService {
     private BrandDao brandDao;
 
     @Autowired
-    private SceneService sceneService;
+    private ZhiHouseService zhiHouseService;
 
     @Autowired
     private ControllerUtils controllerUtils;
@@ -256,8 +254,8 @@ public class BrandServiceImpl implements BrandService {
             String videoData =  getSceneVideoData(brandEntity.getSceneNum());
             log.info("四维看看返回的video data={}" , videoData);
             reqData.put("sceneVideoData" , videoData);
-            SceneEntity scene = sceneService.queryByScene(brandEntity.getSceneNum());
-            reqData.put("scenenName" , scene.getName());
+            JSONObject jsonObject = zhiHouseService.queryBySceneNum(brandEntity.getSceneNum());
+            reqData.put("scenenName" , jsonObject.getString("sceneName"));
         }
 
         reqData.put("shareWxQrCode" , brandEntity.getShareWxQrCode());

platform-shop/src/main/java/com/platform/service/impl/SceneServiceImpl.java

@@ -1,154 +0,0 @@
-package com.platform.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.platform.dao.SceneDao;
-import com.platform.entity.Result;
-import com.platform.entity.SceneEntity;
-import com.platform.service.SceneService;
-import com.platform.utils.DateUtils;
-
-import com.platform.vos.ReturnDTO;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service实现类
- *
- * @author lipengjun
- * @email 939961241@qq.com
- * @date 2017-08-19 17:59:15
- */
-@Service
-public class SceneServiceImpl implements SceneService {
-    private static Logger log = LoggerFactory.getLogger(SceneServiceImpl.class);
-
-    @Autowired
-    private SceneDao sceneDao;
-
-    @Autowired
-    private ZhiHouseService zhiHouseService;
-
-    @Override
-    public SceneEntity queryObject(Integer id) {
-        return sceneDao.queryObject(id);
-    }
-
-    @Override
-    public List<SceneEntity> queryList(Map<String, Object> map) {
-        return sceneDao.queryList(map);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        return sceneDao.queryTotal(map);
-    }
-
-    @Override
-    public int save(SceneEntity sceneEntity,boolean checkName) {
-        SceneEntity SceneEntity = sceneDao.findByName(sceneEntity.getName());
-        if(SceneEntity != null){
-            if(ObjectUtils.isEmpty(checkName) || checkName){
-                log.error("场景已经被绑定");
-                return 0;
-            }
-            sceneEntity.setName(sceneEntity.getName().concat(DateUtils.format(new Date(),"MMddHHmmssSSS")));
-        }
-        return sceneDao.save(sceneEntity);
-    }
-
-    @Override
-    public Result update(SceneEntity brand, boolean checkName) {
-        if(checkName){
-            SceneEntity SceneEntity = sceneDao.findByName(brand.getName());
-            if(SceneEntity != null && SceneEntity.getId().intValue() != brand.getId().intValue()){
-                return Result.failure("店铺名称重复");
-            }
-        }
-        int update = sceneDao.update(brand);
-        if(update != 1){
-            return Result.failure("更新店铺失败");
-        }
-        return Result.success();
-    }
-
-    @Override
-    public int delete(Integer id) {
-        return sceneDao.delete(id);
-    }
-
-    @Override
-    public int deleteBatch(Integer[] ids) {
-        return sceneDao.deleteBatch(ids);
-    }
-
-    @Override
-    public SceneEntity queryByScene(String sceneNum) {
-
-        if(StringUtils.isBlank(sceneNum)){
-            return null;
-        }
-        return sceneDao.queryBySceneNum(sceneNum);
-    }
-
-    @Override
-    public List<SceneEntity> selectByDeptIdsAndExceptSceneNums(List<Long> deptIds, List<String> sceneNums) {
-        return sceneDao.selectByDeptIdsAndExceptSceneNums(deptIds,sceneNums);
-    }
-
-    @Override
-    public void updateSceneUser(Long fromUserId, Long toUserId,Long currentUserId) {
-        sceneDao.updateSceneUser(fromUserId,toUserId,currentUserId);
-    }
-
-    @Override
-    public List<SceneEntity> queryByUserId(Long userId) {
-        return sceneDao.queryByUserId(userId);
-    }
-
-    @Override
-    public void sync4dkkSceneData(String mobile,Long userId) {
-        // 请求指房宝获取四维看看数据
-        ReturnDTO returnDTO = zhiHouseService.sync4dkkSceneData(mobile);
-        HashMap<String,List<HashMap<String,String>>> result = (HashMap<String, List<HashMap<String, String>>>) returnDTO.getMessage();
-
-        // 解析数据，获取相机及场景数据，并入库
-        List<HashMap<String, String>> scenes = result.get("scenes");
-
-        if(!ObjectUtils.isEmpty(scenes)){
-            scenes.parallelStream().forEach(map -> {
-                // 查询本地场景是否存在
-                SceneEntity sceneEntity = queryByScene(map.get("num"));
-                if (!ObjectUtils.isEmpty(sceneEntity)) {
-                    if(ObjectUtils.isEmpty(sceneEntity.getCreateUserId())){
-                        sceneEntity.setCreateUserId(userId);
-                        update(sceneEntity,false);
-                    }
-                    return;
-                }
-                SceneEntity scene = new SceneEntity();
-                scene.setName(map.get("sceneName"));
-                scene.setSceneUrl(map.get("webSite"));
-                scene.setSceneNum(map.get("num"));
-                scene.setIsShow(0);
-                scene.setCreateUserId(userId);
-                scene.setUpdateUserId(userId);
-                scene.setIsShow(0);
-                try {
-                    save(scene,false);
-                } catch (Exception e) {
-                    log.error("场景同步失败：{}",JSONObject.toJSONString(map));
-                    e.printStackTrace();
-                }
-            });
-        }
-    }
-}

platform-shop/src/main/resources/com/platform/dao/SceneDao.xml

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.SceneDao">
-
-    <select id="queryObject" resultType="com.platform.entity.SceneEntity">
-		select *  from nideshop_scene
-		where id = #{id}
-	</select>
-
-    <select id="findByName" resultType="com.platform.entity.SceneEntity">
-        select * from nideshop_scene where name = #{brandName}
-    </select>
-
-
-    <select id="queryBySceneNum" resultType="com.platform.entity.SceneEntity">
-        select * from nideshop_scene where scene_num = #{sceneNum} limit 1
-    </select>
-
-    <select id="selectByDeptIdsAndExceptSceneNums" resultType="com.platform.entity.SceneEntity">
-        select * from nideshop_scene scene
-        <if test="deptIds != null and deptIds.size() > 0">
-            join sys_user user on scene.create_user_id = user.user_id
-        </if>
-        <where>
-            <if test="sceneNums != null and sceneNums.size() > 0">
-                AND scene.scene_num not in
-                <foreach item="num" collection="sceneNums" open="(" separator="," close=")">
-                    #{num}
-                </foreach>
-            </if>
-            <if test="deptIds != null and deptIds.size() > 0">
-                AND user.dept_id in
-                <foreach item="deptId" collection="deptIds" open="(" separator="," close=")">
-                    #{deptId}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-    <select id="queryList" resultType="com.platform.entity.SceneEntity">
-        select * from nideshop_scene scene
-        <if test="deptIdList != null and deptIdList.size() > 0">
-            join sys_user user on scene.create_user_id = user.user_id
-        </if>
-        <where>
-            <if test="name != null and name.trim() != ''">
-                scene.name LIKE concat('%',#{name},'%')
-            </if>
-            <if test="idList != null and idList.size() > 0">
-                AND scene.id in
-                <foreach item="id" collection="idList" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="deptIdList != null and deptIdList.size() > 0">
-                AND user.dept_id in
-                <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="createUserId != null">
-                scene.create_user_id LIKE concat('%',#{createUserId},'%')
-            </if>
-        </where>
-        <choose>
-            <when test="sidx != null and sidx.trim() != ''">
-                order by ${sidx} ${order}
-            </when>
-            <otherwise>
-                order by create_time desc
-            </otherwise>
-        </choose>
-        <if test="offset != null and limit != null">
-            limit #{offset}, #{limit}
-        </if>
-    </select>
-
-    <select id="queryTotal" resultType="int">
-        select count(*) from nideshop_scene
-        WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
-        <if test="idList != null and idList.size() > 0">
-            AND id in
-            <foreach item="id" collection="idList" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-    </select>
-
-    <insert id="save" parameterType="com.platform.entity.SceneEntity" useGeneratedKeys="true" keyProperty="id">
-        insert into nideshop_scene(`name`,`is_show`,`app_list_pic_url`,`scene_url`,`scene_num`,`create_user_id`,
-        `update_user_id`,`create_time`,`update_time`,deleted
-        )
-        values(#{name},#{isShow},#{appListPicUrl},#{sceneUrl},#{sceneNum},#{createUserId}, #{updateUserId}, now(),
-        now(),0)
-	</insert>
-
-    <update id="update" parameterType="com.platform.entity.SceneEntity">
-        update nideshop_scene
-        <set>
-            <if test="name != null">`name` = #{name},</if>
-            <if test="isShow != null">`is_show` = #{isShow},</if>
-            <if test="appListPicUrl != null">`app_list_pic_url` = #{appListPicUrl},</if>
-            <if test="sceneUrl != null">`scene_url` = #{sceneUrl},</if>
-            <if test="sceneNum != null">`scene_num` = #{sceneNum},</if>
-            `update_user_id` = #{updateUserId},
-            `create_user_id` = #{createUserId},`update_time` = now()
-        </set>
-        where id = #{id}
-    </update>
-
-    <update id="updateSceneUser">
-        update nideshop_scene set create_user_id = #{toUserId},`update_time` = now(),update_user_id=#{updateUserId} where create_user_id = #{fromUserId}
-    </update>
-
-    <delete id="delete">
-		update nideshop_scene set deleted = 1 where id = #{value}
-	</delete>
-
-    <select id="queryByUserId" resultType="com.platform.entity.SceneEntity">
-        select * from nideshop_scene where create_user_id = #{value}
-    </select>
-
-    <delete id="deleteBatch">
-        update nideshop_scene set deleted = 1
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-</mapper>