留言权限检查

gis_cms/src/main/java/com/gis/cms/controller/WebManageController.java

@@ -180,10 +180,10 @@ public class WebManageController {
         return goodsVoteService.goodsVoteDelByType(goodsId, "like");
     }
 
-    @ApiOperation(value = "v0.2-检查留言", notes = "true:需要弹窗， false:不需要弹窗, 类型：comment:留言，barrage:弹幕")
-    @GetMapping("check/message/{type}")
-    public Result checkMessage(@PathVariable String type) {
-        return webService.checkMessage(type);
+    @ApiOperation(value = "v0.2-检查留言权限", notes = "true:有， false:没有")
+    @GetMapping("check/message")
+    public Result checkMessage() {
+        return webService.checkMessage();
     }
 
 

gis_cms/src/main/java/com/gis/cms/service/WebService.java

@@ -10,5 +10,5 @@ import com.gis.common.util.Result;
 public interface WebService {
 
 
-    Result checkMessage(String type);
+    Result checkMessage();
 }

gis_cms/src/main/java/com/gis/cms/service/impl/QuestionGroupServiceImpl.java

@@ -343,7 +343,7 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
         JSONArray array = new JSONArray();
         for (Map.Entry<String, String> entry : options.entrySet()) {
             String key = entry.getKey();
-            String value = entry.getValue();
+            String value = entry.getValue(); 
             JSONObject obj = new JSONObject();
             obj.put("val", key);
             obj.put("name", value);

gis_cms/src/main/java/com/gis/cms/service/impl/WebServiceImpl.java

@@ -43,15 +43,15 @@ public class WebServiceImpl implements WebService {
 
 
     @Override
-    public Result checkMessage(String type) {
-        Boolean flag = false;
+    public Result checkMessage() {
+//        Boolean flag = false;
 
         Long tokenUserId = getTokenUserId();
 
         // 权限标签
         Boolean permFlag = false;
         Set<String> permissionKey = sysResourceService.getPermissionByUserId(tokenUserId);
-        if (permissionKey.contains("comment:display") || permissionKey.contains("barrage:display")){
+        if (permissionKey.contains("comment:display")){
             log.info("该用户有留言权限： {}", tokenUserId);
             permFlag = true;
         }
@@ -61,21 +61,21 @@ public class WebServiceImpl implements WebService {
         // 2.没有留言、弹幕是否显示权限：不提醒，返回false
         // 3.有权限、没有留言： 需要提醒，返回true;
 
-        if ("comment".equals(type)){
-            Integer n = commentService.countByUserId(tokenUserId);
-            if (n == 0 && permFlag){
-                flag = true;
-                log.info("留言需要提醒");
-            }
-        } else {
-            Integer n = barrageService.countByUserId(tokenUserId);
-            if (n == 0 && permFlag){
-                flag = true;
-                log.info("弹幕需要提醒");
-            }
-        }
-
-        return Result.success(flag);
+//        if ("comment".equals(type)){
+//            Integer n = commentService.countByUserId(tokenUserId);
+//            if (n == 0 && permFlag){
+//                flag = true;
+//                log.info("留言需要提醒");
+//            }
+//        } else {
+//            Integer n = barrageService.countByUserId(tokenUserId);
+//            if (n == 0 && permFlag){
+//                flag = true;
+//                log.info("弹幕需要提醒");
+//            }
+//        }
+
+        return Result.success(permFlag);
     }