授权类型

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

@@ -71,6 +71,7 @@ public enum ResultCode  {
     DEL_AUTH_ERROR(60004, "无授权，无需删除"),
     AUTH_ERROR(60005, "场景管理者无需授权"),
     SCENE_NOT_EXITS(60006, "授权失败，场景不存在或已删除"),
+    SCENE_AUTH_EXITS(60007, "该用户已被授权， 请删除其授权后重试"),
 
 
     ;

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

@@ -20,6 +20,11 @@ public class JySceneUserController {
 
         return ResultData.ok(jySceneUserAuthService.getAuthList(param));
     }
+    @PostMapping("/getAuthType")
+    public ResultData getAuthType(@RequestBody SceneParam param){
+
+        return ResultData.ok(jySceneUserAuthService.getAuthType(param));
+    }
 
     @PostMapping("/setAuthType")
     public ResultData setAuthType(@RequestBody JySceneUserAuth param){

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

@@ -10,6 +10,7 @@ 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.SceneParam;
 import com.fdkankan.manage.vo.request.UserParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,4 +88,10 @@ public class InnerAPIController extends BaseController {
 
         return ResultData.ok( jySceneUserAuthService.checkNumAuth(num,getToken()));
     }
+
+    @PostMapping("/getAuthList")
+    public ResultData getAuthList(@RequestBody SceneParam param){
+
+        return ResultData.ok(jySceneUserAuthService.getAuthList(param));
+    }
 }

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

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
 
+    Object getAuthType(SceneParam param);
+
     Object getAuthList(SceneParam param);
 
     void setAuthType(JySceneUserAuth param);
@@ -35,4 +37,5 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
 
     Object checkNumAuth(String num,String token);
 
+
 }

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

@@ -19,6 +19,7 @@ import com.fdkankan.manage.vo.response.ManageLoginResponse;
 import com.fdkankan.manage.vo.response.SceneAuthVo;
 import com.fdkankan.redis.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.security.Escape;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,6 +53,23 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
 
 
     @Override
+    public Object getAuthType(SceneParam param) {
+        if(StringUtils.isBlank(param.getNum())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        ScenePro pro = sceneProService.getByNum(param.getNum());
+        ScenePlus plus = scenePlusService.getByNum(param.getNum());
+        if(pro == null && plus == null){
+            throw new BusinessException(ResultCode.SCENE_NOT_EXIST);
+        }
+        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(param.getNum());
+        if(jySceneAuth == null ){
+            return new JySceneAuth(0);
+        }
+        return jySceneAuth;
+    }
+
+    @Override
     public Object getAuthList(SceneParam param) {
         if(StringUtils.isBlank(param.getNum())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -64,13 +82,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         }
         Long sceneUserId = pro  == null ? plus.getUserId(): pro.getUserId();
 
-        SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
-        JyUser loginUser = jyUserService.getBySysId(byId.getId());
-
-
-        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(param.getNum());
-        if(jySceneAuth == null ){
-            return new JySceneAuth(0);
+        JyUser loginUser = null;
+        if(StpUtil.isLogin()){
+            loginUser = jyUserService.getBySysId(StpUtil.getLoginId());
+        }else {
+            loginUser = jyUserService.getByRyId(param.getRyId());
         }
 
 
@@ -80,7 +96,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             List<Integer> ids = new ArrayList<>();
             getSubAuthorIdsById(loginUser.getId(),param.getNum(),ids);
             if(ids.size()<=0){
-                return jySceneAuth;
+                return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
             }
             wrapper.in(JySceneUserAuth::getAuthorId,ids);
         }
@@ -98,8 +114,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             }
 
         }
-        jySceneAuth.setPageInfo(PageInfo.PageInfo(page));
-        return jySceneAuth;
+        return PageInfo.PageInfo(page);
     }
 
     private void getSubAuthorIdsById(Integer id,String num,List<Integer> ids) {
@@ -150,6 +165,10 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
+        JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), param.getNum());
+        if(jySceneUserAuth != null){
+            throw new BusinessException(ResultCode.SCENE_AUTH_EXITS);
+        }
         Long sceneUserId = pro == null ? plus.getUserId():pro.getUserId();
 
         if(sceneUserId.equals(jyUser.getUserId())){
@@ -162,6 +181,13 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             sceneJyUser = jyUserService.getByUserId(sceneUserId);
         }
 
+        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(param.getNum());
+        if(jySceneAuth == null){
+            jySceneAuth = new JySceneAuth(0);
+            jySceneAuth.setNum(param.getNum());
+            jySceneAuthService.save(jySceneAuth);
+        }
+
         param.setJyUserId(jyUser.getId());
         param.setAuthorId(sceneJyUser.getId());
         this.save(param);

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

@@ -335,6 +335,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setWebSite(sceneVo.getWebSite());
                 record.setId(sceneVo.getId());
                 record.setStatus(sceneVo.getStatus());
+                record.setSceneName(sceneVo.getSceneName());
             }
 
             if(map !=null ){
@@ -350,7 +351,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setIsAuthOther(true);
             }else {
                 JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), record.getNum());
-                if(jySceneUserAuth != null && (jySceneUserAuth.getCanEditLook() == 1 || jySceneUserAuth.getCanAuthLook() == 1)){
+                if(jySceneUserAuth != null && jySceneUserAuth.getIsAuthor() == 1){
                     record.setIsAuth(true);
                 }
                 if(jySceneUserAuth != null){
@@ -619,7 +620,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5("4Dage168"));
+        System.out.println(SecurityUtil.MD5("5\u0007EFG@AB"));
         System.out.println(SecurityUtil.MD52("4Dage168"));
     }
 }

src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -19,4 +19,6 @@ public class SceneParam extends RequestBase {
     private List<String> snCodes;
     private List<String> sceneCodes;
     private List<String> authNumList = new ArrayList<>();
+
+    private String ryId;
 }