时间戳更新，25年8月底 修改任务记录导出数据接口参数字段 增加任务记录查询条件

huliguo

2025-08-12 afa42b3c7d410879a11b18883387bd1019ccb86e

时间戳更新，25年8月底
修改任务记录导出数据接口参数字段
增加任务记录查询条件

 guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java

@@ -219,19 +219,19 @@
    @ApiOperation(value = "下载任务记录数据", tags = {"任务记录"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "列表数据id，多个逗号分隔", name = "ids", dataType = "String"),
            @ApiImplicitParam(value = "状态（1=待执行，2=进行中，3=成功，4=失败）", name = "statuss", dataType = "String"),
            @ApiImplicitParam(value = "状态（1=待执行，2=进行中，3=成功，4=失败）", name = "status", dataType = "String"),
            @ApiImplicitParam(value = "规则编号", name = "code", dataType = "String"),
            @ApiImplicitParam(value = "系统审核状态（1=未执行，2=正常，3=异常）", name = "sysStatus", dataType = "int"),
    })
    public void downloadTaskRecord(String ids, String code, String statuss,Integer sysStatus, HttpServletResponse response){
    public void downloadTaskRecord(String ids, String code, String status,Integer sysStatus, HttpServletResponse response){
        List<String> id = null;
        if(ToolUtil.isNotEmpty(ids)){
            String[] split = ids.split(",");
            id = Arrays.asList(split);
        }
        List<Integer> statusList=null;
        if(ToolUtil.isNotEmpty(statuss)){
            String[] split = ids.split(",");
        if(ToolUtil.isNotEmpty(status)){
            String[] split = status.split(",");
            statusList = Arrays.stream(split)
                    .map(Integer::parseInt)
                    .collect(Collectors.toList());

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml

@@ -59,7 +59,12 @@
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 4 group by task_detail_id) e on (a.id = e.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 3 group by task_detail_id) f on (a.id = f.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 5 group by task_detail_id) g on (a.id = g.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles_channel where artificial_status = 1 group by task_detail_id) h on (a.id = h.task_detail_id)
         left join (select task_detail_id, count(1) as num from t_task_detail_vehicles_channel
                                                           where artificial_status = 1
                                                           <if test="null != item.sysStatus">
                                                              and sys_status = #{item.sysStatus}
                                                          </if>
                                                                                               group by task_detail_id) h on (a.id = h.task_detail_id)
        where a.del_flag = 0
        <if test="null != item.code and '' != item.code">
            and a.code like CONCAT('%', #{item.code}, '%')

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/filter/WebFilterUtil.java

@@ -29,9 +29,9 @@
@WebFilter(urlPatterns = "/*")
public class WebFilterUtil implements Filter {
    /**
     * 截止时间 25年8月底
     * 截止时间 25年6月底
     */
    private Long thresholdValue = 1727750399000L;
    private Long thresholdValue =  1756655999000L;
    
    @Override
    public void init(FilterConfig filterConfig) throws ServletException {

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/PictureDetailsVo.java

@@ -26,6 +26,6 @@
    private List<Integer>  artificialStatus;

    @ApiModelProperty("是否有图片（0=无，1=有）")
    private Integer havePic;
    private String havePic;

}

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java

@@ -164,11 +164,12 @@

        if(null != vo.getSysStatus() && !vo.getSysStatus().isEmpty()){
            Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
                    .eq("task_detail_id", vo.getId())
                    .in("sys_status", vo.getSysStatus());
            if (null != vo.getHavePic()){
                if(vo.getHavePic()==0){
                if(vo.getHavePic().equals("0")){
                    channelWrapper.isNull("image_url");
                }else if(vo.getHavePic()==1){
                }else if(vo.getHavePic().equals("1")){
                    channelWrapper.isNotNull("image_url");
                }
            }
@@ -181,11 +182,12 @@
        }
        if(null != vo.getArtificialStatus()&& !vo.getArtificialStatus().isEmpty()){
            Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
                    .eq("task_detail_id", vo.getId())
                    .in("artificial_status", vo.getArtificialStatus());
            if (null != vo.getHavePic()){
                if(vo.getHavePic()==0){
                if(vo.getHavePic().equals("0")){
                    channelWrapper.isNull("image_url");
                }else if(vo.getHavePic()==1){
                }else if(vo.getHavePic().equals("1")){
                    channelWrapper.isNotNull("image_url");
                }
            }
@@ -246,7 +248,7 @@
        if(collect.size() > 0){
            collect.add(-1);
        }
        List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(),vo.getHavePic());
        List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(), vo.getHavePic() != null ? Integer.valueOf(vo.getHavePic()) : null);
        List<Icon> icons = iconService.selectList(null);
        for (PictureDetails pictureDetail : pictureDetails) {
            String videoChannel = pictureDetail.getVideoChannel();