文件夹修复

src/dsb/com/cnd3b/common/restful/WebClientRest.java

@@ -453,8 +453,6 @@ public class WebClientRest {
      * @param uploadfileInputStream
      * @param uploadfile
      * @param tuserid
-     * @param accesstoken
-     * @param ftype
      * @return
      */
     @Path("uploadexcel")

src/dsb/com/cnd3b/restcontroller/enterprise/datacenter/datacenter.java

@@ -316,8 +316,8 @@ public class datacenter extends Controller {
      * @return
      */
     public String updateFolderName() {
-        String oldName = content.getString("oldName");
-        String newName = content.getString("newName");
+        String oldName = content.get("oldName").toString();
+        String newName = content.get("newName").toString();
 
 
         String sqlSelect = "SELECT*FROM tfolder WHERE tfilename='" + oldName + "'";

src/dsb/com/cnd3b/restcontroller/enterprise/tagentauth/tagentauth.java

@@ -2,16 +2,25 @@ package com.cnd3b.restcontroller.enterprise.tagentauth;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.model.PutObjectRequest;
 import com.cnd3b.common.Controller;
 import com.cnd3b.common.data.Row;
 import com.cnd3b.common.data.Rows;
 import com.cnd3b.common.data.SQLFactory;
+import com.cnd3b.common.parameter.parameter;
+import com.cnd3b.restcontroller.system.system.uploadExcelData;
+import com.cnd3b.utility.qywechat.base.Parameter;
 import p2.common.parse.S;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSetRemote;
 import p2.util.P2Exception;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Base64;
+
+import static com.cnd3b.utility.aliyun.oss.AliyunOSSUtil.BUCKE_NAME_1;
 
 public class tagentauth extends Controller {
     /**
@@ -133,4 +142,26 @@ public class tagentauth extends Controller {
         Rows rows = sqlFactory.runSqlQuery();
         return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
     }
+
+    /**
+     * µ¼Èëexcel
+     *
+     * @return
+     */
+    public String upLoadExcel() {
+        String base64Str = content.getString("byteStr");
+        if (base64Str.length() == 0) {
+            return getErrReturnObject().setErrMsg("ÎļþΪ¿Õ").toString();
+        }
+        byte[] byteStr = Base64.getDecoder().decode(base64Str);
+        JSONObject content = new JSONObject();
+        content.put("tuserid", parameter.tuserid);
+        uploadExcelData uploadExcelData = new uploadExcelData(content);
+        InputStream input = new ByteArrayInputStream(byteStr);
+        ;
+
+        return uploadExcelData.upLoadExcel2(input);
+    }
+
+
 }

src/dsb/com/cnd3b/restcontroller/system/system/uploadExcelData.java

@@ -72,6 +72,43 @@ public class uploadExcelData extends Controller {
         }
     }
 
+    public String upLoadExcel2(InputStream uploadfileInputStream) {
+        // 获取文件名称
+        JSONObject resultObject = new JSONObject();
+        Workbook workbook = null;
+        WritableWorkbook writableWorkbook = null;
+        try {
+            workbook = Workbook.getWorkbook(uploadfileInputStream);
+            String filename = Calendar.getInstance().getTimeInMillis() + "_err.xls";
+            String name = parameter.UpLoadExcelErrFilePath() + "\\" + filename;
+            File errfile = new File(name);
+            writableWorkbook = Workbook.createWorkbook(errfile, workbook);
+            /**
+             * 如果返回结果不为空，则表示导入错误，需生成excel供用户下载
+             */
+            if (!uploadData_tagentauth(writableWorkbook)) {
+                writableWorkbook.write();
+                errfile.exists();
+                return getErrReturnObject().setErrMsg("导入错误，是否下载错误信息").addKeyValue("errfileurl", "https://test.buwanjia.com/jsmanage/" + filename).toString();
+            } else {
+                errfile.delete();
+                errfile.exists();
+                return getSucReturnObject().toString();
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return getErrReturnObject().setErrMsg(e.getMessage()).toString();
+        } finally {
+            try {
+                workbook.close();
+                writableWorkbook.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
 
     /**
      * 经销商授权体系导入