Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 
 import java.util.List;
@@ -40,7 +41,7 @@ public interface ISysMessageService {
     List<SysMessage> listSysMessage();
 
     /**
-     * 根据id查询消息
+     * 根据id查询消息*标记已读
      * @param id
      * @return
      */
@@ -54,12 +55,12 @@ public interface ISysMessageService {
      */
     ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager);
 
-    /**
+//    /**
-     * 根据id修改消息状态
+//     * 根据id修改消息状态
-     * @param id
+//     * @param id
-     * @param status
+//     * @param status
-     */
+//     */
-    void updateSysMessageStatusById(String id,Integer status);
+//    void updateSysMessageStatusById(String id,Integer status);
 
     /**
      * 批量删除系统消息
@@ -67,10 +68,16 @@ public interface ISysMessageService {
      */
     void deleteSysMessageByIds(String[] ids);
 
+//    /**
+//     * 批量修改消息状态
+//     * @param ids
+//     * @param status
+//     */
+//    void updateSysMessageStatusByIds(String[] ids,Integer status);
+
     /**
-     * 批量修改消息状态
+     * 添加用户消息关系表
-     * @param ids
+     * @param refUserMessage
-     * @param status
      */
-    void updateSysMessageStatusByIds(String[] ids,Integer status);
+    RefUserMessage insertRefUserMessage(RefUserMessage refUserMessage);
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -31,6 +32,7 @@ import java.util.Map;
  **/
 @RestController
 @Api(description="登陆授权demo")
+@RequestMapping(CoreBaseController.BASE_URL + "/demo")
 public class DemoAuthController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java

@@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -39,9 +40,9 @@ import java.util.Locale;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/demo-mongo-service")
 @Api(description="系统服务demo")
-public class DemoMongoController {
+@RequestMapping(CoreBaseController.BASE_URL + "/demo-mongo-service")
+public class DemoMongoController extends CoreBaseController{
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller;
 
 import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -32,9 +33,9 @@ import java.util.concurrent.TimeoutException;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/demo")
 @Api(description="复杂对象服务demo")
-public class DemoRedisMqController {
+@RequestMapping(CoreBaseController.BASE_URL + "/demo")
+public class DemoRedisMqController extends CoreBaseController{
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoRedisMqController.class);
 
     /**

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
@@ -36,9 +37,9 @@ import java.util.Locale;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/demo-system-service")
 @Api(description="系统服务demo")
-public class DemoResourceController {
+@RequestMapping(CoreBaseController.BASE_URL + "/demo-system-service")
+public class DemoResourceController extends CoreBaseController {
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class);
 
     /**

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.quartz.ScheduleTool;
 import cn.estsh.impp.framework.boot.quartz.TaskInfo;
@@ -22,9 +23,9 @@ import java.util.List;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/schedule")
 @Api(description="定时任务demo")
-public class DemoScheduleController {
+@RequestMapping(CoreBaseController.BASE_URL + "/schedule")
+public class DemoScheduleController extends CoreBaseController{
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class);
 
     /************ 定时任务demo *********/

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.Department;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -30,9 +31,9 @@ import java.net.URLConnection;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/demo")
 @Api(description="树和异常demo")
-public class DemoTreeAndExceptionController {
+@RequestMapping(CoreBaseController.BASE_URL + "/demo")
+public class DemoTreeAndExceptionController extends CoreBaseController{
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
@@ -23,9 +24,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/demo-upload")
 @Api(description="复杂对象服务demo")
-public class DemoUploadController {
+@RequestMapping(CoreBaseController.BASE_URL + "/demo-upload")
+public class DemoUploadController extends CoreBaseController{
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class);
 
     /********************** 文件上传 ***********************/

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java

@@ -7,6 +7,8 @@ import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+import cn.estsh.impp.framework.base.controller.BaseController;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
+
 /**
  * @Description : 用户权限服务
  * @Reference :
@@ -33,9 +36,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/auth")
 @Api(description="用户所有权限操作服务")
-public class AuthController {
+@RequestMapping(CoreBaseController.BASE_URL + "/auth")
+public class AuthController extends CoreBaseController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.controller.base;
 
 import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import io.swagger.annotations.Api;
@@ -20,9 +21,9 @@ import java.util.List;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/simple-service")
 @Api(tags="SimpleController",description="简单服务demo")
-public class SimpleController {
+@RequestMapping(CoreBaseController.BASE_URL +"/simple-service")
+public class SimpleController extends CoreBaseController{
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.Department;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -32,9 +33,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/department")
 @Api(description = "部门管理服务")
-public class DepartmentController {
+@RequestMapping(CoreBaseController.BASE_URL +"/department")
+public class DepartmentController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(DepartmentController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,9 +22,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/enum")
 @Api(description = "系统枚举服务")
-public class EnumController {
+@RequestMapping(CoreBaseController.BASE_URL + "/enum")
+public class EnumController extends CoreBaseController{
 
     @GetMapping("/method-level")
     @ApiOperation(value = "功能类型", notes = "查询全部功能类型功能")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService;
 import cn.estsh.i3plus.pojo.platform.bean.FactoryStore;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,9 +21,9 @@ import java.util.List;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/factory-store")
 @Api(description="复杂对象服务demo")
-public class FactoryStoreController {
+@RequestMapping(CoreBaseController.BASE_URL +"/factory-store")
+public class FactoryStoreController extends CoreBaseController {
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     @PostMapping(value="/insert/{name}/{code}")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -31,9 +32,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/log-operate")
 @Api(description = "操作日志")
-public class LogOperateController {
+@RequestMapping(CoreBaseController.BASE_URL + "/log-operate")
+public class LogOperateController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(LogOperateController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -29,9 +30,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("log-system")
 @Api(description = "系统日志服务")
-public class LogSystemController {
+@RequestMapping(CoreBaseController.BASE_URL +"log-system")
+public class LogSystemController extends CoreBaseController{
     public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.Organize;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -30,9 +31,9 @@ import java.util.List;
  * @Modify      :
  **/
 @RestController
-@RequestMapping("/organize")
 @Api(description = "组织")
-public class OrganizeController {
+@RequestMapping(CoreBaseController.BASE_URL +"/organize")
+public class OrganizeController extends CoreBaseController{
 
     public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class);
 
@@ -59,7 +60,7 @@ public class OrganizeController {
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize);
         } catch (ImppBusiException busExcep) {
             LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
-            return ResultBean.fail(busExcep.getErrorShow()).build();
+            return ResultBean.fail(busExcep).build();
         } catch (Exception e) {
             return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.Position;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -31,9 +32,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/position")
 @Api(description = "岗位管理服务")
-public class PositionController {
+@RequestMapping(CoreBaseController.BASE_URL +"/position")
+public class PositionController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(PositionController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -29,9 +30,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-config")
 @Api(description = "系统参数管理服务")
-public class SysConfigController {
+@RequestMapping(CoreBaseController.BASE_URL +"/sys-config")
+public class SysConfigController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -31,9 +32,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-dictionary")
 @Api(description = "字典管理服务")
-public class SysDictionaryController {
+@RequestMapping(CoreBaseController.BASE_URL +"/sys-dictionary")
+public class SysDictionaryController extends CoreBaseController{
     public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java

@@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.i3plus.pojo.platform.bean.SysFile;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -41,9 +42,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-file")
 @Api(description = "文件资源服务")
-public class SysFileController {
+@RequestMapping(CoreBaseController.BASE_URL +"/sys-file")
+public class SysFileController extends CoreBaseController{
     public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java

@@ -30,8 +30,8 @@ import java.util.List;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/sys-locale-language")
 @Api(description = "系统语言服务")
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-language")
 public class SysLocaleLanguageController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java

@@ -33,8 +33,8 @@ import java.util.List;
  * @Modify:
  **/
 @RestController
-@RequestMapping("/sys-locale-resource")
 @Api(description = "系统语言资源服务")
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-resource")
 public class SysLocaleResourceController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java

@@ -9,6 +9,7 @@
  import cn.estsh.i3plus.pojo.platform.bean.Organize;
  import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
  import cn.estsh.impp.framework.base.controller.BaseController;
+ import cn.estsh.impp.framework.base.controller.CoreBaseController;
  import cn.estsh.impp.framework.boot.auth.AuthUtil;
  import cn.estsh.impp.framework.boot.exception.ImppBusiException;
  import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -32,9 +33,9 @@
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-menu")
 @Api(description = "系统功能服务")
-public class SysMenuController extends BaseController {
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-menu")
+public class SysMenuController extends CoreBaseController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java

@@ -1,14 +1,17 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
+import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.i3plus.pojo.platform.bean.*;
-import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -17,11 +20,15 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,9 +39,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-message")
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-message")
 @Api(description = "消息管理服务")
-public class SysMessageController {
+public class SysMessageController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class);
 
     @Autowired
@@ -44,21 +51,18 @@ public class SysMessageController {
     @ApiOperation(value = "新增消息",notes = "新增消息")
     public ResultBean insertSysMessage(SysMessage sysMessage){
         try {
-            // 登录用户
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            SessionUser user = AuthUtil.getSessionUser();
-
             // 条件校验
             ValidatorBean.beginValid(sysMessage)
                     .notNull("messageTitle",sysMessage.getMessageTitle())
                     .notNull("messageContent",sysMessage.getMessageContent())
-                    .checkNotZero("messageType",sysMessage.getMessageTypeId())
+                    .checkNotZero("messageType",sysMessage.getMessageType())
-                    .notNull("messageRecipientId",sysMessage.getMessageRecipientId());
+                    .notNull("messageReceiversId",sysMessage.getMessageReceiversId());
 
-            // 添加初始化
+            // 设置发件人名称
-            ConvertBean.modelInitialize(sysMessage,user);
 //            sysMessage.setMessageSendId(user.getUser().getId());
 //            sysMessage.setRedSendName(user.getUser().getName());
-            sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue());
+            sysMessage.setMessageSendTime(sdf.format(new Date()));
 
             sysMessageService.insertSysMessage(sysMessage);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -100,11 +104,7 @@ public class SysMessageController {
             ValidatorBean.beginValid(sysMessage)
                     .notNull("messageTitle",sysMessage.getMessageTitle())
                     .notNull("messageContent",sysMessage.getMessageContent())
-                    .checkNotZero("messageType",sysMessage.getMessageTypeId())
+                    .checkNotZero("messageType",sysMessage.getMessageType());
-                    .notNull("messageRecipientId",sysMessage.getMessageRecipientId());
-
-            // 修改初始化
-            ConvertBean.modelUpdate(sysMessage,user);
 
             sysMessageService.updateSysMessage(sysMessage);
             return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -166,23 +166,23 @@ public class SysMessageController {
         }
     }
 
-    @PutMapping("/status")
+//    @PutMapping("/status")
-    public ResultBean updateSysMessageStatusById(String id,Integer status){
+//    public ResultBean updateSysMessageStatusById(String id,Integer status){
-        try {
+//        try {
-            // 条件校验
+//            // 条件校验
-            ValidatorBean.checkNotNull(id,"id不能为空");
+//            ValidatorBean.checkNotNull(id,"id不能为空");
-            ValidatorBean.checkNotZero(status,"修改状态值不能为空");
+//            ValidatorBean.checkNotZero(status,"修改状态值不能为空");
-
+//
-            sysMessageService.updateSysMessageStatusById(id,status);
+//            sysMessageService.updateSysMessageStatusById(id,status);
-            return  ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//            return  ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
+//        }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+//            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
-            return ResultBean.fail(busExcep.getErrorShow());
+//            return ResultBean.fail(busExcep.getErrorShow());
-        }catch(Exception e){
+//        }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+//            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+//            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
-        }
+//        }
-    }
+//    }
 
     @DeleteMapping("/batch-delete")
     @ApiOperation(value = "批量删除消息",notes = "批量删除消息")
@@ -208,28 +208,28 @@ public class SysMessageController {
         }
     }
 
-    @PutMapping("/batch-status")
+//    @PutMapping("/batch-status")
-    @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态")
+//    @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态")
-    public ResultBean updateSysMessageStatusByIds(String[] ids,Integer status){
+//    public ResultBean updateSysMessageStatusByIds(String[] ids,Integer status){
-        try{
+//        try{
-            // 条件判断
+//            // 条件判断
-            ValidatorBean.checkNotZero(status,"状态不能为空");
+//            ValidatorBean.checkNotZero(status,"状态不能为空");
-            ids = ConvertBean.modelSafeArrayNumber(ids,true);
+//            ids = ConvertBean.modelSafeArrayNumber(ids,true);
-            if(ids.length == 0){
+//            if(ids.length == 0){
-                throw ImppExceptionBuilder.newInstance()
+//                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+//                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                        .setErrorDetail("请选择需要操作的资源。")
+//                        .setErrorDetail("请选择需要操作的资源。")
-                        .build();
+//                        .build();
-            }
+//            }
-            sysMessageService.updateSysMessageStatusByIds(ids,status);
+//            sysMessageService.updateSysMessageStatusByIds(ids,status);
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
+//        }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+//            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
-            return ResultBean.fail(busExcep.getErrorShow());
+//            return ResultBean.fail(busExcep.getErrorShow());
-        }catch(Exception e){
+//        }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+//            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+//            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
-        }
+//        }
-    }
+//    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -31,9 +32,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-role")
 @Api(description = "系统角色服务")
-public class SysRoleController {
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-role")
+public class SysRoleController extends CoreBaseController{
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class);
 
@@ -50,9 +51,9 @@ public class SysRoleController {
 
             //新增初始化
             ConvertBean.modelInitialize(role, AuthUtil.getSessionUser());
-            role.setRoleStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
+            role.setRoleStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
-            role.setRedMenuNumber(0);
+            role.setMenuNumber(0);
-            role.setRedModuleNumber(0);
+            role.setModuleNumber(0);
 
             role = sysRoleService.insertSysRole(role);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(role);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.RefUserRole;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -34,9 +35,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-user")
 @Api(description = "系统用户服务")
-public class SysUserController {
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-user")
+public class SysUserController extends CoreBaseController{
 
     public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java

@@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.bean.Department;
 import cn.estsh.i3plus.pojo.platform.bean.SysFile;
 import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -35,9 +36,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys-user-info")
 @Api(description = "系统用户服务")
-public class SysUserInfoController {
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-user-info")
+public class SysUserInfoController extends CoreBaseController{
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java

@@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -32,9 +33,9 @@ import java.util.List;
  * @Modify      :
  **/
 @RestController
-@RequestMapping("/task-time")
 @Api(description = "定时任务服务")
-public class TaskTimeController {
+@RequestMapping(CoreBaseController.BASE_URL +"/task-time")
+public class TaskTimeController extends CoreBaseController{
 
     public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java

@@ -1,13 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -30,9 +29,9 @@ import java.util.List;
  * @Modify      :
  **/
 @RestController
-@RequestMapping("/task-time-expression")
 @Api(description = "系统时间表达式")
-public class TaskTimeExpressionController {
+@RequestMapping(CoreBaseController.BASE_URL +"/task-time-expression")
+public class TaskTimeExpressionController extends CoreBaseController{
 
     public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeExpressionController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java

@@ -1,16 +1,14 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
 import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.Department;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.Tool;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -34,9 +32,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/tool")
 @Api(description = "硬件服务")
-public class ToolController {
+@RequestMapping(CoreBaseController.BASE_URL +"/tool")
+public class ToolController extends CoreBaseController{
     public static final Logger LOGGER = LoggerFactory.getLogger(ToolController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.ToolType;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -31,9 +32,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/tool-type")
 @Api(description = "硬件类型服务")
-public class ToolTypeController {
+@RequestMapping(CoreBaseController.BASE_URL +"/tool-type")
+public class ToolTypeController extends CoreBaseController{
     public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeController.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.platform.bean.Department;
 import cn.estsh.i3plus.pojo.platform.bean.Organize;
 import cn.estsh.i3plus.pojo.platform.bean.Position;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.util.ResultBean;
@@ -30,9 +31,9 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/tree")
 @Api(description = "树服务")
-public class TreeController {
+@RequestMapping(CoreBaseController.BASE_URL + "/tree")
+public class TreeController extends CoreBaseController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.EntityManager;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,7 +54,16 @@ public class UserPermissionDaoImpl implements IUserPermissionDao {
                 " left join RefRoleMenu as rrm on rrm.roleId = rur.roleId" +
                 " left join SysMenu as sm on sm.id = rrm.menuId" +
                 " where rur.userId =:userId";
-        return entityManager.createQuery(hql).setParameter("userId",user.getId()).getResultList();
+        List<SysMenu> list = entityManager.createQuery(hql).setParameter("userId", user.getId()).getResultList();
+        List<SysMenu> result = new ArrayList<>();
+        if(list != null && list.size() > 0){
+            for (SysMenu menu : list) {
+                if(!result.contains(menu)){
+                    result.add(menu);
+                }
+            }
+        }
+        return result;
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.mq;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Queue;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,6 +19,10 @@ public class I3CoreQueueConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(I3CoreQueueConfig.class);
 
     public static final String IMPP_MESSAGE_QUEUE = "IMPP_MESSAGE_QUEUE";
+
+    public static final String IMPP_MESSAGE_MAIL_QUEUE = "IMPP_MESSAGE_MAIL_QUEUE";
+    public static final String IMPP_MESSAGE_LETTER_QUEUE = "IMPP_MESSAGE_LETTER_QUEUE";
+
     @Bean
     public Queue getImppMessageQueue() {
         LOGGER.info("【开启平台消息队列】");

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.core.apiservice.mq;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
+import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
+import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import com.rabbitmq.client.Channel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+/**
+ * @Description : 站内信队列处理
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-15 22:35
+ * @Modify:
+ **/
+@Component
+public class LetterQueueReceiver {
+    private static final Logger LOGGER = LoggerFactory.getLogger(LetterQueueReceiver.class);
+
+    @Autowired
+    ISysMessageService sysMessageService;
+    @Autowired
+    ISysUserService sysUserService;
+
+    /**
+     * 站内信处理队列
+     * @param msg
+     * @param channel
+     * @param message
+     * 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....));
+     */
+//    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE)
+    public void processImppMessage(RefUserMessage msg, Channel channel, Message message) {
+        try {
+            LOGGER.info("【MQ-IMPP_MESSAGE_QUEUE】数据接收成功：{}",msg);
+
+            sysMessageService.insertRefUserMessage(msg);
+
+            //信息已处理
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
+        } catch (IOException e) {
+            LOGGER.error("【MQ-IMPP_MESSAGE_QUEUE】处理出错：{}",e.getMessage(),e);
+            //丢弃这条消息
+            try {
+                // 未成功处理，重新发送
+                channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true);
+            } catch (IOException e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.core.apiservice.mq;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
+import cn.estsh.i3plus.core.apiservice.util.MailUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
+import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import com.rabbitmq.client.Channel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.Message;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Description : 邮件队列处理
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-15 22:15
+ * @Modify:
+ **/
+@Component
+public class MailQueueReceiver {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MailQueueReceiver.class);
+
+    @Autowired
+    ISysMessageService sysMessageService;
+    @Autowired
+    ISysUserService sysUserService;
+
+    /**
+     * 系统邮件处理队列
+     * @param msg
+     * @param channel
+     * @param message
+     */
+//    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE)
+    public void processImppMail(RefUserMessage msg, Channel channel, Message message) {
+        try {
+            LOGGER.info("【MQ-IMPP_MESSAGE_QUEUE】数据接收成功：{}",msg);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            msg.setReceiverTime(sdf.format(new Date()));
+            sysMessageService.insertRefUserMessage(msg);
+
+            SysMessage sysMessage = sysMessageService.getSysMessageById(msg.getMessageId().toString());
+            SysUser sysUser = sysUserService.getSysUserById(msg.getReceiverId().toString());
+
+            MailUtil mailUtil = new MailUtil();
+            mailUtil.setSubject(sysMessage.getMessageTitle());
+            mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.valueOfDescription(sysMessage.getMessageContentType()));
+            mailUtil.setBody(sysMessage.getMessageContent());
+            mailUtil.setTo(sysUser.getUserEmail());
+            mailUtil.send();
+
+            //信息已处理
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
+        } catch (IOException e) {
+            LOGGER.error("【MQ-IMPP_MESSAGE_QUEUE】处理出错：{}",e.getMessage(),e);
+            //丢弃这条消息
+            try {
+                // 未成功处理，重新发送
+                channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true);
+            } catch (IOException e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java

@@ -67,12 +67,12 @@ public class SysMenuService implements ISysMenuService {
         if (sysMenu.getParentId() != null  && sysMenu.getParentId() > 0) {
             SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId());
             ValidatorBean.checkNotNull(parent,"上级权限信息不存在");
-            sysMenu.setRedParentName(parent.getName());
+            sysMenu.setParentNameRdd(parent.getName());
         }
 
         sysMenuRDao.update(sysMenu);
         sysMenuRDao.updateByProperties("parentId",sysMenu.getId(),
-                "redParentName",sysMenu.getName());
+                "parentNameRdd",sysMenu.getName());
     }
 
     @Override
@@ -152,15 +152,15 @@ public class SysMenuService implements ISysMenuService {
             if (sysMenu.getParentId() != null  && sysMenu.getParentId() > 0) {
                 SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId());
                 ValidatorBean.checkNotNull(parent,"上级权限信息不存在");
-                sysMenu.setRedParentName(parent.getName());
+                sysMenu.setParentNameRdd(parent.getName());
             }
             return sysMenuRDao.insert(sysMenu);
         }else {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                     .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
-                    .setErrorDetail("角色代码已存在")
+                    .setErrorDetail("功能代码已存在")
-                    .setErrorSolution("请重新输入角色代码")
+                    .setErrorSolution("请重新输入功能代码")
                     .build();
         }
     }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java

@@ -1,23 +1,22 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
+import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.i3plus.pojo.platform.repository.RefUserMessageRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import org.apache.commons.lang3.StringUtils;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,45 +34,61 @@ public class SysMessageService implements ISysMessageService {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageService.class);
 
     @Autowired
-    public SysMessageRepository sysMessageRDao;
+    private SysMessageRepository sysMessageRDao;
-
+    @Autowired
+    private RefUserMessageRepository refUserMessageRDao;
     @Autowired
-    public SysUserRepository sysUserRDao;
+    private SysUserRepository sysUserRDao;
 
+    /**
+     * rabbitMQ队列
+     */
     @Autowired
-    private SysUserInfoRepository userInfoRDao;
+    private RabbitTemplate rabbitTemplate;
 
     @Override
     public SysMessage insertSysMessage(SysMessage sysMessage) {
-        // 查询接收人名称
+        sysMessage = sysMessageRDao.insert(sysMessage);
-        if (sysMessage.getMessageRecipientId() != null  && sysMessage.getMessageRecipientId() > 0) {
+
-            LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId());
+        String[] messageReceiver = sysMessage.getMessageReceiversId().split(",");
-            SysUserInfo userInfo = userInfoRDao.getById(sysMessage.getMessageRecipientId());
+        // 收件人名称集合
-
+        String[] receiverName = new String[messageReceiver.length];
-            sysMessage.setRedMessageRecipientName(userInfo.getName());
+        RefUserMessage refUserMessage;
+        SysUser sysUser;
+
+        for (int i = 0; i < messageReceiver.length; i++) {
+            sysUser = sysUserRDao.getById(Long.parseLong(messageReceiver[i]));
+            receiverName[i] = sysUser.getUserName();
+
+            refUserMessage = new RefUserMessage();
+            refUserMessage.setMessageId(sysMessage.getId());
+            refUserMessage.setMessageTitleRdd(sysMessage.getMessageTitle());
+            refUserMessage.setMessageTypeRdd(sysMessage.getMessageType());
+            refUserMessage.setReceiverId(sysUser.getId());
+            refUserMessage.setReceiverNameRdd(sysUser.getUserName());
+
+            // 判断消息类型推送到对应的队列
+            if(ImppEnumUtil.USER_MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
+                rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE,refUserMessage);
+            }else{
+                rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE,refUserMessage);
+            }
         }
 
-        LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage);
+        sysMessage.setMessageSenderNameRdd(StringUtils.join(receiverName, ","));
-        return sysMessageRDao.insert(sysMessage);
+        sysMessageRDao.update(sysMessage);
+        return sysMessage;
     }
 
     @Override
     public void deleteSysMessageById(String id) {
         LOGGER.info("消息 SYS_MESSAGE id:{}",id);
+        refUserMessageRDao.deleteByProperty("messageId",Long.parseLong(id));
         sysMessageRDao.deleteById(Long.parseLong(id));
-
     }
 
     @Override
     public void updateSysMessage(SysMessage sysMessage){
-        // 查询接收人名称
-        if (sysMessage.getMessageRecipientId() != null  && sysMessage.getMessageRecipientId() > 0) {
-            LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId());
-            SysUserInfo userInfo = userInfoRDao.getById(sysMessage.getMessageRecipientId());
-
-            sysMessage.setRedMessageRecipientName(userInfo.getName());
-        }
-
         LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage);
         sysMessageRDao.update(sysMessage);
     }
@@ -103,11 +118,11 @@ public class SysMessageService implements ISysMessageService {
         }
     }
 
-    @Override
+//    @Override
-    public void updateSysMessageStatusById(String id, Integer status) {
+//    public void updateSysMessageStatusById(String id, Integer status) {
-        LOGGER.info("消息 SYS_MESSAGE id:{}，status:{}",id,status);
+//        LOGGER.info("消息 SYS_MESSAGE id:{}，status:{}",id,status);
-        sysMessageRDao.updateByProperties("id",Long.parseLong(id),"messageStatusId", status);
+//        sysMessageRDao.updateByProperties("id",Long.parseLong(id),"messageStatusId", status);
-    }
+//    }
 
     @Override
     public void deleteSysMessageByIds(String[] ids) {
@@ -120,12 +135,17 @@ public class SysMessageService implements ISysMessageService {
         sysMessageRDao.deleteByIds(array);
     }
 
-    @Override
+//    @Override
-    public void updateSysMessageStatusByIds(String[] ids,Integer status) {
+//    public void updateSysMessageStatusByIds(String[] ids,Integer status) {
-        LOGGER.info("消息 SYS_MESSAGE ids：{}，status：{}",ids,status);
+//        LOGGER.info("消息 SYS_MESSAGE ids：{}，status：{}",ids,status);
-        StringBuffer where = new StringBuffer();
+//        StringBuffer where = new StringBuffer();
-        HqlPack.getInPack(String.join(",", ids), "id", where);
+//        HqlPack.getInPack(String.join(",", ids), "id", where);
+//
+//        sysMessageRDao.updateByHqlWhere(where.toString(), "messageStatusId", status);
+//    }
 
-        sysMessageRDao.updateByHqlWhere(where.toString(), "messageStatusId", status);
+    @Override
+    public RefUserMessage insertRefUserMessage(RefUserMessage refUserMessage) {
+        return refUserMessageRDao.insert(refUserMessage);
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java

@@ -57,7 +57,7 @@ public class SysRoleService implements ISysRoleService {
     public void updateSysRoleStatus(String id, int status, SessionUser user) {
         LOGGER.info("系统角色 SYS_MENU  id:{} status:{} user:{}", id,status,user);
         SysRole role = sysRoleRDao.getById(Long.parseLong(id));
-        role.setRoleStatusId(status);
+        role.setRoleStatus(status);
         role.setModifyUser(user.getUserName());
         sysRoleRDao.update(role);
     }
@@ -162,11 +162,11 @@ public class SysRoleService implements ISysRoleService {
 
             // 冗余信息
             for (SysRole role : roleList) {
-                role.setRedModuleNumber(moduleListRdd.size());
+                role.setModuleNumber(moduleListRdd.size());
-                role.setRedModuleNames(String.join(",",moduleListRdd));
+                role.setModuleNamesRdd(String.join(",",moduleListRdd));
 
-                role.setRedMenuNumber(featuresListRdd.size());
+                role.setMenuNumber(featuresListRdd.size());
-                role.setRedMenuNames(String.join(",",featuresListRdd));
+                role.setMenuNamesRdd(String.join(",",featuresListRdd));
             }
 
             refRoleMenuRDao.saveAll(refs);
@@ -184,7 +184,10 @@ public class SysRoleService implements ISysRoleService {
     @Override
     public List<RefRoleMenu> findRefRoleMenuByRoleId(String roleId) {
         LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId");
-        return refRoleMenuRDao.findByProperty("roleId",Long.parseLong(roleId));
+        return refRoleMenuRDao.findByProperty(
+                new String[]{"roleId","isValid"},
+                new Object[]{Long.parseLong(roleId),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}
+                );
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java

@@ -1,16 +1,17 @@
 package cn.estsh.i3plus.core.apiservice.util;
 
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
-import sun.misc.BASE64Encoder;
 
 import javax.mail.*;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.Properties;
 
 /**
@@ -145,9 +146,6 @@ public class MailUtil {
      */
     public void send() {
         try {
-            // 乱码
-            BASE64Encoder enc = new BASE64Encoder();
-
             Properties server = new Properties();
             server.put("mail.smtp.port", String.valueOf(this.smtpPort));
             server.put("mail.smtp.host", this.smtpHost);
@@ -159,7 +157,8 @@ public class MailUtil {
 
             MimeMessage msg = new MimeMessage(conn);
             if (nick != null && !"".equals(nick)) {
-                msg.setSubject("=?GB2312?B?" + enc.encode(nick.getBytes())+ "?=");
+
+                msg.setSubject( MimeUtility.encodeText(nick, MimeUtility.mimeCharset("gb2312"), null));
                 msg.setFrom(new InternetAddress(nick + " <" + from + ">"));
             } else {
                 msg.setFrom(new InternetAddress(this.from));
@@ -173,10 +172,9 @@ public class MailUtil {
                 msg.setRecipients(Message.RecipientType.CC, this.cc);
             }
 
-            msg.setSubject("=?GB2312?B?" + enc.encode(this.title.getBytes())+ "?=");
+            msg.setSubject( MimeUtility.encodeText(this.title, MimeUtility.mimeCharset("gb2312"), null));
             msg.setSubject(this.title);
 
-            // 是HTML格式的邮件
             msg.setContent(this.content, this.content_type);
 
             msg.saveChanges();
@@ -193,10 +191,17 @@ public class MailUtil {
             e.printStackTrace();
         } catch (MessagingException e) {
             e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
         }
     }
 
-    public boolean isHtmlModeMail() {
+    public static void main(String[] args) {
-        return this.content_type.equals(CommonConstWords.MAIL_MODE_HTML);
+        MailUtil mail = new MailUtil();
+        mail.setTo("yunhao.wang@estsh.com");
+        mail.setSubject("中文");
+        mail.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getDescription());
+        mail.setBody("内容");
+        mail.send();
     }
 }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/MailUtil.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.core.apiservice.mq;
+
+import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import org.junit.Test;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-15 13:22
+ * @Modify:
+ **/
+public class MailUtil extends TestBase {
+
+    /**
+     * rabbitMQ队列
+     */
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Test
+    public void sendMail() throws InterruptedException {
+
+        SysMessage sysMessage = new SysMessage();
+        sysMessage.setMessageTitle("test-系统通知");
+        sysMessage.setMessageSenderNameRdd("system");
+        sysMessage.setMessageSenderId(-1L);
+        sysMessage.setMessageType(ImppEnumUtil.USER_MESSAGE_TYPE.MAIL.getValue());
+        sysMessage.setMessageSendTime("2018-11-01 16:58:00");
+
+        for (int i = 0; i < 50; i++) {
+            sysMessage = new SysMessage();
+            sysMessage.setId(null);
+            sysMessage.setMessageTitle( i + "mail测试");
+            sysMessage.setMessageSenderNameRdd(i+"");
+            rabbitTemplate.convertAndSend("WYH_MESSAGE_QUEUE", new SysMessage());
+            System.out.println("第" + i + "次");
+        }
+
+    }
+}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMessageServiceImpl.java

@@ -56,13 +56,10 @@ public class TestMessageServiceImpl extends TestBase {
     public void testInsertSysMessage() {
         SysMessage sysMessage = new SysMessage();
         sysMessage.setMessageTitle("test-系统通知");
-        sysMessage.setRedSendName("system");
+        sysMessage.setMessageSenderNameRdd("system");
-        sysMessage.setMessageSendId(-1L);
+        sysMessage.setMessageSenderId(-1L);
-        sysMessage.setRedMessageRecipientName("admin");
+        sysMessage.setMessageType(ImppEnumUtil.USER_MESSAGE_TYPE.MAIL.getValue());
-        sysMessage.setMessageRecipientId(-1L);
+        sysMessage.setMessageSendTime("2018-11-01 16:58:00");
-        sysMessage.setMessageTypeId(ImppEnumUtil.USER_MESSAGE_TYPE.NOTICE.getValue());
-        sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue());
-        sysMessage.setCreateDatetime("2018-11-01 16:58:00");
 
         for (int i = 0; i < 50; i++) {
             sysMessage.setId(null);