bug 时间问题

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

@@ -1251,7 +1251,9 @@ public class ExcelTabController extends BladeController {
                                     sheet.getCellRange(y1, x1).getStyle().setShrinkToFit(true);
 
                                 } else {
-                                    sheet.getCellRange(y1, x1).setText(myData);
+                                    final CellRange cellRange = sheet.getCellRange(y1, x1);
+                                    cellRange.setText(myData);
+                                    cellRange.getCellStyle().setHorizontalAlignment(HorizontalAlignType.Left);
                                 }
                             }
                         }
@@ -1640,4 +1642,7 @@ public class ExcelTabController extends BladeController {
        // expailHtmlInfo(thmlUrl, detail.getId());
         return R.success("上传成功");
     }
+
+
+
 }

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

@@ -27,12 +27,18 @@ import com.mixsmart.utils.ListUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 import org.springblade.business.feign.InformationQueryClient;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.IoUtil;
+import org.springblade.core.tool.utils.ResourceUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.bean.TableInfo;
 import org.springblade.manager.dto.FormData;
@@ -57,6 +63,9 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -290,4 +299,87 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 			}
 		}
 	}
+
+	// 获取用户
+	public Map<String,String>  getTablbCols(String pkeyid, String colkey) throws FileNotFoundException {
+		Map<String,String> dataMap = new HashMap<>();
+		if(StringUtils.isNotEmpty(pkeyid)){
+			return null;
+		}
+		//获取html
+		WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+				.eq(WbsTreeContract::getPKeyId,pkeyid));
+
+		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);
+		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);
+				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(keys[0])){
+						String datakeyVal = dataMap.get(datakey)+";"+keyVal;
+					}else{
+						dataMap.put(datakey,keyVal);
+					}
+				}
+			}
+		}
+		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);
+	}
 }

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

@@ -33,5 +33,4 @@ public class UserApplication {
 	public static void main(String[] args) {
 		BladeApplication.run(AppConstant.APPLICATION_USER_NAME, UserApplication.class, args);
 	}
-
 }