feat: 新增获取签到报表接口给人事系统提供

guzijian
1 parent e2edbcbe
Showing 5 changed files with 108 additions and 10 deletions
Bsth-admin/src/main/java/com/ruoyi/common/global/Result.java
Bsth-admin/src/main/java/com/ruoyi/controller/ReportController.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
Bsth-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -81,7 +81,7 @@ public class Result&lt;T extends Object&gt; {
         Result r = new Result();
         r.setSuccess(false);
         r.setCode(code.getCode());
-        r.setMsg("失败");
+        r.setMsg(msg);
         return r;
     }
@@ -16,6 +16,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -65,14 +66,14 @@ public class ReportController {
     @ApiOperation("告警通知")
     @GetMapping("/alarm/notice")
-    public Result<?> getAlarmNotice(@RequestParam(value = "type",required = false) Integer type){
+    public Result<?> getAlarmNotice(@RequestParam(value = "type", required = false) Integer type) {
         return Result.OK(reportService.getAlarmNoticeByType(type));
     }
     @ApiOperation("确认通知")
     @PostMapping("/sureNotice")
-    public Result<?> sureNotice(@Validated @RequestBody SysNotice notice){
+    public Result<?> sureNotice(@Validated @RequestBody SysNotice notice) {
         return Result.OK(reportService.sureNotice(notice));
     }
@@ -83,4 +84,11 @@ public class ReportController {
         ExcelUtil<ReportErrorResponseVo> util = new ExcelUtil<ReportErrorResponseVo>(ReportErrorResponseVo.class);
         util.exportEasyExcel(response, list, "异常报表");
     }
+
+
+    @ApiOperation("提供给人事用接口(获取当月所有签到记录)")
+    @GetMapping("/list/{month}")
+    public Result<?> listReportMonth(@PathVariable("month") String month, HttpServletRequest request) {
+        return reportService.listReportMonth(month, request);
+    }
 }
@@ -25,13 +25,17 @@ import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 @HeadRowHeight(25)
 @HeadFontStyle(fontHeightInPoints = 10,fontName = "黑体")
 public class ExportReportViewResponseVo {
+    @ApiModelProperty("工号")
     @ExcelProperty(value = "工号")
     private String jobCode;
+    @ApiModelProperty("姓名")
     @ExcelProperty(value = "姓名")
     private String name;
+    @ApiModelProperty("工种")
     @ExcelProperty(value = "工种")
     private String posts;
+    @ApiModelProperty("线路")
     @ExcelProperty(value = "线路")
     private String lineName;
@@ -40,76 +44,113 @@ public class ExportReportViewResponseVo {
     @ColumnWidth(12)
     private String fleetName;
+    @ApiModelProperty("车辆自编号")
     @ExcelProperty(value = "车辆自编号")
     @ColumnWidth(12)
     private String nbbm;
+    @ApiModelProperty("计划签到时间")
     @ExcelProperty(value = "计划签到时间")
     @ColumnWidth(20)
     private Date planSignInTime;
+
+    @ApiModelProperty("实际签到时间")
     @ExcelProperty(value = "实际签到时间")
     @ColumnWidth(20)
     private Date actualSignInTime;
+
+    @ApiModelProperty("是否酒精测试")
     @ExcelProperty(value = "是否酒精测试")
     @ColumnWidth(12)
     private String alcoholStringIn;
+
+    @ApiModelProperty("酒精测试含量")
     @ExcelProperty(value = "酒精测试含量")
     @ColumnWidth(12)
     private BigDecimal alcoholIntakeIn;
+
+    @ApiModelProperty("签到结果")
     @ExcelProperty(value = "签到结果")
     @ColumnWidth(12)
     private String signInResultString;
+    @ApiModelProperty("计划签退时间")
     @ExcelProperty(value = "计划签退时间")
     @ColumnWidth(20)
     private Date planSignOutTime;
+    @ApiModelProperty("实际签退时间")
     @ExcelProperty(value = "实际签退时间")
     @ColumnWidth(20)
     private Date actualSignOutTime;
+
+    @ApiModelProperty("是否酒精测试")
     @ExcelProperty(value = "是否酒精测试")
     @ColumnWidth(12)
     private String alcoholStringOut;
+
+    @ApiModelProperty("酒精测试含量")
     @ExcelProperty(value = "酒精测试含量")
     @ColumnWidth(12)
     private BigDecimal alcoholIntakeOut;
+
+    @ApiModelProperty("签退结果")
     @ExcelProperty(value = "签退结果")
     private String signOutResultString;
+    @ApiModelProperty("有无分班")
     @ExcelProperty(value = "有无分班")
     private String haveSecondFlagString;
+    @ApiModelProperty("分班计划签到时间")
     @ExcelProperty(value = "分班计划签到时间")
     @ColumnWidth(20)
     private Date secondPlanSignInTime;
+
+    @ApiModelProperty("分班实际签到时间")
     @ExcelProperty(value = "分班实际签到时间")
     @ColumnWidth(20)
     private Date secondActualSignInTime;
+    @ApiModelProperty("是否酒精测试")
     @ExcelProperty(value = "是否酒精测试")
     @ColumnWidth(12)
     private String secondAlcoholStringIn;
+
+    @ApiModelProperty("酒精测试含量")
     @ExcelProperty(value = "酒精测试含量")
     @ColumnWidth(12)
     private BigDecimal secondAlcoholIntakeIn;
+
+    @ApiModelProperty("分班签到结果")
     @ExcelProperty(value = "分班签到结果")
     @ColumnWidth(12)
     private String secondSignInResultString;
+
+    @ApiModelProperty("分班计划签退时间")
     @ExcelProperty(value = "分班计划签退时间")
     @ColumnWidth(20)
     private Date secondPlanSignOutTime;
+
+    @ApiModelProperty("分班实际签退时间")
     @ExcelProperty(value = "分班实际签退时间")
     @ColumnWidth(20)
     private Date secondActualSignOutTime;
+    @ApiModelProperty("是否酒精测试")
     @ExcelProperty(value = "是否酒精测试")
     @ColumnWidth(12)
     private String secondAlcoholStringOut;
+
+    @ApiModelProperty("酒精测试含量")
     @ExcelProperty(value = "酒精测试含量")
     @ColumnWidth(12)
     private BigDecimal secondAlcoholIntakeOut;
+
+    @ApiModelProperty("分班签退结果")
     @ExcelProperty(value = "分班签退结果")
     @ColumnWidth(12)
     private String secondSignOutResultString;
+    @ApiModelProperty("排班日期")
     @ExcelProperty(value = "排班日期")
     @ColumnWidth(20)
     private Date scheduleDate;
 package com.ruoyi.service;
+import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.global.Result;
+import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
@@ -11,19 +14,24 @@ import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.*;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
+import com.ruoyi.utils.ConstDateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ReportProperties.DAY;
@@ -86,16 +94,16 @@ public class ReportService {
     public List<ExportReportViewResponseVo> exportReportList(ReportViewRequestVo requestVo, HttpServletResponse response) {
         //  处理天
         if (requestVo.getExportFlag().equals(DAY)) {
-            return getDayReportTableResponseVo(requestVo.getDate(), response);
+            return getDayReportTableResponseVo(requestVo.getDate());
         }
         // 处理月
         else if (requestVo.getExportFlag().equals(MONTH)) {
-            return getMonthReportTableResponseVo(requestVo, response);
+            return getMonthReportTableResponseVo(requestVo);
         }
         return null;
     }
-    private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date, HttpServletResponse response) {
+    private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date) {
         List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
         Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
         List<ExportReportViewResponseVo> vo = new ArrayList<>(800);
@@ -122,11 +130,11 @@ public class ReportService {
         }
     }
-    private List<ExportReportViewResponseVo> getMonthReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
+    private List<ExportReportViewResponseVo> getMonthReportTableResponseVo(ReportViewRequestVo requestVo) {
         List<ExportReportViewResponseVo> responseVos = new ArrayList<>(10000);
         List<String> days = getNowMonthAllDay(requestVo.getDate());
         for (String day : days) {
-            List<ExportReportViewResponseVo> dayReportTableResponseVo = getDayReportTableResponseVo(day, response);
+            List<ExportReportViewResponseVo> dayReportTableResponseVo = getDayReportTableResponseVo(day);
             responseVos.addAll(dayReportTableResponseVo);
         }
         return responseVos;
@@ -197,7 +205,7 @@ public class ReportService {
     public SysNotice getAlarmNoticeByType(Integer type) {
         String username = SecurityUtils.getUsername();
-        return noticeService.getAlarmNotice(username,type);
+        return noticeService.getAlarmNotice(username, type);
     }
     public Object sureNotice(SysNotice notice) {
@@ -206,4 +214,45 @@ public class ReportService {
         noticeService.updateNotice(notice);
         return null;
     }
+
+    public Result listReportMonth(String month, HttpServletRequest request) {
+        boolean validateDate = validateDate(month);
+        String header = request.getHeader("X-TOKEN-AUTHORIZATION");
+        if (!PERSONNEL_API_KEY.equals(header)) {
+            return Result.ERROR(ResultCode.CODE_401, "X-TOKEN-AUTHORIZATION value error");
+        }
+        if (!validateDate) {
+            return Result.ERROR(ResultCode.CODE_400, "Parameter format error");
+        }
+        ReportViewRequestVo vo = new ReportViewRequestVo();
+        vo.setDate(month + "-01");
+        List<ExportReportViewResponseVo> responseVoList = getMonthReportTableResponseVo(vo);
+        Map<String, List<ExportReportViewResponseVo>> map = new HashMap<>(responseVoList.size() / 30);
+        handleResponseByDay(responseVoList, map, vo.getDate());
+        return Result.OK(map);
+    }
+
+    private void handleResponseByDay(List<ExportReportViewResponseVo> responseVoList, Map<String, List<ExportReportViewResponseVo>> map, @NotBlank String date) {
+        for (ExportReportViewResponseVo vo : responseVoList) {
+            String key = ConstDateUtil.formatDate("yyyy-MM-dd", vo.getScheduleDate());
+            List<ExportReportViewResponseVo> vos = map.get(key);
+            if (CollectionUtil.isEmpty(vos)){
+                map.put(key,new ArrayList<>(Arrays.asList(vo)));
+            }else {
+                map.get(key).add(vo);
+            }
+        }
+    }
+
+    /**
+     * yyyy-MM 格式的正则表达式
+     */
+    public static boolean validateDate(String input) {
+        String regex = "^(\\d{4})-(0[1-9]|1[0-2])$";
+
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(input);
+
+        return matcher.matches();
+    }
 }
@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/system/dict/data/**","/app/version/check/**","/app/checkDeviceHeart","/app/download","/driver/**","/in/**","/eexception/**","/equipment/**","/report/**","/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/report/list/**","/system/dict/data/**","/app/version/check/**","/app/checkDeviceHeart","/app/download","/driver/**","/in/**","/eexception/**","/equipment/**","/report/**","/login", "/register", "/captchaImage").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()