Merge branch 'feature/login_test-wjz' into feature/login_test

xusd

3 days ago 8c13eebe691e5f25aa10fd6df6789f2e856a23da

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridEventService.java

@@ -9,6 +9,8 @@
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.file.domain.po.FileInfo;
import cn.huge.module.file.service.FileInfoService;
import cn.huge.module.grid.dao.mapper.GridEventMapper;
import cn.huge.module.grid.domain.dto.GridFileUploadDTO;
import cn.huge.module.grid.domain.dto.GridOrgDTO;
@@ -62,6 +64,9 @@

    @Autowired
    private CustClientImpl custClient;

    @Autowired
    private FileInfoService fileInfoService;

    @Value("${grid.url:http://219.137.166.84:8061}")
    private String gridUrl;
@@ -246,10 +251,13 @@
                for (FileInfoBaseDTO fileInfoBaseDTO : fileInfoList) {
                    try {
                        GridFileUploadVo gridFileUploadVo = new GridFileUploadVo();
                        gridFileUploadVo.setFileName(fileInfoBaseDTO.getFileName());
                        gridFileUploadVo.setFilePath(fileInfoBaseDTO.getFullPath());
                        gridFileUploadVo.setFileSize(fileInfoBaseDTO.getSize() != null ? fileInfoBaseDTO.getSize().longValue() : 0L);
                        gridFileUploadVo.setType(fileInfoBaseDTO.getSuffix());
                        //  通过id获取文件信息
                        FileInfo fileInfo = fileInfoService.getById(fileInfoBaseDTO.getId());

                        gridFileUploadVo.setFileName(fileInfo.getFileName());
                        gridFileUploadVo.setFilePath(fileInfo.getFullPath());
                        gridFileUploadVo.setFileSize(fileInfo.getSize() != null ? fileInfo.getSize().longValue() : 0L);
                        gridFileUploadVo.setType(fileInfo.getSuffix());
                        R<GridFileUploadDTO> result = null;
                        //上传附件信息
                        result = gridCaseDataService.uploadFileInfo(gridFileUploadVo);