feat: 增加定时任务，计算签到未签人员

guzijian
1 parent bbbd710c
Showing 11 changed files with 218 additions and 63 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/DriverSignInRecommendation.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.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
@@ -7,7 +7,6 @@ import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 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;
@@ -19,9 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.ruoyi.common.ConstSignInConstSignInProperties.EXPORT;
  
 /**
  * @author 20412
@@ -69,8 +65,8 @@ public class ReportController {
  
     @ApiOperation("告警通知")
     @GetMapping("/alarm/notice")
-    public Result<?> getAlarmNotice(){
-        return Result.OK(reportService.getAlarmNotice());
+    public Result<?> getAlarmNotice(@RequestParam(value = "type",required = false) Integer type){
+        return Result.OK(reportService.getAlarmNoticeByType(type));
     }
  
  
@@ -107,4 +107,9 @@ public interface IDriverService
      * @param jobList
      */
     void deleteNotEmptyJob(List<String> jobList);
+
+    /**
+     * 计算异常班次
+     */
+    void computedExceptionScheduling();
 }
@@ -12,6 +12,7 @@ import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
 import com.github.pagehelper.util.StringUtil;
+import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,6 +20,7 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.common.global.ResultCode;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
@@ -35,6 +37,8 @@ import com.ruoyi.pojo.response.DriverResponseVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -70,6 +74,9 @@ public class DriverServiceImpl implements IDriverService {
  
     private Logger log = LoggerFactory.getLogger(DriverServiceImpl.class);
  
+    @Autowired
+    private ISysNoticeService noticeService;
+
     @Value("${api.url.getSchedulingInfo}")
     private String schedulingInfoUrl;
     @Value("${api.config.password}")
@@ -80,6 +87,9 @@ public class DriverServiceImpl implements IDriverService {
     private SchedulingCache schedulingCache;
  
     @Resource
+    private NowSchedulingCache nowSchedulingCache;
+
+    @Resource
     private SchedulingService schedulingService;
  
     @Autowired
@@ -131,20 +141,9 @@ public class DriverServiceImpl implements IDriverService {
     }
  
     private DriverSignInRecommendation checkTime(List<DriverScheduling> dto, Long now) {
-        Map<Integer, DriverSignInRecommendation> timeMap = new HashMap<>();
-        for (int i = 0; i < dto.size(); i++) {
-            timeMap.put(i, new DriverSignInRecommendation(dto.get(i), i));
-        }
-        long minDiff = Long.MAX_VALUE;
         Integer index = 0;
-        // 迭代比较每个时间戳与当前时间戳的差值
-        for (Integer i : timeMap.keySet()) {
-            long diff = Math.abs(now - timeMap.get(i).getTimestamps());
-            if (diff < minDiff) {
-                minDiff = diff;
-                index = i;
-            }
-        }
+        Map<Integer, DriverSignInRecommendation> timeMap = new HashMap<>();
+        index = handleSchedulingMap(dto, now, timeMap);
  
         LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
         LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
@@ -173,6 +172,23 @@ public class DriverServiceImpl implements IDriverService {
         return timeMap.get(index);
     }
  
+    private static Integer handleSchedulingMap(List<DriverScheduling> dto, Long now, Map<Integer, DriverSignInRecommendation> timeMap) {
+        Integer index = 0;
+        for (int i = 0; i < dto.size(); i++) {
+            timeMap.put(i, new DriverSignInRecommendation(dto.get(i), i));
+        }
+        long minDiff = Long.MAX_VALUE;
+        // 迭代比较每个时间戳与当前时间戳的差值
+        for (Integer i : timeMap.keySet()) {
+            long diff = Math.abs(now - timeMap.get(i).getTimestamps());
+            if (diff < minDiff) {
+                minDiff = diff;
+                index = i;
+            }
+        }
+        return index;
+    }
+
  
     /**
      * 新增驾驶员信息
@@ -233,7 +249,7 @@ public class DriverServiceImpl implements IDriverService {
         // 获取考勤表进行比对，因为排班数据是会变化的
         List<DriverScheduling> dto = schedulingService.queryScheduling(jobCode, now);
         log.info("获取到排班数据:{}", cacheMapValue);
-        if (jobCode.equals("700001")){
+        if (jobCode.equals("700001")) {
             return AjaxResult.success("");
         }
         // 优先从缓存中读取
@@ -335,15 +351,15 @@ public class DriverServiceImpl implements IDriverService {
             dto = schedulingService.queryScheduling(item.getJobCode(), now);
             DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
             // 针对指定用户操作
-            if ( item.getJobCode().equals("722717") || item.getJobCode().equals("700001")) {
-                if (!CollectionUtil.isEmpty(dto) && vo.getPlanAction().equals(SIGN_IN_STRING) ){
+            if (item.getJobCode().equals("722717") || item.getJobCode().equals("700001")) {
+                if (!CollectionUtil.isEmpty(dto) && vo.getPlanAction().equals(SIGN_IN_STRING)) {
                     vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
-                }else if (!CollectionUtil.isEmpty(dto)){
+                } else if (!CollectionUtil.isEmpty(dto)) {
                     vos.add(vo);
-                }else {
+                } else {
                     vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
                 }
-            }else {
+            } else {
                 // 无排班
                 if (Objects.isNull(vo)) {
                     vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, false, false, "", "", ""));
@@ -359,15 +375,16 @@ public class DriverServiceImpl implements IDriverService {
  
     /**
      * 100一下的都设置为有酒精测试的设备
+     *
      * @param deviceId
      * @return
      */
     public static boolean doCheckDevice(String deviceId) {
-        if (StringUtil.isEmpty(deviceId)){
+        if (StringUtil.isEmpty(deviceId)) {
             return true;
         }
         int num = Integer.parseInt(deviceId);
-        if (num < 101){
+        if (num < 101) {
             return true;
         }
         return false;
@@ -512,6 +529,57 @@ public class DriverServiceImpl implements IDriverService {
         driverMapper.deleteNotEmptyJob(jobList);
     }
  
+    @Override
+    public void computedExceptionScheduling() {
+        // 从当前缓存种读取所有的签到数据 遍历每个工号的打卡集合
+        Map<String, List<DriverScheduling>> map = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(new Date()));
+        List<DriverSignInRecommendation> nowTimerList = new ArrayList<>();
+        Long now = System.currentTimeMillis();
+        for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
+            List<DriverScheduling> value = entry.getValue();
+            // 匹配
+            Map<Integer, DriverSignInRecommendation> timeMap = new HashMap<>();
+            Integer index = handleSchedulingMap(value, now, timeMap);
+            nowTimerList.add(timeMap.get(index));
+        }
+        // 处理当前时间段未签人员
+        nowTimerList = handleTimeOutPerson(nowTimerList);
+        sendNotice(nowTimerList);
+    }
+
+    private void sendNotice(List<DriverSignInRecommendation> nowTimerList) {
+        List<SysNotice> noticeList = new ArrayList<>(nowTimerList.size());
+        for (DriverSignInRecommendation item : nowTimerList) {
+            SysNotice notice = new SysNotice();
+            notice.setCreateBy("system");
+            notice.setUpdateBy("system");
+            notice.setNoticeTitle("应签未签通知");
+            String jobCode = "工号：" + item.getJobCode() + "\n";
+            String name = "姓名：" + item.getName() + "\n";
+            String posts = "工种：" + item.getPosts() + "\n";
+            String fleetName = "车队：" + item.getFleetName() + "\n";
+            String scheduling = "排班：" + "有排班" + "\n";
+            String signDate = "计划签到时间：" + ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(item.getTimestamps())) + "\n";
+            String content = jobCode + name + posts + fleetName + scheduling + signDate;
+            notice.setNoticeContent(content);
+            notice.setNoticeType("1");
+            notice.setStatus("0");
+            notice.setCreateTime(DateUtils.getNowDate());
+            notice.setUpdateTime(DateUtils.getNowDate());
+            notice.setPlanTime(new Date(item.getTimestamps()));
+            notice.setJobCode(item.getJobCode());
+            noticeList.add(notice);
+        }
+        noticeService.saveBatch(noticeList);
+    }
+
+    private List<DriverSignInRecommendation> handleTimeOutPerson(List<DriverSignInRecommendation> nowTimerList) {
+        return nowTimerList.stream()
+                // 筛选应签未签人员
+                .filter(item -> Objects.isNull(item.getSignTime()) || item.getTimestamps() - item.getSignTime() < 0)
+                .collect(Collectors.toList());
+    }
+
     /**
      * 获取新的imageUrl
      *
@@ -274,6 +274,13 @@ public class DriverJob implements InitializingBean {
     }
  
     /**
+     * 计算异常班次 ： 当前应当打卡但是未打卡人员
+     */
+    public void computedExceptionScheduling() {
+        DRIVER_SERVICE.computedExceptionScheduling();
+    }
+
+    /**
      * 生成排班
      */
     public void createAttendance() {
@@ -3,6 +3,8 @@ package com.ruoyi.pojo;
 import com.ruoyi.domain.DriverScheduling;
 import lombok.Data;
  
+import java.util.Objects;
+
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
  
 /**
@@ -22,15 +24,23 @@ public class DriverSignInRecommendation {
     private String nbbm;
     private String lpName;
     private String lineName;
+    private Long signTime;
+    private String jobCode;
+    private String name;
+    private String fleetName;
  
     public DriverSignInRecommendation() {
     }
  
     public DriverSignInRecommendation(DriverScheduling dto, Integer index) {
         this.setIndex(index);
+        this.setFleetName(dto.getFleetName());
         this.setBcType(dto.getBcType());
+        this.setJobCode(dto.getJobCode());
+        this.setName(dto.getName());
         this.setTimestamps(BC_TYPE_OUT.equals(dto.getBcType()) ? dto.getFcsjT() : dto.getZdsjT());
         this.setSignInId(dto.getSignInId());
+        this.setSignTime(Objects.isNull(dto.getSignTime()) ? null : dto.getSignTime().getTime());
         this.setPosts(dto.getPosts());
         this.setExType(dto.getExType());
         this.setLineName(dto.getLineName());
@@ -195,9 +195,9 @@ public class ReportService {
         return vos;
     }
  
-    public SysNotice getAlarmNotice() {
+    public SysNotice getAlarmNoticeByType(Integer type) {
         String username = SecurityUtils.getUsername();
-        return noticeService.getAlarmNotice(username);
+        return noticeService.getAlarmNotice(username,type);
     }
  
     public Object sureNotice(SysNotice notice) {
@@ -7,6 +7,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
  
+import java.util.Date;
+
 /**
  * 通知公告表 sys_notice
  * 
@@ -34,6 +36,26 @@ public class SysNotice extends BaseEntity
     /** 公告状态（0正常 1关闭） */
     private String status;
  
+    private String jobCode;
+
+    public String getJobCode() {
+        return jobCode;
+    }
+
+    public void setJobCode(String jobCode) {
+        this.jobCode = jobCode;
+    }
+
+    public Date getPlanTime() {
+        return planTime;
+    }
+
+    public void setPlanTime(Date planTime) {
+        this.planTime = planTime;
+    }
+
+    private Date planTime;
+
     public Long getNoticeId()
     {
         return noticeId;
@@ -98,6 +120,8 @@ public class SysNotice extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("jobCode", getJobCode())
+            .append("planTime", getPlanTime())
             .toString();
     }
 }
@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
  
 import java.util.List;
 import com.ruoyi.system.domain.SysNotice;
+import org.apache.ibatis.annotations.Param;
  
 /**
  * 通知公告表 数据层
@@ -60,8 +61,14 @@ public interface SysNoticeMapper
  
     /**
      * 获取当前用户未读通告
-     * @param username
+     * @param type
      * @return
      */
-    List<SysNotice> getAlarmNotice(String username);
+    List<SysNotice> getAlarmNoticeByType(@Param("type") Integer type);
+
+    /**
+     * 批量保存
+     * @param noticeList
+     */
+    void saveBatch(@Param("list") List<SysNotice> noticeList);
 }
@@ -60,8 +60,16 @@ public interface ISysNoticeService
  
     /**
      * 获取当前用户为已读的通告
+     *
      * @param username
+     * @param type
      * @return
      */
-    SysNotice getAlarmNotice(String username);
+    SysNotice getAlarmNotice(String username, Integer type);
+
+    /**
+     * 批量插入
+     * @param noticeList
+     */
+    void saveBatch(List<SysNotice> noticeList);
 }
@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import java.util.List;
  
 import com.ruoyi.common.utils.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.domain.SysNotice;
@@ -11,98 +12,97 @@ import com.ruoyi.system.service.ISysNoticeService;
  
 /**
  * 公告 服务层实现
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class SysNoticeServiceImpl implements ISysNoticeService
-{
+public class SysNoticeServiceImpl implements ISysNoticeService {
     @Autowired
     private SysNoticeMapper noticeMapper;
  
     /**
      * 查询公告信息
-     * 
+     *
      * @param noticeId 公告ID
      * @return 公告信息
      */
     @Override
-    public SysNotice selectNoticeById(Long noticeId)
-    {
+    public SysNotice selectNoticeById(Long noticeId) {
         return noticeMapper.selectNoticeById(noticeId);
     }
  
     /**
      * 查询公告列表
-     * 
+     *
      * @param notice 公告信息
      * @return 公告集合
      */
     @Override
-    public List<SysNotice> selectNoticeList(SysNotice notice)
-    {
+    public List<SysNotice> selectNoticeList(SysNotice notice) {
         return noticeMapper.selectNoticeList(notice);
     }
  
     /**
      * 新增公告
-     * 
+     *
      * @param notice 公告信息
      * @return 结果
      */
     @Override
-    public int insertNotice(SysNotice notice)
-    {
+    public int insertNotice(SysNotice notice) {
         return noticeMapper.insertNotice(notice);
     }
  
     /**
      * 修改公告
-     * 
+     *
      * @param notice 公告信息
      * @return 结果
      */
     @Override
-    public int updateNotice(SysNotice notice)
-    {
+    public int updateNotice(SysNotice notice) {
         return noticeMapper.updateNotice(notice);
     }
  
     /**
      * 删除公告对象
-     * 
+     *
      * @param noticeId 公告ID
      * @return 结果
      */
     @Override
-    public int deleteNoticeById(Long noticeId)
-    {
+    public int deleteNoticeById(Long noticeId) {
         return noticeMapper.deleteNoticeById(noticeId);
     }
  
     /**
      * 批量删除公告信息
-     * 
+     *
      * @param noticeIds 需要删除的公告ID
      * @return 结果
      */
     @Override
-    public int deleteNoticeByIds(Long[] noticeIds)
-    {
+    public int deleteNoticeByIds(Long[] noticeIds) {
         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)){
+    public SysNotice getAlarmNotice(String username, Integer type) {
+        List<SysNotice> noticeList = noticeMapper.getAlarmNoticeByType(type);
+        if (CollectionUtils.isNotEmpty(noticeList)) {
+            for (SysNotice notice : noticeList) {
+                if (StringUtils.isEmpty(notice.getRemark()) || !notice.getRemark().contains(username)) {
                     return notice;
                 }
             }
         }
         return null;
     }
+
+    @Override
+    public void saveBatch(List<SysNotice> noticeList) {
+        if (CollectionUtils.isNotEmpty(noticeList)) {
+            noticeMapper.saveBatch(noticeList);
+        }
+    }
 }
@@ -41,11 +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 id="getAlarmNoticeByType" resultType="com.ruoyi.system.domain.SysNotice">
         select * from sys_notice
+            where DATE_FORMAT(create_time,'%y-%m-%d') = DATE_FORMAT(now(),'%y-%m-%d')
+            <if test="type != null">
+                and notice_type = #{type}
+            </if>
             order by create_time desc
-            limit 10
-
     </select>
  
     <insert id="insertNotice" parameterType="SysNotice">
@@ -67,7 +69,35 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			sysdate()
 		)
     </insert>
-	 
+    <insert id="saveBatch">
+        insert into sys_notice (
+            notice_title,
+            notice_type,
+            notice_content,
+            status,
+            remark,
+            create_by,
+            job_code,
+            plan_time,
+            create_time
+        )values
+        <foreach collection="list" index="index" item="item" separator=",">
+           (
+            #{item.noticeTitle},
+            #{item.noticeType},
+            #{item.noticeContent},
+            #{item.status},
+            #{item.remark},
+            #{item.createBy},
+            #{item.jobCode},
+            #{item.planTime},
+            sysdate()
+            )
+        </foreach>
+        on duplicate key update
+        job_code = values(job_code)
+    </insert>
+
     <update id="updateNotice" parameterType="SysNotice">
         update sys_notice 
         <set>