Oss相关调整

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

@@ -17,7 +17,9 @@ import com.cnd3b.restcontroller.publicmethod.users.Users;
 import com.cnd3b.restcontroller.system.system.uploadExcelData;
 import com.cnd3b.utility.Encryption;
 import com.cnd3b.utility.Sms;
+
 import static com.cnd3b.utility.aliyun.oss.AliyunOSSUtil.*;
+
 import com.cnd3b.utility.sysmsg;
 import com.cnd3b.utility.wechatpay.apppay.POJO.APPQueryOrderRequest;
 import com.cnd3b.utility.wechatpay.apppay.POJO.AppWechatOrder;
@@ -360,10 +362,21 @@ public class WebClientRest {
         }
         String phonenumber = requestcontent.getString("phonenumber");
         String password = requestcontent.getString("password");
-
+        if (password.equals("")) {
+            return new D3BReturnObject_Err().setErrCode(-1).setErrMsg("密码不能为空").toString();
+        }
 
         DBConnect connect = new DBConnect();
 
+        Rows tuserRows = connect.runSqlQuery("SELECT tuserid FROM tuser WHERE wechat_mobile= '" + phonenumber + "'");
+        if (tuserRows.isEmpty()) {
+            return new D3BReturnObject_Err().setErrCode(-1).setErrMsg("手机号不存在").toString();
+        }
+        Rows tadministratorsRows = connect.runSqlQuery("SELECT * from tadministrators WHERE tuserid = '" + tuserRows.get(0).getString("tuserid") + "'");
+        if (tadministratorsRows.isEmpty()) {
+            return new D3BReturnObject_Err().setErrCode(-1).setErrMsg("当前账号不是管理员").toString();
+        }
+
         String sql = "SELECT t2.fpassword FROM tuser t1 LEFT JOIN tadministrators t2 ON t1.tuserid =t2.tuserid WHERE wechat_mobile='" + phonenumber + "'";
         Rows pwdRows = connect.runSqlQuery(sql);
         if (pwdRows.isEmpty()) {

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

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnd3b.common.Controller;
 import com.cnd3b.common.data.Rows;
 import com.cnd3b.common.data.SQLFactory;
+import com.cnd3b.common.parameter.parameter;
 import com.cnd3b.utility.DigitUppercase;
+import com.cnd3b.utility.qywechat.base.Parameter;
 import oracle.net.aso.MD5;
 import org.apache.commons.codec.digest.DigestUtils;
 import p2.pao.PaoRemote;
@@ -50,6 +52,7 @@ public class tadministrators extends Controller {
         if (paoSetRemote.isEmpty()) {
             PaoRemote paoRemote = paoSetRemote.addAtEnd();
             paoRemote.setValue("tuserid", tuserid, 11L);
+            paoRemote.setValue("siteid", parameter.defaultsiteid);
             paoRemote.setValue("fpassword", fpassword, 11L);
             paoRemote.setValue("fisagent", fisagent, 11L);
             paoRemote.setValue("fissaler", fissaler, 11L);
@@ -102,6 +105,7 @@ public class tadministrators extends Controller {
         if (!paoSetRemote.isEmpty()) {
             PaoRemote paoRemote = paoSetRemote.getPao(0);
             paoRemote.setValue("tuserid", tuserid, 11L);
+            paoRemote.setValue("siteid", parameter.defaultsiteid);
             paoRemote.setValue("fpassword", fpassword, 11L);
             paoRemote.setValue("fisagent", fisagent, 11L);
             paoRemote.setValue("fissaler", fissaler, 11L);

src/dsb/com/cnd3b/restcontroller/enterprise/tarchives_sc/SQL/查询课件列表.sql

@@ -6,7 +6,10 @@ SELECT t1.tarchives_scid,
        t1.fvisitors,
        t1.fisontop,
        t1.fiscandownload,
-       t1.fstatus
+       t1.fstatus,
+       t2.fparentid
 FROM tarchives_sc t1
+         LEFT JOIN ttypedetail t2
+                   ON t1.ttypedetailid = t2.ttypedetailid
 WHERE (t1.fnotes LIKE $keywords$ OR t1.ftitle LIKE $keywords$)
   and t1.ttypedetailid = $ttypedetailid$

src/dsb/com/cnd3b/restcontroller/enterprise/tarchives_sc/SQL/查询课件列表_全部.sql

@@ -6,6 +6,9 @@ SELECT t1.tarchives_scid,
        t1.fvisitors,
        t1.fisontop,
        t1.fiscandownload,
-       t1.fstatus
+       t1.fstatus,
+       t2.fparentid
 FROM tarchives_sc t1
+         LEFT JOIN ttypedetail t2
+                   ON t1.ttypedetailid = t2.ttypedetailid
 WHERE (t1.fnotes LIKE $keywords$ OR t1.ftitle LIKE $keywords$)

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

@@ -57,7 +57,7 @@ public class tarchives_sc extends Controller {
      */
     public String updateTarchives_sc() throws P2Exception {
         String tarchives_scid = content.getString("tarchives_scid");
-        String ttypedetailid = content.getString("tagentsid");
+        String ttypedetailid = content.getString("ttypedetailid");
         String fnotes = content.getString("fnotes");
         String ftitle = content.getString("ftitle");
 

src/dsb/com/cnd3b/restcontroller/enterprise/tuser/SQL/通过部门查成员.sql

@@ -0,0 +1,10 @@
+SELECT t1.tuserid,
+       t1.wechat_depid,
+       t1.wechat_userid,
+       t1.wechat_name,
+       t1.wechat_open_userid,
+       t1.wechat_mobile,
+       t1.wechat_position,
+       t1.fusertype
+FROM tuser t1
+WHERE t1.wechat_depid = $wechat_depid$

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

@@ -31,6 +31,21 @@ public class tuser extends Controller {
         return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
     }
 
+    /**
+     * 获取经销商成员列表
+     *
+     * @return
+     */
+    public String selectDepMemberList() {
+
+        String wechat_depid = content.getString("wechat_depid");
+        SQLFactory sqlFactory = new SQLFactory(this, "通过部门查成员", pageSize, pageNumber, "t1.createdate DESC");
+        sqlFactory.addParameter("wechat_depid", wechat_depid);
+        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
+
+    }
+
     /**
      * 更新经销商
      *

src/dsb/com/cnd3b/service/GetWechatData.java

@@ -30,6 +30,7 @@ import static com.cnd3b.utility.aliyun.oss.AliyunOSSUtil.*;
 public class GetWechatData extends BaseClass implements Runnable {
 
 
+
     @Override
     public void run() {
 //        if (new SQLiteJDBC().checkServicesUsed("GetWechatData", false)) {
@@ -105,9 +106,10 @@ public class GetWechatData extends BaseClass implements Runnable {
      */
     public JSONArray getDepartmentList() throws P2Exception {
         String url = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=" + WechatDock_Enterprise.getAccessToken();
-//        System.err.println(url);
+        System.err.println(url);
         String response = new WebRequest().doGet(url);
         JSONObject object = JSONObject.parseObject(response);
+        System.err.println(object.toJSONString());
         JSONArray array = object.getJSONArray("department");
         if (array.size() > 0) {
             updateDepartment(array);
@@ -146,6 +148,7 @@ public class GetWechatData extends BaseClass implements Runnable {
         String url = "https://qyapi.weixin.qq.com/cgi-bin/user/list?access_token=" + WechatDock_Enterprise.getAccessToken() + "&department_id=" + id + "&fetch_child=" + fetch_child;
         String response = new WebRequest().doGet(url);
         JSONObject object = JSONObject.parseObject(response);
+        System.err.println(object.toJSONString());
         return object.getJSONArray("userlist");
     }
 

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

@@ -261,31 +261,31 @@ 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.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();
-//        jsonArray.add("test1/1.txt");
-//        jsonArray.add("test2/1.txt");
-//        AliyunOSSUtil.deleteFiles(jsonArray);
+        AliyunOSSUtil.uploadFile("test2/", "1.txt", "");
+        //批量删除文价夹
+        JSONArray jsonArray2 = new JSONArray();
+        jsonArray2.add("test1/1.txt");
+        jsonArray2.add("test2/1.txt");
+        AliyunOSSUtil.deleteFiles(jsonArray2);
 
         //获取下级目录
-        System.err.println(getFolders(""));
+        getFolders("");
         //获取所有目录
-        System.err.println(getAllFolders());
-
+        getAllFolders();
+        //获取指定目录下的文件和文件夹
         getFilesOfPath("资料中心/");
-
-        System.err.println(getOssPreviewUrl("1.tx"));
+        //获取oss文档预览url 60分钟，需要开通【智能媒体管理 IMM】并在oss下面配置
+        getOssPreviewUrl("1.tx");
 
     }