feat: 新增通告

guzijian
1 parent f87060a0
Showing 8 changed files with 123 additions and 5 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
 package com.ruoyi.controller;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.global.Result;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
@@ -8,6 +9,7 @@ import com.ruoyi.pojo.response.ExportReportViewResponseVo;
 import com.ruoyi.pojo.response.ReportErrorResponseVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.service.ReportService;
+import com.ruoyi.system.domain.SysNotice;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -65,6 +67,19 @@ public class ReportController {
         util.exportEasyExcel(response, list, "签到报表");
     }
+    @ApiOperation("告警通知")
+    @GetMapping("/alarm/notice")
+    public Result<?> getAlarmNotice(){
+        return Result.OK(reportService.getAlarmNotice());
+    }
+
+
+    @ApiOperation("确认通知")
+    @PostMapping("/sureNotice")
+    public Result<?> sureNotice(@Validated @RequestBody SysNotice notice){
+        return Result.OK(reportService.sureNotice(notice));
+    }
+
     @ApiOperation("异常报表导出")
     @PostMapping("/error/export")
     public void exportErrorReport(@ApiParam ReportErrorRequestVo requestVo, HttpServletResponse response) {
 package com.ruoyi.service;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
@@ -8,6 +9,8 @@ import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.*;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,9 @@ public class ReportService {
     private SignInMapper signInMapper;
     @Autowired
+    private ISysNoticeService noticeService;
+
+    @Autowired
     private EquipmentExceptionMapper exceptionMapper;
     @Autowired
@@ -188,4 +194,16 @@ public class ReportService {
         List<SignInResponseVo> vos = signInMapper.selectSignInList(vo);
         return vos;
     }
+
+    public SysNotice getAlarmNotice() {
+        String username = SecurityUtils.getUsername();
+        return noticeService.getAlarmNotice(username);
+    }
+
+    public Object sureNotice(SysNotice notice) {
+        String username = SecurityUtils.getUsername();
+        notice.setRemark(notice.getRemark() + "," + username);
+        noticeService.updateNotice(notice);
+        return null;
+    }
 }
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.domain.RuleAttendanceMain;
@@ -25,6 +26,8 @@ import com.ruoyi.job.DriverJob;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +45,7 @@ import sun.misc.BASE64Decoder;
 import javax.annotation.Resource;
 import java.io.*;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -49,6 +53,7 @@ import java.util.stream.Collectors;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 import static com.ruoyi.common.ConstEquipmentProperties.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_ALCOHOL_EX_NUM;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_NO_EX_NUM;
 import static com.ruoyi.common.RuleSchedulingProperties.WORK_FLAG;
@@ -66,6 +71,9 @@ public class ThreadJobService {
     @Autowired
     private IErrorJobcodeService errorJobcodeService;
+    @Autowired
+    private ISysNoticeService noticeService;
+
     @Resource
     private EmailService emailService;
@@ -168,9 +176,47 @@ public class ThreadJobService {
                 exception.setPlanTime(scheduling.getBcType().equals(BC_TYPE_IN) ? new Date(scheduling.getZdsjT()) : new Date(scheduling.getFcsjT()));
             }
             exceptionMapper.insertEquipmentException(exception);
+            // 发送通知
+            sendNotice(signIn, driver, dto, globalIndex);
         }
     }
+    private void sendNotice(SignIn signIn, Driver driver, List<DriverScheduling> dto, GlobalIndex globalIndex) {
+        if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())){
+            SysNotice notice = new SysNotice();
+            notice.setCreateBy("system");
+            notice.setUpdateBy("system");
+            notice.setNoticeTitle("酒精测试异常通知");
+            DriverScheduling item = null;
+            if (CollectionUtil.isEmpty(dto)) {
+                item = new DriverScheduling();
+                handlerNoScheduling(item, signIn, driver);
+            }else {
+                item = dto.get(globalIndex.getIndex());
+            }
+            String jobCode = "工号：" + item.getJobCode() + "\n";
+            String name = "姓名：" + item.getName() + "\n";
+            String posts = "工种：" + item.getPosts() + "\n";
+            String fleetName = "车队：" + item.getFleetName() + "\n";
+            String scheduling = "排班：" + (Objects.isNull(item.getScheduleDate()) ? "无排班" : "有排班") + "\n";
+            String signDate = "打卡时间：" + ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", signIn.getCreateTime()) + "\n";
+            String cause = "原因：酒精测试超标，当前测试值达到" + signIn.getAlcoholIntake() + "mg/100ml。属于" + getResultString(signIn.getAlcoholIntake());
+            String content = jobCode + name + posts + fleetName + scheduling + signDate + cause;
+            notice.setNoticeContent(content);
+            notice.setNoticeType("1");
+            notice.setStatus("0");
+            notice.setCreateTime(DateUtils.getNowDate());
+            notice.setUpdateTime(DateUtils.getNowDate());
+            noticeService.insertNotice(notice);
+        }
+    }
+    private String getResultString(BigDecimal alcoholIntake) {
+        if (alcoholIntake.compareTo(new BigDecimal(20)) >= 0 && alcoholIntake.compareTo(new BigDecimal(80)) < 0)
+            return "饮酒后驾驶机动车";
+        else
+            return "醉酒后驾驶机动车";
+    }
+
     @Async
     public void asyncUploadDriverWithUpdateImageUrl(List<Driver> drivers, String token) {
         // 插入数据
@@ -20,6 +20,9 @@ public class SysNotice extends BaseEntity
     private Long noticeId;
     /** 公告标题 */
+    @Xss(message = "公告标题不能包含脚本字符")
+    @NotBlank(message = "公告标题不能为空")
+    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
     private String noticeTitle;
     /** 公告类型（1通知 2公告） */
@@ -46,9 +49,7 @@ public class SysNotice extends BaseEntity
         this.noticeTitle = noticeTitle;
     }
-    @Xss(message = "公告标题不能包含脚本字符")
-    @NotBlank(message = "公告标题不能为空")
-    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
+
     public String getNoticeTitle()
     {
         return noticeTitle;
@@ -57,4 +57,11 @@ public interface SysNoticeMapper
      * @return 结果
      */
     public int deleteNoticeByIds(Long[] noticeIds);
+
+    /**
+     * 获取当前用户未读通告
+     * @param username
+     * @return
+     */
+    List<SysNotice> getAlarmNotice(String username);
 }
@@ -57,4 +57,11 @@ public interface ISysNoticeService
      * @return 结果
      */
     public int deleteNoticeByIds(Long[] noticeIds);
+
+    /**
+     * 获取当前用户为已读的通告
+     * @param username
+     * @return
+     */
+    SysNotice getAlarmNotice(String username);
 }
 package com.ruoyi.system.service.impl;
 import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.domain.SysNotice;
@@ -89,4 +91,18 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     {
         return noticeMapper.deleteNoticeByIds(noticeIds);
     }
+
+    @Override
+    public SysNotice getAlarmNotice(String username) {
+        List<SysNotice> noticeList = noticeMapper.getAlarmNotice(username);
+        if (noticeList.size() > 0){
+            for (int i = noticeList.size(); i >= 0; i--) {
+                SysNotice notice = noticeList.get(0);
+                if (StringUtils.isEmpty(notice.getRemark()) || !notice.getRemark().contains(username)){
+                    return notice;
+                }
+            }
+        }
+        return null;
+    }
 }
@@ -41,7 +41,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			</if>
 		</where>
     </select>
-    
+    <select id="getAlarmNotice" resultType="com.ruoyi.system.domain.SysNotice">
+        select * from sys_notice
+            order by create_time desc
+            limit 10
+
+    </select>
+
     <insert id="insertNotice" parameterType="SysNotice">
         insert into sys_notice (
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
@@ -70,7 +76,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
             <if test="status != null and status != ''">status = #{status}, </if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+
+            update_time = sysdate()
         </set>
         where notice_id = #{noticeId}
     </update>