提交

src/main/java/cn/ezhizao/framework/task/RyTask.java

@@ -157,9 +157,9 @@ public class RyTask {
 //        BigDecimal totalSpace = BigDecimal.valueOf(Double.parseDouble(total.substring(0, total.length() - 1)));
         // 判断存储余量
         String config = sysConfigService.selectConfigByKey("storage_alarm");
-        System.out.println("总存储空间：" + server.getSysFiles().get(0).getTotal());
-        System.out.println("存储剩余空间：" + server.getSysFiles().get(0).getFree());
-        System.out.println("存储剩余比例：" + server.getSysFiles().get(0).getUsage());
+        System.out.println("总磁盘空间：" + server.getSysFiles().get(0).getTotal());
+        System.out.println("磁盘空间剩余：" + server.getSysFiles().get(0).getFree());
+        System.out.println("磁盘空间使用比例：" + server.getSysFiles().get(0).getUsage());
         System.out.println("预警比例：" + config);
         try {
             if (config != null && Double.parseDouble(config) > 0) {
@@ -175,7 +175,7 @@ public class RyTask {
             }
         } catch (NumberFormatException e) {
             // 发送邮件通知管理员
-            emailService.sendEmail("linliaoyouyin@163.com", "存储余量预警值参数错误", "存储余量预警值设置为" + config + "为非数字，设置错误。请重新设置。");
+            emailService.sendEmail("linliaoyouyin@163.com", "存储余量预警值参数错误", "存储余量预警值设置为" + (config == null || config.isEmpty() ? "空" : config) + "为非数字，设置错误。请重新设置。");
         }
 
     }

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -420,9 +420,9 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         processDetailDrawing.setProducerId(SecurityUtils.getLoginUser().getUser().getUserId());
         processDetailDrawing.setProducer(SecurityUtils.getLoginUser().getUser().getNickName());
         boolean result = bizTechnologicalProcessDetailDrawingService.save(processDetailDrawing);
-        if (result) {
-            sendMessage();
-        }
+//        if (result) {
+//            sendMessage();
+//        }
         return toAjax(result);
     }
 
@@ -435,7 +435,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         if (i == 3) {
             return error("请先上传个人章");
         } else {
-            sendMessage();
+//            sendMessage();
             return toAjax(i);
         }
 
@@ -506,7 +506,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
             drawingRecords.setType("新增");
             bizTechnologicalProcessDetailDrawingRecordsService.save(drawingRecords);
         }
-        sendMessage();
+//        sendMessage();
         return success();
     }
 

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/service/impl/BizTechnologicalProcessDetailDrawingServiceImpl.java

@@ -5,6 +5,8 @@ import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.pdf.PdfUtils;
 import cn.ezhizao.framework.config.RuoYiConfig;
 import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.message.domain.BizMessage;
+import cn.ezhizao.project.business.message.service.IBizMessageService;
 import cn.ezhizao.project.business.personSeal.domain.BizPersonalSeal;
 import cn.ezhizao.project.business.personSeal.mapper.BizPersonalSealMapper;
 import cn.ezhizao.project.business.publicSeal.domain.BizPublicSeal;
@@ -16,7 +18,9 @@ import cn.ezhizao.project.business.technologicalProcessDetailDrawingRecords.doma
 import cn.ezhizao.project.business.technologicalProcessDetailDrawingRecords.mapper.BizTechnologicalProcessDetailDrawingRecordsMapper;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawingUser.domain.BizTechnologicalProcessDetailDrawingUser;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawingUser.mapper.BizTechnologicalProcessDetailDrawingUserMapper;
+import cn.ezhizao.project.system.domain.SysRole;
 import cn.ezhizao.project.system.domain.SysUser;
+import cn.ezhizao.project.system.mapper.SysRoleMapper;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +37,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -60,6 +65,10 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
 
     @Resource
     SysUserMapper sysUserMapper;
+    @Resource
+    SysRoleMapper sysRoleMapper;
+    @Resource
+    IBizMessageService bizMessageService;
 
     @Resource
     BizTechnologicalProcessDetailDrawingUserMapper bizTechnologicalProcessDetailDrawingUserMapper;
@@ -189,6 +198,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                         break;
                     case 1:
                         issuer(item,personalSeal,user);
+                        sendMessage();
                         break;
                 }
             }
@@ -577,4 +587,29 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
         out.write(bos.toByteArray());
         out.close();
     }
+
+    private void sendMessage() {
+        SysRole role = new SysRole();
+        role.setRoleKey("drawingRatify");
+        List<SysRole> roles = sysRoleMapper.selectRoleList(role);
+        List<BizMessage> messages = new ArrayList<>();
+        roles.forEach(l -> {
+            SysUser conditions = new SysUser();
+            conditions.setRoleId(l.getRoleId());
+            List<SysUser> items = sysUserMapper.selectAllocatedList(conditions);
+            items.forEach(v -> {
+                BizMessage message = new BizMessage();
+                message.setFromNickName(SecurityUtils.getLoginUser().getUser().getNickName());
+                message.setFromUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+                message.setFromUserName(SecurityUtils.getLoginUser().getUser().getUserName());
+                message.setToNickName(v.getNickName());
+                message.setToUserId(v.getUserId());
+                message.setToUserName(v.getUserName());
+                message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
+                message.setMessageDate(new Date());
+                messages.add(message);
+            });
+        });
+        bizMessageService.saveBatch(messages);
+    }
 }