fix: add report api

guzijian
1 parent 54f9339e
Showing 20 changed files with 381 additions and 37 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ErrorTypeProperties.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/mapper/EquipmentExceptionMapper.java
ruoyi-admin/src/main/java/com/ruoyi/equipment/mapper/EquipmentMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/mapper/SignInMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportErrorRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/report/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
ruoyi-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+package com.ruoyi.common;
+
+/**
+ * @author 20412
+ */
+public interface ErrorTypeProperties {
+    String SIGN_IN_ERROR = "签到异常";
+    String EQUIPMENT_ERROR = "设备异常";
+}
+package com.ruoyi.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
+import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.service.ReportService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 20412
+ */
+@RestController
+@RequestMapping("/report")
+@Api(tags = "报表管理")
+public class ReportController {
+
+    @Resource
+    private ReportService reportService;
+
+    @ApiOperation("签到报表集合查询")
+    @GetMapping("/list")
+    public AjaxResult getList(@ApiParam @ModelAttribute ReportViewRequestVo requestVo) {
+        return AjaxResult.success(reportService.getReportScrollViewTable(requestVo));
+    }
+
+    @ApiOperation("异常报表集合查询")
+    @GetMapping("/error/list")
+    public AjaxResult getErrorList(@ApiParam @ModelAttribute ReportErrorRequestVo request) {
+        return AjaxResult.success(reportService.getErrorReportList(request));
+    }
+}
 package com.ruoyi.driver.mapper;
  
 import java.util.List;
+import java.util.Set;
+
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import org.apache.ibatis.annotations.Param;
@@ -76,4 +78,11 @@ public interface DriverMapper
      * @return
      */
     List<ResponseScheduling> getDriverSchedulingList(@Param("date") String date,@Param("jobCode") String jobCode);
+
+    /**
+     *
+     * @param jobCodes
+     * @return
+     */
+    List<Driver> getNameByJobCode(@Param("jobCodes") Set<String> jobCodes);
 }
@@ -60,6 +60,11 @@ public class DriverServiceImpl implements IDriverService {
      */
     @Override
     public int insertDriver(Driver driver) {
+        // 判断是否存在相同的工号数据  存在既更新
+//        Driver driverById = driverMapper.selectDriverById(driver.getId());
+//        if (driverById == null){
+//
+//        }
         return driverMapper.insertDriver(driver);
     }
  
@@ -111,7 +116,6 @@ public class DriverServiceImpl implements IDriverService {
         }
         // 数据库中读取所有接收到的排班信息
         List<ResponseScheduling> responseSchedulings = driverMapper.getDriverSchedulingList(schedulingDate, jobCode);
-        // 缓存中读取当天的排班信息
         return AjaxResult.success(responseSchedulings);
     }
  
@@ -22,9 +22,17 @@ public class EquipmentException extends BaseEntity
     @Excel(name = "标题")
     private String title;
  
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     /** 设备id */
     @Excel(name = "设备id")
-    private Long deviceId;
+    private String deviceId;
  
     /** 上报人 */
     @Excel(name = "上报人")
@@ -56,15 +64,8 @@ public class EquipmentException extends BaseEntity
     {
         return title;
     }
-    public void setDeviceId(Long deviceId) 
-    {
-        this.deviceId = deviceId;
-    }
  
-    public Long getDeviceId() 
-    {
-        return deviceId;
-    }
+
     public void setJobCode(String jobCode) 
     {
         this.jobCode = jobCode;
@@ -2,6 +2,7 @@ package com.ruoyi.eexception.mapper;
  
 import java.util.List;
 import com.ruoyi.eexception.domain.EquipmentException;
+import com.ruoyi.pojo.request.ReportErrorRequestVo;
  
 /**
  * 设备异常记录Mapper接口
@@ -58,4 +59,6 @@ public interface EquipmentExceptionMapper
      * @return 结果
      */
     public int deleteEquipmentExceptionByIds(Long[] ids);
+
+    List<EquipmentException> getEquipmentErrorList(ReportErrorRequestVo request);
 }
@@ -58,4 +58,5 @@ public interface EquipmentMapper
      * @return 结果
      */
     public int deleteEquipmentByIds(Long[] ids);
+
 }
@@ -2,6 +2,9 @@ package com.ruoyi.in.mapper;
  
 import java.util.List;
 import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
+import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.response.ReportViewResponseVo;
  
 /**
  * 签到Mapper接口
@@ -59,4 +62,12 @@ public interface SignInMapper
      */
     public int deleteSignInByIds(Long[] ids);
  
+    /**
+     * 获取签到数据
+     * @param requestVo
+     * @return
+     */
+    List<ReportViewResponseVo> getReportScrollViewTable(ReportViewRequestVo requestVo);
+
+    List<SignIn> getSignErrorList(ReportErrorRequestVo request);
 }
@@ -5,6 +5,8 @@ import java.util.List;
  
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
+import com.ruoyi.pojo.response.ReportViewResponseVo;
  
 /**
  * 签到Service接口
@@ -68,4 +70,5 @@ public interface ISignInService
      * @return
      */
     int addSignIn(SignIn signIn) throws FileUploadException, IOException;
+
 }
@@ -111,7 +111,6 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public int addSignIn(SignIn signIn) throws FileUploadException, IOException {
         // base64转图片
-        System.out.println(signIn.getSingnIn());
         signIn.setCreateTime(new Date());
         signIn.setIp(IpUtils.getIpAddr());
         String base64 = signIn.getImage();
+package com.ruoyi.pojo.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 异常报表请求
+ * @author 20412
+ */
+@ApiModel("异常报表请求")
+@Data
+public class ReportErrorRequestVo {
+    /**
+     * 错误类型
+     */
+    @ApiModelProperty("错误类型")
+    private String errorType;
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}
+package com.ruoyi.pojo.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 异常报表对象
+ * @author 20412
+ */
+@Data
+@ApiModel("异常报表对象")
+public class ReportErrorResponseVo {
+    @ApiModelProperty("异常类型")
+    private String errorType;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("工号")
+    private String jobCode;
+    @ApiModelProperty("图片")
+    private String image;
+    @ApiModelProperty("设备id")
+    private String deviceId;
+    @ApiModelProperty("时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss" , timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("备注")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss" , timezone = "GMT+8")
+    private String remark;
+}
+package com.ruoyi.pojo.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 20412
+ */
+@ApiModel("滚动大屏响应体数据")
+@Data
+public class ReportViewResponseVo {
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty("工号")
+    private String jobCode;
+    @ApiModelProperty("签到类型")
+    private String singnIn;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("签到时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date createTime;
+    @ApiModelProperty("签到状态1 成功2 异常")
+    private Integer status;
+    /**
+     * 签到签退
+     */
+    @ApiModelProperty("签到签退")
+    private Integer type;
+    /**
+     * 是否酒精检测 1 检查 2 未检
+     */
+    @ApiModelProperty("是否酒精检测 1 检查 2 未检")
+    private Integer alcoholFlag;
+    /**
+     * 酒精含量
+     */
+    @ApiModelProperty("酒精含量")
+    private BigDecimal alcoholIntake;
+    @ApiModelProperty("头像")
+    private String image;
+    @ApiModelProperty("备注")
+    private String remark;
+}
-package com.ruoyi.report;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author 20412
- */
-@RestController
-@RequestMapping("/report")
-@Api(tags = "报表管理")
-public class ReportController {
-
-    @ApiOperation("签到报表集合查询")
-    @GetMapping("/list" )
-    public String getList() {
-        return "暂未开发";
-    }
-}
+package com.ruoyi.service;
+
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.eexception.domain.EquipmentException;
+import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
+import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.response.ReportErrorResponseVo;
+import com.ruoyi.pojo.response.ReportViewResponseVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.common.ErrorTypeProperties.EQUIPMENT_ERROR;
+import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_ERROR;
+
+/**
+ * @author 20412
+ */
+@Service
+public class ReportService {
+
+    @Autowired
+    private SignInMapper signInMapper;
+
+    @Autowired
+    private EquipmentExceptionMapper exceptionMapper;
+
+    @Autowired
+    private DriverMapper driverMapper;
+
+    /**
+     * 查询报表信息
+     */
+    public List<ReportViewResponseVo> getReportScrollViewTable(ReportViewRequestVo requestVo) {
+        return signInMapper.getReportScrollViewTable(requestVo);
+    }
+
+    public List<ReportErrorResponseVo> getErrorReportList(ReportErrorRequestVo request) {
+        // 获取基础报表信息
+        List<SignIn> signInList = signInMapper.getSignErrorList(request);
+        List<EquipmentException> exceptionList = exceptionMapper.getEquipmentErrorList(request);
+        // 封装到集合返回前端
+        List<ReportErrorResponseVo> responses = new ArrayList<>();
+        // 获取对应名称
+        Set<String> jobCodes = new HashSet<>();
+        signInList.stream().forEach(item -> {
+            jobCodes.add(item.getJobCode());
+        });
+        exceptionList.stream().forEach(item -> {
+            jobCodes.add(item.getJobCode());
+        });
+        Map<String, String> names = driverMapper.getNameByJobCode(jobCodes).stream().collect(Collectors.toMap(Driver::getJobCode, Driver::getPersonnelName));
+        if (SIGN_IN_ERROR.equals(request.getErrorType())) {
+            copyToResponse(names, signInList, responses);
+        }else if (EQUIPMENT_ERROR.equals(request.getErrorType())) {
+            copyToResponseByException(names, exceptionList, responses);
+        }else {
+            copyToResponse(names, signInList, responses);
+            copyToResponseByException(names, exceptionList, responses);
+        }
+        responses = sortListByCreateTime(responses);
+
+        // 清除缓存
+        jobCodes.clear();
+        signInList.clear();
+        exceptionList.clear();
+        return responses;
+    }
+
+    private List<ReportErrorResponseVo> sortListByCreateTime(List<ReportErrorResponseVo> responses) {
+        responses = responses.stream().sorted(Comparator.comparing(ReportErrorResponseVo::getCreateTime, Comparator.reverseOrder())).collect(Collectors.toList());
+        return responses;
+    }
+
+    private void copyToResponseByException(Map<String, String> names, List<EquipmentException> exceptionList, List<ReportErrorResponseVo> responses) {
+        exceptionList.forEach(item -> {
+            ReportErrorResponseVo vo = new ReportErrorResponseVo();
+            vo.setName(names.get(item.getJobCode()));
+            vo.setImage(item.getImage());
+            vo.setRemark(item.getRemark());
+            vo.setCreateTime(item.getCreateTime());
+            vo.setDeviceId(item.getDeviceId());
+            vo.setErrorType(EQUIPMENT_ERROR);
+            responses.add(vo);
+        });
+    }
+
+    private void copyToResponse(Map<String, String> names, List<SignIn> signInList, List<ReportErrorResponseVo> responses) {
+        signInList.forEach(item -> {
+            ReportErrorResponseVo vo = new ReportErrorResponseVo();
+            vo.setName(names.get(item.getJobCode()));
+            vo.setImage(item.getImage());
+            vo.setRemark(item.getRemark());
+            vo.setCreateTime(item.getCreateTime());
+            vo.setJobCode(item.getJobCode());
+//            vo.setDeviceId();
+            vo.setErrorType(SIGN_IN_ERROR);
+            responses.add(vo);
+        });
+    }
+}
@@ -88,6 +88,17 @@
         from driver_scheduling
         where scheduleDate = #{date} and job_code = #{jobCode}
     </select>
+    <select id="getNameByJobCode" resultMap="DriverResult">
+        select personnel_name,job_code
+            from driver
+        <where>
+            job_code IN
+            <foreach collection="jobCodes" item="item" open="(" separator="," close=")" >
+                #{item}
+            </foreach>
+
+        </where>
+    </select>
  
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
@@ -236,7 +247,7 @@
             )
         </foreach>
         on duplicate key update
-        personnel_name = values(personnel_name)
+        job_code = values(job_code)
     </insert>
  
 </mapper>
 \ No newline at end of file
@@ -35,7 +35,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectEquipmentExceptionVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getEquipmentErrorList" resultType="com.ruoyi.eexception.domain.EquipmentException">
+        <include refid="selectEquipmentExceptionVo"></include>
+        where 1=1
+        <if test="endTime != '' and endTime != null">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
+            and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
+        </if>
+    </select>
+
     <insert id="insertEquipmentException" parameterType="EquipmentException" useGeneratedKeys="true" keyProperty="id">
         insert into equipment_exception
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -42,7 +42,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectEquipmentVo"/>
         where id = #{id}
     </select>
-        
+
+
     <insert id="insertEquipment" parameterType="Equipment" useGeneratedKeys="true" keyProperty="id">
         insert into equipment
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -43,6 +43,48 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectSignInVo"/>
         where id = #{id}
     </select>
+    <select id="getReportScrollViewTable" resultType="com.ruoyi.pojo.response.ReportViewResponseVo">
+        SELECT
+        sign_in.id,
+        sign_in.singn_in singnIn,
+        driver.job_code jobCode,
+        personnel_name `name`,
+        sign_in.create_time createTime,
+        `status`,
+        type,
+        alcohol_flag alcoholFlag,
+        alcohol_intake alcoholIntake,
+        sign_in.image,
+        sign_in.remark
+        FROM
+        sign_in,
+        driver
+        WHERE
+        sign_in.jobCode = driver.job_code
+        <if test="jobCode != '' and jobCode != null">
+          and  sign_in.jobCode = #{jobCode}
+        </if>
+        <if test="startTime != '' and startTime != null">
+            and DATE_FORMAT(sign_in.create_time,'%Y-%m-%d') >= #{startTime}
+            and DATE_FORMAT(sign_in.create_time,'%Y-%m-%d') &lt;= #{endTime}
+        </if>
+        <if test="status != '' and status != null">
+            and sign_in.status = #{status}
+        </if>
+        <if test="name != '' and name != null">
+            and driver.personnel_name = #{name}
+        </if>
+        order by sign_in.create_time desc
+    </select>
+    <select id="getSignErrorList" resultType="com.ruoyi.in.domain.SignIn">
+        <include refid="selectSignInVo"></include>
+        where `status` = 2
+        <if test="endTime != '' and endTime != null">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
+            and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
+        </if>
+
+    </select>
  
     <insert id="insertSignIn" parameterType="SignIn" useGeneratedKeys="true" keyProperty="id">
         insert into sign_in
@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/driver/**","/in/**","/eexception/**","/equipment/**","/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/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()