inner接口

src/main/java/com/fdkankan/manage/config/SaTokenConfigure.java

@@ -45,7 +45,7 @@ public class SaTokenConfigure {
     public SaServletFilter getSaServletFilter() {
         return new SaServletFilter()
                 // 指定 拦截路由 与 放行路由
-                .addInclude("/**").addExclude("/**/reMyselfPassword","/test/**","/**/external/**")
+                .addInclude("/**").addExclude("/**/reMyselfPassword","/test/**","/**/external/**","/**/inner/**")
                 // 认证函数: 每次请求执行
                 .setAuth(obj -> {
                     log.info("---------- 进入Sa-Token全局认证 -----------");

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -0,0 +1,70 @@
+package com.fdkankan.manage.controller.inner;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.entity.JySceneUserAuth;
+import com.fdkankan.manage.exception.BusinessException;
+import com.fdkankan.manage.service.IJySceneUserAuthService;
+import com.fdkankan.manage.service.IJyUserService;
+import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.util.RsaUtils;
+import com.fdkankan.manage.vo.request.UserParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@RestController
+@RequestMapping("/service/manage/inner")
+public class InnerAPIController {
+
+    @Autowired
+    IJyUserService jyUserService;
+    @Autowired
+    IUserService userService;
+    @Autowired
+    IJySceneUserAuthService jySceneUserAuthService;
+
+    @PostMapping("/getByRyId")
+    public ResultData getByRyId(@RequestBody UserParam param){
+        return ResultData.ok(jyUserService.getByRyId(param.getRyId()));
+    }
+
+    @PostMapping("/addUcenterUser")
+    public ResultData addUcenterUser(@RequestBody UserParam param){
+        userService.addUcenterUser(param);
+        return ResultData.ok();
+    }
+
+
+    @PostMapping("/delUcenterUser")
+    public ResultData delUcenterUser(@RequestBody UserParam param){
+        userService.delUcenterUser(param);
+        return ResultData.ok();
+    }
+
+
+    @PostMapping("/addAuth")
+    public ResultData addAuth(@RequestBody JySceneUserAuth param){
+        jySceneUserAuthService.addAuth(param);
+        return ResultData.ok();
+    }
+
+
+    @PostMapping("/delAuth")
+    public ResultData delAuth(@RequestBody JySceneUserAuth param){
+        if(StringUtils.isBlank(param.getNum()) || StringUtils.isBlank(param.getRyId())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        JySceneUserAuth db = jySceneUserAuthService.getByNumAndRyId(param.getNum(),param.getRyId());
+        if(db == null){
+            throw new BusinessException(ResultCode.DEL_AUTH_ERROR);
+        }
+        jySceneUserAuthService.delAuth(db);
+        return ResultData.ok();
+    }
+
+}

src/main/java/com/fdkankan/manage/httpClient/client/TestClient.java

@@ -0,0 +1,19 @@
+package com.fdkankan.manage.httpClient.client;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.*;
+import com.fdkankan.manage.httpClient.address.FdkkAddressSource;
+
+import java.util.HashMap;
+
+/**
+ * 获取，调用4dkk服务
+ */
+public interface TestClient {
+
+    @Get(value = "http://192.168.0.25/service/manage/external/addUcenterUser")
+    JSONObject addUcenterUser( @Body String param);
+
+    @Get("/ucenter/_manage/_copy_scene")
+    JSONObject copyScene( @Query HashMap<String, Object> param ,@Header("sign") String sign);
+}

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

@@ -21,4 +21,6 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
     void delAuth(JySceneUserAuth param);
 
     JySceneUserAuth getByNumAndRyId(String num, String ryId);
+
+    JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -21,4 +22,8 @@ public interface IJyUserService extends IService<JyUser> {
     List<JyUser> getListByRyId(String ryId);
 
     JyUser getByRyId(String ryId);
+
+    HashMap<Long, JyUser> getMapByUserIds(Set<Long> userIds);
+
+    JyUser getBySysId(Object loginId);
 }

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

@@ -96,7 +96,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             throw new BusinessException(ResultCode.AUTH_ERROR);
         }
 
-        JySceneUserAuth auth = this.getByNumAndJyId(jyUser.getId(),param.getNum());
+        JySceneUserAuth auth = this.getByNumAndJyUserId(jyUser.getId(),param.getNum());
         if(auth != null){
             param.setId(auth.getId());
         }
@@ -115,7 +115,8 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         this.removeById(param.getId());
     }
 
-    private JySceneUserAuth getByNumAndJyId(Integer jyUserId, String num) {
+    @Override
+    public JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num) {
         LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);
         wrapper.eq(JySceneUserAuth::getNum,num);
@@ -128,6 +129,6 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
-        return this.getByNumAndJyId(jyUser.getId(),num);
+        return this.getByNumAndJyUserId(jyUser.getId(),num);
     }
 }

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -50,4 +51,23 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         wrapper.eq(JyUser::getRyId,ryId);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public HashMap<Long, JyUser> getMapByUserIds(Set<Long> userIds) {
+        HashMap<Long, JyUser> map = new HashMap<>();
+        if(userIds.size() >0){
+            LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(JyUser::getUserId,userIds);
+            List<JyUser> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getUserId(),entity));
+        }
+        return map;
+    }
+
+    @Override
+    public JyUser getBySysId(Object loginId) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getSysUserId,loginId);
+        return this.getOne(wrapper);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -80,6 +81,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     FdKKClient fdKKClient;
     @Autowired
     IFolderSceneService folderSceneService;
+    @Autowired
+    IJyUserService jyUserService;
+    @Autowired
+    IJySceneUserAuthService jySceneUserAuthService;
 
 
     @Override
@@ -293,11 +298,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<SceneVo> records = page.getRecords();
-        HashMap<String,SceneCopyLog> map = null;
-        if(records.size() >0){
-            List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
-            map = copyLogService.getByNewNumList(numList);
-        }
+        List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+        HashMap<String,SceneCopyLog> map =  copyLogService.getByNewNumList(numList);
+
+        JyUser jyUser = jyUserService.getBySysId(StpUtil.getLoginId());
+
+
         for (SceneVo record : page.getRecords()) {
             record.setStatusString(SceneStatusUtil.getStatusString(record));
             if(map !=null ){
@@ -307,6 +313,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     record.setIsCopy(true);
                 }
             }
+            if(jyUser.getUserId().equals(record.getUserId())){
+                record.setIsAuth(true);
+                record.setIsAuthOther(true);
+            }else {
+                JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), record.getNum());
+                if(jySceneUserAuth != null && jySceneUserAuth.getIsAuthor() == 1){
+                    record.setIsAuth(true);
+                }
+            }
+
         }
         return PageInfo.PageInfo(page);
     }

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

@@ -22,6 +22,8 @@ public class SceneVo {
 
     private String algorithmTime;  //v4场景计算完成时间
 
+    private Long userId;
     private Boolean isAuth = false;          //是否有授权按钮
+    private Boolean isAuthOther = false;     //是否有授权其他人选项按钮
 
 }

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

@@ -31,7 +31,7 @@
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as thumb
-        ,null as algorithmTime
+        ,null as algorithmTime,s.user_id
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -41,7 +41,7 @@
         UNION
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as thumb
-        ,algorithm_time
+        ,algorithm_time,s.user_id
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>