fix: 修改报案人 群查询

wl

2022-12-27 ed9f81d8a6c15a1537207fec10b0f64b6c1e0ef1

fix: 修改报案人 群查询

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

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,13 +12,17 @@
import com.example.jz.modle.entity.GroupUser;
import com.example.jz.modle.entity.Message;
import com.example.jz.modle.entity.Report;
import com.example.jz.modle.entity.User;
import com.example.jz.modle.vo.ReportListVo;
import com.example.jz.service.GroupUserService;
import com.example.jz.service.MessageService;
import com.example.jz.service.ReportService;
import com.example.jz.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -43,6 +48,8 @@
    GroupUserService groupUserService;
    @Resource
    MessageService messageService;
    @Autowired
    UserService userService;

    /**
     * 分页查询所有数据
@@ -96,9 +103,21 @@
    @ApiOperation(httpMethod = "PUT", value = "案件台-报案人员-编辑")
    @PutMapping("/updateReport")
    @ApiResponse(message = "执行成功", code = 200)
    public R updateReport(@RequestBody Report report) {
        report.setPic(null);
    @Transactional(rollbackFor = Exception.class)
    public R updateReport(@RequestBody AddReportDto report) {
        int imgIndexFirst = report.getPic().indexOf("/img");
        int imgIndexEnd = report.getPic().indexOf("?");
        String pic = report.getPic().substring(imgIndexFirst + 5, imgIndexEnd);
        report.setPic(pic);
        reportService.updateById(report);
        Report one = reportService.getOne(new LambdaQueryWrapper<Report>().eq(Report::getId, report.getId()));
        User user = new User();
        user.setRealName(report.getReporterName());
        user.setUserIdcard(report.getIdcard());
        user.setUserMobile(report.getMobile());
        user.setPic(pic);
        user.setId(one.getUserId());
        userService.updateById(user);
        return R.ok();
    }


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

@@ -177,7 +177,6 @@
    @GetMapping("/manager/group/list")
    public R getMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
        ArrayList<Map<String, Object>> list = new ArrayList<>();
//        List<GroupUser> groupUsers = groupUserService.list(new QueryWrapper<GroupUser>().eq("user_id", id));
        List<Group> groupUsers = groupService.list(new QueryWrapper<Group>().eq("user_id", id));
        if (groupUsers != null && groupUsers.size() != 0) {
            groupUsers.forEach(item -> {
@@ -204,7 +203,7 @@
    @GetMapping("/user/group/list")
    public R getUserMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
        ArrayList<Map<String, Object>> list = new ArrayList<>();
        reportService.list((new QueryWrapper<Report>().eq("user_id", id)))
        reportService.listGroup(id)
                .forEach(item ->
                        {
                            GroupUser groupUser = groupUserService.getOne(new QueryWrapper<GroupUser>().eq("user_id", item.getId()));

 src/main/java/com/example/jz/dao/ReportDao.java

@@ -27,5 +27,7 @@
    List<ReportListVo> getPageByGroupId( ReportParamDto reportParamDto, Integer causeId,Long size,Long current);

    Integer getPageByGroupIdCount(ReportParamDto reportParamDto, Integer causeId);

    List<Report> selectListGroup(Integer id);
}


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

@@ -6,10 +6,10 @@
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;
import java.util.List;

/**
 * 报案表(Report)表服务接口
@@ -33,9 +33,12 @@

    /**
     * 添加案件
     *
     * @param addReportDto
     * @return
     */
    Boolean addReport(AddReportDto addReportDto);

    List<Report> listGroup(Integer id);
}


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

@@ -214,4 +214,9 @@
                .setCauseId(addReportDto.getCauseId());
        return reportService.save(report);
    }

    @Override
    public List<Report> listGroup(Integer id) {
        return reportDao.selectListGroup(id);
    }
}

 src/main/resources/mapper/ReportDao.xml

@@ -91,4 +91,15 @@
        ) as reporter
    </select>

    <select id="selectListGroup" resultType="com.example.jz.modle.entity.Report">
        SELECT
            t1.*
        FROM
            report t1
                LEFT JOIN group_user t2 ON t1.id = t2.user_id
        where t1.user_id=#{id}
        GROUP BY
            t2.group_id
    </select>

</mapper>

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

@@ -26,7 +26,12 @@

    @Test
    void getAllUser() {
        List<GroupUserVo> groupUserVos = groupDao.getAllUser(1);
        System.out.println(groupUserVos);
        String str ="http://42.193.1.25:9000/img/2022/12/27/851da62efac5431c8c313a757a14e327.jpeg" +
                "?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=satori%2F20221227%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date" +
                "=20221227T034709Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=" +
                "c584eaa85b7f22420541e53f6e36d681bbc4aeb0ef07272538689dea7ee112b4";
        int imgIndexFirst = str.indexOf("/img");
        int imgIndexEnd= str.indexOf("?");
        System.out.println(str.substring(imgIndexFirst+5,imgIndexEnd));
    }
}