v1.3.0

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -77,6 +77,7 @@ public enum ResultCode  {
     API_AUTH_DEL_ERROR(60010, "api添加权限，不可删除"),
     SS_SCENE_DOWN_ERROR(60011, "深时点云场景下载失败"),
     COPY_NUM_NOT_GEN_OBJ(60012, "复制场景不支持生成 Obj"),
+    SHARE_USER_ERROR(60013, "该用户已共享"),
 
 
     ;

src/main/java/com/fdkankan/manage/controller/JyUserShareController.java

@@ -1,9 +1,13 @@
 package com.fdkankan.manage.controller;
 
 
+import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.UserShareParam;
+import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.IJyUserShareService;
+import com.fdkankan.manage.vo.response.UserShareVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,7 +29,31 @@ public class JyUserShareController {
     @PostMapping("/list")
     public ResultData list(@RequestBody UserShareParam param){
 
+        return ResultData.ok(jyUserShareService.pageList(param));
+    }
+
+    @PostMapping("/add")
+    public ResultData add(@RequestBody UserShareVo param){
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        jyUserShareService.add(param.getId());
+        return ResultData.ok();
+    }
+
+    @PostMapping("/delete")
+    public ResultData delete(@RequestBody UserShareVo param){
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        jyUserShareService.removeById(param.getId());
         return ResultData.ok();
     }
+
+    @PostMapping("/sceneList")
+    public ResultData sceneList(@RequestBody UserShareParam param){
+
+        return ResultData.ok(jyUserShareService.sceneList(param));
+    }
 }
 

src/main/java/com/fdkankan/manage/controller/MailTemplateController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-09-22
- */
-@RestController
-@RequestMapping("/manage/mailTemplate")
-public class MailTemplateController {
-
-}
-

src/main/java/com/fdkankan/manage/controller/Scene3dNumController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景编码表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/scene3dNum")
-public class Scene3dNumController {
-
-}
-

src/main/java/com/fdkankan/manage/controller/SceneEditControlsController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/sceneEditControls")
-public class SceneEditControlsController {
-
-}
-

src/main/java/com/fdkankan/manage/controller/SceneEditInfoController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/sceneEditInfo")
-public class SceneEditInfoController {
-
-}
-

src/main/java/com/fdkankan/manage/controller/SceneEditInfoExtController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/sceneEditInfoExt")
-public class SceneEditInfoExtController {
-
-}
-

src/main/java/com/fdkankan/manage/entity/JyUser.java

@@ -65,6 +65,9 @@ public class JyUser implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    /**
+     * 0禁用，1正常
+     */
     @TableField("status")
     private Integer status;
 }

src/main/java/com/fdkankan/manage/entity/UserShareParam.java

@@ -6,7 +6,10 @@ import lombok.Data;
 @Data
 public class UserShareParam extends RequestBase {
 
-    private String nickName;
+    private String ryNickName;
     private String ryNo;
-
+    private Integer mainUserId;
+    private Integer jyUserId;
+    private Integer type;   //0我共享的，1共享给我的
+    private Long userId;
 }

src/main/java/com/fdkankan/manage/mapper/IJyUserShareMapper.java

@@ -1,7 +1,11 @@
 package com.fdkankan.manage.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.entity.JyUserShare;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.entity.UserShareParam;
+import com.fdkankan.manage.vo.response.UserShareVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IJyUserShareMapper extends BaseMapper<JyUserShare> {
 
+    Page<UserShareVo> pageList(Page<UserShareVo> objectPage, UserShareParam param);
 }

src/main/java/com/fdkankan/manage/mapper/IScenePlusMapper.java

@@ -1,8 +1,11 @@
 package com.fdkankan.manage.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.entity.UserShareParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
+import com.fdkankan.manage.vo.response.UserShareSceneVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,4 +26,6 @@ public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
     List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList, @Param("isObj") Integer isObj);
 
     List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
+
+    Page<UserShareSceneVo> shareScenePageList(Page<UserShareSceneVo> objectPage, UserShareParam param);
 }

src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -29,4 +29,8 @@ public interface IJyUserService extends IService<JyUser> {
     JyUser getByUserId(Long sceneUserId);
 
     JyUser getByRyNo(String ryNo);
+
+    List<JyUser> getLikeByNickName(String nickName);
+
+    List<JyUser> getLikeByRyNo(String ryNo);
 }

src/main/java/com/fdkankan/manage/service/IJyUserShareService.java

@@ -1,7 +1,11 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.entity.JyUserShare;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.UserShareParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IJyUserShareService extends IService<JyUserShare> {
 
+    Object pageList(UserShareParam param);
+
+    void add(Integer jyUserId);
+
+    JyUserShare getByMainUserIdAndUserId(Integer sysUserId, Integer jyUserId);
+
+    Object sceneList(UserShareParam param);
 }

src/main/java/com/fdkankan/manage/service/IScenePlusService.java

@@ -1,8 +1,11 @@
 package com.fdkankan.manage.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.UserShareParam;
+import com.fdkankan.manage.vo.response.UserShareSceneVo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,4 +28,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj);
 
     HashMap<Long, Long> getCountGroupByCameraId(ArrayList<Long> longs);
+
+    Page<UserShareSceneVo> shareScenePageList(Page<UserShareSceneVo> objectPage, UserShareParam param);
 }

src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -342,7 +342,8 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             return sceneAuthVo;
         }
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
-        if(jySceneAuth != null  && jySceneAuth.getAuthType() == 0){
+        //if(jySceneAuth != null  && jySceneAuth.getAuthType() == 0){
+        if(jySceneAuth != null  ){
             JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num);
             if(jySceneUserAuth != null){
                 Date date = new Date();

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -91,4 +91,18 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         wrapper.eq(JyUser::getRyNo,ryNo);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public List<JyUser> getLikeByNickName(String nickName) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(JyUser::getRyNickName,nickName);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public List<JyUser> getLikeByRyNo(String ryNo) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(JyUser::getRyNo,ryNo);
+        return this.list(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -1,11 +1,32 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.entity.JyUserShare;
+import com.fdkankan.manage.entity.ScenePlus;
+import com.fdkankan.manage.entity.UserShareParam;
+import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IJyUserShareMapper;
+import com.fdkankan.manage.service.IJyUserService;
 import com.fdkankan.manage.service.IJyUserShareService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IScenePlusService;
+import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.vo.response.UserShareSceneVo;
+import com.fdkankan.manage.vo.response.UserShareVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +38,72 @@ import org.springframework.stereotype.Service;
 @Service
 public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUserShare> implements IJyUserShareService {
 
+
+    @Autowired
+    IJyUserService jyUserService;
+    @Autowired
+    IScenePlusService scenePlusService;
+
+    @Override
+    public Object pageList(UserShareParam param) {
+        JyUser mainUser = jyUserService.getBySysId(StpUtil.getLoginId().toString());
+        if(mainUser == null){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
+        }
+        if(param.getType() == null || param.getType() == 0){
+            param.setMainUserId(mainUser.getId());
+        }
+        if(param.getType() == 1){
+            param.setJyUserId(mainUser.getId());
+        }
+
+        Page<UserShareVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
+        if(param.getType() == 1){
+            List<Long> userIds = page.getRecords().stream().map(UserShareVo::getUserId).collect(Collectors.toList());
+            HashMap<Long, Long> map = scenePlusService.getCountGroupByUserId(userIds, null);
+            for (UserShareVo record : page.getRecords()) {
+                record.setSceneCount(map.get(record.getUserId())== null?0: map.get(record.getUserId()));
+            }
+        }
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
+    public void add(Integer jyUserId) {
+        JyUser jyUser = jyUserService.getById(jyUserId);
+        if(jyUser == null || jyUser.getStatus() != 1){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
+        }
+        JyUser mainUser = jyUserService.getBySysId(StpUtil.getLoginId().toString());
+        if(mainUser == null){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
+        }
+        JyUserShare jyUserShare = this.getByMainUserIdAndUserId(mainUser.getId(),jyUserId);
+        if(jyUserShare != null){
+            throw new BusinessException(ResultCode.SHARE_USER_ERROR);
+        }
+        jyUserShare = new JyUserShare();
+        jyUserShare.setJyUserId(jyUserId);
+        jyUserShare.setMainJyUserId(mainUser.getId());
+        this.save(jyUserShare);
+
+    }
+
+    @Override
+    public JyUserShare getByMainUserIdAndUserId(Integer sysUserId, Integer jyUserId) {
+        LambdaQueryWrapper<JyUserShare> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUserShare::getMainJyUserId,sysUserId);
+        wrapper.eq(JyUserShare::getJyUserId,jyUserId);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public Object sceneList(UserShareParam param) {
+        if(param.getJyUserId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        Page<UserShareSceneVo> page = scenePlusService.shareScenePageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
+
+        return PageInfo.PageInfo(page);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.entity.*;
@@ -9,6 +10,7 @@ import com.fdkankan.manage.mapper.IScenePlusMapper;
 import com.fdkankan.manage.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.vo.response.GroupByCount;
+import com.fdkankan.manage.vo.response.UserShareSceneVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,16 +57,25 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Override
     public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj) {
         HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList,isObj);
-        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        if(!userIdList.isEmpty()){
+            List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList,isObj);
+            result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        }
         return map;
     }
 
     @Override
     public HashMap<Long, Long> getCountGroupByCameraId(ArrayList<Long> cameraIds) {
         HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByCount> result = this.getBaseMapper().getCountGroupByCameraId(cameraIds);
-        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        if(!cameraIds.isEmpty()){
+            List<GroupByCount> result = this.getBaseMapper().getCountGroupByCameraId(cameraIds);
+            result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        }
         return map;
     }
+
+    @Override
+    public Page<UserShareSceneVo> shareScenePageList(Page<UserShareSceneVo> objectPage, UserShareParam param) {
+        return this.getBaseMapper().shareScenePageList(objectPage,param);
+    }
 }

src/main/java/com/fdkankan/manage/vo/response/UserShareSceneVo.java

@@ -0,0 +1,17 @@
+package com.fdkankan.manage.vo.response;
+
+
+import lombok.Data;
+
+@Data
+public class UserShareSceneVo {
+    private Integer id;
+    private String title;
+    private String webSite;
+    private String num;
+    private String createTime;
+    private String algorithmTime;
+    private String ryNo;
+    private String ryNickName;
+    private Integer status;
+}

src/main/java/com/fdkankan/manage/vo/response/UserShareVo.java

@@ -0,0 +1,13 @@
+package com.fdkankan.manage.vo.response;
+
+import lombok.Data;
+
+@Data
+public class UserShareVo {
+    private Integer id;
+    private String ryNickName;
+    private String ryNo;
+    private Integer status;
+    private Long userId;
+    private Long sceneCount;
+}

src/main/resources/mapper/manage/JyUserShareMapper.xml

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.IJyUserShareMapper">
 
+    <select id="pageList" resultType="com.fdkankan.manage.vo.response.UserShareVo">
+        select us.id,u.user_id u.ry_nick_name,u.ry_no,u.status from jy_user u left join jy_user_share us on u.id = us.jy_user_id
+        where u.rec_status = 'A' and us.rec_status = 'A'
+        <if test="param.ryNickName != null and param.ryNickName !=''">
+            and u.ry_nick_name like  concat ('%',#{param.ryNickName},'%')
+        </if>
+        <if test="param.ryNo != null and param.ryNo !=''">
+            and u.ry_no like  concat ('%',#{param.ryNo},'%')
+        </if>
+        <if test="param.mainUserId != null ">
+            and us.main_jy_user_id = #{param.mainUserId}
+        </if>
+        <if test="param.jyUserId != null ">
+            and us.jy_user_id = #{param.jyUserId}
+        </if>
+        order by us.id desc
+    </select>
 </mapper>

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -31,4 +31,16 @@
         </foreach>
         GROUP BY camera_id
     </select>
+    <select id="shareScenePageList" resultType="com.fdkankan.manage.vo.response.UserShareSceneVo">
+        select s.id,s.title,s.num,s.create_time,s.scene_status,e.web_site,e.algorithm_time,ju.ry_no,ju.ry_nick_name
+        from t_scene_plus s
+                 left join  t_scene_plus_ext e on s.id = e.plus_id
+                 left join jy_user ju on s.user_id = ju.user_id
+        where s.rec_status = 'A'
+        <if test="param.jyUserId != null">
+            and s.user_id = #{param.jyUserId}
+        </if>
+        order by s.id desc
+
+    </select>
 </mapper>