wl
2022-10-21 63374f2d70f290d6a430e0c6e2505d7bce593898
日志名称乱码 处置案件图片添加
3个文件已修改
5个文件已添加
167 ■■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
@@ -98,7 +98,8 @@
        umsAdminLoginLogPage.setSize(logQueryParams.getSize());
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode( ".xlsx", "utf-8"));
        String fileName = URLEncoder.encode("日志", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+fileName + ".xlsx");
        EasyExcel
                .write(response.getOutputStream(), UmsAdminLogVO.class)
                .sheet("数据")
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -13,6 +13,7 @@
import com.ycl.service.caseHandler.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -49,6 +50,8 @@
    IBaseCaseService baseCaseService;
    @Autowired
    IDisposeRecordService iDisposeRecordService;
    @Autowired
    IImageResourcesService iImageResourcesService;
    @ApiOperation(value = "调度")
    @RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@@ -90,7 +93,18 @@
        iArrivalSituationService.save(arrivalSituation);
        //文书
        Integer illegalBuildingType = 2;
        if (type.equals(illegalBuildingType)) {
        Integer violation = 1;
        String handType = "02";
        ImageResources imageResources = new ImageResources();
        imageResources.setType(handType);
        imageResources.setBelongToId(caseId);
        imageResources.setCreateTime(LocalDateTime.now());
        imageResources.setCreateUser(user.getUserId());
        if (type == violation) {
            imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
            iImageResourcesService.save(imageResources);
        }
        if (type==illegalBuildingType) {
            Writ writ = new Writ();
            BeanUtils.copyProperties(uploadDisposingResultParam, writ);
            writ.setBaseCaseId(caseId);
@@ -98,6 +112,14 @@
            writ.setCreateTime(LocalDateTime.now());
            writ.setCreateUser(user.getUserId());
            iWritService.save(writ);
            imageResources.setUrl(StringUtils
                    .joinWith(",", uploadDisposingResultParam.getPic()
                            , uploadDisposingResultParam.getSituationPic()
                            , uploadDisposingResultParam.getOriginalPic()
                            , uploadDisposingResultParam.getOtherPic()
                            , uploadDisposingResultParam.getRectifiedPic()
                            , uploadDisposingResultParam.getWritPic()));
            iImageResourcesService.save(imageResources);
        }
        baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        String stepName = StepName.CHECK.getName();
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -94,7 +94,8 @@
        equipmentBayonetPage.setSize(size);
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode( ".xlsx", "utf-8"));
        String fileName = URLEncoder.encode("卡口", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), EquipmentBayonetVO.class)
                .sheet("数据")
                .doWrite(iEquipmentBayonetService
ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
New file
@@ -0,0 +1,65 @@
package com.ycl.entity.caseHandler;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
 * <p>
 *
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_image_resources")
public class ImageResources implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键Id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 所属Id
     */
    @TableField("belong_to_id")
    private Long belongToId;
    /**
     * 图片资源类型 01-上报  02-处置
     */
    @TableField("type")
    private String type;
    /**
     * 图片路径
     */
    @TableField("url")
    private String url;
    /**
     * 创建人
     */
    @TableField("create_user")
    private Long createUser;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private LocalDateTime createTime;
}
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java
New file
@@ -0,0 +1,16 @@
package com.ycl.mapper.caseHandler;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.caseHandler.ImageResources;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
public interface BaseImageResourcesMapper extends BaseMapper<ImageResources> {
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
New file
@@ -0,0 +1,16 @@
package com.ycl.service.caseHandler;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.caseHandler.ImageResources;
/**
 * <p>
 *  服务类
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
public interface IImageResourcesService extends IService<ImageResources> {
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.caseHandler.ImageResources;
import com.ycl.mapper.caseHandler.BaseImageResourcesMapper;
import com.ycl.service.caseHandler.IImageResourcesService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 服务实现类
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
@Service
public class ImageResourcesServiceImpl extends ServiceImpl<BaseImageResourcesMapper, ImageResources> implements IImageResourcesService {
}
ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml
New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.mapper.caseHandler.BaseImageResourcesMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.ImageResources">
        <id column="id" property="id" />
        <result column="belong_to_id" property="belongToId" />
        <result column="type" property="type" />
        <result column="url" property="url" />
        <result column="create_user" property="createUser" />
        <result column="create_time" property="createTime" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, belong_to_id, type, url, create_user, create_time
    </sql>
</mapper>