Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JiLinPushTomeDto.java

@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class JiLinPushTomeDto {
-
     private Long projId;
     private Long pactId;
     private Long kid;

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/ArchiveAutoDto.java → blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/JiLinArchiveAutoDto.java

@@ -1,9 +1,12 @@
-package org.springblade.archive.dto;
+package org.springblade.archive.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
 
 @Data
-public class ArchiveAutoDto {
+@TableName("u_jilin_archives")
+public class JiLinArchiveAutoDto{
     private Long id;
     private Long projectId;
     private Long contractId;
@@ -14,14 +17,17 @@ public class ArchiveAutoDto {
     private String endDate;
     private String storageTime;
     private String secretLevel;
-    private String updateUser;
-    private String updateTime;
+    private String updateUserName;
+    private String updateUserTime;
     private String autoFileSort;
-    private String createTime;
+    private String createUserTime;
     private Integer fileN;
     private String rollor;
     private Long  nodeId;
     private Integer pageN;
     private String fileUrl;
     private String pdfFileUrl;
+    private Long tomeId;
+    private Long catlogId;
+
 }

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/feign/ArchiveAutoClient.java

@@ -1,13 +1,9 @@
 package org.springblade.archive.feign;
 
-import org.springblade.archive.dto.ArchiveAutoDto;
-import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.entity.ArchivesAuto;
-import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.archive.vo.UpdateExpertVO;
 import org.springblade.common.constant.ArchiveConstant;
-import org.springblade.common.constant.EVisaConstant;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ArchiveTreeContractClient.java

@@ -62,5 +62,5 @@ public interface ArchiveTreeContractClient {
     public ArchiveTreeContract getMatchNode(@RequestParam Long nodeId);
 
     @PostMapping(API_PREFIX+"/getArchiveTreeContractDto")
-    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestBody List<JiLinQueryDto>dtos, @RequestParam Long cqProjectId);
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestBody List<JiLinQueryDto>dtos, @RequestParam Long projectId);
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/InventoryFormApply.java

@@ -128,4 +128,18 @@ public class InventoryFormApply extends BaseEntity {
             this.currentMeterTotal = new BigDecimal(currentMeterTotal.stripTrailingZeros().toPlainString());
         }
     }
+
+    public BigDecimal getCurrentMeterMoney() {
+        if (currentMeterMoney == null){
+            return null;
+        }else {
+            return new BigDecimal(currentMeterMoney.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setCurrentMeterMoney(BigDecimal currentMeterMoney) {
+        if (currentMeterMoney != null) {
+            this.currentMeterMoney = new BigDecimal(currentMeterMoney.stripTrailingZeros().toPlainString());
+        }
+    }
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MiddleMeterApply.java

@@ -137,4 +137,20 @@ public class MiddleMeterApply extends BaseEntity {
 
     @ApiModelProperty(value = "是否自动计量生成1(自动批量计量生成)0(手动新增)")
     private Integer isAutoBuild;
+
+
+
+    public BigDecimal getMeterMoney() {
+        if (meterMoney == null){
+            return null;
+        }else {
+            return new BigDecimal(meterMoney.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setMeterMoney(BigDecimal meterMoney) {
+        if (meterMoney != null) {
+            this.meterMoney = new BigDecimal(meterMoney.stripTrailingZeros().toPlainString());
+        }
+    }
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterInventoryVO.java

@@ -100,4 +100,18 @@ public class MeterInventoryVO {
     public void setAllMeterTotal(BigDecimal allMeterTotal) {
         this.allMeterTotal = new BigDecimal(allMeterTotal.stripTrailingZeros().toPlainString());
     }
+
+    public BigDecimal getCurrentMeterMoney() {
+        if (currentMeterMoney == null){
+            return null;
+        }else {
+            return new BigDecimal(currentMeterMoney.stripTrailingZeros().toPlainString());
+        }
+    }
+
+    public void setCurrentMeterMoney(BigDecimal currentMeterMoney) {
+        if (currentMeterMoney != null) {
+            this.currentMeterMoney = new BigDecimal(currentMeterMoney.stripTrailingZeros().toPlainString());
+        }
+    }
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/JinLinPushApiController.java

@@ -2,16 +2,21 @@ package org.springblade.archive.controller;
 
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.annotations.Api;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springblade.archive.dto.*;
+
 import org.springblade.archive.entity.ArchiveJiLinPush;
-import org.springblade.archive.feign.ArchiveAutoClient;
+import org.springblade.archive.entity.JiLinArchiveAutoDto;
 import org.springblade.archive.service.IArchiveJiLinPushService;
 import org.springblade.archive.service.IArchivesAutoService;
+import org.springblade.archive.service.IJiLinArchiveAutoDtoService;
+import org.springblade.archive.service.impl.JiLinArchiveAutoDtoImpl;
+import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.feign.ArchiveTreeContractClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +40,10 @@ public class JinLinPushApiController {
     private static  final String PYSYSTEMID="9";
     private static final Long jlPyProjId=72900L;
     private static  final Long cqPyProjectId=1644168307341238273L;
+
     //烟长
-    private static final String YCPYCLIENTID="hqs_veams03";
-    private static  final String YCPYCLIENTSECRETKEY="FA3E91A9C2F04ED5A4D76E2DF4D09463";
+    private static final String YCCLIENTID="hqs_veams03";
+    private static  final String YCCLIENTSECRETKEY="FA3E91A9C2F04ED5A4D76E2DF4D09463";
     private static  final String YCSYSTEMID="9";
     private static final Long jlYcProjId=73100L;
     private static final Long cqYcProjectId=1644178425269166081L;
@@ -46,7 +52,7 @@ public class JinLinPushApiController {
     private static  final String HJCLIENTSECRETKEY="50644A2D550A42E88964FE63B7C6D4E7";
     private static  final String HJSYSTEMID="9";
     private static final Long jlHjProjId=73200L;
-    private static final Long jlHjProjectId=1644178786029641730L;
+    private static final Long cqHjProjectId=1644178786029641730L;
 
     @Resource
     private IArchivesAutoService iArchivesAutoService;
@@ -57,25 +63,28 @@ public class JinLinPushApiController {
     @Resource
     private IArchiveJiLinPushService iArchiveJiLinPushService;
 
+    @Resource
+    private IJiLinArchiveAutoDtoService iJiLinArchiveAutoDtoService;
+
     @GetMapping("/test")
     public void JinlinApiPush() throws JsonProcessingException {
         //获取发送get请求的校验码
-     String query = "clientSecretKey="+PYCLIENTSECRETKEY;
+     String query = "clientSecretKey="+HJCLIENTSECRETKEY;
      String querySignature = DigestUtils.md5Hex(query).toUpperCase();
        // 获取吉林项目合同段的地址
      String queryUrl = "https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/hqsws/hqsprojpact/query";
      HashMap<String,String> queryHeaders=new HashMap<>();
         queryHeaders.put("Content-Type", "application/json");
-        queryHeaders.put("clientId",PYCLIENTID);
+        queryHeaders.put("clientId",HJCLIENTID);
         queryHeaders.put("signature",querySignature);
-        queryHeaders.put("systemId",PYSYSTEMID);
+        queryHeaders.put("systemId",HJSYSTEMID);
      String queryBody = HttpUtil.createGet(queryUrl).addHeaders(queryHeaders).execute().body();
      JSONObject jsonObject=JSONObject.parseObject(queryBody);
      //吉林蒲烟项目合同段信息
      List<PactAndProjDto> pactAndProjDtoList = JSONObject.parseArray(jsonObject.getString("data").toString(),PactAndProjDto.class);
 
      //重庆吉林蒲烟项目合同段信息（中间表）
-     List<ArchiveJiLinPush>archiveJiLinPushList= iArchiveJiLinPushService.getArchiveJiLinPush(jlPyProjId);
+     List<ArchiveJiLinPush>archiveJiLinPushList= iArchiveJiLinPushService.getArchiveJiLinPush(jlHjProjId);
 
      //中间项目合同中间集合
      List<JiLinQueryDto>dtos=new ArrayList<>();
@@ -94,8 +103,9 @@ public class JinLinPushApiController {
             }
         }
       //传入重庆的项目ID，和吉林需要的合同段集合 查出重庆的目录树
-        List<ArchiveTreeContractDTO> archiveTreeContractDtos = archiveTreeContractClient.getArchiveTreeContractDto(dtos,cqPyProjectId);
-        System.out.println("重庆的目录树"+archiveTreeContractDtos.size());
+        Long projectId=cqHjProjectId;
+        List<ArchiveTreeContractDTO> archiveTreeContractDtos = archiveTreeContractClient.getArchiveTreeContractDto(dtos,projectId);
+        System.out.println(archiveTreeContractDtos.size());
       //构建需要传给吉林的目录树 数据
         List<JiLinPushTreeDto>jiLinPushTreeDtos=new ArrayList<>();
         for (ArchiveTreeContractDTO archiveTreeContractDto : archiveTreeContractDtos) {
@@ -107,7 +117,7 @@ public class JinLinPushApiController {
             jiLinPushTreeDto.setAddUserName(archiveTreeContractDto.getUpdateUserName());
             jiLinPushTreeDto.setPactId(archiveTreeContractDto.getContractId());
             //直接统一设置好目录树项目Id为吉林的项目ID
-            jiLinPushTreeDto.setProjId(jlPyProjId);
+            jiLinPushTreeDto.setProjId(jlHjProjId);
             jiLinPushTreeDtos.add(jiLinPushTreeDto);
 
         }
@@ -121,214 +131,148 @@ public class JinLinPushApiController {
                 }
             }
         }
-        System.out.println("推送的目录树"+jiLinPushTreeDtos.size());
-        System.out.println(jiLinPushTreeDtos.get(20));
-//        String tree= JSONObject.toJSONString(jiLinPushTreeDtos);
-//        String treeMsg=tree+PYCLIENTSECRETKEY;
-//        String treeSignature = DigestUtils.md5Hex(treeMsg).toUpperCase();
-//        //传输吉林目录树的地址
-//        String treeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tree";
-//        HashMap<String,String> treeHeaders=new HashMap<>();
-//        treeHeaders.put("Content-Type", "application/json");
-//        treeHeaders.put("clientId",PYCLIENTID);
-//        treeHeaders.put("signature",treeSignature);
-//        treeHeaders.put("systemId",PYSYSTEMID);
-//        //开始传输目录树
-//        String treeBody = HttpUtil.createPost(treeUrl).addHeaders(treeHeaders).body(tree).contentType("application/json").execute().body();
-//        System.out.println(treeBody);
-
-       //根据项目ID，合同段ID 查询出所有符合的档案数据
-        List<ArchiveAutoDto>archiveAutoDtos=iArchivesAutoService.getArchiveAutoDtoList(cqPyProjectId,dtos);
-        //双重循环查出来的档案 将我们的项目 合同ID 设置为吉林的
-        for (ArchiveAutoDto archiveAutoDto : archiveAutoDtos) {
-            archiveAutoDto.setProjectId(jlPyProjId);
-            for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
-                if (archiveAutoDto.getContractId() != null && archiveAutoDto.getContractId().equals(archiveJiLinPush.getCqContractId())) {
-                    archiveAutoDto.setContractId(archiveJiLinPush.getJlPactId());
-                }
-            }
-        }
-        System.out.println("档案"+archiveAutoDtos.size());
-        System.out.println(archiveAutoDtos.get(20));
+        System.out.println(jiLinPushTreeDtos.size());
 
-       List<JiLinPushTomeDto> list=new ArrayList<>();
-        for (int i = 0; i < archiveAutoDtos.size(); i++) {
-            if(i>=20){
-                break;
-            }
-            JiLinPushTomeDto jiLinPushTomeDto=new JiLinPushTomeDto();
-            jiLinPushTomeDto.setPactId(jlPyProjId);
-            jiLinPushTomeDto.setPactId(archiveAutoDtos.get(i).getContractId());
-            jiLinPushTomeDto.setKid(archiveAutoDtos.get(i).getNodeId()+1L);
-            jiLinPushTomeDto.setSortID(archiveAutoDtos.get(i).getNodeId());
-            jiLinPushTomeDto.setTomeSuper(archiveAutoDtos.get(i).getName());
-            jiLinPushTomeDto.setRecordNum(archiveAutoDtos.get(i).getFileNumber());
-            jiLinPushTomeDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
-            jiLinPushTomeDto.setAddTime(archiveAutoDtos.get(i).getCreateTime());
-            jiLinPushTomeDto.setBWeaveDate(archiveAutoDtos.get(i).getStartDate());
-            jiLinPushTomeDto.setEWeaveDate(archiveAutoDtos.get(i).getEndDate());
-            jiLinPushTomeDto.setKeepTerm(archiveAutoDtos.get(i).getStorageTime());
-            jiLinPushTomeDto.setSortID(Long.valueOf(i));
-            jiLinPushTomeDto.setMutualNum("0");
-            jiLinPushTomeDto.setWeaveUnit(archiveAutoDtos.get(i).getUnit());
-            jiLinPushTomeDto.setSecrecy(archiveAutoDtos.get(i).getSecretLevel());
-            jiLinPushTomeDto.setYear(Integer.parseInt(archiveAutoDtos.get(i).getStorageTime()));
-            list.add(jiLinPushTomeDto);
-            i++;
-            log.info(""+i);
-        }
+        String tree= JSONObject.toJSONString(jiLinPushTreeDtos);
+        String treeMsg=tree+HJCLIENTSECRETKEY;
+        String treeSignature = DigestUtils.md5Hex(treeMsg).toUpperCase();
+        //传输吉林目录树的地址
+        String treeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tree";
+        HashMap<String,String> treeHeaders=new HashMap<>();
+        treeHeaders.put("Content-Type", "application/json");
+        treeHeaders.put("clientId",HJCLIENTID);
+        treeHeaders.put("signature",treeSignature);
+        treeHeaders.put("systemId",HJSYSTEMID);
+        //开始传输目录树
+        String treeBody = HttpUtil.createPost(treeUrl).addHeaders(treeHeaders).body(tree).contentType("application/json").execute().body();
+        System.out.println(tree);
+        System.out.println(treeBody);
 
+       //根据项目ID，合同段ID 查询出所有符合的档案数据
+//        List<JiLinArchiveAutoDto>archiveAutoDtos=iArchivesAutoService.getArchiveAutoDtoList(cqHjProjectId,dtos);
 
+        //双重循环查出来的档案 将我们的项目 合同ID 设置为吉林的
+//        for (JiLinArchiveAutoDto archiveAutoDto : archiveAutoDtos) {
+//            Long id = SnowFlakeUtil.getId();
+//            Long id1 = SnowFlakeUtil.getId();
+//            archiveAutoDto.setProjectId(jlPyProjId);
+//            archiveAutoDto.setTomeId(id);
+//            archiveAutoDto.setCatlogId(id1);
+//            for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
+//                if (archiveAutoDto.getContractId() != null && archiveAutoDto.getContractId().equals(archiveJiLinPush.getCqContractId())) {
+//                    archiveAutoDto.setContractId(archiveJiLinPush.getJlPactId());
+//                }
+//            }
+//        }
+//        System.out.println("档案："+archiveAutoDtos.size());
+//        iJiLinArchiveAutoDtoService.saveBatch(archiveAutoDtos);
+//        int pageNum=1;
+//        int size=500;
+//        Page<JiLinArchiveAutoDto> pages=iJiLinArchiveAutoDtoService.queryAll(pageNum,size);
+//        System.out.println(pages.getRecords().size());
 
-//        JiLinPushTomeDto jiLinPushTomeDto=new JiLinPushTomeDto();
-//        jiLinPushTomeDto.setProjId(72900L);
-//        jiLinPushTomeDto.setPactId(44804217L);
-//        jiLinPushTomeDto.setKid(1644215386427621385L+1L);
-//        jiLinPushTomeDto.setSortID(1644215386427621385L);
-//        jiLinPushTomeDto.setTomeSuper("G1221PYJL102001  延吉至长春高速公路大蒲柴河至烟筒山段建设项目PYZJB01合同段2021年K201+516.999-K211+690道路巡视记录");
-//        jiLinPushTomeDto.setRecordNum("111");
-//        jiLinPushTomeDto.setAddUserName("111");
-//        jiLinPushTomeDto.setAddTime("2024-09-11");
-//        jiLinPushTomeDto.setBWeaveDate("2024-08-11");
-//        jiLinPushTomeDto.setEWeaveDate("2024-09-10");
-//        jiLinPushTomeDto.setKeepTerm("3年");
-//        jiLinPushTomeDto.setSortID(1L);
-//        jiLinPushTomeDto.setMutualNum("0");
-//        jiLinPushTomeDto.setWeaveUnit("重庆");
-//        jiLinPushTomeDto.setSecrecy("3");
-//        jiLinPushTomeDto.setYear(3);
-//
-//        JiLinPushTomeDto jiLinPushTomeDto1 = new JiLinPushTomeDto();
-//        jiLinPushTomeDto1.setProjId(72900L);
-//        jiLinPushTomeDto1.setPactId(44804217L);
-//        jiLinPushTomeDto1.setKid(1644215386427621385L+2L);
-//        jiLinPushTomeDto1.setSortID(1644215386427621385L);
-//        jiLinPushTomeDto1.setTomeSuper("G1221PYJL102001  延吉至长春高速公路大蒲柴河至烟筒山段建设项目PYZJB01合同段2021年K201+516.999-K211+690道路巡视记录");
-//        jiLinPushTomeDto1.setRecordNum("111");
-//        jiLinPushTomeDto1.setAddUserName("111");
-//        jiLinPushTomeDto1.setAddTime("2024-09-11");
-//        jiLinPushTomeDto1.setBWeaveDate("2024-08-11");
-//        jiLinPushTomeDto1.setEWeaveDate("2024-09-10");
-//        jiLinPushTomeDto1.setKeepTerm("3年");
-//        jiLinPushTomeDto1.setSortID(1L);
-//        jiLinPushTomeDto1.setMutualNum("0");
-//        jiLinPushTomeDto1.setWeaveUnit("重庆");
-//        jiLinPushTomeDto1.setSecrecy("3");
-//        jiLinPushTomeDto1.setYear(3);
-//
-//        List<JiLinPushTomeDto>dtos=new ArrayList<>();
-//        dtos.add(jiLinPushTomeDto);
-//        dtos.add(jiLinPushTomeDto1);
 
-//   String tome=JSONObject.toJSONString(dtos);
-//   String tomeMsg=tome+PYCLIENTSECRETKEY;
-//   String tomeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tome";
-//   String tomeSignature = DigestUtils.md5Hex(tomeMsg).toUpperCase();
-//    HashMap<String,String> tomeHeaders=new HashMap<>();
-//        tomeHeaders.put("Content-Type", "application/json");
-//        tomeHeaders.put("clientId",PYCLIENTID);
-//        tomeHeaders.put("signature",tomeSignature);
-//        tomeHeaders.put("systemId",PYSYSTEMID);
-//     String tomeBody = HttpUtil.createPost(tomeUrl).addHeaders(tomeHeaders).body(tome).contentType("application/json").execute().body();
-//     System.out.println(tomeBody);
-//
-//     JiLinPushCatalogDto jiLinPushCatalogDto = new JiLinPushCatalogDto();
-//      jiLinPushCatalogDto.setProjId(72900L);
-//      jiLinPushCatalogDto.setPactId(44804217L);
-//      jiLinPushCatalogDto.setKid(1644215386427621385L+2L);
-//      jiLinPushCatalogDto.setSortId(1644215386427621385L);
-//      jiLinPushCatalogDto.setTomeId(1644215386427621385L+1L);
-//      jiLinPushCatalogDto.setFileSuper("1111");
-//      jiLinPushCatalogDto.setCatalogRecord("222200");
-//      jiLinPushCatalogDto.setAmsFileNum("0");
-//      jiLinPushCatalogDto.setFileNum("0");
-//      jiLinPushCatalogDto.setWeaveDate("2024-07-09");
-//      jiLinPushCatalogDto.setPieceCount(7);
-//      jiLinPushCatalogDto.setDutyPerson("豆豆");
-//      jiLinPushCatalogDto.setFilePage(7);
-//      jiLinPushCatalogDto.setReferenceInfo("0");
-//      jiLinPushCatalogDto.setSortOrder(1);
-//      jiLinPushCatalogDto.setAddUserName("豆豆");
-//      jiLinPushCatalogDto.setAddTime("2024-09-09");
-//
-//        JiLinPushCatalogDto jiLinPushCatalogDto1 = new JiLinPushCatalogDto();
-//        jiLinPushCatalogDto1.setProjId(72900L);
-//        jiLinPushCatalogDto1.setPactId(44804217L);
-//        jiLinPushCatalogDto1.setKid(1644215386427621385L+3L);
-//        jiLinPushCatalogDto1.setSortId(1644215386427621385L);
-//        jiLinPushCatalogDto1.setTomeId(1644215386427621385L+1L);
-//        jiLinPushCatalogDto1.setFileSuper("1111");
-//        jiLinPushCatalogDto1.setCatalogRecord("222200");
-//        jiLinPushCatalogDto1.setAmsFileNum("0");
-//        jiLinPushCatalogDto1.setFileNum("0");
-//        jiLinPushCatalogDto1.setWeaveDate("2024-07-09");
-//        jiLinPushCatalogDto1.setPieceCount(7);
-//        jiLinPushCatalogDto1.setDutyPerson("豆豆");
-//        jiLinPushCatalogDto1.setFilePage(7);
-//        jiLinPushCatalogDto1.setReferenceInfo("0");
-//        jiLinPushCatalogDto1.setSortOrder(1);
-//        jiLinPushCatalogDto1.setAddUserName("豆豆");
-//        jiLinPushCatalogDto1.setAddTime("2024-09-09");
-//
-//         List<JiLinPushCatalogDto>jiLinPushCatalogDtoList=new ArrayList<>();
-//        String catLog=JSONObject.toJSONString(jiLinPushCatalogDtoList);
-//        String catLogMsg=catLog+PYCLIENTSECRETKEY;
-//        String catLogUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/catalog";
-//        String catLogSignature = DigestUtils.md5Hex(catLogMsg).toUpperCase();
-//        HashMap<String,String> catLogHeaders=new HashMap<>();
-//        catLogHeaders.put("Content-Type", "application/json");
-//        catLogHeaders.put("clientId",PYCLIENTID);
-//        catLogHeaders.put("signature",catLogSignature);
-//        catLogHeaders.put("systemId",PYSYSTEMID);
-//        String catLogBody = HttpUtil.createPost(catLogUrl).addHeaders(catLogHeaders).body(catLog).contentType("application/json").execute().body();
-//        System.out.println(catLogBody);
-//        JiLinPushFileUrlDto jiLinPushFileUrlDto = new JiLinPushFileUrlDto();
-//        jiLinPushFileUrlDto.setProjId(72900L);
-//        jiLinPushFileUrlDto.setPactId(44804217L);
-//        jiLinPushFileUrlDto.setKid(1682310830420393984L);
-//        jiLinPushFileUrlDto.setCatalogID(1644215386427621385L+2L);
-//        jiLinPushFileUrlDto.setAnnexName("G1221PYJL102001  延吉至长春高速公路大蒲柴河至烟筒山段建设项目PYZJB01合同段2021年K201+516.999-K211+690道路巡视记录");
-//        jiLinPushFileUrlDto.setTableNumber("G1221PYJL102001");
-//        jiLinPushFileUrlDto.setWeaveDate("2024-09-08");
-//        jiLinPushFileUrlDto.setAnnexPage(6);
-//        jiLinPushFileUrlDto.setFileUrl("https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20220713/bd748b37f0a84790f9c3d72d30daedac.pdf");
-//        jiLinPushFileUrlDto.setSortOrder(1);
-//        jiLinPushFileUrlDto.setAddUserName("豆豆");
-//        jiLinPushFileUrlDto.setAddTime("2024-08-09");
-//
-//        JiLinPushFileUrlDto jiLinPushFileUrlDto1 = new JiLinPushFileUrlDto();
-//        jiLinPushFileUrlDto1.setProjId(72900L);
-//        jiLinPushFileUrlDto1.setPactId(44804217L);
-//        jiLinPushFileUrlDto1.setKid(1682310830420393984L);
-//        jiLinPushFileUrlDto1.setCatalogID(1644215386427621385L+3L);
-//        jiLinPushFileUrlDto1.setAnnexName("延吉至长春高速公路大蒲柴河至烟筒山段建设项目");
-//        jiLinPushFileUrlDto1.setTableNumber("G1221PYJL102002");
-//        jiLinPushFileUrlDto1.setWeaveDate("2024-09-08");
-//        jiLinPushFileUrlDto1.setAnnexPage(6);
-//        jiLinPushFileUrlDto1.setFileUrl("https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20220720/4ba7021876f50e079db67acbdcbd7f28.pdf");
-//        jiLinPushFileUrlDto1.setSortOrder(1);
-//        jiLinPushFileUrlDto1.setAddUserName("豆豆");
-//        jiLinPushFileUrlDto1.setAddTime("2024-08-09");
-//        List<JiLinPushFileUrlDto>jiLinPushFileUrlDtoList=new ArrayList<>();
+//       List<JiLinPushTomeDto> jiLinPushTomeDtoList=new ArrayList<>();
+//       List<JiLinPushCatalogDto>jiLinPushCatalogDtoList=new ArrayList<>();
+//       List<JiLinPushFileUrlDto>jiLinPushFileUrlDtoList=new ArrayList<>();
 //
+//        for (int i = 0; i < archiveAutoDtos.size(); i++) {
+//            if(i>=50){
+//                break;
+//            }
+//            Long id = SnowFlakeUtil.getId();
+//            //设置档案案卷
+//            JiLinPushTomeDto jiLinPushTomeDto=new JiLinPushTomeDto();
+//            jiLinPushTomeDto.setPactId(jlPyProjId);
+//            jiLinPushTomeDto.setPactId(archiveAutoDtos.get(i).getContractId());
+//            jiLinPushTomeDto.setKid(id);
+//            jiLinPushTomeDto.setSortID(archiveAutoDtos.get(i).getNodeId());
+//            jiLinPushTomeDto.setTomeSuper(archiveAutoDtos.get(i).getName());
+//            jiLinPushTomeDto.setRecordNum(archiveAutoDtos.get(i).getFileNumber());
+//            jiLinPushTomeDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
+//            jiLinPushTomeDto.setAddTime(archiveAutoDtos.get(i).getCreateTime());
+//            jiLinPushTomeDto.setBWeaveDate(archiveAutoDtos.get(i).getStartDate());
+//            jiLinPushTomeDto.setEWeaveDate(archiveAutoDtos.get(i).getEndDate());
+//            jiLinPushTomeDto.setKeepTerm(archiveAutoDtos.get(i).getStorageTime());
+//            jiLinPushTomeDto.setSortOrder(i);
+//            jiLinPushTomeDto.setMutualNum("0");
+//            jiLinPushTomeDto.setWeaveUnit(archiveAutoDtos.get(i).getUnit());
+//            jiLinPushTomeDto.setSecrecy(archiveAutoDtos.get(i).getSecretLevel());
+//            jiLinPushTomeDto.setYear(Integer.parseInt(archiveAutoDtos.get(i).getStorageTime()));
+//            jiLinPushTomeDtoList.add(jiLinPushTomeDto);
+//        //    设置档案卷内目录
+//            JiLinPushCatalogDto jiLinPushCatalogDto=new JiLinPushCatalogDto();
+//            jiLinPushCatalogDto.setProjId(jlPyProjId);
+//            jiLinPushCatalogDto.setPactId(archiveAutoDtos.get(i).getContractId());
+//            jiLinPushCatalogDto.setKid(id+1L);
+//            jiLinPushCatalogDto.setSortId(archiveAutoDtos.get(i).getNodeId());
+//            jiLinPushCatalogDto.setTomeId(id);
+//            jiLinPushCatalogDto.setFileSuper(archiveAutoDtos.get(i).getName());
+//            jiLinPushCatalogDto.setCatalogRecord(archiveAutoDtos.get(i).getFileNumber());
+//            jiLinPushCatalogDto.setAmsFileNum("0");
+//            jiLinPushCatalogDto.setFileNum("0");
+//            jiLinPushCatalogDto.setWeaveDate(archiveAutoDtos.get(i).getCreateTime());
+//            jiLinPushCatalogDto.setPieceCount(archiveAutoDtos.get(i).getFileN());
+//            jiLinPushCatalogDto.setDutyPerson(archiveAutoDtos.get(i).getRollor());
+//            jiLinPushCatalogDto.setFilePage(archiveAutoDtos.get(i).getPageN());
+//            jiLinPushCatalogDto.setReferenceInfo("0");
+//            jiLinPushCatalogDto.setSortOrder(i);
+//            jiLinPushCatalogDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
+//            jiLinPushCatalogDto.setAddTime(archiveAutoDtos.get(i).getUpdateTime());
+//            jiLinPushCatalogDtoList.add(jiLinPushCatalogDto);
+//            //设置档案文件
+//            JiLinPushFileUrlDto jiLinPushFileUrlDto=new JiLinPushFileUrlDto();
+//            jiLinPushFileUrlDto.setProjId(jlPyProjId);
+//            jiLinPushFileUrlDto.setPactId(archiveAutoDtos.get(i).getContractId());
+//            jiLinPushFileUrlDto.setKid(archiveAutoDtos.get(i).getId());
+//            jiLinPushFileUrlDto.setCatalogID(id+1L);
+//            jiLinPushFileUrlDto.setAnnexName(archiveAutoDtos.get(i).getName());
+//            jiLinPushFileUrlDto.setTableNumber(archiveAutoDtos.get(i).getFileNumber());
+//            jiLinPushFileUrlDto.setWeaveDate(archiveAutoDtos.get(i).getCreateTime());
+//            jiLinPushFileUrlDto.setAnnexPage(archiveAutoDtos.get(i).getPageN());
+//            jiLinPushFileUrlDto.setFileUrl(archiveAutoDtos.get(i).getPdfFileUrl()==null?archiveAutoDtos.get(i).getFileUrl():archiveAutoDtos.get(i).getPdfFileUrl());
+//            jiLinPushFileUrlDto.setSortOrder(i);
+//            jiLinPushFileUrlDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
+//            jiLinPushFileUrlDto.setAddTime(archiveAutoDtos.get(i).getUpdateTime());
+//            jiLinPushFileUrlDtoList.add(jiLinPushFileUrlDto);
 //
-//        String annex=JSONObject.toJSONString(jiLinPushFileUrlDtoList);
-//        String annexMsg=annex+PYCLIENTSECRETKEY;
-//        String annexUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/annex";
-//        String annexSignature = DigestUtils.md5Hex(annexMsg).toUpperCase();
-//        HashMap<String,String> annexHeaders=new HashMap<>();
-//        annexHeaders.put("Content-Type", "application/json");
-//        annexHeaders.put("clientId",PYCLIENTID);
-//        annexHeaders.put("signature",annexSignature);
-//        annexHeaders.put("systemId",PYSYSTEMID);
-//        String annexBody = HttpUtil.createPost(annexUrl).addHeaders(annexHeaders).body(annex).contentType("application/json").execute().body();
-//        System.out.println(annexBody);
+//        }
+//            //传输吉林档案案卷的地址
+//            String tome=JSONObject.toJSONString(jiLinPushTomeDtoList);
+//            System.out.println(tome);
+//            String tomeMsg=tome+PYCLIENTSECRETKEY;
+//            String tomeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tome";
+//            String tomeSignature = DigestUtils.md5Hex(tomeMsg).toUpperCase();
+//            HashMap<String,String> tomeHeaders=new HashMap<>();
+//            tomeHeaders.put("Content-Type", "application/json");
+//            tomeHeaders.put("clientId",PYCLIENTID);
+//            tomeHeaders.put("signature",tomeSignature);
+//            tomeHeaders.put("systemId",PYSYSTEMID);
+//            String tomeBody = HttpUtil.createPost(tomeUrl).addHeaders(tomeHeaders).body(tome).contentType("application/json").execute().body();
+//            System.out.println(tomeBody);
+//            //传输吉林档案卷内目录
+//            String catLog=JSONObject.toJSONString(jiLinPushCatalogDtoList);
+//            String catLogMsg=catLog+PYCLIENTSECRETKEY;
+//            String catLogUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/catalog";
+//            String catLogSignature = DigestUtils.md5Hex(catLogMsg).toUpperCase();
+//            HashMap<String,String> catLogHeaders=new HashMap<>();
+//            catLogHeaders.put("Content-Type", "application/json");
+//            catLogHeaders.put("clientId",PYCLIENTID);
+//            catLogHeaders.put("signature",catLogSignature);
+//            catLogHeaders.put("systemId",PYSYSTEMID);
+//            String catLogBody = HttpUtil.createPost(catLogUrl).addHeaders(catLogHeaders).body(catLog).contentType("application/json").execute().body();
+//            System.out.println(catLogBody);
+//            //传输吉林档案文件
+//            String annex=JSONObject.toJSONString(jiLinPushFileUrlDtoList);
+//            String annexMsg=annex+PYCLIENTSECRETKEY;
+//            String annexUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/annex";
+//            String annexSignature = DigestUtils.md5Hex(annexMsg).toUpperCase();
+//            HashMap<String,String> annexHeaders=new HashMap<>();
+//            annexHeaders.put("Content-Type", "application/json");
+//            annexHeaders.put("clientId",PYCLIENTID);
+//            annexHeaders.put("signature",annexSignature);
+//            annexHeaders.put("systemId",PYSYSTEMID);
+//            String annexBody = HttpUtil.createPost(annexUrl).addHeaders(annexHeaders).body(annex).contentType("application/json").execute().body();
+//            System.out.println(annexBody);
    }
-
-
-
-
-
-
-
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/feign/ArchiveAutoClientImpl.java

@@ -2,14 +2,11 @@ package org.springblade.archive.feign;
 
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
-import org.springblade.archive.dto.ArchiveAutoDto;
-import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.mapper.ArchivesAutoMapper;
 import org.springblade.archive.service.IArchiveProjectConfigService;
 import org.springblade.archive.service.IArchivesAutoService;
-import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.archive.vo.UpdateExpertVO;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -17,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @RestController

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -17,13 +17,13 @@
 package org.springblade.archive.mapper;
 
 import org.apache.ibatis.annotations.MapKey;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.archive.dto.ArchiveAutoDto;
+
 import org.springblade.archive.dto.ArchivesAutoDTO;
 import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveConclusion;
 import org.springblade.archive.entity.ArchivesAuto;
+import org.springblade.archive.entity.JiLinArchiveAutoDto;
 import org.springblade.archive.vo.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -205,5 +205,5 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 	List<CabinetVO> getUnitAllCabinet(@Param("projectId") Long projectId,@Param("nodeId") Long nodeId);
 
-    List<ArchiveAutoDto> getArchiveAutoDtoList(@Param("projId") Long projId,@Param("dtos") List<JiLinQueryDto>dtos);
+    List<JiLinArchiveAutoDto> getArchiveAutoDtoList(@Param("projId") Long projId, @Param("dtos") List<JiLinQueryDto>dtos);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -1182,7 +1182,7 @@
         </foreach>
     </update>
 
-    <resultMap id="archiveAutoDtoMap" type="org.springblade.archive.dto.ArchiveAutoDto">
+    <resultMap id="archiveAutoDtoMap" type="org.springblade.archive.entity.JiLinArchiveAutoDto">
         <id column="id" property="id"></id>
         <result column="project_id" property="projectId"></result>
         <result column="contract_id" property="contractId"></result>
@@ -1193,10 +1193,10 @@
         <result column="end_date" property="endDate"></result>
         <result column="storage_time" property="storageTime"></result>
         <result column="secret_level" property="secretLevel"></result>
-        <result column="update_user" property="updateUser"></result>
-        <result column="update_time" property="updateTime"></result>
+        <result column="update_user" property="updateUserName"></result>
+        <result column="update_time" property="updateUserTime"></result>
         <result column="auto_file_sort" property="autoFileSort"></result>
-        <result column="create_time" property="createTime"></result>
+        <result column="create_time" property="createUserTime"></result>
         <result column="file_n" property="fileN"></result>
         <result column="rollor" property="rollor"></result>
         <result column="node_id" property="nodeId"></result>

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/JiLinArchiveAutoDtoMapper.java

@@ -0,0 +1,11 @@
+package org.springblade.archive.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.archive.entity.JiLinArchiveAutoDto;
+
+import java.util.List;
+
+
+public interface JiLinArchiveAutoDtoMapper extends BaseMapper<JiLinArchiveAutoDto> {
+
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/JiLinArchiveAutoDtoMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.archive.mapper.JiLinArchiveAutoDtoMapper">
+
+
+
+</mapper>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -16,20 +16,19 @@
  */
 package org.springblade.archive.service;
 
-import org.springblade.archive.dto.ArchiveAutoDto;
+
 import org.springblade.archive.dto.ArchiveWarningDTO;
 import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.dto.SaveApplyDTO;
 import org.springblade.archive.entity.ArchiveConclusion;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.entity.ExpertInspection;
+import org.springblade.archive.entity.JiLinArchiveAutoDto;
 import org.springblade.archive.vo.*;
-import org.springblade.business.entity.ArchiveFile;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.ExcelEditCallback;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.user.entity.User;
@@ -154,5 +153,5 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	List<List<Map<String, List<CabinetVO>>>> getUnitAllCabinet(Long projectId, Integer type);
 
-    List<ArchiveAutoDto> getArchiveAutoDtoList(Long projId,List<JiLinQueryDto>dtos);
+    List<JiLinArchiveAutoDto> getArchiveAutoDtoList(Long projId, List<JiLinQueryDto>dtos);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IJiLinArchiveAutoDtoService.java

@@ -0,0 +1,13 @@
+package org.springblade.archive.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.archive.entity.JiLinArchiveAutoDto;
+
+import java.util.List;
+
+
+public interface IJiLinArchiveAutoDtoService extends IService<JiLinArchiveAutoDto > {
+    Page<JiLinArchiveAutoDto> queryAll(int pageNum, int size);
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -20,23 +20,20 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import com.aliyun.oss.OSSClient;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springblade.archive.dto.ArchiveAutoDto;
+
 import org.springblade.archive.dto.ArchiveWarningDTO;
 import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.dto.SaveApplyDTO;
@@ -52,9 +49,7 @@ import org.springblade.business.entity.TaskParallel;
 import org.springblade.business.feign.ArchiveFileClient;
 import org.springblade.business.feign.MetadataClassificationClient;
 import org.springblade.business.feign.TaskClient;
-import org.springblade.business.vo.ArchiveFileVO;
 import org.springblade.common.utils.CommonUtil;
-import org.springblade.common.utils.IDUtils;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -67,25 +62,17 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.feign.ArchiveTreeContractClient;
 import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ProjectClient;
-import org.springblade.manager.feign.WbsInfoClient;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
-import org.springblade.manager.feign.ContractClient;
-import org.springblade.manager.feign.ProjectClient;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.user.entity.User;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
@@ -102,7 +89,6 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -3686,8 +3672,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	}
 
 	@Override
-	public List<ArchiveAutoDto> getArchiveAutoDtoList(Long projId,List<JiLinQueryDto>dtos) {
-		List<ArchiveAutoDto> list = baseMapper.getArchiveAutoDtoList(projId,dtos);
+	public List<JiLinArchiveAutoDto> getArchiveAutoDtoList(Long projId,List<JiLinQueryDto>dtos) {
+		List<JiLinArchiveAutoDto> list = baseMapper.getArchiveAutoDtoList(projId,dtos);
 		return list;
 	}
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/JiLinArchiveAutoDtoImpl.java

@@ -0,0 +1,31 @@
+package org.springblade.archive.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.archive.entity.JiLinArchiveAutoDto;
+
+import org.springblade.archive.mapper.JiLinArchiveAutoDtoMapper;
+import org.springblade.archive.service.IJiLinArchiveAutoDtoService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class JiLinArchiveAutoDtoImpl extends ServiceImpl<JiLinArchiveAutoDtoMapper,JiLinArchiveAutoDto> implements IJiLinArchiveAutoDtoService {
+
+    @Resource
+    JiLinArchiveAutoDtoMapper jiLinArchiveAutoDtoMapper;
+    @Override
+    public Page<JiLinArchiveAutoDto> queryAll(int pageNum, int size) {
+        Page<JiLinArchiveAutoDto>page=new Page<>(pageNum,size);
+        QueryWrapper<JiLinArchiveAutoDto> wrapper = new QueryWrapper<>();
+        return jiLinArchiveAutoDtoMapper.selectPage(page,wrapper);
+    }
+}

blade-service/blade-business/src/main/java/org/springblade/business/controller/FixedFlowController.java

@@ -1,19 +1,21 @@
 package org.springblade.business.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-
-import javax.validation.Valid;
-
 import org.apache.commons.lang.StringUtils;
+import org.springblade.business.entity.FixedFlow;
 import org.springblade.business.entity.FixedFlowLink;
 import org.springblade.business.entity.Task;
 import org.springblade.business.service.IFixedFlowLinkService;
+import org.springblade.business.service.IFixedFlowService;
+import org.springblade.business.vo.FixedFlowVO;
 import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -29,13 +31,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.business.entity.FixedFlow;
-import org.springblade.business.vo.FixedFlowVO;
-import org.springblade.business.service.IFixedFlowService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -74,7 +71,7 @@ public class FixedFlowController extends BladeController {
         //获取当前系统配置的角色划分
         List<RoleVO> roleVOS = this.sysClient.search().getData();
         //获取项目人员
-        List<SaveUserInfoByProjectDTO> contractUserList = this.projectAssignmentUserClient.queryContractDownAllUser(contractId, 1);
+        List<SaveUserInfoByProjectDTO> contractUserList = this.projectAssignmentUserClient.queryContractDownAllUser(contractId, 2);
 
         //先处理管理员
         for (RoleVO vos : roleVOS) {

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ArchiveTreeContractImpl.java

@@ -136,8 +136,8 @@ public class ArchiveTreeContractImpl implements ArchiveTreeContractClient {
     }
 
     @Override
-    public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos, Long cqProjectId) {
-        return archiveTreeContractService.getArchiveTreeContractDto(dtos,cqProjectId);
+    public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos, Long projectId) {
+        return archiveTreeContractService.getArchiveTreeContractDto(dtos,projectId);
     }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.java

@@ -151,7 +151,7 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
 
     void updateAllChild(@Param("node") ArchiveTreeContract archiveTreeContract);
 
-    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@Param("dtos")List<JiLinQueryDto>dtos,@Param("cqProjectId")Long cqProjectId);
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@Param("dtos")List<JiLinQueryDto>dtos,@Param("projectId")Long projectId);
 
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -745,10 +745,11 @@
     </resultMap>
     <select id="getArchiveTreeContractDto" resultMap="getArchiveTreeContractDtoMap">
         select a.id,a.project_id,a.parent_id,a.contract_id,a.node_name,b.real_name,a.update_time from m_archive_tree_contract AS a LEFT JOIN blade_user AS b
-        on a.update_user=b.id where project_id=#{cqProjectId}
-        and a.contract_id in
+        on a.update_user=b.id where a.project_id=#{projectId}
+        and (a.contract_id in
     <foreach collection="dtos" item="item"  open="(" separator="," close=")">
         #{item.cqContractId}
     </foreach>
+        or a.contract_id is null) and a.tenant_id!='000000';
     </select>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeContractService.java

@@ -138,5 +138,5 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
     ArchiveTreeContract getMatchNode(Long nodeId);
 
 
-    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos,Long cqProjectId);
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos,Long projectId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

@@ -1579,8 +1579,8 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	}
 
 	@Override
-	public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos,Long cqProjectId) {
-		return baseMapper.getArchiveTreeContractDto(dtos,cqProjectId);
+	public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos,Long projectId) {
+		return baseMapper.getArchiveTreeContractDto(dtos,projectId);
 	}
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -4430,8 +4430,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             htmlString = htmlString.replaceAll("placeholder", "placeholderxx");
             htmlString = htmlString.replaceAll("title", "titlexx");
             Document doc = Jsoup.parse(htmlString);
-            //通过html获取页面上的key值 返回key值对应的数据
-            setBasicFormData(doc, reData, sampleInfo, trialMaterialMobilization,null);
+
             if (dataIn.size() >= 1) {
                 Map<String, Object> mysqlData = dataIn.get(0);
                 for (String key : mysqlData.keySet()) {
@@ -4497,10 +4496,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                 }
             }
+            //通过html获取页面上的key值 返回key值对应的数据
+            setBasicFormData(doc, reData, sampleInfo, trialMaterialMobilization,null);
         } catch (Exception e) {
             e.printStackTrace();
         }
 
+
         // 获取默认值
         QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("col_key", "sig_role_name");
@@ -4547,12 +4549,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             setFirstData(doc,"生产厂家",trialMaterialMobilization.getPlaceOfProduction(),reData);
         }
         String representativeCount = sampleInfo.getRepresentativeCount();
+        String calculationUnit = sampleInfo.getCalculationUnit();
         Date mobilizationDate = sampleInfo.getMobilizationDate();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String format = simpleDateFormat.format(mobilizationDate);
         setFirstData(doc,"批号",sampleInfo.getBatchNumber(),reData);
         setFirstData(doc,"拟用结构部 位",sampleInfo.getProposedPosition(),reData);
-        setFirstData(doc,"进场日期代表数量",format+representativeCount,reData);
+        setFirstData(doc,"进场日期代表数量",format+"/"+representativeCount+calculationUnit,reData);
     }
     private static void setFirstData(Document doc, String elementValue,Object value,Map<String, Object> reData) {
 

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -404,12 +404,12 @@ public class FileUtils {
         if(fileUrl.indexOf("/www/wwwroot")>=0){
             file_path2 = file_path;
         }
-        File file = new File(fileUrl);
-
-        if(file.exists()){
-            //存在
-            return fileUrl;
-        }
+//        File file = new File(fileUrl);
+//
+//        if(file.exists()){
+//            //存在
+//            return fileUrl;
+//        }
        String path = sys_file_net_url + fileUrl.replaceAll("//", "/").replaceAll(file_path2, "");
         return path;
     }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1350,7 +1350,7 @@ public class TaskController extends BladeController {
                 //实时查询上报总金额
                 if (task.getMeterTaskType() == 1) {
                     //中间计量
-                    reportAllMoney = middleMeterApplyTaskMapper.selectAllMoney(task.getId());
+                    reportAllMoney = middleMeterApplyTaskMapper.selectAllMoney(Long.valueOf(task.getContractId()),Long.valueOf(task.getFormDataId()));
                 } else if (task.getMeterTaskType() == 2) {
                     //材料计量
                     reportAllMoney = materialMeterFormTaskMapper.selectAllMoney(task.getId());

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -212,13 +212,22 @@
             and middle_meter_id != #{middleId}
         </if>
     </select>
+<!--    <select id="getCurrentMeterMoney" resultType="java.math.BigDecimal">-->
+<!--        select ifnull(sum(meter_money),0)-->
+<!--        from s_middle_meter_apply-->
+<!--        where contract_id = #{contractId} and is_deleted = 0 and approve_status != 3-->
+<!--        <if test="contractPeriodId != -1">-->
+<!--            and contract_period_id = #{contractPeriodId}-->
+<!--        </if>-->
+<!--    </select>-->
+
     <select id="getCurrentMeterMoney" resultType="java.math.BigDecimal">
-        select ifnull(sum(meter_money),0)
-        from s_middle_meter_apply
-        where contract_id = #{contractId} and is_deleted = 0 and approve_status != 3
-        <if test="contractPeriodId != -1">
-            and contract_period_id = #{contractPeriodId}
-        </if>
+        select current_period_pay
+        from s_interim_pay_certificate_item where  chapter_seq='实际支付' and is_deleted = 0
+                                              and certificate_id =
+                                                  (select id from s_interim_pay_certificate
+                                                   WHERE contract_id = #{contractId} and contract_period_id = #{contractPeriodId} and is_deleted = 0
+                                                  )
     </select>
 
 
@@ -453,4 +462,5 @@
     </select>
 
 
+
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyTaskMapper.java

@@ -8,5 +8,5 @@ import java.math.BigDecimal;
 
 public interface MiddleMeterApplyTaskMapper extends BaseMapper<MiddleMeterApplyTask> {
 
-    BigDecimal selectAllMoney(@Param("taskId") Long id);
+    BigDecimal selectAllMoney(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyTaskMapper.xml

@@ -2,7 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.meter.mapper.MiddleMeterApplyTaskMapper">
 
+<!--    <select id="selectAllMoney" resultType="java.math.BigDecimal">-->
+<!--        select sum(meter_money) from s_middle_meter_apply_task where is_deleted = 0 and task_id = #{taskId}-->
+<!--    </select>-->
+
     <select id="selectAllMoney" resultType="java.math.BigDecimal">
-        select sum(meter_money) from s_middle_meter_apply_task where is_deleted = 0 and task_id = #{taskId}
+        select current_period_pay
+        from s_interim_pay_certificate_item where  chapter_seq='实际支付' and is_deleted = 0
+                                              and certificate_id =
+                                                  (select id from s_interim_pay_certificate
+                                                   WHERE contract_id = #{contractId} and contract_period_id = #{contractPeriodId} and is_deleted = 0
+                                                  )
     </select>
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -271,7 +271,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
                 formApply.setChangeBuildPictureTotal(l.getChangeTotal());
                 if (l.getCurrentMeterTotal() != null && l.getCurrentPrice() != null) {
                     formApply.setCurrentMeterTotal(l.getCurrentMeterTotal());
-                    formApply.setCurrentMeterMoney(l.getCurrentPrice().multiply(l.getCurrentMeterTotal()));
+                    formApply.setCurrentMeterMoney(l.getCurrentPrice().multiply(l.getCurrentMeterTotal()).setScale(0,RoundingMode.HALF_UP));
 
                 }else {
                     throw new ServiceException("单价和计量数量不能为空");
@@ -298,7 +298,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
              for (InventoryFormApply formApply : formApplies) {
                  big = big.add(formApply.getCurrentMeterMoney());
              }
-             apply.setMeterMoney(big);
+             apply.setMeterMoney(big.setScale(0,RoundingMode.HALF_UP));
             inventoryFormApplyService.saveBatch(formApplies);
         }else {
              throw new ServiceException("请添加需要计量的清单");
@@ -473,7 +473,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
                 formApply.setChangeBuildPictureTotal(l.getChangeTotal());
                 if (l.getCurrentMeterTotal() != null && l.getCurrentPrice() != null) {
                     formApply.setCurrentMeterTotal(l.getCurrentMeterTotal());
-                    formApply.setCurrentMeterMoney(l.getCurrentPrice().multiply(l.getCurrentMeterTotal()));
+                    formApply.setCurrentMeterMoney(l.getCurrentPrice().multiply(l.getCurrentMeterTotal()).setScale(0,RoundingMode.HALF_UP));
                 }else {
                     throw new ServiceException("单价和计量数量和支付比例不能为空");
                 }
@@ -499,7 +499,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
             for (InventoryFormApply formApply : formApplies) {
                 big = big.add(formApply.getCurrentMeterMoney());
             }
-            apply.setMeterMoney(big);
+            apply.setMeterMoney(big.setScale(0,RoundingMode.HALF_UP));
             inventoryFormApplyService.saveBatch(formApplies);
         }
         this.updateById(apply);