培训学习记录和资料中心下载记录

src/dsb/com/cnd3b/restcontroller/enterprise/tadministrators/SQL/查询管理员列表.sql

@@ -10,9 +10,18 @@ SELECT t1.tadministratorsid,
        t2.wechat_mobile,
        t2.wechat_position,
        t2.fusertype,
-       t2.wechat_open_userid
+       t2.wechat_depname
 FROM tadministrators t1
-         LEFT JOIN tuser t2
+         LEFT JOIN (SELECT t1.wechat_name,
+                           t1.tuserid,
+                           t1.wechat_mobile,
+                           t1.wechat_position,
+                           t1.fusertype,
+                           t2.wechat_depname
+                    from tuser t1
+                             LEFT JOIN tdepartment t2
+                                       ON t1.wechat_depid = t2.wechat_depid) t2
                    ON t1.tuserid = t2.tuserid
+
 where $where$
   and t1.tuserid != '1'

src/dsb/com/cnd3b/utility/aliyun/oss/AliyunOSSUtil.java

@@ -273,35 +273,35 @@ public class AliyunOSSUtil {
     }
 
 
-    public static void main(String[] args) {
-
-        //创建文件夹
-        AliyunOSSUtil.createFolder("test1/");
-        AliyunOSSUtil.createFolder("test2/");
-        //批量删除文价夹
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.add("test1/");
-        jsonArray.add("test2/");
-        AliyunOSSUtil.deleteFolders(jsonArray);
-//        //上传文件
-        AliyunOSSUtil.uploadFile("", "1.txt", "");
-        AliyunOSSUtil.uploadFile("test2/", "1.txt", "");
-        //批量删除文价夹
-        JSONArray jsonArray2 = new JSONArray();
-        jsonArray2.add("test1/1.txt");
-        jsonArray2.add("test2/1.txt");
-        AliyunOSSUtil.deleteFiles(jsonArray2);
-
-        //获取下级目录
-        getFolders("");
-        //获取所有目录
-        getAllFolders();
-        //获取指定目录下的文件和文件夹
-        getFilesOfPath("资料中心/");
-        //获取oss文档预览url 60分钟，需要开通【智能媒体管理 IMM】并在oss下面配置
-        getOssPreviewUrl("1.tx");
-
-    }
+//    public static void main(String[] args) {
+//
+//        //创建文件夹
+//        AliyunOSSUtil.createFolder("test1/");
+//        AliyunOSSUtil.createFolder("test2/");
+//        //批量删除文价夹
+//        JSONArray jsonArray = new JSONArray();
+//        jsonArray.add("test1/");
+//        jsonArray.add("test2/");
+//        AliyunOSSUtil.deleteFolders(jsonArray);
+////        //上传文件
+//        AliyunOSSUtil.uploadFile("", "1.txt", "");
+//        AliyunOSSUtil.uploadFile("test2/", "1.txt", "");
+//        //批量删除文价夹
+//        JSONArray jsonArray2 = new JSONArray();
+//        jsonArray2.add("test1/1.txt");
+//        jsonArray2.add("test2/1.txt");
+//        AliyunOSSUtil.deleteFiles(jsonArray2);
+//
+//        //获取下级目录
+//        getFolders("");
+//        //获取所有目录
+//        getAllFolders();
+//        //获取指定目录下的文件和文件夹
+//        getFilesOfPath("资料中心/");
+//        //获取oss文档预览url 60分钟，需要开通【智能媒体管理 IMM】并在oss下面配置
+//        getOssPreviewUrl("1.tx");
+//
+//    }
 
 
     private static final String ossBucket = BUCKE_NAME_1;