Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/business/bdiscuss/controller/BDiscussController.java

@@ -47,9 +47,8 @@ public class BDiscussController extends PaginationController<BDiscuss> {
             @ApiImplicitParam(name = "pid", value = "上一级（评论别人的评论需要）", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "studentId", value = "评论人id", required = true, dataType = "varchar")})
     @PostMapping(value = "/add")
-    public Result add(@Valid BDiscuss bDiscuss, BindingResult bindingResult) {
-//        bDiscuss.setToken(getToken());
-        PersistModel data = bDiscussServiceImpl.save(bDiscuss);
+    public Result add(CurUser curUser, @Valid BDiscuss bDiscuss, BindingResult bindingResult) {
+        PersistModel data = bDiscussServiceImpl.save(curUser,bDiscuss);
         return Result.builder(data,
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/business/bdiscuss/service/BDiscussService.java

@@ -4,6 +4,7 @@ import org.rcisoft.business.bdiscuss.dto.BDiscussDto;
 import org.rcisoft.business.bdiscuss.entity.BDiscuss;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +19,7 @@ public interface BDiscussService {
     * @param bDiscuss
     * @return
     */
-    PersistModel save(BDiscuss bDiscuss);
+    PersistModel save(CurUser curUser, BDiscuss bDiscuss);
 
     /**
     * 逻辑删除 

src/main/java/org/rcisoft/business/bdiscuss/service/impl/BDiscussServiceImpl.java

@@ -12,6 +12,7 @@ import org.rcisoft.common.model.InfoTypeEnum;
 import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
 import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
 import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
+import org.rcisoft.common.util.outClient.MTMicroappApiRequestClient;
 import org.rcisoft.common.util.outClient.MTNotificationApiRequestClient;
 import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.UserUtil;
@@ -22,6 +23,7 @@ import org.rcisoft.business.bdiscuss.entity.BDiscuss;
 import org.rcisoft.business.bdiscuss.service.BDiscussService;
 
 
+import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +71,9 @@ public class BDiscussServiceImpl implements BDiscussService {
     @Autowired
     MTNotificationApiRequestClient client;
 
+    @Autowired
+    MTMicroappApiRequestClient microappApiRequestClient;
+
     /**
     * 保存 bDiscuss
     * @param bDiscuss
@@ -76,8 +81,8 @@ public class BDiscussServiceImpl implements BDiscussService {
     */
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public PersistModel save(BDiscuss bDiscuss){
-        if (StringUtils.isNotBlank(bDiscuss.getReplyId())){
+    public PersistModel save(CurUser curUser,BDiscuss bDiscuss){
+        if (StringUtils.isNotBlank(bDiscuss.getReplyId()) && microappApiRequestClient.isHaveApps(Long.parseLong(curUser.getUserId()),Long.parseLong(curUser.getCorpId()))){
             BNotice bNotice = new BNotice();
 //            UserUtil.setCurrentPersistOperation(bNotice);
             bNotice.setRecipientId(bDiscuss.getReplyId());

src/main/java/org/rcisoft/common/model/MenuMap.java

@@ -32,6 +32,7 @@ public class MenuMap {
         menuMap.put("F-QES", "0022");
         menuMap.put("F-PAPER-CATE", "0031");
         menuMap.put("F-PAPER", "0032");
+        menuMap.put("F-DAILY-QUESTION", "0033");
         menuMap.put("P-ANA-PAPER", "0041");
         menuMap.put("P-ANA-EXAM", "0042");
         menuMap.put("P-ANA-SCORE", "0043");
@@ -39,5 +40,6 @@ public class MenuMap {
         menuMap.put("F-USER-MANAGE", "0052");
         menuMap.put("F-ROLE-MANAGE", "0053");
         menuMap.put("F-NOTICE-MANAGE", "0054");
+        menuMap.put("F-GALLERY-MANAGE", "0055");
     }
 }

src/main/java/org/rcisoft/common/util/feignClient/MicroappFeignClient.java

+package org.rcisoft.common.util.feignClient;
+
+import org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO;
+import org.rcisoft.core.result.Ret;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 智信消息客户端接口
+ */
+@FeignClient(value = "ZX-MICROAPP")
+public interface MicroappFeignClient {
+
+    /**
+     * 发送智信消息
+     * @return
+     */
+    @RequestMapping(value = "/micro_app/isHaveApps",method = RequestMethod.GET)
+    Ret isHaveApps(@RequestParam("UserId") Long UserId,
+                    @RequestParam("corpId") Long corpId,
+                    @RequestParam("appId") Long appId
+    );
+}

src/main/java/org/rcisoft/common/util/outClient/MTMicroappApiRequestClient.java

+package org.rcisoft.common.util.outClient;
+
+import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.common.util.feignClient.FileFeignClient;
+import org.rcisoft.common.util.feignClient.MicroappFeignClient;
+import org.rcisoft.common.util.feignDto.MTOssRspDTO;
+import org.rcisoft.core.result.Ret;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 消息通知接口调用
+ * @author David
+ */
+@Slf4j
+@Component
+public class MTMicroappApiRequestClient {
+
+    public static Long appId = (long)1;
+
+//    @Autowired
+    private MicroappFeignClient microappFeignClient;
+
+    public boolean isHaveApps(long userId, long corpId) {
+        Ret ret = microappFeignClient.isHaveApps(userId,corpId,appId);
+        if(ret != null && "M0000".equals(ret.getCode())){
+            return (boolean) ret.getData();
+        }
+        return false;
+    }
+
+}

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -185,7 +185,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     public int addAdminRoleMenuUser(CurUser curUser) {
 
-        String privilege = "M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE";
+        String privilege = "M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-DAILY-QUESTION,F-GALLERY-MANAGE";
         //主管理员角色id
         String mRId = IdGen.uuid();
         //初始化角色（新加公司超级管理员）