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

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ExctabCell.java

@@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -30,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * Excel 结构信息表实体类
@@ -82,4 +85,14 @@ public class ExctabCell implements Serializable {
     @TableLogic
     @ApiModelProperty(value = "是否已删除")
     private Integer isDeleted;
+
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @JsonSerialize(
+            using = ToStringSerializer.class
+    )
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -659,11 +659,12 @@ public class ExcelTabController extends BladeController {
 
 
 
-   /* public static void main(String[] args) throws FileNotFoundException {
+/*
+    public static void main(String[] args) throws FileNotFoundException {
 
         String thmlUrl = "/Users/hongchuangyanfa/Desktop/1234567890.html";
 
-        File file1 = ResourceUtil.getFile("/Users/hongchuangyanfa/Downloads/D8.101.xlsx");
+        File file1 = ResourceUtil.getFile("/Users/hongchuangyanfa/Desktop/监表22 混凝土浇筑申请报告单.xlsx");
 
         Workbook wb = new Workbook();
         wb.loadFromMHtml(new FileInputStream(file1));
@@ -672,7 +673,8 @@ public class ExcelTabController extends BladeController {
 
         sheet.saveToHtml(thmlUrl);
         expailHtmlInfo(thmlUrl,1L);
-    }*/
+    }
+*/
 
 
 
@@ -1051,6 +1053,7 @@ public class ExcelTabController extends BladeController {
             exctabCell.setExctabId(excelId);
             exctabCell.setIsDeleted(0);
             exctabCell.setTextInfo(title);
+            exctabCell.setCreateTime(new Date());
 
             if (title.contains("日期") || title.contains("年") || title.contains("月") || title.contains("日")){
                 //日期
@@ -1767,7 +1770,7 @@ public class ExcelTabController extends BladeController {
     @PostMapping("/save_buss_data")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
-    public R<String> _saveBussData(@Valid @RequestBody JSONObject dataInfo, BladeUser bladeUser) throws IOException {
+    public R<String> saveBussData(@Valid @RequestBody JSONObject dataInfo, BladeUser bladeUser) throws Exception {
         JSONArray dataArray = new JSONArray();
         if (dataInfo.containsKey("dataInfo")) { // 节点保存
             JSONObject jsonObject = dataInfo.getJSONObject("dataInfo");
@@ -1777,10 +1780,22 @@ public class ExcelTabController extends BladeController {
         }
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);
         this.excelTabService.formulaFillData(tableInfoList);
+        // pdf 预览
+
         this.excelTabService.saveOrUpdateInfo(tableInfoList);
+        //单个 pdf
+        for(TableInfo tableInfo:tableInfoList){
+            this.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
+        }
+        // 合并pdf
+        TableInfo tableInfo = tableInfoList.get(0);
+
+      //  this.getBussPdfs(tableInfo.getp);
+
         return R.success("1");
     }
 
+
     /***
      * 覆盖上传
      */

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

@@ -539,7 +539,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				updateWrapper.in("p_key_id",tableInfo.getPkeyId());
 				updateWrapper.set("is_tab_pdf",2);
 				wbsTreeContractService.update(updateWrapper);
-
 					jdbcTemplate.execute(sqlInfo);
 					// pdf 预览添加
 					//this.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
@@ -564,6 +563,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 		}
 	}
 
+
 	// 获取用户
 	public Map<String,String>  getTablbCols(String pkeyid, String colkey) throws FileNotFoundException {
 		Map<String,String> dataMap = new HashMap<>();
@@ -577,7 +577,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         	return  dataMap;
 		}
 		File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
-		//File file1 = ResourceUtil.getFile("file:///Users/hongchuangyanfa/Desktop/privateUrl/1568060412589506560.html");
 
 		FileInputStream fileInputStream = new FileInputStream(file1);
 		String htmlString = IoUtil.readToString(fileInputStream);
@@ -591,21 +590,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 			for (int j = 0; j < tds.size(); j++) {
 				Element data = tds.get(j);
 				if(!data.children().isEmpty()){
-					String x1 = data.children().get(0).attr("x1");
-					//	String x2 = data.children().get(0).attr("x2");
-					String y1 = data.children().get(0).attr("y1");
-					//String y2 = data.children().get(0).attr("y2");
+				//	String x1 = data.children().get(0).attr("x1");
+				//	String y1 = data.children().get(0).attr("y1");
 					String keyVal = i+"_"+j;
 					String keyname = data.children().get(0).attr("keyname");
 					if(StringUtils.isNotEmpty(keyname)){
 						String[] keys = keyname.split("__");
 						String datakey = keys[0];
-//						keyVal=keys[1];
-//						if(dataMap.containsKey(keys[0])){
-//							String datakeyVal = dataMap.get(datakey)+";"+keyVal;
-//						}else{
-//							dataMap.put(datakey,keyVal);
-//						}
 						dataMap.merge(datakey,keyVal,(v1,v2)-> v1+";"+v2);
 					}
 				}
@@ -614,42 +605,4 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 		return dataMap;
 	}
 
-/*	public static void main(String[] args) throws FileNotFoundException {
-		File file1 = ResourceUtil.getFile("file:///Users/hongchuangyanfa/Desktop/privateUrl/1568060412589506560.html");
-		Map<String,String> dataMap = new HashMap<>();
-		FileInputStream fileInputStream = new FileInputStream(file1);
-		String htmlString = IoUtil.readToString(fileInputStream);
-		Document doc = Jsoup.parse(htmlString);
-		Element table = doc.select("table").first();
-		Elements trs = table.select("tr");
-
-		for (int i = 0; i <= trs.size() - 1; i++) {
-			Element tr = trs.get(i);
-			Elements tds = tr.select("td");
-			for (int j = 0; j < tds.size(); j++) {
-				Element data = tds.get(j);
-
-				if(data.html().indexOf("keyname=")>=0){
-					String x1 = data.children().get(0).attr("x1");
-					//String x2 = data.children().get(0).attr("x2");
-					String y1 = data.children().get(0).attr("y1");
-					//String y2 = data.children().get(0).attr("y2");
-					String keyVal = x1+"_"+y1;
-					String keyname = data.children().get(0).attr("keyname");
-					if(StringUtils.isNotEmpty(keyname)){
-						String keys[] = keyname.split("__");
-						String datakey = keys[0];
-						if(dataMap.containsKey(datakey)){
-							String datakeyVal = dataMap.get(datakey)+";"+keyVal;
-							dataMap.put(datakey,datakeyVal);
-						}else{
-							dataMap.put(datakey,keyVal);
-						}
-					}
-				}
-			}
-		}
-
-		System.out.println(dataMap);
-	}*/
 }