统计逻辑优化

duty-service/src/main/java/cn/com/taiji/duty/config/ScheduleConfig.java

@@ -0,0 +1,25 @@
+package cn.com.taiji.duty.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+/**
+ * @Description
+ * @Author yangyue
+ * @Date 2023/12/15
+ */
+@Configuration
+public class ScheduleConfig {
+    /**
+     * 修复同一时间无法执行多个定时任务问题。@Scheduled默认是单线程的
+     */
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+        //核心线程池数量，方法: 返回可用处理器的Java虚拟机的数量。
+        taskScheduler.setPoolSize(Runtime.getRuntime().availableProcessors() * 2);
+        return taskScheduler;
+    }
+}

duty-service/src/main/java/cn/com/taiji/duty/mapper/DutyStatisticsMapper.java

@@ -29,6 +29,8 @@ public interface DutyStatisticsMapper extends BaseMapper<DutyStatistics> {
 
     String queryRate(@Param("day") String day, @Param("week") String week, @Param("month") String month, @Param("type") String type);
 
-    String queryLogCount(@Param("day") String day, @Param("week") String week, @Param("month") String month);
+    String queryLogCount(@Param("day") String day, @Param("week") String week, @Param("month") String month, @Param("type") String type);
+
+    String queryWeekStatus(@Param("time") String time);
 
 }

duty-service/src/main/java/cn/com/taiji/duty/model/DutyStatistics.java

@@ -34,7 +34,7 @@ public class DutyStatistics implements Serializable {
 
 	/** 年月 */
 	@ApiModelProperty("年月")
-	@TableField("year_month")
+	@TableField("`year_month`")
 	private String yearMonth;
 
 	/** 周数 */

duty-service/src/main/java/cn/com/taiji/duty/service/IDutyStatisticsService.java

@@ -4,6 +4,7 @@ import cn.com.taiji.duty.model.AdminAnalysisInfo;
 import cn.com.taiji.duty.model.DutyStatistics;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rabbitmq.client.LongString;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,6 +28,8 @@ public interface IDutyStatisticsService extends IService<DutyStatistics> {
 
     String queryRate(String day, String week, String month, String type);
 
-    String queryLogCount(String day, String week, String month);
+    String queryLogCount(String day, String week, String month, String type);
+
+    String queryWeekStatus(String time);
 
 }

duty-service/src/main/java/cn/com/taiji/duty/service/impl/DutyStatisticsServiceImpl.java

@@ -5,6 +5,7 @@ import cn.com.taiji.duty.model.DutyStatistics;
 import cn.com.taiji.duty.mapper.DutyStatisticsMapper;
 import cn.com.taiji.duty.service.IDutyStatisticsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +51,12 @@ public class DutyStatisticsServiceImpl extends ServiceImpl<DutyStatisticsMapper,
     }
 
     @Override
-    public String queryLogCount(String day, String week, String month) {
-        return statisticsMapper.queryLogCount(day, week, month);
+    public String queryLogCount(String day, String week, String month, String type) {
+        return statisticsMapper.queryLogCount(day, week, month, type);
+    }
+
+    @Override
+    public String queryWeekStatus(String time) {
+        return statisticsMapper.queryWeekStatus(time);
     }
 }

duty-service/src/main/java/cn/com/taiji/duty/service/impl/DutyWorkbenchServiceImpl.java

@@ -187,11 +187,7 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
                     list.add(log);
                 });
 
-                long l = weekReportRecordMapper.queryWeekCount(deptId, timeVo.getBeginTime(), timeVo.getEndTime());
-                weekMap.put(timeVo.getEndTime(),"2");
-                if (l > 0) {
-                    weekMap.put(timeVo.getEndTime(),"1");
-                }
+                weekMap.put(timeVo.getEndTime(),statisticsService.queryWeekStatus(timeVo.getEndTime()));
             });
 
             checkCalender.setDateList(list);
@@ -248,8 +244,14 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             endTime = localDate.format(formatter);
         } else if ("week".equals(type)) {
             LocalDate localDate = LocalDate.now().minusWeeks(1);
-            startTime = localDate.with(DayOfWeek.MONDAY).format(formatter);
-            endTime = localDate.with(DayOfWeek.SUNDAY).format(formatter);
+            int value = LocalDate.now().getDayOfWeek().getValue();
+            if (value == 6 || value == 7) {
+                startTime = localDate.with(DayOfWeek.SATURDAY).format(formatter);
+                endTime = LocalDate.now().with(DayOfWeek.FRIDAY).format(formatter);
+            } else {
+                startTime = localDate.minusWeeks(1).with(DayOfWeek.SATURDAY).format(formatter);
+                endTime = localDate.with(DayOfWeek.FRIDAY).format(formatter);
+            }
         } else {
             LocalDate localDate = LocalDate.now().minusMonths(1);
             startTime = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
@@ -308,11 +310,24 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             statistics.setDay(day);
         } else if ("2".equals(type)) {
             LocalDate localDate = LocalDate.now();
-            startTime = localDate.with(DayOfWeek.MONDAY).format(formatter);
-            endTime = localDate.with(DayOfWeek.SUNDAY).format(formatter);
-            AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
+            int value = localDate.getDayOfWeek().getValue();
+            if (value == 6 || value == 7) {
+                startTime = localDate.with(DayOfWeek.SATURDAY).format(formatter);
+                endTime = localDate.plusDays(1).with(DayOfWeek.FRIDAY).format(formatter);
+            } else {
+                startTime = localDate.minusWeeks(1).with(DayOfWeek.SATURDAY).format(formatter);
+                endTime = localDate.with(DayOfWeek.FRIDAY).format(formatter);
+            }
+            // startTime = localDate.with(DayOfWeek.MONDAY).format(formatter);
+            // endTime = localDate.with(DayOfWeek.SUNDAY).format(formatter);
+            // AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             AdminStatisticsWeek week = new AdminStatisticsWeek();
-            week.setQq(day.getCq());
+            int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
+            if (value == 6 || value == 7) {
+                endDayOfWeek += 1;
+            }
+            // week.setQq(day.getCq());
+            week.setQq(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null, "1"));
             int weekNum = localDate.get(ChronoField.DAY_OF_WEEK);
             if (weekNum == 6) {
                 weekNum = 1;
@@ -323,10 +338,9 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             }
 
             week.setTotal(String.valueOf(weekNum));
-            week.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/weekNum*100));
+            week.setCqRate(String.format("%.2f", Double.parseDouble(week.getQq())/weekNum*100));
 
-            int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
-            week.setRz(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null));
+            week.setRz(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null, "2"));
 
             week.setDayRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "2"));
 
@@ -341,15 +355,17 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             LocalDate localDate = LocalDate.now();
             startTime = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             endTime = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
-            AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
+            // AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             AdminStatisticsMonth month = new AdminStatisticsMonth();
-            month.setQq(day.getCq());
-            int monthNum = localDate.get(ChronoField.DAY_OF_MONTH);
-            month.setTotal(String.valueOf(monthNum));
-            month.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/monthNum*100));
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM");
             String yearMonth = localDate.format(df);
-            month.setRz(statisticsService.queryLogCount(null, null, yearMonth));
+            // month.setQq(day.getCq());
+            month.setQq(statisticsService.queryLogCount(null, null, yearMonth, "1"));
+            int monthNum = localDate.get(ChronoField.DAY_OF_MONTH);
+            month.setTotal(String.valueOf(monthNum));
+            month.setCqRate(String.format("%.2f", Double.parseDouble(month.getQq())/monthNum*100));
+
+            month.setRz(statisticsService.queryLogCount(null, null, yearMonth, "2"));
             month.setDayRate(statisticsService.queryRate(null, null, yearMonth, "2"));
 
             // month.setWeekRate(statisticsService.queryRate(null, null, yearMonth, "3"));
@@ -379,15 +395,28 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             statistics.setDay(day);
         } else if ("5".equals(type)) {
             LocalDate localDate = LocalDate.now().minusWeeks(1);
-            startTime = localDate.with(DayOfWeek.MONDAY).format(formatter);
-            endTime = localDate.with(DayOfWeek.SUNDAY).format(formatter);
-            AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
+            int value = LocalDate.now().getDayOfWeek().getValue();
+            if (value == 6 || value == 7) {
+                startTime = localDate.with(DayOfWeek.SATURDAY).format(formatter);
+                endTime = LocalDate.now().with(DayOfWeek.FRIDAY).format(formatter);
+            } else {
+                startTime = localDate.minusWeeks(1).with(DayOfWeek.SATURDAY).format(formatter);
+                endTime = localDate.with(DayOfWeek.FRIDAY).format(formatter);
+            }
+            // startTime = localDate.with(DayOfWeek.MONDAY).format(formatter);
+            // endTime = localDate.with(DayOfWeek.SUNDAY).format(formatter);
+            // AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             AdminStatisticsWeek week = new AdminStatisticsWeek();
-            week.setQq(day.getCq());
-            week.setTotal("7");
-            week.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/7*100));
             int endDayOfWeek = localDate.get(WeekFields.ISO.weekOfWeekBasedYear());
-            week.setRz(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null));
+            if (value == 6 || value == 7) {
+                endDayOfWeek += 1;
+            }
+            // week.setQq(day.getCq());
+            week.setQq(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null, "1"));
+            week.setTotal("7");
+            week.setCqRate(String.format("%.2f", Double.parseDouble(week.getQq())/7*100));
+
+            week.setRz(statisticsService.queryLogCount(null, String.valueOf(endDayOfWeek), null, "2"));
             week.setDayRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "2"));
 
             // week.setWeekRate(statisticsService.queryRate(null, String.valueOf(endDayOfWeek), null, "3"));
@@ -401,15 +430,16 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             LocalDate localDate = LocalDate.now().minusMonths(1);
             startTime = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             endTime = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
-            AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
+            // AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             AdminStatisticsMonth month = new AdminStatisticsMonth();
-            month.setQq(day.getCq());
-            int monthNum = localDate.lengthOfMonth();
-            month.setTotal(String.valueOf(monthNum));
-            month.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/monthNum*100));
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM");
             String yearMonth = localDate.format(df);
-            month.setRz(statisticsService.queryLogCount(null, null, yearMonth));
+            // month.setQq(day.getCq());
+            month.setQq(statisticsService.queryLogCount(null, null, yearMonth, "1"));
+            int monthNum = localDate.lengthOfMonth();
+            month.setTotal(String.valueOf(monthNum));
+            month.setCqRate(String.format("%.2f", Double.parseDouble(month.getQq())/monthNum*100));
+            month.setRz(statisticsService.queryLogCount(null, null, yearMonth, "2"));
             month.setDayRate(statisticsService.queryRate(null, null, yearMonth, "2"));
 
             // month.setWeekRate(statisticsService.queryRate(null, null, yearMonth, "3"));

duty-service/src/main/java/cn/com/taiji/duty/task/TimeTask.java

@@ -14,6 +14,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.WeekFields;
@@ -125,7 +126,7 @@ public class TimeTask {
     }
 
 
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void statisticsScheduleOne() {
         log.info("===========定时开始===========");
         LocalDate localDate = LocalDate.now().plusDays(-1);
@@ -137,17 +138,29 @@ public class TimeTask {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM");
         LocalDate now = LocalDate.now();
+        boolean bool = false;
+        int value = now.getDayOfWeek().getValue();
+        if (value == 5) {
+            bool = true;
+        }
         String time = formatter.format(now);
-        String year = String.valueOf(now.getYear());
+        String yearValue = String.valueOf(now.getYear());
         String yearMonth = df.format(now);
-        String week = String.valueOf(now.get(WeekFields.ISO.weekOfWeekBasedYear()));
+        int weekNum = now.get(WeekFields.ISO.weekOfWeekBasedYear());
+        if (value == 6 || value == 7) {
+            LocalDate date = now.plusDays(value);
+            // int year2 = date.with(DayOfWeek.FRIDAY).getYear();
+            weekNum = date.with(DayOfWeek.FRIDAY).get(WeekFields.ISO.weekOfWeekBasedYear());
+        }
+        String week = String.valueOf(weekNum);
         List<DutySeatDutyUnit> dutyUnits = dutyUnitService.queryDutyUnit();
         List<DutyStatistics> dutyStatisticsList = new ArrayList<>();
+        boolean finalBool = bool;
         dutyUnits.forEach(dutyUnit -> {
             DutyStatistics statistics = new DutyStatistics();
             statistics.setDeptId(dutyUnit.getDeptId());
             statistics.setUnitName(dutyUnit.getName());
-            statistics.setYear(year);
+            statistics.setYear(yearValue);
             statistics.setYearMonth(yearMonth);
             statistics.setWeek(week);
             statistics.setTime(time);
@@ -157,23 +170,25 @@ public class TimeTask {
             DutyStatistics statistics2 = new DutyStatistics();
             statistics2.setDeptId(dutyUnit.getDeptId());
             statistics2.setUnitName(dutyUnit.getName());
-            statistics2.setYear(year);
+            statistics2.setYear(yearValue);
             statistics2.setYearMonth(yearMonth);
             statistics2.setWeek(week);
             statistics2.setTime(time);
             statistics2.setType("2");
             statistics2.setStatus("2");
             dutyStatisticsList.add(statistics2);
-            DutyStatistics statistics3 = new DutyStatistics();
-            statistics.setDeptId(dutyUnit.getDeptId());
-            statistics3.setUnitName(dutyUnit.getName());
-            statistics3.setYear(year);
-            statistics3.setYearMonth(yearMonth);
-            statistics3.setWeek(week);
-            statistics3.setTime(time);
-            statistics3.setType("3");
-            statistics3.setStatus("2");
-            dutyStatisticsList.add(statistics3);
+            if (finalBool) {
+                DutyStatistics statistics3 = new DutyStatistics();
+                statistics.setDeptId(dutyUnit.getDeptId());
+                statistics3.setUnitName(dutyUnit.getName());
+                statistics3.setYear(yearValue);
+                statistics3.setYearMonth(yearMonth);
+                statistics3.setWeek(week);
+                statistics3.setTime(time);
+                statistics3.setType("3");
+                statistics3.setStatus("2");
+                dutyStatisticsList.add(statistics3);
+            }
         });
         statisticsService.saveBatch(dutyStatisticsList);
 

duty-service/src/main/resources/application.yml

@@ -11,13 +11,6 @@ spring:
       max-request-size: 200MB
       # 上传文件临时目录自定义
       location: /home/duty/upload_tmp
-  task:
-    scheduling:
-      pool:
-        # 最大线程数，默认是 1
-        size: 10
-      # 线程名称前缀，默认是 scheduling-
-      # thread-name-prefix: foxScheduling-
 
 #文件上传根路径
 file:

duty-service/src/main/resources/mapper/DutyStatisticsMapper.xml

@@ -136,7 +136,10 @@
                 `year_month` AS date,max(status) AS status
             </if>
             FROM duty_statistics
-            where type = 2
+            <where>
+                <if test="type != null and type != ''">
+                    and type = #{type}
+                </if>
                 <if test="day != null and day != ''">
                     and time = #{day}
                 </if>
@@ -146,6 +149,7 @@
                 <if test="month != null and month != ''">
                     and `year_month` = #{month}
                 </if>
+            </where>
             <if test="day != null and day != ''">
                 GROUP BY time,dept_id
             </if>
@@ -158,5 +162,18 @@
         ) a
         GROUP BY a.date
     </select>
+    <select id="queryWeekStatus" resultType="java.lang.String">
+        select max(status)
+        from (
+            SELECT time AS date,max(status) AS status
+            FROM duty_statistics
+            where type = '3'
+            <if test="time != null and time != ''">
+                and time = #{time}
+            </if>
+            GROUP BY time,dept_id
+        ) a
+        GROUP BY a.date
+    </select>
 
 </mapper>

duty-service/src/main/resources/mapper/DutyWeekReportRecordMapper.xml

@@ -99,7 +99,10 @@
         SELECT count(*)
         FROM duty_week_report_record
         WHERE
-            del_flag = 0 and dept_id = #{deptId}
+            del_flag = 0
+            <if test="deptId != null">
+                and dept_id = #{deptId}
+            </if>
           AND date_format(submit_time, '%Y-%m-%d') BETWEEN date_format(#{startTime}, '%Y-%m-%d') AND date_format(#{endTime}, '%Y-%m-%d')
     </select>
     <select id="queryByWeekTime" resultType="DutyWeekReportRecord">