fix: 导入和报案方式

wl

2022-12-28 d759812b05ceffc6021dee9ebf61bc0c22472df3

fix: 导入和报案方式

 src/main/java/com/example/jz/controller/ReportController.java

@@ -21,9 +21,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -139,6 +141,15 @@
        return R.ok();
    }

    @ApiOperation(httpMethod = "POST", value = "案件台-案件录入-报案人员-报案人元导入")
    @PostMapping("/reporterUpload")
    @ApiResponse(message = "执行成功", code = 200)
    @SneakyThrows
    public R uploadReporter(@RequestParam(value = "multipartFile") MultipartFile multipartFile, Integer causeId) {
        reportService.loadFileReport(multipartFile,causeId);
        return R.ok();
    }

    @ApiOperation(httpMethod = "POST", value = "案件台-报案人员-报案材料导出")
    @PostMapping("/exportReporter")
    @ApiResponse(message = "执行成功", code = 200)

 src/main/java/com/example/jz/controller/WxAppController.java

@@ -164,7 +164,7 @@
        report.setIsInGroup(0);
        report.setCtime(new Date());
        report.setStatus(0);
        report.setReportMethod("现场录入");
        report.setReportMethod("扫码报案");
        return R.ok(reportService.save(report));
    }


 src/main/java/com/example/jz/modle/dto/CauseLoadDto.java

@@ -20,24 +20,28 @@
    @ExcelProperty(value = "案件名称",index = 1)
    private String name;

    @ApiModelProperty(dataType = "String", value = "案件名称")
    @ExcelProperty(value = "预估总金额",index = 2)
    private String totalMoney;

    //最早次案发时间
    @ApiModelProperty(dataType = "Date", value = "最早发案时间")
    @ExcelProperty(value = "最早发案时间",index = 2)
    @ExcelProperty(value = "最早发案时间",index = 3)
    private Date firstTime;

    //案件状态
    @ApiModelProperty(dataType = "String", value = "案件状态")
    @ExcelProperty(value = "案件状态",index = 3)
    @ExcelProperty(value = "案件状态",index = 4)
    private String status;

    //负责人
    @ApiModelProperty(dataType = "String", value = "负责人")
    @ExcelProperty(value = "负责人",index = 4)
    @ExcelProperty(value = "负责人",index = 5)
    private String userName;

    //案件描述
    @ApiModelProperty(dataType = "String", value = "案件描述")
    @ExcelProperty(value = "案件描述",index = 5)
    @ExcelProperty(value = "案件描述",index = 6)
    private String description;

}

 src/main/java/com/example/jz/service/ReportService.java

@@ -6,6 +6,7 @@
import com.example.jz.modle.dto.ReportParamDto;
import com.example.jz.modle.entity.Report;
import com.example.jz.modle.vo.ReportListVo;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.Serializable;
@@ -40,5 +41,7 @@
    Boolean addReport(AddReportDto addReportDto);

    List<Report> listGroup(Integer id);

    void loadFileReport(MultipartFile multipartFile, Integer causeId);
}


 src/main/java/com/example/jz/service/impl/CauseServiceImpl.java

@@ -295,8 +295,9 @@
                .setUserId(user.getId())
                .setCtime(new Date())
                .setStatus(1)
                .setReportMethod("后台录入")
                .setIsCommission("0").setReportTime(new Date())
                .setReportMethod("现场报案")
                .setIsCommission("0")
                .setReportTime(new Date())
                .setCauseId(addReportDto.getCauseId());
        reportService.save(report);
        return groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0)) > 0;

 src/main/java/com/example/jz/service/impl/ReportServiceImpl.java

@@ -1,6 +1,8 @@
package com.example.jz.service.impl;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.metadata.data.ImageData;
import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.util.IoUtils;
@@ -12,6 +14,7 @@
import com.example.jz.dao.*;
import com.example.jz.modle.PageParam;
import com.example.jz.modle.dto.AddReportDto;
import com.example.jz.modle.dto.AddReportLoadDto;
import com.example.jz.modle.dto.ReportParamDto;
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.ExportExcelReportVo;
@@ -25,6 +28,7 @@
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -206,8 +210,9 @@
                .setCtime(new Date())
                .setStatus(0)
                .setIsInGroup(0)
                .setReportMethod("后台录入")
                .setIsCommission("0").setReportTime(new Date())
                .setReportMethod("现场报案")
                .setIsCommission("0")
                .setReportTime(new Date())
                .setCauseId(addReportDto.getCauseId());
        return reportService.save(report);
    }
@@ -216,4 +221,28 @@
    public List<Report> listGroup(Integer id) {
        return reportDao.selectListGroup(id);
    }

    @Override
    @SneakyThrows
    public void loadFileReport(MultipartFile multipartFile, Integer causeId) {
        EasyExcel.read(multipartFile.getInputStream(), AddReportLoadDto.class, new AnalysisEventListener<AddReportLoadDto>() {
                    @Override
                    public void invoke(AddReportLoadDto data, AnalysisContext context) {
                        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(data.getReporterName()) && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(data.getIdcard())) {
                            AddReportDto addReportDto = new AddReportDto();
                            BeanUtils.copyProperties(data, addReportDto);
                            addReportDto.setCauseId(causeId);
                            addReport(addReportDto);
                        }

                    }

                    @Override
                    public void doAfterAllAnalysed(AnalysisContext context) {

                    }
                })
                .autoCloseStream(true)
                .doReadAll();
    }
}

 src/test/java/com/example/jz/dao/UserDaoTest.java

@@ -1,13 +1,8 @@
package com.example.jz.dao;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.example.jz.modle.entity.User;
import com.example.jz.utils.Md5Utils;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

import static org.junit.jupiter.api.Assertions.*;

/**
 * @author 安瑾然
@@ -20,11 +15,15 @@
    @Autowired
    private UserDao userDao;

    @Test
    void updateUser() {
        User user = userDao.selectOne(new LambdaQueryWrapper<>(User.class).eq(User::getId, 1));
        System.out.println(user);
        user.setLoginUsername("admin");
        user.setLoginPassword(Md5Utils.md5("admin"));
        userDao.updateById(user);
        String str = "XXO";
        int conut = 0;
        for (char c : str.toCharArray()) {
            if (c != 'O') {
                conut++;
            }
        }
        System.out.println(conut);
    }
}