同步报送接口

business-common/src/main/java/com/rongwei/bscommon/sys/feign/BsPlatformService.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.feign;
 import com.rongwei.bsentity.dto.OutsideInspactionSyncDto;
 import com.rongwei.rwcommon.base.R;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -18,5 +19,9 @@ public interface BsPlatformService {
      * @return
      */
     @PostMapping("rw-business-server/sync/exterior-inspection")
-    R syncOutsideInpection(@RequestBody List<OutsideInspactionSyncDto> list);
+    R syncOutsideInpection(
+            @RequestBody List<OutsideInspactionSyncDto> list
+            , @PathVariable("companyName") String companyName  //路径参数
+    );
+
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxOutsideInspectionItpService.java

@@ -67,7 +67,7 @@ public interface ZhcxOutsideInspectionItpService extends IService<ZhcxOutsideIns
      *
      * @param req
      */
-    void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req);
+    void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req,String companyName);
 
     /**
      * 获取初始化报验点状态报验单

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -9,13 +9,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.ZhcxInsideInspectionDao;
+import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpDao;
 import com.rongwei.bscommon.sys.feign.BsPlatformService;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ZhcxCommon;
 import com.rongwei.bsentity.domain.*;
-import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpDao;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.dto.*;
 import com.rongwei.bsentity.dto.indicators.ComlpateIndicatorsRequest;
 import com.rongwei.bsentity.dto.outside.OutsideInspectionInsertRequest;
@@ -23,7 +23,9 @@ import com.rongwei.bsentity.dto.outside.OutsideInspectionUpdateRequest;
 import com.rongwei.bsentity.dto.project.indicator.DelPhysicalParam;
 import com.rongwei.bsentity.dto.project.node.ProjectNodeStateBo;
 import com.rongwei.bsentity.dto.project.node.UnItpNodeStateBo;
-import com.rongwei.bsentity.vo.*;
+import com.rongwei.bsentity.vo.OperOutsideInspectionVo;
+import com.rongwei.bsentity.vo.SupervisionVo;
+import com.rongwei.bsentity.vo.ZhcxOutsideExportVo;
 import com.rongwei.bsentity.vo.outside.OutsideInspectionVo;
 import com.rongwei.bsentity.vo.project.ShipOffStoreNodeTotal;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
@@ -52,8 +54,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -1303,7 +1303,8 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
      * @param req
      */
     @Override
-    public void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req) {
+    public void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req,String companyName) {
+        System.out.println(companyName+"公司名称===========");
         List<OutsideInspactionSyncDto> syncDtoList = dao.getInspection(req);
 
         if(ObjectUtil.isEmpty(syncDtoList)) {
@@ -1340,8 +1341,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             record.setDeleted("0");
             recordList.add(record);
         }
-
-        R result = bsPlatformService.syncOutsideInpection(syncDtoList);
+        R result = bsPlatformService.syncOutsideInpection(syncDtoList,companyName);
 
         if(ObjectUtil.isNull(result) || !"200".equals(result.getCode())) {
             log.error("请求结果：{}", result);

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpController.java

@@ -114,8 +114,8 @@ public class ZhcxOutsideInspectionItpController {
      */
     @ApiOperation("推送到报送平台")
     @PostMapping("/syncBsPlatform")
-    public R syncBsPlatform(@RequestBody OutsideInspactionSyncReqquest req){
-        service.sync2SubmissionPlatform(req);
+    public R syncBsPlatform(@RequestBody OutsideInspactionSyncReqquest req,@RequestParam String companyName){
+        service.sync2SubmissionPlatform(req,companyName);
         return R.ok();
     }