接口调整

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

@@ -98,9 +98,9 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 	}
 
 	@Override
-	@TargetDataSource("secondary")
+	//@TargetDataSource("secondary")
 	public void saveFgw(SubAerialImgVO vo, LoginUserVO loginUserVO) {
-		SubAerialImage image = new SubAerialImage();
+		/*SubAerialImage image = new SubAerialImage();
 		if(StringUtil.isNotEmpty(vo.getId())) {
 			image = subAerialImageMapper.findById(vo.getId());
 			image.setAerialDate(vo.getAerialDate());
@@ -120,7 +120,27 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 			image.setCreateTime(new Date());
 			image.setCreateUserId(loginUserVO.getId());
 			subAerialImageMapper.save(image);
+		}*/
+		SubAerialImage image = new SubAerialImage();
+		if(StringUtil.isNotEmpty(vo.getId())) {
+			image = subAerialImageDao.findById(vo.getId());
+			image.setAerialDate(vo.getAerialDate());
+			image.setImgId(vo.getImgId());
+			image.setRemark(vo.getRemark());
+			image.setLastUpdateTime(new Date());
+			image.setLastUpdateUserId(loginUserVO.getId());
+		}else {
+			image.setId(Identities.uuid());
+			image.setAerialDate(vo.getAerialDate());
+			image.setImgId(vo.getImgId());
+			image.setRemark(vo.getRemark());
+			image.setSubId(vo.getSubId());
+			image.setCreateTime(new Date());
+			image.setCreateUserId(loginUserVO.getId());
+
 		}
+		HttpClientUtil.fgwPostRequest("/outApi/remote/saveOrUpdateSubAerialImage", image);
+		subAerialImageDao.saveOrUpdate(image);
 	}
 
 	@Override
@@ -153,10 +173,10 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 	}
 
 	@Override
-	@TargetDataSource("secondary")
+	//@TargetDataSource("secondary")
 	public void saveFgw(List<SubAerialImgVO> list, LoginUserVO loginUserVO) {
 
-		for (SubAerialImgVO vo:list){
+		/*for (SubAerialImgVO vo:list){
 			SubAerialImage image = new SubAerialImage();
 			if(StringUtil.isNotEmpty(vo.getId())) {
 				image = subAerialImageMapper.findById(vo.getId());
@@ -180,8 +200,33 @@ public class SubAerialImageServiceImpl implements ISubAerialImageService {
 				subAerialImageMapper.save(image);
 			}
 
+		}*/
+		for (SubAerialImgVO vo:list){
+			SubAerialImage image = new SubAerialImage();
+			if(StringUtil.isNotEmpty(vo.getId())) {
+				image = subAerialImageDao.findById(vo.getId());
+				image.setAerialDate(vo.getAerialDate());
+				image.setImgId(vo.getImgId());
+				image.setRemark(vo.getRemark());
+				image.setLastUpdateTime(new Date());
+				image.setType("1");
+				image.setLogicDeleteFlag(vo.getLogicDeleteFlag());
+				image.setLastUpdateUserId(loginUserVO.getId());
+			}else {
+				image.setId(Identities.uuid());
+				image.setAerialDate(vo.getAerialDate());
+				image.setImgId(vo.getImgId());
+				image.setRemark(vo.getRemark());
+				image.setSubId(vo.getSubId());
+				image.setCreateTime(new Date());
+				image.setType("1");
+				image.setCreateUserId(loginUserVO.getId());
+			}
+			HttpClientUtil.fgwPostRequest("/outApi/remote/saveOrUpdateSubAerialImage", image);
+			subAerialImageDao.saveOrUpdate(image);
 		}
 
+
 	}
 
 	@Override

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

@@ -364,7 +364,7 @@ public class SubRptContServiceImpl implements SubRptContService {
 
 	@Override
 	@Transactional
-	@TargetDataSource("secondary")
+	//@TargetDataSource("secondary")
 	public void saveFgwReport(WeekContentVO vo, LoginUserVO loginUserVO, RptContKindEnum contKindEnum) {
 		BigDecimal bl = new BigDecimal("0.00");
 		String week = "";
@@ -388,6 +388,7 @@ public class SubRptContServiceImpl implements SubRptContService {
 			SubInfo subInfo = subInfoMapper.findByFgwId(vo.getSubId());
 			if (subInfo != null && vo.getContent() != null) {
 				subInfo.setYbContent(vo.getContent());
+				HttpClientUtil.fgwPostRequest("/outApi/remote/updateContent", subInfo);
 				subInfoMapper.update(subInfo);
 			}
 		}
@@ -399,7 +400,6 @@ public class SubRptContServiceImpl implements SubRptContService {
 			RptCont cont = new RptCont();
 			cont.setId(Identities.uuid());
 			//开始时间  结束时间
-
 			//设置类型
 			cont.setKind(contKindEnum.getCode());
 			cont.setBeginDate(vo.getBeginDate());
@@ -414,11 +414,11 @@ public class SubRptContServiceImpl implements SubRptContService {
 			cont.setSubId(vo.getSubId());
 			cont.setSubPlanId(vo.getSubPlanId());
 			cont.setAmt(vo.getAmt());
-			/*			cont.setAssignAmt(vo.getAssignAmt());*/
 			cont.setCreateTime(new Date());
 			cont.setLogicDeleteFlag(0);
 			cont.setCreateUserId(loginUserVO.getId());
 			cont.setKjMonth(moth);
+			HttpClientUtil.fgwPostRequest("/outApi/remote/saveRptCont", cont);
 			rptContMapper.save(cont);
 			mainId =cont.getId();
 			if (RptContKindEnum.MONTH.getCode().equals(contKindEnum.getCode())){
@@ -483,14 +483,13 @@ public class SubRptContServiceImpl implements SubRptContService {
 			old.setReason(vo.getReason());
 			old.setContent(vo.getContent());
 			old.setAmtLast(vo.getAmtLast());
-//			old.setAmtRt(vo.getAmtRt());
 			old.setNumBl(bl);
 			old.setAmt(vo.getAmt());
 			old.setSubPlanId(vo.getSubPlanId());
 			old.setLastUpdateTime(new Date());
 			old.setLastUpdateUserId(loginUserVO.getId());
 			old.setKjMonth(moth);
-			/*	old.setAssignAmt(vo.getAssignAmt());*/
+			HttpClientUtil.fgwPostRequest("/outApi/remote/updateRptCont", old);
 			rptContMapper.update(old);
 			mainId= old.getId();
 		}
@@ -505,10 +504,16 @@ public class SubRptContServiceImpl implements SubRptContService {
 			}
 			SubInfo info = subInfoMapper.findByFgwId(vo.getSubId());
 			info.setAmtComp(totalMoney);
+			HttpClientUtil.fgwPostRequest("/outApi/remote/updateContent", info);
 			subInfoMapper.update(info);
 		}
 		//保存附件信息
 		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/SubDataLogServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.Objects;
 import com.rtrh.common.util.Identities;
 import com.rtrh.common.util.UUIDUtil;
 import com.rtrh.projects.modules.system.mapper.SubDataLogMapper;
+import com.rtrh.projects.util.HttpClientUtil;
 import org.hibernate.id.UUIDGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -180,7 +181,7 @@ public class SubDataLogServiceImpl implements SubDataLogService {
         subDataLog.setLastUpdateUserId(lastUpdateUserId);
         subDataLog.setLastUpdateTime(lastUpdateTime);
         subDataLog.setType(type);
-
+        HttpClientUtil.fgwPostRequest("/outApi/remote/saveOrUpdateDataLog", subDataLog);
         subDataLogMapper.save(subDataLog);
     }
 

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

@@ -1,7 +1,9 @@
 package com.rtrh.projects.vo;
 
 import com.rtrh.core.repository.Page;
+import com.rtrh.projects.modules.projects.po.SubAerialImage;
 import com.rtrh.projects.modules.projects.vo.RptContQueryVO;
+import com.rtrh.projects.modules.system.po.WeekAndMonthFile;
 import com.rtrh.projects.modules.system.vo.LoginUserVO;
 import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
 import lombok.Getter;
@@ -23,5 +25,7 @@ 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,6 +211,7 @@ 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")