Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-12-12 35fe315b94c508edecfff64fbe5c7429832682db

Merge branch 'local_20221104' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -954,6 +954,27 @@
    }


    @ApiOperation(value = "新批量上传照片")
    @PostMapping(value = "/uploadimagess", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImagess(@RequestParam MultipartFile[] files, HttpServletRequest request) {
        List<UploadFilesVO> urlList = new ArrayList<>();
        for (MultipartFile file : files) {
            try {
                assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
                String extension = FilenameUtils.getExtension(file.getOriginalFilename());
                String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
                String imageUrl = minioUtil.upload(file, name);
                UploadFilesVO fileVO = new UploadFilesVO();
                fileVO.setUrl(imageUrl);
                return R.ok(imageUrl);
            } catch (Exception e) {
                log.error("上传照片失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.ok(urlList);
    }

    @ApiOperation(value = "党员数据统计-分页查询党员数据",response = ComDataStatisticsMemberVo.class)
    @PostMapping("/dataStatistics/member/page")
    public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingWestApi.java

@@ -882,6 +882,27 @@
        return R.ok(urlList);
    }

    @ApiOperation(value = "新批量上传照片")
    @PostMapping(value = "/uploadimagess", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImagess(@RequestParam MultipartFile[] files, HttpServletRequest request) {
        List<UploadFilesVO> urlList = new ArrayList<>();
        for (MultipartFile file : files) {
            try {
                assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
                String extension = FilenameUtils.getExtension(file.getOriginalFilename());
                String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
                String imageUrl = minioUtil.upload(file, name);
                UploadFilesVO fileVO = new UploadFilesVO();
                fileVO.setUrl(imageUrl);
                return R.ok(imageUrl);
            } catch (Exception e) {
                log.error("上传照片失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.ok(urlList);
    }


    @ApiOperation(value = "党员数据统计-分页查询党员数据",response = ComDataStatisticsMemberVo.class)
    @PostMapping("/dataStatistics/member/page")