Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/service/SysMessageService.java

@@ -7,6 +7,7 @@ import com.qmth.sop.business.bean.result.SysMessageResult;
 import com.qmth.sop.business.bean.result.SysMessageWorkResult;
 import com.qmth.sop.business.entity.SysMessage;
 import com.qmth.sop.business.entity.SysNotice;
+import com.qmth.sop.business.entity.TSJobRemind;
 import com.qmth.sop.common.enums.MessageTypeEnum;
 
 import java.util.List;
@@ -41,6 +42,12 @@ public interface SysMessageService extends IService<SysMessage>{
 
     void publishByNotice(SysNotice sysNotice);
 
+    /**
+     * 保存任务提醒
+     * @param tsJobRemind
+     */
+    void publishByTSJobRemind(TSJobRemind tsJobRemind);
+
     boolean read(long id);
 
 

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysMessageServiceImpl.java

@@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.bean.result.SysMessageCountResult;
 import com.qmth.sop.business.bean.result.SysMessageResult;
 import com.qmth.sop.business.bean.result.SysMessageWorkResult;
-import com.qmth.sop.business.entity.SysMessage;
-import com.qmth.sop.business.entity.SysNotice;
-import com.qmth.sop.business.entity.SysUser;
-import com.qmth.sop.business.entity.TBService;
+import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.mapper.SysMessageMapper;
 import com.qmth.sop.business.service.SysMessageService;
 import com.qmth.sop.business.service.SysUserService;
 import com.qmth.sop.business.service.TBServiceService;
 import com.qmth.sop.business.service.TBUserArchivesSupplierService;
+import com.qmth.sop.common.enums.JobQuartzTypeEnum;
+import com.qmth.sop.common.enums.JobTypeEnum;
 import com.qmth.sop.common.enums.MessageTypeEnum;
 import com.qmth.sop.common.enums.NoticeTypeEnum;
 import com.qmth.sop.common.util.ServletUtil;
@@ -75,22 +74,27 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
     public void publishByNotice(SysNotice sysNotice) {
         if (sysNotice.getType() == NoticeTypeEnum.SYSTEM) {
             List<SysUser> sysUsers = sysUserService.listEnable();
-            sysUsers.forEach(s -> {
-                insertMessage(sysNotice, s.getId());
-            });
+            sysUsers.forEach(s -> insertMessage(sysNotice, s.getId()));
         } else if (sysNotice.getType() == NoticeTypeEnum.SUPPLIER) {
             List<SysUser> sysUsers = tbUserArchivesSupplierService.findUsers(sysNotice.getSupplierId());
-            sysUsers.forEach(s -> {
-                insertMessage(sysNotice, s.getId());
-            });
+            sysUsers.forEach(s -> insertMessage(sysNotice, s.getId()));
         } else if (sysNotice.getType() == NoticeTypeEnum.SERVICE) {
             List<TBService> tbServices = tbServiceService.listEnable(sysNotice.getServiceId());
-            tbServices.forEach(s -> {
-                insertMessage(sysNotice, s.getServiceLeadId());
-            });
+            tbServices.forEach(s -> insertMessage(sysNotice, s.getServiceLeadId()));
         }
 
     }
+
+    @Override
+    public void publishByTSJobRemind(TSJobRemind tsJobRemind) {
+        if (tsJobRemind.getType() == JobQuartzTypeEnum.NOTICE) {
+            List<SysUser> sysUsers = sysUserService.listEnable();
+            sysUsers.forEach(s -> insertMessage(tsJobRemind, s.getId()));
+        } else if (tsJobRemind.getType() == JobQuartzTypeEnum.FLOW) {
+            insertMessage(tsJobRemind, tsJobRemind.getReceiveUserId());
+        }
+    }
+
     private void insertMessage(SysNotice sysNotice, Long s) {
         SysMessage sysMessage = new SysMessage();
         sysMessage.setContent(sysNotice.getContent());
@@ -106,6 +110,21 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
         this.save(sysMessage);
     }
 
+    private void insertMessage(TSJobRemind tsJobRemind, Long s) {
+        SysMessage sysMessage = new SysMessage();
+        sysMessage.setCrmNo(null);
+        sysMessage.setFormUserId(tsJobRemind.getCreateId());
+        sysMessage.setNoticeId(tsJobRemind.getId());
+        sysMessage.setReceiveUserId(s);
+        sysMessage.setSendTime(System.currentTimeMillis());
+        sysMessage.setStatus(false);
+        sysMessage.setType(MessageTypeEnum.SYSTEM);
+        sysMessage.setContent(tsJobRemind.getObjName());
+        sysMessage.setType(tsJobRemind.getRemindType().equals(JobTypeEnum.AFTER)?MessageTypeEnum.AFTER:MessageTypeEnum.BEFORE);
+        sysMessage.setCode(tsJobRemind.getCode());
+        this.save(sysMessage);
+    }
+
     @Override
     @Transactional
     public boolean read(long id) {
@@ -124,8 +143,8 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
         for (int i = 0; i < types.length; i++) {
             typeStr[i] = types[i].toString();
         }
-        SysUser sysUser= (SysUser) ServletUtil.getRequestUser();
-        return this.baseMapper.countByTypes(typeStr.length>0?typeStr:null,sysUser.getId());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return this.baseMapper.countByTypes(typeStr.length > 0 ? typeStr : null, sysUser.getId());
     }
 
     @Override
@@ -134,10 +153,9 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
         for (int i = 0; i < types.length; i++) {
             typeStr[i] = types[i].toString();
         }
-        SysUser sysUser= (SysUser) ServletUtil.getRequestUser();
-        return this.baseMapper.pageByTypes(iPage,typeStr.length>0?typeStr:null,status,serviceId,custom,query,startTime,endTime,sysUser.getId());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return this.baseMapper.pageByTypes(iPage, typeStr.length > 0 ? typeStr : null, status, serviceId, custom, query, startTime, endTime, sysUser.getId());
     }
 
 
-
 }