定时任务

单号生成规则

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
+import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 
@@ -20,31 +21,36 @@ public interface ISysMessageService {
      * 添加消息
      * @param sysMessage
      */
+    @ApiOperation(value = "添加消息")
     SysMessage insertSysMessage(SysMessage sysMessage);
 
     /**
      * 删除消息
      * @param id
      */
+    @ApiOperation(value = "删除消息")
     void deleteSysMessageById(Long id);
 
     /**
      * 修改消息
      * @param sysMessage
      */
+    @ApiOperation(value = "修改消息")
     void updateSysMessage(SysMessage sysMessage);
 
     /**
      *  查询全部信息
      * @return
      */
+    @ApiOperation(value = "查询全部信息")
     List<SysMessage> listSysMessage();
 
     /**
-     * 根据id查询消息*标记已读
+     * 根据id查询消息
      * @param id
      * @return
      */
+    @ApiOperation(value = "根据id查询消息")
     SysMessage getSysMessageById(Long id);
 
     /**
@@ -53,6 +59,7 @@ public interface ISysMessageService {
      * @param pager
      * @return
      */
+    @ApiOperation(value = "系统消息复杂查询，分页，排序")
     ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager);
 
 //    /**
@@ -66,6 +73,7 @@ public interface ISysMessageService {
      * 批量删除系统消息
      * @param ids
      */
+    @ApiOperation(value = "批量删除消息")
     void deleteSysMessageByIds(Long[] ids);
 
 //    /**
@@ -76,9 +84,10 @@ public interface ISysMessageService {
 //    void updateSysMessageStatusByIds(String[] ids,Integer status);
 
     /**
-     * 添加用户消息关系表
+     * 添加用户消息关系
      * @param refUserMessage
      */
+    @ApiOperation(value = "添加用户消息关系")
     SysRefUserMessage insertSysRefUserMessage(SysRefUserMessage refUserMessage);
 
     /**
@@ -86,5 +95,22 @@ public interface ISysMessageService {
      * @param sysMessage
      * @return
      */
+    @ApiOperation(value = "添加消息并发送")
     void sendSysMessage(SysMessage sysMessage);
+
+    /**
+     * 分页查询用户消息表
+     * @return
+     */
+    @ApiOperation(value = "分页查询用户消息表")
+    ListPager querySysRefUserMessageByPager(SysRefUserMessage sysRefUserMessage, Pager pager);
+
+    /**
+     * 根据用户id和消息状态和查询用户消息表
+     * @param userId
+     * @param status
+     * @return
+     */
+    @ApiOperation(value = "根据用户id和消息状态和查询用户消息表")
+    List findSysRefUserMessageByUserIdAndStatus(Long userId,Integer status);
 }

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

@@ -31,4 +31,7 @@ public interface ISysOrderNoRuleService {
 
     @ApiOperation(value = "根据code查询单号规则")
     SysOrderNoRule getSysOrderNoRuleCode(String code);
+
+    @ApiOperation(value = "根据id修改用户状态")
+    void updateSysOrderNoRuleCodeStatusById(Long id,Integer status);
 }

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

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
+import cn.estsh.i3plus.core.apiservice.util.MailUtil;
 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.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
@@ -36,7 +38,9 @@ public class SysConfigController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
 
     @Autowired
-    public ISysConfigService sysConfigService;
+    private ISysConfigService sysConfigService;
+    @Autowired
+    private MailUtil mailUtil;
 
     @PostMapping("/insert")
     @ApiOperation(value = "添加系统参数",notes = "添加系统参数")
@@ -122,6 +126,8 @@ public class SysConfigController extends CoreBaseController {
     @ApiOperation(value = "根据id查询系统参数",notes = "根据id查询系统参数")
     public ResultBean getSysConfigById(@PathVariable("id") String id){
         try {
+            ValidatorBean.checkNotNull(id,"id不能为空");
+
             SysConfig sysConfig = sysConfigService.getSysConfigById(Long.parseLong(id));
             if (sysConfig != null) {
                 return ResultBean.success("查询成功")
@@ -141,9 +147,7 @@ public class SysConfigController extends CoreBaseController {
     public ResultBean querySysConfigByPager(SysConfig sysConfig,Pager pager) {
         try {
             ListPager sysConfigListPager = sysConfigService.querySysConfigByPager(sysConfig,pager);
-            return  ResultBean.success("查询成功")
+            return  ResultBean.success("查询成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-                    .setListPager(sysConfigListPager)
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
@@ -155,6 +159,8 @@ public class SysConfigController extends CoreBaseController {
     @ApiOperation(value = "根据代码获取系统配置")
     public ResultBean getSysConfigByCode(@PathVariable("code") String code){
         try {
+            ValidatorBean.checkNotNull(code,"配置项代码不能为空");
+
             SysConfig sysConfig = sysConfigService.getSysConfigByCode(code);
             if(sysConfig == null){
                 return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
@@ -186,10 +192,14 @@ public class SysConfigController extends CoreBaseController {
     }
 
     @PostMapping("/update-code/{code}/{value}")
+    @ApiOperation(value = "根据code修改系统配置")
     public ResultBean updateSysConfigByCode(@PathVariable("code") String code,@PathVariable("value") String value){
         try{
-//            sysConfigService.update
+            ValidatorBean.checkNotNull(code,"配置项代码不能为空");
-            return null;
+            ValidatorBean.checkNotNull(value,"值不能为空");
+
+            sysConfigService.updateSysConfigByCode(code,value);
+            return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
@@ -197,4 +207,23 @@ public class SysConfigController extends CoreBaseController {
         }
     }
 
+    @GetMapping("/send-test-mail/{to}")
+    @ApiOperation(value = "邮件测试")
+    public ResultBean sendTestMail(@PathVariable("to") String to){
+        try {
+            ValidatorBean.checkNotNull(to,"收件人不能为空");
+
+            mailUtil.init();
+            mailUtil.setSubject("测试邮件");
+            mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getDescription());
+            mailUtil.setBody("测试邮件");
+            mailUtil.setTo(to);
+            mailUtil.send();
+            return ResultBean.success("测试邮件已发送").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ 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.SysMessage;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -36,7 +37,7 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping(CoreBaseController.BASE_URL + "/sys-message")
+@RequestMapping(CoreBaseController.BASE_URL)
 @Api(description = "消息管理服务")
 public class SysMessageController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class);
@@ -44,7 +45,7 @@ public class SysMessageController extends CoreBaseController {
     @Autowired
     private ISysMessageService sysMessageService;
 
-    @PostMapping(value = "/insert")
+    @PostMapping(value = "/sys-message/insert")
     @ApiOperation(value = "新增消息",notes = "新增消息")
     public ResultBean insertSysMessage(SysMessage sysMessage){
         try {
@@ -67,15 +68,13 @@ public class SysMessageController extends CoreBaseController {
             sysMessageService.sendSysMessage(sysMessage);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
-    @DeleteMapping("/delete/{id}")
+    @DeleteMapping("/sys-message/delete/{id}")
     @ApiOperation(value = "根据id删除消息",notes = "根据id删除消息")
     public ResultBean deleteSysMessageById(@PathVariable("id") String id){
         try {
@@ -85,15 +84,13 @@ public class SysMessageController extends CoreBaseController {
             sysMessageService.deleteSysMessageById(Long.parseLong(id));
             return  ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
-    @PutMapping("/update")
+    @PutMapping("/sys-message/update")
     @ApiOperation(value = "修改信息",notes = "修改信息")
     public ResultBean updateSysMessage(SysMessage sysMessage){
         try {
@@ -109,30 +106,26 @@ public class SysMessageController extends CoreBaseController {
             sysMessageService.updateSysMessage(sysMessage);
             return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
-    @GetMapping(value = "/list")
+    @GetMapping(value = "/sys-message/list")
     @ApiOperation(value = "查询全部消息",notes = "查询全部消息")
     public ResultBean findSysConfigAll(){
         try {
             List<SysMessage> sysMessageList = sysMessageService.listSysMessage();
             return  ResultBean.success("查询成功").setResultList(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
-    @GetMapping(value = "/get/{id}")
+    @GetMapping(value = "/sys-message/get/{id}")
     @ApiOperation(value = "根据id查询消息",notes = "根据id查询消息")
     public ResultBean getSysConfigById(String id){
         try {
@@ -143,26 +136,22 @@ public class SysMessageController extends CoreBaseController {
                 return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
             }
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
-    @GetMapping(value = "/query")
+    @GetMapping(value = "/sys-message/query")
     @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序")
     public ResultBean querySysMessageByPager(SysMessage sysMessage, Pager pager){
         try {
             ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager);
             return  ResultBean.success("查询成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -184,7 +173,7 @@ public class SysMessageController extends CoreBaseController {
 //        }
 //    }
 
-    @DeleteMapping("/batch-delete")
+    @DeleteMapping("/sys-message/batch-delete")
     @ApiOperation(value = "批量删除消息",notes = "批量删除消息")
     public ResultBean deleteSysMessageByIds(String[] ids){
         try{
@@ -200,11 +189,9 @@ public class SysMessageController extends CoreBaseController {
             sysMessageService.deleteSysMessageByIds(StringTool.getArrayLong(ids));
             return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -232,4 +219,31 @@ public class SysMessageController extends CoreBaseController {
 //            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
 //        }
 //    }
+
+    @GetMapping(value = "/user-message/query")
+    @ApiOperation(value = "用户消息复杂查询，分页，排序")
+    public ResultBean querySysRefUserMessageByPager(SysRefUserMessage sysRefUserMessage,Pager pager){
+        try {
+            ListPager userMessageList = sysMessageService.querySysRefUserMessageByPager(sysRefUserMessage,pager);
+            return  ResultBean.success("查询成功").setListPager(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping(value = "/user-message/find-unread")
+    @ApiOperation(value = "查看用户未读站内信")
+    public ResultBean findUnreadUserMessage(){
+        try {
+            List userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(getSessionUser().getUser().getId(),
+                        ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
+            return  ResultBean.success("查询成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
-import cn.estsh.i3plus.core.apiservice.util.OrderNoMakeUtil;
+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.SysOrderNoRule;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
@@ -42,6 +44,9 @@ public class SysOrderNoRuleController {
                     .checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength())
                     .checkNotZero("isCycle",sysOrderNoRule.getIsCycle());
 
+            sysOrderNoRule.setOrderNoRuleStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            sysOrderNoRule.setSerialNo(CommonEnumUtil.PARENT.DEFAULT.getValue());
+
             sysOrderNoRuleService.insertSysOrderNoRule(sysOrderNoRule);
             return  ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
@@ -115,12 +120,6 @@ public class SysOrderNoRuleController {
             ValidatorBean.checkNotNull(code,"code不能为空");
 
             SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code);
-            if (sysOrderNoRule == null) {
-                return ResultBean.fail("单号规则不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
-            }else {
-                sysOrderNoRule = OrderNoMakeUtil.next(sysOrderNoRule);
-                sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule);
-            }
             return  ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep.getErrorShow());
@@ -129,4 +128,32 @@ public class SysOrderNoRuleController {
         }
     }
 
+    @GetMapping(value = "/query")
+    @ApiOperation(value = "单号规则复杂查询，分页，排序")
+    public ResultBean querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager){
+        try {
+            ListPager sysOrderNoRuleList = sysOrderNoRuleService.querySysOrderNoRuleByPager(sysOrderNoRule, pager);
+            return  ResultBean.success("查询成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @PutMapping(value = "/update-status/{id}/{status}")
+    @ApiOperation(value = "单号规则复杂查询，分页，排序")
+    public ResultBean updateSysOrderNoRuleStatusById(@PathVariable("id") String id,@PathVariable("status") Integer status){
+        try {
+            ValidatorBean.checkNotNull(id,"code不能为空");
+            ValidatorBean.checkNotZero(status,"code不能为空");
+
+            sysOrderNoRuleService.updateSysOrderNoRuleCodeStatusById(Long.parseLong(id),status);
+            return  ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ 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.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
@@ -61,8 +62,10 @@ public class LetterQueueReceiver {
                 refUserMessage.setMessageId(msg.getId());
                 refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                 refUserMessage.setMessageTypeRdd(msg.getMessageType());
+                refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());
                 refUserMessage.setReceiverId(sysUser.getId());
                 refUserMessage.setReceiverNameRdd(sysUser.getUserName());
+                refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
                 refUserMessage.setReceiverTime(TimeTool.getNowTime(true));
 
                 sysMessageService.insertSysRefUserMessage(refUserMessage);

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

@@ -44,8 +44,7 @@ public class MailQueueReceiver {
     //@RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE)
     public void processImppMail(SysMessage msg, Channel channel, Message message) {
         try {
-            LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);
+            LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);msg = sysMessageService.insertSysMessage(msg);
-            msg = sysMessageService.insertSysMessage(msg);
             mailUtil.init();
 
             // 收件人信息
@@ -63,8 +62,10 @@ public class MailQueueReceiver {
                 refUserMessage.setMessageId(msg.getId());
                 refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                 refUserMessage.setMessageTypeRdd(msg.getMessageType());
+                refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());
                 refUserMessage.setReceiverId(sysUser.getId());
                 refUserMessage.setReceiverNameRdd(sysUser.getUserName());
+                refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
                 refUserMessage.setReceiverTime(TimeTool.getNowTime(true));
 
                 sysMessageService.insertSysRefUserMessage(refUserMessage);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java

@@ -1,16 +1,11 @@
 package cn.estsh.i3plus.core.apiservice.schedulejob;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
 import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
 import cn.estsh.impp.framework.boot.init.ApplicationProperties;
 import io.swagger.annotations.ApiOperation;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 /**
  * @Description :  定时任务
@@ -23,20 +18,12 @@ import java.util.Date;
 public class DemoJob extends BaseImppScheduleJob {
     public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class);
 
-    @Autowired
-    private ISysTaskTimeService taskTimeService;
-
     public DemoJob() {
         super(DemoJob.class,"定时任务demo");
     }
 
     @Override
     public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:dd");
-
-        taskTimeService.doSysTaskTimeLastDateByNameAndGroupName(sdf.format(new Date()),
-                context.getJobDetail().getKey().getName(),
-                context.getJobDetail().getKey().getGroup());
         System.out.println("定时任务被执行");
         LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort());
     }

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

@@ -100,8 +100,9 @@ public class SysConfigService implements ISysConfigService {
     }
 
     @Override
+    @ApiOperation(value = "根据code修改系统配置")
     public void updateSysConfigByCode(String code, String value) {
-        SysConfigRDao.updateByProperties("configCode",value,"",value);
+        SysConfigRDao.updateByProperties("configCode",value,"configValue",value);
     }
 
 }

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

@@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefUserMessageRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -48,11 +49,13 @@ public class SysMessageService implements ISysMessageService {
     private RabbitTemplate rabbitTemplate;
 
     @Override
+    @ApiOperation(value = "添加消息")
     public SysMessage insertSysMessage(SysMessage sysMessage) {
         return sysMessageRDao.insert(sysMessage);
     }
 
     @Override
+    @ApiOperation(value = "删除消息")
     public void deleteSysMessageById(Long id) {
         LOGGER.info("消息 SYS_MESSAGE id:{}",id);
         refUserMessageRDao.deleteByProperty("messageId",id);
@@ -60,24 +63,28 @@ public class SysMessageService implements ISysMessageService {
     }
 
     @Override
+    @ApiOperation(value = "修改消息")
     public void updateSysMessage(SysMessage sysMessage){
         LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage);
         sysMessageRDao.update(sysMessage);
     }
 
     @Override
+    @ApiOperation(value = "查询全部信息")
     public List<SysMessage> listSysMessage(){
         LOGGER.info("消息 SYS_MESSAGE list");
         return sysMessageRDao.list();
     }
 
     @Override
+    @ApiOperation(value = "根据id查询消息")
     public SysMessage getSysMessageById(Long id) {
         LOGGER.info("消息 SYS_MESSAGE id:{}",id);
         return sysMessageRDao.getById(id);
     }
 
     @Override
+    @ApiOperation(value = "系统消息复杂查询，分页，排序")
     public ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager) {
         LOGGER.info("消息 SYS_MESSAGE SysMessage:{}，Pager:{}",sysMessage,pager);
         if(sysMessage == null) {
@@ -97,6 +104,7 @@ public class SysMessageService implements ISysMessageService {
 //    }
 
     @Override
+    @ApiOperation(value = "批量删除消息")
     public void deleteSysMessageByIds(Long[] ids) {
         LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString());
         sysMessageRDao.deleteByIds(ids);
@@ -112,11 +120,13 @@ public class SysMessageService implements ISysMessageService {
 //    }
 
     @Override
+    @ApiOperation(value = "添加用户消息关系")
     public SysRefUserMessage insertSysRefUserMessage(SysRefUserMessage refUserMessage) {
         return refUserMessageRDao.insert(refUserMessage);
     }
 
     @Override
+    @ApiOperation(value = "添加消息并发送")
     public void sendSysMessage(SysMessage sysMessage) {
         // 判断消息类型推送到对应的队列
         if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
@@ -125,4 +135,24 @@ public class SysMessageService implements ISysMessageService {
             rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
         }
     }
+
+    @Override
+    @ApiOperation(value = "分页查询用户消息表")
+    public ListPager querySysRefUserMessageByPager(SysRefUserMessage sysRefUserMessage, Pager pager) {
+        if(sysRefUserMessage == null) {
+            pager = PagerHelper.getPager(pager, sysMessageRDao.listCount());
+            return new ListPager(refUserMessageRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlSysRefUserMessage(sysRefUserMessage);
+            pager = PagerHelper.getPager(pager, sysMessageRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(sysMessageRDao.findByHqlWherePage(hqlPack + sysRefUserMessage.orderBy(),pager),pager);
+        }
+    }
+
+    @Override
+    @ApiOperation(value = "根据用户id和消息状态和查询用户消息表")
+    public List findSysRefUserMessageByUserIdAndStatus(Long userId, Integer status) {
+        return refUserMessageRDao.findByProperty(new String[]{"receiverId","messageStatus","messageTypeRdd"},
+                    new Object[]{userId,status,ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue()});
+    }
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
+import cn.estsh.i3plus.core.apiservice.util.OrderNoMakeUtil;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
@@ -82,8 +83,33 @@ public class SysOrderNoRuleService implements ISysOrderNoRuleService {
     }
 
     @Override
-    public SysOrderNoRule getSysOrderNoRuleCode(String code) {
+    public synchronized SysOrderNoRule getSysOrderNoRuleCode(String code) {
-        return sysOrderNoRuleRDao.getByProperty("code",code);
+        SysOrderNoRule sysOrderNoRule = sysOrderNoRuleRDao.getByProperty("orderNoRuleCode",code);
+
+        if (sysOrderNoRule == null) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                    .setErrorDetail("规则代码不存在存在")
+                    .setErrorSolution("请重新输入规则代码")
+                    .build();
+        }else if(sysOrderNoRule.getOrderNoRuleStatus() == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("单号规则已禁用")
+                    .setErrorSolution("请重新输入规则代码")
+                    .build();
+        }else {
+            sysOrderNoRule = OrderNoMakeUtil.next(sysOrderNoRule);
+            sysOrderNoRuleRDao.update(sysOrderNoRule);
+            return sysOrderNoRule;
+        }
+    }
+
+    @Override
+    public void updateSysOrderNoRuleCodeStatusById(Long id, Integer status) {
+        sysOrderNoRuleRDao.updateByProperties("id",id,"orderNoRuleStatus",status);
     }
 
 

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

@@ -30,21 +30,21 @@ public class OrderNoMakeUtil {
         // 流水号长度补全
         String serialNumberFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength());
 
-        if (orderNoRule.getLastMakeSerialNo() > 0) {
+        if (orderNoRule.getSerialNo() > 0) {
-            int serialNo = orderNoRule.getLastMakeSerialNo() + orderNoRule.getSerialNoIncrement();
+            Long serialNo = orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement();
             // 达到最大值后循环或继续
             if(orderNoRule.getSerialNoLength().intValue() < String.valueOf(serialNo).length()
                 && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
-                orderNoRule.setLastMakeSerialNo(orderNoRule.getSerialNoSeed());
+                orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed());
             } else {
-                orderNoRule.setLastMakeSerialNo(orderNoRule.getLastMakeSerialNo() + orderNoRule.getSerialNoIncrement());
+                orderNoRule.setSerialNo(orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement());
             }
         } else {
-            orderNoRule.setLastMakeSerialNo(orderNoRule.getSerialNoSeed());
+            orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed());
         }
-        replace(orderNo, PlatformConstWords.SERIAL_NO, String.format(serialNumberFormatStr, orderNoRule.getLastMakeSerialNo()));
+        replace(orderNo, PlatformConstWords.SERIAL_NO, String.format(serialNumberFormatStr, orderNoRule.getSerialNo()));
 
-        orderNoRule.setLastMakeOrderNo(orderNo.toString());
+        orderNoRule.setOrderNo(orderNo.toString());
         return orderNoRule;
     }
 

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestOrderNoMakeUtil.java

@@ -14,14 +14,14 @@ import org.junit.Test;
 public class TestOrderNoMakeUtil extends TestBase {
 
     @Test
-    public void TestMakeOrderNO() {
+    public void TestMakeOrderNo() {
         SysOrderNoRule sysOrderNoRule = new SysOrderNoRule();
         sysOrderNoRule.setName("一号单据");
         sysOrderNoRule.setOrderNoRule("GG-{yyyy}{MM}{dd}{serialNo}");
-        sysOrderNoRule.setSerialNoSeed(1);
+        sysOrderNoRule.setSerialNoSeed(1L);
-        sysOrderNoRule.setSerialNoIncrement(1);
+        sysOrderNoRule.setSerialNoIncrement(1L);
-        sysOrderNoRule.setSerialNoLength(4);
+        sysOrderNoRule.setSerialNoLength(4L);
-        sysOrderNoRule.setLastMakeSerialNo(9999);
+        sysOrderNoRule.setSerialNo(9999L);
         sysOrderNoRule.setIsCycle(1);
 
         System.out.println(OrderNoMakeUtil.next(sysOrderNoRule));