Merge remote-tracking branch 'origin/zhuwei' into dev

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/TaskSplit.java

@@ -69,5 +69,6 @@ public class TaskSplit extends BaseEntity {
 	@ApiModelProperty("完成数量")
 		private Integer finished;
 
-
+	@ApiModelProperty("分解任务名称")
+	private String taskName;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ArchiveFileClient.java

@@ -161,4 +161,7 @@ public interface ArchiveFileClient {
 
     @PostMapping(API_PREFIX + "/updateFilesEx")
     void updateArchiveFileEx(@RequestBody List<ArchiveFile> files);
+
+    @PostMapping(API_PREFIX + "/saveArchiveFileByBIM")
+    void saveArchiveFileByBIM(@RequestBody ArchiveFile archiveFile);
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/InformationQueryBIMVO.java

@@ -0,0 +1,28 @@
+package org.springblade.system.user.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@TableName("u_information_query")
+public class InformationQueryBIMVO {
+
+    @TableField("id")
+    private String id;
+    @TableField("父级id")
+    private String parentId;
+
+    @TableField("名称")
+    private String name;
+
+    @JsonProperty("eVisaPdfUrl")
+    private String fileUrlPath;
+
+    @TableField("nodeType 1节点 2文件")
+    private String nodeType;
+
+    @TableField("文件状态 0未上报，1待审批，2已审批，3已废除")
+    private String status;
+}

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

@@ -341,7 +341,7 @@ ArchiveFileAutoController extends BladeController {
         List<ArchiveFile> result = this.archiveFileClient.getArchiveFileByArchivesId(ids, "");
         List<String> pdfUrls = result.stream().map(archiveFile -> StringUtils.isNotEmpty(archiveFile.getPdfFileUrl()) ? archiveFile.getPdfFileUrl() : archiveFile.getFileUrl()).distinct().collect(Collectors.toList());
 
-//        FileUtils.mergePdfPublicMethods(pdfUrls,"");
+        //FileUtils.mergePdfPublicMethods(pdfUrls,"");
         /**
          * 案卷的只有一个文件，不合并先，需要的时候在把合并方法放出来
          * **/

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

@@ -22,6 +22,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.archive.vo.TaskSplitVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -73,13 +74,13 @@ public class TaskSplitController extends BladeController {
 	/**
 	 * 查询任务任务信息
 	 */
-/*	@GetMapping("/selectTaskSplit")
+	@GetMapping("/selectTaskSplit")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查询任务任务信息", notes = "传入taskSplit")
 	public R<IPage<TaskSplitVO>> page(TaskSplitVO taskSplit, Query query) {
 		IPage<TaskSplitVO> pages = taskSplitService.selectTaskSplitPage(Condition.getPage(query), taskSplit);
 		return R.data(pages);
-	}*/
+	}
 
 	/**
 	 * 新增 解析主标任务

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.archive.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.archive.entity.TaskSplit;
 import org.springblade.archive.vo.TaskSplitVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,11 @@ public interface TaskSplitMapper extends BaseMapper<TaskSplit> {
 	 * @param taskSplit
 	 * @return
 	 */
-	List<TaskSplitVO> selectTaskSplitPage(IPage page, TaskSplitVO taskSplit);
+	List<TaskSplitVO> selectTaskSplitPage(IPage page,@Param("taskSplit") TaskSplitVO taskSplit);
 
+	//获取合同段下 整个文件数
 	Integer getArchiveCount(String contractId);
+
+	// 获取分解任务是否存在
+	Integer getSpliteTaskCount(String contractId);
 }

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

@@ -18,15 +18,20 @@
         <result column="type" property="type"/>
         <result column="tool_count" property="toolCount"/>
         <result column="finished" property="finished"/>
+        <result column="task_name" property="taskName"/>
     </resultMap>
 
 
     <select id="selectTaskSplitPage" resultMap="taskSplitResultMap">
-        select * from u_task_split where is_deleted = 0
+        select * from u_task_split where is_deleted = 0 and contract_id = #{taskSplit.contractId}
     </select>
 
     <select id="getArchiveCount" resultType="java.lang.Integer">
         select count(1) from u_archives_auto where contract_id = #{contractId}
     </select>
 
+    <select id="getSpliteTaskCount" resultType="java.lang.Integer">
+        select count(1) from u_task_split where contract_id = #{contractId} and type=2
+    </select>
+
 </mapper>

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

@@ -4121,6 +4121,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(fileUrl==null || Func.isNull(fileUrl)){
 			R.fail("请上传fileUrl");
 		}
+
+
 		if(fileName==null || Func.isNull(fileName)){
 			R.fail("请上传fileName");
 		}
@@ -4134,6 +4136,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(treeContractId==null || Func.isNull(treeContractId)){
 			R.fail("请校验传输的nodeId和contractId,没有查到父节点Id");
 		}
+
+
+
 		// 将数据插入到 auto表中
 		ArchivesAuto archivesAuto = new ArchivesAuto();
 		long newPkId = SnowFlakeUtil.getId(); //主键Id
@@ -4141,8 +4146,17 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		archivesAuto.setProjectId(Func.toLong(contractInfo.getPId()));
 		archivesAuto.setContractId(Func.toLong(contractId));
 		archivesAuto.setName(fileName);
-
-		return null;
+		archivesAuto.setIsDeleted(0);
+		this.save(archivesAuto);
+
+		// 保存文件到archive_file表中
+		long arueId = SnowFlakeUtil.getId(); //主键Id
+		ArchiveFile archiveFile = new ArchiveFile();
+		archiveFile.setId(arueId);
+		archiveFile.setArchiveId(newPkId);
+		archiveFile.setFileName(fileName);
+		archiveFileClient.saveArchiveFileByBIM(archiveFile);
+		return R.success("保存成功");
 	}
 
 }

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

@@ -24,11 +24,17 @@ import org.springblade.archive.service.ITaskSplitService;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
 
 /**
  * 解析主标任务 服务实现类
@@ -51,6 +57,7 @@ public class TaskSplitServiceImpl extends BaseServiceImpl<TaskSplitMapper, TaskS
 	@Override
 	public R saveTaskSplit(TaskSplit taskSplit) {
 		// 数据校验区
+		Map<String,Object> data = new HashMap<>();
 		String contractId = taskSplit.getContractId();
 		String splitIds = taskSplit.getIds();
 		if (contractId=="" || contractId==null || contractId.length()==0 || Func.isEmpty(contractId)){
@@ -60,19 +67,41 @@ public class TaskSplitServiceImpl extends BaseServiceImpl<TaskSplitMapper, TaskS
 		if (splitIds=="" || splitIds==null || splitIds.length()==0 || Func.isEmpty(splitIds)){ // 代表整个合同解析
 			taskSplit.setType(2);
 			// 查询整个合同段下的所有文件
+			Integer spliteTaskCount =baseMapper.getSpliteTaskCount(contractId);
+			if(spliteTaskCount>=1){
+				return R.fail("该合同已经添加任务，无需重复操作");
+			}
+
+			Random random = new Random();
+			int randomNumber = random.nextInt(11) + 10; // 生成10到20之间的随机数
+			int i = (int) Math.ceil(randomNumber * spliteTaskCount/60.0 );
+
 			Integer archiveCount = baseMapper.getArchiveCount(contractId);
 			taskSplit.setToolCount(archiveCount);
 			taskSplit.setFinished(0);
 
+			taskSplit.setTaskName("整个合同段 "+archiveCount+" 条的分解任务");
+			data.put("fileCount",archiveCount);
+			data.put("taskTime",i);
 		}else{ // 指定文件解析
 			taskSplit.setType(3);
 			String[] split = splitIds.split(",");
 			taskSplit.setToolCount(split.length);
 			taskSplit.setFinished(0);
+
+			Random random = new Random();
+			int randomNumber = random.nextInt(11) + 10; // 生成10到20之间的随机数
+			int i = (int) Math.ceil(randomNumber * split.length/60.0 );
+			data.put("fileCount",split.length);
+			data.put("taskTime",i);
+			LocalDateTime now = LocalDateTime.now();
+			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd HH:mm:ss");
+			String formattedDateTime = now.format(formatter)+"_"+split.length+"条分解任务";
+			taskSplit.setTaskName(formattedDateTime);
 		}
 
 		int insert = baseMapper.insert(taskSplit);
-		return R.success("dddd");
+		return R.data(200,data,"操作成功");
 	}
 
 }

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

@@ -294,7 +294,7 @@ public class TrialDetectionController extends BladeController {
     @ApiOperationSupport(order = 18)
     @ApiOperation(value = "自检多表PDF预览", notes = "传入nodeId=试验记录id、classify、contractId、projectId")
     public R<Object> getPDFs(String nodeId, String classify, String contractId, String projectId) throws FileNotFoundException {
-        String sql = "select pdf_url,e_visa_pdf_url from u_information_query where status in(1,2) and project_id ='" + projectId + "' and classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "'";
+        String sql = "select pdf_url,e_visa_pdf_url from u_information_query where status in(0,1,2) and project_id ='" + projectId + "' and classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "'";
         List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
         if (maps.size() >= 1) {
             Map<String, Object> stringObjectMap = maps.get(0);

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -341,4 +341,9 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
         }
     }
 
+    @Override
+    public void saveArchiveFileByBIM(ArchiveFile archiveFile) {
+        iArchiveFileService.save(archiveFile);
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/utils/PDFUtil.java

@@ -8,12 +8,17 @@ import com.spire.pdf.PdfDocument;
 import com.spire.pdf.PdfPageBase;
 import com.spire.pdf.general.find.PdfTextFind;
 import com.spire.pdf.general.find.PdfTextFindCollection;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.tool.utils.Func;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class PDFUtil {
@@ -89,34 +94,50 @@ public class PDFUtil {
         table.addCell(cell);
     }
 
-    public static List<String> getPdfSignIds(String pdfUrl) {
-        PdfDocument pdf = new PdfDocument();
+    public static List<String>  getPdfSignIds(String pdfUr) {
         List<String> eVisaConfigList = new ArrayList<>();
-        try {
-            InputStream ossInputStream = CommonUtil.getOSSInputStream(pdfUrl);
-            //加载PDF文档
-            pdf.loadFromStream(ossInputStream);
-
-            for(int i= 0;i<pdf.getPages().getCount();i++){
-                PdfPageBase page = pdf.getPages().get(i);
-                PdfTextFindCollection allText = page.findAllText();
-                PdfTextFind[] finds = allText.getFinds();
-                for(int k=0;k<finds.length;k++){
-                    String textStr = finds[k].getMatchText();
-                    System.out.println(textStr);
-                    String[] textS = Func.toStrArray("\\|\\|",textStr);
-                    for(String txt : textS){
-                        if (txt.length() >= 15 && Func.isNumeric(txt)||(Func.isNumeric(txt)&&txt.length()==8&&txt.startsWith("123"))) {
-                            eVisaConfigList.add(txt);
+        try  {
+            InputStream inputStream = CommonUtil.getOSSInputStream(pdfUr);
+            PDDocument document = PDDocument.load(inputStream);
+            PDFTextStripper stripper = new PDFTextStripper();
+            String text = stripper.getText(document);
+            String[] lines = text.split("[ \\n]+");
+            for(int k=0;k<lines.length;k++){
+                String textStr = lines[k];
+                if(textStr.indexOf("*")>=0){
+                    textStr = textStr.substring(textStr.lastIndexOf("*")+1,textStr.length());
+                }
+
+                String[] textS = Func.toStrArray("\\|\\|",textStr);
+                for(String txt : textS){
+                    for (int i = 0; i < txt.length(); i++) {
+                        if (!Character.isDigit(txt.charAt(i))) {
+                            txt=txt.substring(0,i);
                         }
                     }
+                    if (txt.length() >= 15 && Func.isNumeric(txt)) {
+                        eVisaConfigList.add(txt);
+                    }
+                }
+
+                // 特殊处理
+                if(textStr.indexOf("1")>=0){
+                    String txt = textStr.substring(textStr.indexOf("1"));
+                    if (txt.length() >= 15 && Func.isNumeric(txt)) {
+                        System.out.println(txt);
+                        eVisaConfigList.add(txt);
+                    }
                 }
             }
-            ossInputStream.close();
+
+            List<String> unique = eVisaConfigList.stream().distinct().collect(Collectors.toList());
+            document.close();
+            return unique;
         }catch (Exception e){
             e.printStackTrace();
+            System.out.println("pdf大小为0");
+            return eVisaConfigList;
         }
-        return eVisaConfigList;
     }
 
 /*     public static void main(String[] args) {

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/ArchiveController.java

@@ -181,12 +181,12 @@ public class ArchiveController {
             String firstPage = FileUtils.getSysLocalFileUrl() + "archiveSplit/";
             int bkb = 0 ;
             //将imagePath 的数据转成一个可解析的html
-            String htmlUrl1 = pngToHtml(firstPage, archiveId);
-            String htmlUrl2 = pngToHtml(firstPage, archiveId);
+            String htmlUrl = pngToHtml(firstPage, archiveId);
+            /*String htmlUrl2 = pngToHtml(firstPage, archiveId);
             String htmlUrl = "";
             if (htmlUrl1.equals(htmlUrl2) && htmlUrl1.indexOf("_001.html") >= 0 && htmlUrl1.indexOf("archiveSplit") >= 0) {
                 htmlUrl = htmlUrl2;
-            }
+            }*/
 
             if (htmlUrl.indexOf("_001.html") >= 0 && htmlUrl.indexOf("archiveSplit") >= 0) {
                 String htmlString = IoUtil.readToString(new FileInputStream(htmlUrl));

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -58,7 +58,7 @@ public class EVController {
     @Resource(name = "taskExecutor1")
     private ThreadPoolExecutor executor;
 
-    @Scheduled(cron = "0/10 * * * * ?")
+   // @Scheduled(cron = "0/10 * * * * ?")
     public void SignInfo() {
         //执行代码
 

blade-service/blade-manager/src/main/java/org/springblade/manager/job/SystemMsgJob.java

@@ -42,7 +42,7 @@ public class SystemMsgJob {
     /**
      *  定时推送公告-取消公告-修改公告状态,不想污染日志，使用jdbc
      */
-     @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
     public void autoUpdateMsgStatus(){
         // 本地环境跳过执行（可添加日志输出）
         if (!schedulerEnabled) return;
@@ -71,13 +71,13 @@ public class SystemMsgJob {
                     .in(SystemMsg::getId,list2.stream().map(SystemMsg::getId).collect(Collectors.toList())));
         }
         /** 维护倒计时*/
-        //  String sql3 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status != 3 and TIMESTAMPADD(SECOND, 1, NOW()) >= push_count_down_date_time and now() < push_date_time ";
+      //  String sql3 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status != 3 and TIMESTAMPADD(SECOND, 1, NOW()) >= push_count_down_date_time and now() < push_date_time ";
         String sql3 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status != 3 and TIMESTAMPDIFF(SECOND,push_count_down_date_time,sysdate())>0  ";
         List<SystemMsg> list3 = jdbcTemplate.query(sql3,new BeanPropertyRowMapper<>(SystemMsg.class));
         if (list3.size() > 0){
             SystemMsg msg = list3.get(0);
             msg.setMsgType(3);
-            // msg.setMsgContent(Duration.between(LocalDateTime.now(), msg.getPushDateTime()).getSeconds()+"");
+           // msg.setMsgContent(Duration.between(LocalDateTime.now(), msg.getPushDateTime()).getSeconds()+"");
             msg.setMsgContent((msg.getMsgCountDownTime()*60)+"");
             systemMsgService.pushSystemMsgToAllUser(msg);
             systemMsgService.update(new LambdaUpdateWrapper<SystemMsg>()

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -19,6 +19,7 @@ import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.manager.vo.WbsTreeContractLazyVO;
 import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.util.ComplexStringComparator;
+import org.springblade.system.user.vo.InformationQueryBIMVO;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -167,6 +168,17 @@ public class WbsTreeController extends BladeController {
         return R.data(iUserService.queryInformationByContractIdAndName(contractId, name));
     }
 
+    @GetMapping("/informationWriteQuery/queryInformationByFileNumber")
+    @ApiOperation("根据合同段Id，模糊文件名查询(杭宁项目专用)")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "contractId",value = "合同段Id"),
+            @ApiImplicitParam(name="fileNumber",value = "划分编号")
+    })
+    public R<List<InformationQueryBIMVO>> queryInformationByFileNumber(@RequestParam String contractId, @RequestParam String fileNumber){
+        return R.data(iUserService.queryInformationByFileNumber(contractId, fileNumber));
+    }
+
+
 //    /**
 //     * 项目全加载树
 //     *

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -25,10 +25,7 @@ import org.springblade.business.vo.InformationQueryVO;
 import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
-import org.springblade.system.user.vo.InformationQueryVO1;
-import org.springblade.system.user.vo.InformationQueryVO2;
-import org.springblade.system.user.vo.UserContractInfoVO;
-import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.*;
 
 import java.util.List;
 
@@ -80,4 +77,7 @@ public interface UserMapper extends BaseMapper<User> {
     List<PrivateTreeVO2> getAllNode(@Param("projectId") String projectId);
 
     List<InformationQueryVO1> queryInformationByContractIdAndName(@Param("contractId")String contractId, @Param("name")String name);
+
+    //
+    List<InformationQueryBIMVO> queryInformationByFileNumber(@Param("contractId")String contractId, @Param("name")String name);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -247,4 +247,8 @@
         </if>
     </select>
 
+    <select id="queryInformationByFileNumber" resultType="org.springblade.system.user.vo.InformationQueryBIMVO">
+
+    </select>
+
 </mapper>

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -16,6 +16,7 @@ import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.entity.UserOauth;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.excel.UserExcel;
+import org.springblade.system.user.vo.InformationQueryBIMVO;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.UserVO;
 
@@ -244,4 +245,6 @@ public interface IUserService extends BaseService<User> {
 
 
     List<InformationQueryVO1> queryInformationByContractIdAndName(String contractId, String name);
+
+    List<InformationQueryBIMVO> queryInformationByFileNumber(String contractId, String fieldNumber);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -63,6 +63,7 @@ import org.springblade.system.user.service.IUserOauthService;
 import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.util.FileUtils;
 import org.springblade.system.user.util.ForestNodeMerger;
+import org.springblade.system.user.vo.InformationQueryBIMVO;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.InformationQueryVO2;
 import org.springblade.system.user.vo.UserVO;
@@ -2048,4 +2049,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     }
 
 
+    @Override
+    public List<InformationQueryBIMVO> queryInformationByFileNumber(String contractId, String fileNumber) {
+        if (StringUtil.isEmpty(contractId)) {
+            throw new ServiceException("未获取到合同段id");
+        }
+
+        List<InformationQueryBIMVO> informationQueryVO1s = baseMapper.queryInformationByFileNumber(contractId, fileNumber);
+
+        return informationQueryVO1s;
+    }
+
 }