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

blade-common/src/main/java/org/springblade/common/utils/AsyncConfigurer.java

@@ -15,7 +15,7 @@ public class AsyncConfigurer {
     /**
      * cpu 核心数量
      */
-    public static final int cpuNum = 4;//Runtime.getRuntime().availableProcessors();
+    public static final int cpuNum = 6;//Runtime.getRuntime().availableProcessors();
 
     /**
      * 线程池配置
@@ -25,7 +25,7 @@ public class AsyncConfigurer {
     @Bean("taskExecutor1")
     public ThreadPoolExecutor getAsyncExecutor() {
         return new ThreadPoolMonitor(cpuNum
-                , 6
+                , 12
                 , 60
                 , TimeUnit.SECONDS
                 , new LinkedBlockingQueue<>(2000)

blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/LargeFile.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *  Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
@@ -18,7 +18,6 @@ package org.springblade.resource.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java

@@ -54,7 +54,7 @@ public class AliOssBuilder {
         OssProperties ossProperties = new OssProperties();
         ossProperties.setEndpoint(oss.getEndpoint());
 
-        //本地测试
+        //本地测试1
         //ossProperties.setEndpoint("https://oss-cn-hangzhou.aliyuncs.com/");
 
         ossProperties.setAccessKey(oss.getAccessKey());

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java

@@ -145,7 +145,8 @@ public class OssBuilder {
                 Oss defaultOss = new Oss();
                 defaultOss.setId(0L);
                 defaultOss.setCategory(OssEnum.of(ossProperties.getName()).getCategory());
-                defaultOss.setEndpoint(ossProperties.getEndpoint());
+              //  defaultOss.setEndpoint(ossProperties.getEndpoint());
+                defaultOss.setEndpoint("https://oss-cn-hangzhou.aliyuncs.com");
                 defaultOss.setBucketName(ossProperties.getBucketName());
                 defaultOss.setAccessKey(ossProperties.getAccessKey());
                 defaultOss.setSecretKey(ossProperties.getSecretKey());

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/LargeFileEndpoint.java

@@ -363,14 +363,16 @@ public class LargeFileEndpoint {
             merge(largeFile, filePath);
             String path = largeFile.getPath(); //获取到的路径 没有.1 .2 这样的东西
             //截取视频所在的路径
-            path = path.replace(filePath, "");
-            File file = new File(filePath + path);
-            //修改成原来的文件名
-            renameFile(file, param.getFilename());
-            FileInputStream inputStream = new FileInputStream(filePath + param.getFilename());
+//            path = path.replace(filePath, "");
+//            File file = new File(filePath + path);
+//            //修改成原来的文件名
+//            renameFile(file, param.getFilename());
+//            FileInputStream inputStream = new FileInputStream(filePath + param.getFilename());
+            FileInputStream inputStream = new FileInputStream(path);
             //上传oss
             BladeFile bladeFile = ossBuilder.template().putFile(param.getFilename(), inputStream);
-            File file1 = new File(filePath + param.getFilename());
+//            File file1 = new File(filePath + param.getFilename());
+            File file1 = new File(path);
             MultipartFile multipartFile = getMultipartFile(file1);
             if (param.getFilename().contains("pdf")) {
                 try {
@@ -396,8 +398,10 @@ public class LargeFileEndpoint {
             file1.delete();
             iLargeFileService.updateLargeFileDeleted(param.getIdentifier());
         } catch (FileNotFoundException e) {
+            iLargeFileService.updateLargeFileDeleted(param.getIdentifier());
             e.printStackTrace();
         } catch (InterruptedException e) {
+            iLargeFileService.updateLargeFileDeleted(param.getIdentifier());
             e.printStackTrace();
         } finally {
             lock.unlock();

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

@@ -1129,9 +1129,16 @@ public class TaskController extends BladeController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "资料填报-任务管理-任务查看分页查询", notes = "传入BusinessTaskDTO")
     public R<IPage<BusinessTaskPageVO>> page(@RequestBody BusinessTaskDTO dto) throws IOException {
+        if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
+            throw new ServiceException("未获取到当前用户信息，请联系管理员");
+        }
+        if (ObjectUtil.isEmpty(dto.getProjectIdValue())) {
+            throw new ServiceException("未获取到当前用户所在的项目信息，请联系管理员");
+        }
         if (ObjectUtil.isEmpty(dto.getCurrentContractId())) {
             throw new ServiceException("未获取到当前用户所在的合同段信息，请联系管理员");
         }
+        ProjectInfo projectInfo = jdbcTemplate.query("select approval_type from m_project_info where id = " + dto.getProjectIdValue(), new BeanPropertyRowMapper<>(ProjectInfo.class)).stream().findAny().orElse(null);
         int current = dto.getCurrent();
         int size = dto.getSize();
         //封装入参SQL
@@ -1297,6 +1304,24 @@ public class TaskController extends BladeController {
                     vo.setProcessInstanceId(task.getProcessInstanceId());
                     List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                     if (taskParallelList != null && taskParallelList.size() > 0) {
+                        //如果是垂直签，判断是否是当前用户审批轮次，不是当前用户审批轮次就不显示该任务
+                        if (projectInfo != null && projectInfo.getApprovalType() == 1) {
+                            boolean shouldDisplayTask = false; //标记是否显示当前任务
+                            for (TaskParallel taskParallel : taskParallelList) {
+                                if (SecureUtil.getUserId().equals(Long.parseLong(taskParallel.getTaskUser()))) {
+                                    shouldDisplayTask = true; //当前用户是审批人，需要显示任务
+                                    break;
+                                } else if (taskParallel.getStatus() != 2) {
+                                    //之前的审批人员任务未完成，不显示任务
+                                    break;
+                                }
+                            }
+                            if (!shouldDisplayTask) {
+                                //跳过当前任务
+                                return null;
+                            }
+                        }
+
                         List<String> names = taskParallelList.stream().map(TaskParallel::getTaskUserName).collect(Collectors.toList());
                         if (names.size() > 0) {
                             vo.setTaskApproveUserNames(StringUtils.join(names, ","));
@@ -1330,6 +1355,7 @@ public class TaskController extends BladeController {
                     }
                     return vo;
                 })
+                .filter(Objects::nonNull) //过滤掉为null的任务
                 .collect(Collectors.toList());
         page.setRecords(pageList);
         page.setTotal(totalCount);
@@ -1433,7 +1459,7 @@ public class TaskController extends BladeController {
             } else {
                 sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 99 AND u_task_parallel.status != 3)");
             }
-        }else {
+        } else {
             if (StringUtils.isNotBlank(dto.getEVisaUserName())) {
                 sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 1 AND u_task_parallel.status = 2 AND u_task_parallel.task_user_name LIKE ?)");
                 params.add("%" + dto.getEVisaUserName() + "%");
@@ -1557,15 +1583,15 @@ public class TaskController extends BladeController {
                                 String resultIds = processInstanceIds.stream()
                                         .map(id -> "'" + id + "'")
                                         .collect(Collectors.joining(","));
-                                taskParallelGroupMap = jdbcTemplate.query("select parallel_process_instance_id,process_instance_id,task_user_name from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
+                                taskParallelGroupMap = jdbcTemplate.query("select parallel_process_instance_id,process_instance_id,e_visa_status,task_user,task_user_name,status from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
                             }
                             Map<String, List<TaskParallel>> finalTaskParallelGroupMap = taskParallelGroupMap;
 
                             for (Task task : taskList) {
                                 List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                                 for (TaskParallel taskParallel : taskParallelList) {
-                                    //待审批的不进行重签
-                                    if (!(new Integer(1)).equals(taskParallel.getStatus())) {
+                                    //待审批的不进行重签, 存在待审批，但是电签状态是失败的
+                                    if (!(new Integer(1)).equals(taskParallel.getStatus()) || (taskParallel.getEVisaStatus() != null && taskParallel.getEVisaStatus() == 99)) {
                                         TaskApprovalVO approvalVO = new TaskApprovalVO();
                                         approvalVO.setTaskId(task.getId().toString());
                                         approvalVO.setFlag("OK");
@@ -1574,6 +1600,7 @@ public class TaskController extends BladeController {
                                         approvalVO.setFormDataId(task.getFormDataId());
                                         approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
                                         approvalVO.setYsNickName(taskParallel.getTaskUserName());
+                                        approvalVO.setUserId(Long.parseLong(taskParallel.getTaskUser()));
                                         taskApprovalVOS.add(approvalVO);
                                     }
                                 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TaskBatchMapper.xml

@@ -26,7 +26,7 @@
     </delete>
 
     <select id="queryDataInfo" resultMap="taskBatchResultMap">
-        SELECT * from u_task_batch  WHERE is_deleted =4  LIMIT 50
+        SELECT max(id) as id,task_parallel_id,json_data,create_user,create_dept,create_time,nick_name,is_deleted from u_task_batch  WHERE is_deleted =0 GROUP BY JSON_EXTRACT(json_data,'$.formDataId')  LIMIT 100
     </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -562,7 +562,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
             //保存批次
             TaskBatch taskBatch = new TaskBatch(null, JSONObject.toJSONString(taskApprovalVO));
-            taskBatch.setCreateUser(userId);
+            taskBatch.setCreateUser(taskApprovalVO.getUserId());
             taskBatch.setNickName(nickName);
             taskBatch.setCreateTime(new Date());
             taskList.add(taskBatch);
@@ -625,7 +625,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         RedisTemplate.opsForValue().set("sign-" + taskApprovalVO.getFormDataId(), "1", 60, TimeUnit.SECONDS);
 
         String pdfUrlEVisa = this.completeApprovalTask(taskApprovalVO);
-        System.out.println("电签操作成功buss-----" + pdfUrlEVisa);
+
+
+        System.out.println("电签操作成功buss-----" + pdfUrlEVisa+"---batchId="+batchId);
         //TODO ============== 电签成功，修改试验状态，关联工程部位信息pdf（只有电签成功，才修改） liuYc 2023-03-16 ==============
         if ("OK".equals(taskApprovalVO.getFlag()) && StringUtils.isNotEmpty(pdfUrlEVisa)) {
             //已审批
@@ -710,18 +712,17 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     //todo ===================== 执行合同章
 
                     //根据主表的业务ID（processInstanceId）获取主流程的taskId
-                    String masterTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(masterTask.getProcessInstanceId());
-                    if (StringUtils.isNotEmpty(masterTaskId)) {
+                 //   String masterTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(masterTask.getProcessInstanceId());
+                   // if (StringUtils.isNotEmpty(masterTaskId)) {
                         //完成流程
-                        this.newFlowClient.completeApprovalTask(taskId, masterTask.getProcessInstanceId(), "审批完成");
+                      //  this.newFlowClient.completeApprovalTask(taskId, masterTask.getProcessInstanceId(), "审批完成");
                         //修改主流程状态为已完成
                         this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 2).set(Task::getUpdateTime, new Date()).eq(Task::getId, masterTask.getId()));
                         //修改对应的业务数据状态为已审批
                         this.updateBusinessDataByFormDataId(masterTask, 2, finalPdfUrl, taskApprovalVO.getUserId());
-
-                        //返回电签成功的pdf路径，给试验用
-                        return finalPdfUrl;
-                    }
+                  //  }
+                    //返回电签成功的pdf路径，给试验用
+                    return finalPdfUrl;
                 } else {
                     //只更新PDF路径
                     this.updateBusinessDataByFormDataId(masterTask, 1, eVisaStatus.contains("@@@@") ? eVisaStatus.split("@@@@")[1] : null, taskApprovalVO.getUserId());
@@ -1130,6 +1131,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         .set(InformationQuery::getEVisaPdfSize, pdfSize)
                         .set(InformationQuery::getBusinessTime, dateInfo)
                         .in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
+
+                //修改试验业务状态
+                if (new Integer(2).equals(queryinfo.getType()) && ObjectUtil.isNotEmpty(queryinfo.getWbsId())) {
+                    jdbcTemplate.execute("update u_trial_self_inspection_record set task_status = '已审批' where id = " + queryinfo.getWbsId());
+                }
+
             }
         } catch (Exception e) {
             this.informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getStatus, status)

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -241,7 +241,9 @@ public class EVisaServiceImpl implements EVisaService {
                 String sqlinfo = "SELECT a.id,a.pyzbx,a.pyzby,b.signature_file_url,b.id as sfId,b.certificate_password,b.certificate_user_name from m_textdict_info a ,m_sign_pfx_file b where a.sig_role_id = b.pfx_type and b.project_contract_role like '%" + contractId + "%' and a.is_deleted=0 and b.is_deleted=0 and a.type=6 and a.id in(" + ids + ")";
                 List<Map<String, Object>> maps = jdbcTemplate.queryForList(sqlinfo);
                 System.out.println("合同-" + contractId + "--" + sqlinfo);
-
+                if(maps==null ||maps.isEmpty()){
+                    return finalPdfUrl;
+                }
                 //准备签章策略
                 List<SealStrategyVO> sealStrategyVOS = new ArrayList<>();
                 for (Map<String, Object> eVisaConfig : maps) {

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/utils/PDFUtils.java

@@ -13,6 +13,7 @@ import org.springblade.core.tool.utils.Func;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class PDFUtils {
@@ -84,7 +85,8 @@ public class PDFUtils {
         }catch (Exception e){
             e.printStackTrace();
         }
-        return eVisaConfigList;
+        List<String> unique = eVisaConfigList.stream().distinct().collect(Collectors.toList());
+        return unique;
     }
 
     public static void main123(String[] args) {

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

@@ -421,7 +421,6 @@ public class TextdictInfoController extends BladeController {
 
         List<WbsTreePrivate> wbsTreePrivatesEqual = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery()
                 .eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
-                .eq(WbsTreePrivate::getType, 2)
                 .eq(WbsTreePrivate::getIsDeleted, 0)
                 .eq(WbsTreePrivate::getExcelId, wbsTreePrivate.getExcelId()));
         List<Long> pKeyIds = wbsTreePrivatesEqual.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList());
@@ -478,7 +477,7 @@ public class TextdictInfoController extends BladeController {
         String replace = str1.replace("\\", "\\\\");
 
         //修改同几点的数据
-        if(ids!=null){
+        if(StringUtils.isNotBlank(ids)){
             String updateSqlP = "update m_wbs_tree_private set html_url = '" + replace + "' where p_key_id in ("+ids+") and project_id="+wbsTreePrivate.getProjectId()+"";
             jdbcTemplate.execute(updateSqlP);
         }

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

@@ -1,135 +1,55 @@
 package org.springblade.manager.utils;
 
-import cn.hutool.core.comparator.PinyinComparator;
-import cn.hutool.extra.pinyin.PinyinUtil;
-import cn.hutool.extra.pinyin.engine.pinyin4j.Pinyin4jEngine;
-import com.alibaba.druid.sql.repository.SchemaObjectType;
-import com.alibaba.excel.util.DateUtils;
-import com.aspose.cells.HtmlSaveOptions;
-import com.spire.xls.*;
-import com.spire.xls.collections.PicturesCollection;
-import com.spire.xls.core.spreadsheet.HTMLOptions;
-import io.swagger.models.auth.In;
-import org.apache.commons.lang.StringUtils;
-import org.jsoup.Connection;
+
+
+
+
+import com.spire.xls.CellRange;
+import com.spire.xls.Workbook;
+import com.spire.xls.Worksheet;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
-import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.tool.utils.IoUtil;
 import org.springblade.core.tool.utils.ResourceUtil;
 
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.io.*;
 
 public class test {
 
-    public static void main1231(String[] args) throws Exception {
-
-        List<String> data = new ArrayList<>();
-
-        data.add("12_0");
-        data.add("13_0");
-        data.add("14_0");
-        data.add("15_0");
-        data.add("16_0");
-        data.add("10_0");
-        data.add("11_0");
-
-        int yindex;
-        int xindex;
-        if(false){ //纵向
-            yindex = 1;
-            xindex = 0;
-        } else { //横向
-            xindex = 1;
-            yindex = 0;
-        }
-
-        String dw[] = data.toArray(new String[data.size()]);
-        Map<Integer, List<String>> result = data.stream().filter(s -> s.indexOf("_")>=0).collect(Collectors.groupingBy(s -> Integer.parseInt(s.split("_")[yindex])));
+    public static void main1(String[] args) throws IOException {
+     //   String excel="/Users/hongchuangyanfa/Downloads/JL1036隧道锚喷支护施工记录表.xlsx";
+        String excel="/Users/hongchuangyanfa/Downloads/养护表格/ZJY6.11.2植筋检验表.xlsx";
+        String poiPath="/Users/hongchuangyanfa/Desktop/pdf/poi.pdf";
+        String pdfPath22="/Users/hongchuangyanfa/Desktop/pdf/poi222.pdf";
+        String pdfPathhtml="/Users/hongchuangyanfa/Desktop/pdf/poi222.html";
+        Workbook workbook2 = new Workbook();
+        workbook2.loadFromFile(excel);
+        //设置转换后的PDF页面高宽适应工作表的内容大小
+        workbook2.getConverterSetting().setSheetFitToPage(true);
+        Worksheet sheet = workbook2.getWorksheets().get(0);
 
-        Map<Integer, List<String>> collect = new LinkedHashMap<>();
-        result.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEachOrdered(x -> collect.put(x.getKey(), x.getValue()));
-        int j=0;
-        for(Integer key: collect.keySet()){
-            List<String> datakey = collect.get(key);
-            List<String> ordList = datakey.stream().filter(s -> s.indexOf("_")>=0).sorted(Comparator.comparing(s -> Integer.parseInt(s.split("_")[xindex]))).collect(Collectors.toList());
-            for (String ord:ordList){
-                dw[j]=ord;
-                j++;
-            }
-        }
+        sheet.saveToHtml(pdfPathhtml);
 
-        for (String da:dw){
-            System.out.println(da);
-        }
+        File file1 = ResourceUtil.getFile(pdfPathhtml);
+        String htmlString = IoUtil.readToString(new FileInputStream(file1));
+        Document doc = Jsoup.parse(htmlString);
+        Element table = doc.select("table").first();
+        Elements trs = table.select("tr");
+        Elements cols = table.select("Col");
 
+        sheet.deleteRow(trs.size(),sheet.getRows().length - trs.size());
+        sheet.deleteColumn(cols.size(),sheet.getColumns().length - cols.size());
 
-      /*  String file_path = FileUtils.getSysLocalFileUrl()+"/pdf/";
+        System.out.println(trs.size());
+        System.out.println(cols.size());
 
-        String filecode = SnowFlakeUtil.getId() + "";
-        String thmlUrl = file_path + filecode + ".html";
+        System.out.println(sheet.getRows().length);
+        System.out.println(sheet.getColumns().length);
 
-        InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl("/Users/hongchuangyanfa/Desktop/pdf/1688448159421825025.xlsx");
-        // 解析excel
-        Workbook wb = new Workbook();
-        wb.loadFromMHtml(inputStreamByUrl);
-        Worksheet sheet = wb.getWorksheets().get(0);
 
-
-
-
-        CellRange[] mergedCells = sheet.getMergedCells();
-        for (int i=0;i<mergedCells.length;i++){
-            CellRange mergedCell = mergedCells[i];
-
-            CellRange data = sheet.getCellRange(mergedCell.getRow(),mergedCell.getColumn());
-
-            System.out.println(data.getValue());
-            System.out.println(mergedCell.getRow()+"--=--"+mergedCell.getColumn());
-
-        }*/
-
-    }
-    public static Map<String, Map<String, String>> getWeather(String city, String month) {
-        String html = "http://www.tianqihoubao.com/lishi/" + city + "/month/" + month + ".html";
-        System.out.println(html);
-        Map<String, Map<String, String>> map = new HashMap<>();
-        Document document = null;
-        try {
-            document = Jsoup.connect(html).get();
-            Element body = document.body();
-            Elements table = body.getElementsByTag("table");
-            Elements trs = table.select("tr");
-            if (trs.get(0).select("td").text().contains("本站目前")) {
-                System.out.println("网页错误");
-                return null;
-            }
-            for (int i = 1; i < trs.size(); i++) {
-                Element tr = trs.get(i);
-                Elements tds = tr.select("td");
-
-                Map<String, String> m = new HashMap<>();
-                m.put("weather", tds.get(1).text().split("/")[0].trim());
-                String[] split = tds.get(2).text().split("/");
-                m.put("tempLow", split[0].substring(0, split[0].length() - 2));
-                m.put("tempHigh", split[1].substring(0, split[1].length() - 1));
-                m.put("windLevel", tds.get(3).text().substring(tds.get(3).text().length() - 2));
-                map.put(tds.get(0).text(), m);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return map;
+        ////16384*/
     }
 
 }