接口调整

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubAerialImageServiceImpl.java

@@ -126,6 +126,7 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 			image = subAerialImageDao.findById(vo.getId());
 			image.setAerialDate(vo.getAerialDate());
 			image.setImgId(vo.getImgId());
+			image.setType("0");
 			image.setRemark(vo.getRemark());
 			image.setLastUpdateTime(new Date());
 			image.setLastUpdateUserId(loginUserVO.getId());
@@ -133,6 +134,7 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 			image.setId(Identities.uuid());
 			image.setAerialDate(vo.getAerialDate());
 			image.setImgId(vo.getImgId());
+			image.setType("0");
 			image.setRemark(vo.getRemark());
 			image.setSubId(vo.getSubId());
 			image.setCreateTime(new Date());

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubRptContServiceImpl.java

@@ -509,11 +509,6 @@ public class SubRptContServiceImpl implements SubRptContService {
 		}
 		//保存附件信息
 		if(CollectionUtil.isNotEmpty(vo.getListFile())) {
-			RemoteRequestDto requestDto = new RemoteRequestDto();
-			requestDto.setListFile(vo.getListFile());
-			requestDto.setMainId(mainId);
-			requestDto.setLoginName(loginUserVO.getLoginName());
-			HttpClientUtil.fgwPostRequest("/outApi/remote/saveOrUpdateWeekAndMonthFile", requestDto);
 			weekAndMonthFileService.saveOrUpdateFgw(vo.getListFile(), loginUserVO.getLoginName(), mainId);
 		}
 	}

projects-service/src/main/java/com/rtrh/projects/modules/system/service/impl/WeekAndMonthFileImpl.java

@@ -71,13 +71,6 @@ public class WeekAndMonthFileImpl implements WeekAndMonthFileService {
 
     @Override
     public void saveOrUpdateFgw(List<WeekAndMonthFile> list, String currUserName, String mainId) {
-
-        /*List<WeekAndMonthFile> list1= weekAndMonrhFileMapper.listByMainId(mainId);
-        for (WeekAndMonthFile weekAndMonthFile:list1){
-            weekAndMonrhFileMapper.delete(weekAndMonthFile.getId());
-        }*/
-
-
         if(CollectionUtil.isNotEmpty(list)) {
             List<WeekAndMonthFile> newList = new ArrayList<>();
             for (WeekAndMonthFile weekAndMonrhFile :list){
@@ -91,10 +84,12 @@ public class WeekAndMonthFileImpl implements WeekAndMonthFileService {
                     newList.add(weekAndMonrhFile);
                 }else{
                     weekAndMonrhFileMapper.update(weekAndMonrhFile);
+                    HttpClientUtil.fgwPostRequest("/outApi/remote/updateWeekAndMonthFile", weekAndMonrhFile);
                 }
             }
             if (newList.size()>0){
                 weekAndMonrhFileMapper.saveOrUpdateAll(newList);
+                HttpClientUtil.fgwPostRequest("/outApi/remote/saveWeekAndMonthFileAll", newList);
             }
         }
     }

projects-service/src/main/java/com/rtrh/projects/vo/RemoteRequestDto.java

@@ -25,7 +25,4 @@ public class RemoteRequestDto implements Serializable {
     private List<String> ids;
     private String month;
     private RptContQueryVO rptVO;
-    private List<WeekAndMonthFile> listFile;
-    private String mainId;
-    private String loginName;
 }

projects/src/main/java/com/rtrh/projects/web/controller/fileSystem/FilePostController.java

@@ -211,7 +211,6 @@ public class FilePostController {
 					} catch (IOException e) {
 						e.printStackTrace();
 					}
-					fileManager.saveOfficialDocument(bo);
 					// 转成pdf 穿件一个新的线程
 					String realname = bo.getFileInfo().getName();
 					if (realname.endsWith(".docx") || realname.endsWith(".doc") || realname.endsWith(".xls")