吴志根 3 rokov pred
rodič
commit
6450751493

+ 3 - 2
src/dsb/com/cnd3b/restcontroller/customer/wechatapplet/SQL/插入文件夹.sql

@@ -1,7 +1,8 @@
 if
 not exists (select 1 from tfolder where fpath = $fpath$)
-      insert into tfolder(tfolderid,rmkenable,createdate,fpath,tfilename) values($tfolderid$,0,GETDATE(), $fpath$,$fpath$)
+      insert into tfolder(tfolderid,rmkenable,createdate,fpath,tfilename) values($tfolderid$,0,GETDATE(), $fpath$,$tfilename$)
    else
 update tfolder
-set changedate = getdate()
+set changedate = getdate(),
+    tfilename  = $tfilename$
 where fpath = $fpath$

+ 0 - 1
src/dsb/com/cnd3b/restcontroller/customer/wechatapplet/SQL/查询课件列表.sql

@@ -8,7 +8,6 @@ SELECT t1.tarchives_scid,
         WHERE tarchives_scid = t1.tarchives_scid) fvisitors,
        t1.fisontop,
        t1.fiscandownload
-
 FROM tarchives_sc t1
 WHERE t1.ttypedetailid = $ttypedetailid$
   and t1.fstatus = '·¢²¼'

+ 31 - 8
src/dsb/com/cnd3b/restcontroller/customer/wechatapplet/wechatapplet.java

@@ -91,10 +91,10 @@ public class wechatapplet extends Controller {
         }
         SQLFactory sqlFactory = null;
         if (ttypedetailid.equals("")) {
-            sqlFactory = new SQLFactory(this, "查询课件列表_全部", pageSize, pageNumber, "t1.fisontop DESC, t1.createdate desc");
+            sqlFactory = new SQLFactory(this, "查询课件列表_全部", pageSize, pageNumber, "t1.SERIALNO");
             sqlFactory.addParameter("keywords", "%" + keywords + "%");
         } else {
-            sqlFactory = new SQLFactory(this, "查询课件列表", pageSize, pageNumber, "t1.fisontop DESC, t1.createdate desc");
+            sqlFactory = new SQLFactory(this, "查询课件列表", pageSize, pageNumber, "t1.SERIALNO");
             sqlFactory.addParameter("ttypedetailid", ttypedetailid);
             sqlFactory.addParameter("keywords", "%" + keywords + "%");
         }
@@ -248,22 +248,39 @@ public class wechatapplet extends Controller {
         // 遍历所有commonPrefix。
         List<JSONObject> listFolder = getListFolder(listing, listUserFolders, listUserRole, listUserfauthtype);
 
-
+        String newName = "";
+        Rows tempRows = dbConnect.runSqlQuery("SELECT tfilename from tfolder WHERE fpath = '" + folderPath + "'");
+        if (!tempRows.isEmpty()) {
+            newName = tempRows.get(0).getString("tfilename");
+        }
         ArrayList<String> keyStr = new ArrayList<>();
+        ArrayList<String> sqlList = new ArrayList<>();
         for (JSONObject object : listFolder) {
-            keyStr.add(object.getString("folderpath"));
+            String fpath = object.getString("folderpath");
+            String selectSql = "SELECT tfilename FROM tfolder WHERE fpath='" + fpath + "'";
+            Rows rows = dbConnect.runSqlQuery(selectSql);
+            String[] tfilename;
+            if (rows.isEmpty()) {
+                tfilename = fpath.split("/");
+            } else {
+                tfilename = rows.get(0).getString("tfilename").split("/");
+            }
             SQLFactory sqlFactory = new SQLFactory(this, "插入文件夹");
-            sqlFactory.addParameter("fpath", object.getString("folderpath"));
+            sqlFactory.addParameter("fpath", fpath);
+            sqlFactory.addParameter("tfilename", newName + tfilename[tfilename.length - 1] + "/");
             sqlFactory.addParameter("tfolderid", createTableID("tfolder", "tfolderid"));
-            dbConnect.runSqlUpdate(sqlFactory);
+
+            sqlList.add(sqlFactory.getSQL());
+            keyStr.add(fpath);
         }
+        dbConnect.runSqlUpdate(sqlList);
         SQLFactory sqlNameFac = new SQLFactory(this, "查询文件名称");
         sqlNameFac.addParameter_in("fpath", keyStr);
         String sqlName = sqlNameFac.getSQL();
         Rows rowsName = dbConnect.runSqlQuery(sqlName);
         JSONObject object = new JSONObject();
         sortByStartDigits(listFiles, "name");
-        sortByStartDigits(rowsName, "tfilename", folderPath);
+        sortByStartDigits(rowsName, "tfilename", newName);
         object.put("files", listFiles);
         object.put("folder", rowsName);
 
@@ -334,8 +351,14 @@ public class wechatapplet extends Controller {
 
         }
 
+        String newName = "";
+        Rows tempRows = dbConnect.runSqlQuery("SELECT tfilename from tfolder WHERE fpath = '" + folderPath + "'");
+        if (!tempRows.isEmpty()) {
+            newName = tempRows.get(0).getString("tfilename");
+        }
+
         sortByStartDigits(listFiles_tmp, "name");
-        sortByStartDigits(rows_tmp, "tfilename", folderPath);
+        sortByStartDigits(rows_tmp, "tfilename", newName);
 
         JSONObject object = new JSONObject();
         object.put("files", listFiles_tmp);

+ 8 - 0
src/dsb/com/cnd3b/restcontroller/enterprise/datacenter/SQL/插入文件夹.sql

@@ -0,0 +1,8 @@
+if
+not exists (select 1 from tfolder where fpath = $fpath$)
+      insert into tfolder(tfolderid,rmkenable,createdate,fpath,tfilename) values($tfolderid$,0,GETDATE(), $fpath$,$tfilename$)
+   else
+update tfolder
+set changedate = getdate(),
+    tfilename  = $tfilename$
+where fpath = $fpath$

+ 26 - 47
src/dsb/com/cnd3b/restcontroller/enterprise/datacenter/datacenter.java

@@ -14,6 +14,7 @@ import p2.common.parse.A;
 import p2.common.parse.S;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSetRemote;
+import p2.pao.SqlFormat;
 import p2.util.P2Exception;
 
 import java.io.ByteArrayInputStream;
@@ -218,46 +219,6 @@ public class datacenter extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
-    /**
-     * 获取文件夹
-     *
-     * @return
-     */
-    public String getAllFolders() {
-        // 构造ListObjectsRequest请求。
-        ListObjectsRequest listObjectsRequest = new ListObjectsRequest(BUCKE_NAME_1);
-
-        // 列举文件。
-        ObjectListing listing = ossClient.listObjects(listObjectsRequest);
-
-        //遍历所有文件。
-        //System.out.println("Objects:");
-        //List<String> stringList = new ArrayList<>();
-        for (OSSObjectSummary objectSummary : listing.getObjectSummaries()) {
-            System.out.println(objectSummary.getKey());
-            if (objectSummary.getKey().endsWith("/")) {
-                String key = objectSummary.getKey();
-                //stringList.add(key);
-                String selectSql = "SELECT*FROM tfolder WHERE fpath='" + key + "'";
-                Rows rows = dbConnect.runSqlQuery(selectSql);
-                if (rows.isEmpty()) {
-
-                    inseretTfolder(objectSummary.getKey());
-                }
-
-            }
-
-        }
-
-        // 关闭OSSClient。
-        ossClient.shutdown();
-
-        String sql = "SELECT tfolderid,fpath ,tfilename FROM tfolder ORDER BY tfolderid ";
-        Rows rows = dbConnect.runSqlQuery(sql);
-
-        return getSucReturnObject().setData(rows).toString();
-    }
-
 
     /**
      * 获取指定目录下的文件和文件夹
@@ -305,19 +266,26 @@ public class datacenter extends Controller {
         }
 
         // 遍历所有commonPrefix。
-        System.out.println("CommonPrefixes:");
+        String newName = "";
+        Rows tempRows = dbConnect.runSqlQuery("SELECT tfilename from tfolder WHERE fpath = '" + folderPath + "'");
+        if (!tempRows.isEmpty()) {
+            newName = tempRows.get(0).getString("tfilename");
+        }
         ArrayList<String> commonPrefixList = new ArrayList<>();
+        ArrayList<String> sqlList = new ArrayList<>();
         for (String commonPrefix : listing.getCommonPrefixes()) {
-//            JSONObject object = new JSONObject();
-//            object.put("folderpath", commonPrefix);
-            String selectSql = "SELECT*FROM tfolder WHERE fpath='" + commonPrefix + "'";
+            String selectSql = "SELECT tfilename FROM tfolder WHERE fpath='" + commonPrefix + "'";
             Rows rows = dbConnect.runSqlQuery(selectSql);
+            String[] tfilename;
             if (rows.isEmpty()) {
-                inseretTfolder(commonPrefix);
-
+                tfilename = commonPrefix.split("/");
+            } else {
+                tfilename = rows.get(0).getString("tfilename").split("/");
             }
+            sqlList.add(inseretOrUpdateTfolder(commonPrefix, newName + tfilename[tfilename.length - 1] + "/"));
             commonPrefixList.add(commonPrefix);
         }
+        dbConnect.runSqlUpdate(sqlList);
         // 关闭OSSClient。
         ossClient.shutdown();
 
@@ -328,7 +296,7 @@ public class datacenter extends Controller {
         Rows rows = dbConnect.runSqlQuery(sql);
 
         sortByStartDigits(objectSummaryList, "name");
-        sortByStartDigits(rows, "tfilename", folderPath);
+        sortByStartDigits(rows, "tfilename", newName);
 
         JSONObject object = new JSONObject();
         object.put("files", objectSummaryList);
@@ -366,6 +334,17 @@ public class datacenter extends Controller {
 
     }
 
+    public String inseretOrUpdateTfolder(String name, String name2) {
+        Long id = createTableID("tfolder", "tfolderid");
+//        String sql = "INSERT INTO tfolder(tfolderid,rmkenable,fpath,createdate,tfilename) VALUES(" + id + ", 0,'" + name + "','" + getDateTime_Str() + "','" + name2 + "')";
+        SQLFactory sqlFactory = new SQLFactory(this, "插入文件夹");
+        sqlFactory.addParameter("tfolderid", id);
+        sqlFactory.addParameter("fpath", name);
+        sqlFactory.addParameter("tfilename", name2);
+
+        return sqlFactory.getSQL();
+    }
+
     public void inseretTfolder(String name) {
         Long id = createTableID("tfolder", "tfolderid");
         String sql = "INSERT INTO tfolder(tfolderid,rmkenable,fpath,createdate,tfilename) VALUES(" + id + ", 0,'" + name + "','" + getDateTime_Str() + "','" + name + "')";

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

@@ -7,6 +7,7 @@ SELECT t1.tarchives_scid,
         FROM tuser_study
         WHERE tarchives_scid = t1.tarchives_scid) fvisitors,
        t1.fisontop,
+       t1.serialno,
        t1.fiscandownload,
        t1.fstatus,
        t2.fparentid

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

@@ -7,6 +7,7 @@ SELECT t1.tarchives_scid,
         FROM tuser_study
         WHERE tarchives_scid = t1.tarchives_scid) fvisitors,
        t1.fisontop,
+       t1.serialno,
        t1.fiscandownload,
        t1.fstatus,
        t2.fparentid

+ 4 - 0
src/dsb/com/cnd3b/restcontroller/enterprise/tarchives_sc/tarchives_sc.java

@@ -35,6 +35,7 @@ public class tarchives_sc extends Controller {
         String ftitle = content.getString("ftitle", 100, "课件说明");
         String fiscandownload = content.getString("fiscandownload");
         String fisontop = content.getString("fisontop");
+        Long serialno = content.getLong("serialno");
 
         //新增
         PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tarchives_sc");
@@ -46,6 +47,7 @@ public class tarchives_sc extends Controller {
         paoRemote.setValue("fvisitors", 0, 11L);
         paoRemote.setValue("fiscandownload", fiscandownload, 11L);
         paoRemote.setValue("fisontop", fisontop, 11L);
+        paoRemote.setValue("serialno", serialno, 11L);
         paoSetRemote.save();
         JSONObject object = new JSONObject();
         object.put("id", paoRemote.getUniqueIDValue());
@@ -65,6 +67,7 @@ public class tarchives_sc extends Controller {
 
         String fiscandownload = content.getString("fiscandownload");
         String fisontop = content.getString("fisontop");
+        Long serialno = content.getLong("serialno");
         //更新体系
         PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tarchives_sc", "tarchives_scid = '" + tarchives_scid + "'");
         if (!paoSetRemote.isEmpty()) {
@@ -75,6 +78,7 @@ public class tarchives_sc extends Controller {
             paoRemote.setValue("ftitle", ftitle, 11L);
             paoRemote.setValue("fiscandownload", fiscandownload, 11L);
             paoRemote.setValue("fisontop", fisontop, 11L);
+            paoRemote.setValue("serialno", serialno, 11L);
             paoSetRemote.save();
         } else {
             return getErrReturnObject().setErrMsg("未找到更新的数据").toString();

+ 32 - 32
src/dsb/com/cnd3b/restcontroller/system/wechatdock/wechatdock.java

@@ -1,32 +1,32 @@
-package com.cnd3b.restcontroller.system.wechatdock;
-
-import com.cnd3b.common.Controller;
-import com.cnd3b.utility.wechatdock.WechatDock_gzh;
-import com.cnd3b.utility.wechatdock.WechatDock_xcx;
-import com.alibaba.fastjson.JSONObject;
-
-public class wechatdock extends Controller {
-    public wechatdock(JSONObject content) {
-        super(content);
-    }
-
-    /**
-     * 创建微信第三方调用请求参数,如微信分享等
-     *
-     * @return
-     */
-    public String getWechatDock() {
-        String url = content.getString("url");
-        String app = "";
-        if (content.containsKey("app")) {
-            app = content.getString("app");
-        }
-        if ("".equals(app)) {
-            return getSucReturnObject().setData(WechatDock_gzh.wechatDock(url)).toString();
-        } else if ("wechatapp".equals(app)) {
-            return getSucReturnObject().setData(WechatDock_xcx.wechatDock(url)).toString();
-        } else {
-            return getErrReturnObject().setErrMsg("错误").toString();
-        }
-    }
-}
+//package com.cnd3b.restcontroller.system.wechatdock;
+//
+//import com.cnd3b.common.Controller;
+//import com.cnd3b.utility.wechatdock.WechatDock_gzh;
+//import com.cnd3b.utility.wechatdock.WechatDock_xcx;
+//import com.alibaba.fastjson.JSONObject;
+//
+//public class wechatdock extends Controller {
+//    public wechatdock(JSONObject content) {
+//        super(content);
+//    }
+//
+//    /**
+//     * 创建微信第三方调用请求参数,如微信分享等
+//     *
+//     * @return
+//     */
+//    public String getWechatDock() {
+//        String url = content.getString("url");
+//        String app = "";
+//        if (content.containsKey("app")) {
+//            app = content.getString("app");
+//        }
+//        if ("".equals(app)) {
+//            return getSucReturnObject().setData(WechatDock_gzh.wechatDock(url)).toString();
+//        } else if ("wechatapp".equals(app)) {
+//            return getSucReturnObject().setData(WechatDock_xcx.wechatDock(url)).toString();
+//        } else {
+//            return getErrReturnObject().setErrMsg("错误").toString();
+//        }
+//    }
+//}

+ 26 - 26
src/dsb/com/cnd3b/restcontroller/system/wechatmsg/WechatMsg.java

@@ -1,26 +1,26 @@
-package com.cnd3b.restcontroller.system.wechatmsg;
-
-import com.cnd3b.common.Controller;
-import com.cnd3b.utility.qywechat.base.Parameter;
-import com.cnd3b.utility.qywechat.base.SendMsg;
-import com.alibaba.fastjson.JSONObject;
-
-public class WechatMsg extends Controller {
-
-    public WechatMsg(JSONObject content) {
-        super(content);
-    }
-
-    public String sendMsg() {
-        String msg = content.getString("msg");
-        String wechatid = content.getString("wechatid");
-        try {
-            Parameter.initParameter();
-            SendMsg sendMsg = new SendMsg();
-            sendMsg.TextMsg(new String[]{wechatid}, null, Parameter.appid_DRP, "0", msg);
-        } catch (Exception e) {
-            return getErrReturnObject().setErrMsg(e.getMessage()).toString();
-        }
-        return getSucReturnObject().toString();
-    }
-}
+//package com.cnd3b.restcontroller.system.wechatmsg;
+//
+//import com.cnd3b.common.Controller;
+//import com.cnd3b.utility.qywechat.base.Parameter;
+//import com.cnd3b.utility.qywechat.base.SendMsg;
+//import com.alibaba.fastjson.JSONObject;
+//
+//public class WechatMsg extends Controller {
+//
+//    public WechatMsg(JSONObject content) {
+//        super(content);
+//    }
+//
+//    public String sendMsg() {
+//        String msg = content.getString("msg");
+//        String wechatid = content.getString("wechatid");
+//        try {
+//            Parameter.initParameter();
+//            SendMsg sendMsg = new SendMsg();
+//            sendMsg.TextMsg(new String[]{wechatid}, null, Parameter.appid_DRP, "0", msg);
+//        } catch (Exception e) {
+//            return getErrReturnObject().setErrMsg(e.getMessage()).toString();
+//        }
+//        return getSucReturnObject().toString();
+//    }
+//}

+ 0 - 48
src/dsb/com/cnd3b/service/DataStatusChange.java

@@ -1,48 +0,0 @@
-//package com.cnd3b.service;
-//
-//import com.cnd3b.common.BaseClass;
-//import com.cnd3b.common.data.db.DBConnect;
-//import com.cnd3b.common.data.db.SQLiteJDBC;
-//
-//import java.util.ArrayList;
-//
-//public class DataStatusChange extends BaseClass implements Runnable {
-//
-//    @Override
-//    public void run() {
-//        try {
-//            if (new SQLiteJDBC().checkServicesUsed("DataStatusChange", true)) {
-//                supplyanddemandstatus();
-//                activitystatus();
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    /**
-//     * 供需到期
-//     */
-//    public void supplyanddemandstatus() {
-//        try {
-//            DBConnect dbConnect = new DBConnect();
-//            dbConnect.runSqlUpdate("update tsupplyanddemand set fstatus='已过期' where convert(varchar(10),fenddate,120)<=getdate() and fstatus ='待对接'");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//
-//    public void activitystatus() {
-//        try {
-//            DBConnect dbConnect = new DBConnect();
-//            ArrayList<String> list = new ArrayList<>();
-//            list.add("update tactivity set fstatus='已结束' where convert(varchar(10),fenddate,120)<convert(varchar(10),getdate(),120)");
-//            list.add("update tactivity set fstatus='未开始' where convert(varchar(10),fbegdate,120)>convert(varchar(10),getdate(),120)");
-//            list.add("update tactivity set fstatus='活动中' where convert(varchar(10),fenddate,120)>=convert(varchar(10),getdate(),120) and convert(varchar(10),fbegdate,120)<=convert(varchar(10),getdate(),120)");
-//            dbConnect.runSqlUpdate(list);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//}

+ 2 - 0
src/dsb/com/cnd3b/service/GetWechatData.java

@@ -507,6 +507,7 @@ public class GetWechatData extends BaseClass implements Runnable {
         int stopPos = 0;
         for (int i = 0; i < len; i++) { // 遍历 str 的字符
             char ch = str.charAt(i);
+            System.err.println(ch);
             if (!(ch >= '0' && ch <= '9')) { // 如果当前字符不是数字
                 stopPos = i;
                 break;
@@ -520,6 +521,7 @@ public class GetWechatData extends BaseClass implements Runnable {
             String str1 = getStartDigits(s1.getString(key).replace(path, "").replace("/", ""));
             String str2 = getStartDigits(s2.getString(key).replace(path, "").replace("/", ""));
             System.err.println(str1);
+            System.err.println(str2);
             int num1 = Integer.MAX_VALUE;
             int num2 = Integer.MAX_VALUE;
             if (!str1.equals("")) {

+ 0 - 75
src/dsb/com/cnd3b/service/ObsAutoDelete.java

@@ -1,75 +0,0 @@
-//package com.cnd3b.service;
-//
-//import com.cnd3b.common.BaseClass;
-//import com.cnd3b.common.data.Row;
-//import com.cnd3b.common.data.Rows;
-//import com.cnd3b.common.data.SQLFactory;
-//import com.cnd3b.common.data.db.DBConnect;
-//import com.cnd3b.common.data.db.SQLiteJDBC;
-//import com.cnd3b.utility.obs.BucketFile;
-//import p2.util.P2Exception;
-//
-//import java.util.Calendar;
-//
-///**
-// * 存储容量定时清理
-// */
-//public class ObsAutoDelete extends BaseClass implements Runnable {
-//
-//    @Override
-//    public void run() {
-//        if (new SQLiteJDBC().checkServicesUsed("ObsAutoDelete", true)) {
-//            try {
-//                clean();
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        }
-//        if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) == 3) {
-//            System.gc();
-//        }
-//    }
-//
-//    public void clean() throws P2Exception {
-//        DBConnect dbConnect = new DBConnect();
-//        /**
-//         * 第一步,搜索出所有存在附件的表格
-//         */
-//        Rows objectrows = dbConnect.runSqlQuery("select distinct ownertable,t2.uniquecolumnname from tattachment t1 inner join PS_SYSTABLES t2 on t1.ownertable=t2.tablename");
-//        for (Row objectrow : objectrows) {
-//
-//            String objectname = objectrow.getString("ownertable");
-//            String uniquecolumnname = objectrow.getString("uniquecolumnname");
-//
-//            Rows tattachmentrows = null;
-//            try {
-//                tattachmentrows = dbConnect.runSqlQuery("select t1.siteid,t1.tattachmentid,t1.serialnumber,t1.fdocument,t1.fparentid,t1.ftype from tattachment t1 left join " + objectname + " t2 on  t1.ownerid=t2." + uniquecolumnname + " inner join tobsmag t3 on t1.siteid=t3.siteid and t3.fisautoclean=1  where t1.ownertable='" + objectname + "' and t2." + uniquecolumnname + " is null");
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//            if (tattachmentrows != null) {
-//                for (Row tattachmentrow : tattachmentrows) {
-//                    String siteid = tattachmentrow.getString("siteid");
-//                    String ftype = tattachmentrow.getString("ftype");
-//                    String tattachmentid = tattachmentrow.getString("tattachmentid");
-//                    String serialnumber = tattachmentrow.getString("serialnumber");
-//                    String fdocument = tattachmentrow.getString("fdocument");
-//                    BucketFile bucketFile = new BucketFile(siteid);
-//                    if ("hls".equalsIgnoreCase(ftype)) {
-//                        bucketFile.deleteFolder(serialnumber);
-//                    } else {
-//                        bucketFile.deleteFile(serialnumber);
-//                    }
-//                    if (!bucketFile.doesObjectExist(serialnumber)) {
-//                        printInfoOut("云存储文件清理", siteid + "-表名:" + objectname + ";附件ID:" + tattachmentid + ";云存储文件名:" + serialnumber + ";文件名:" + fdocument);
-//                        SQLFactory sqlFactory = new SQLFactory(this, "附件信息删除");
-//                        sqlFactory.addParameter("siteid", siteid);
-//                        sqlFactory.addParameter("tattachmentid", tattachmentid);
-//                        dbConnect.runSqlUpdate(sqlFactory.getSQL());
-//                    }
-//                    bucketFile.close();
-//                }
-//            }
-//        }
-//    }
-//}

+ 0 - 100
src/dsb/com/cnd3b/service/ObsMpcTaskQuery.java

@@ -1,100 +0,0 @@
-//package com.cnd3b.service;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.cnd3b.common.BaseClass;
-//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.data.db.DBConnect;
-//import com.cnd3b.common.data.db.SQLiteJDBC;
-//import com.cnd3b.utility.obs.BucketFile;
-//import com.cnd3b.utility.obs.mpc.MpcFactory;
-//import com.cnd3b.utility.obs.mpc.MpcFile;
-//
-//import java.util.ArrayList;
-//
-///**
-// * 华为云存储转码任务查询
-// */
-//public class ObsMpcTaskQuery extends BaseClass implements Runnable {
-//
-//    @Override
-//    public void run() {
-//        try {
-//            if (new SQLiteJDBC().checkServicesUsed("ObsMpcTaskQuery", true)) {
-//                mpcTask();
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    public void mpcTask() {
-//        DBConnect dbConnect = new DBConnect();
-//        SQLFactory taskquerySQl = new SQLFactory(this, "转码任务查询");
-//        Rows rows = dbConnect.runSqlQuery(taskquerySQl.getSQL());
-//
-//        ArrayList<String> list = new ArrayList<>();
-//        if (!rows.isEmpty()) {
-//            System.err.println("转码任务查询:共" + rows.size() + "条");
-//        }
-//        MpcFactory mpcFactory = new MpcFactory();
-//        int rownum = 1;
-//        for (Row row : rows) {
-//            String siteid = row.getString("siteid");
-//            String tattachmentid = row.getString("tattachmentid");
-//            String mpctaskid = row.getString("mpctaskid");
-//            String ownertable = row.getString("ownertable");
-//            String ownerid = row.getString("ownerid");
-//            String postfix = row.getString("postfix");
-//            String fdocument = row.getString("fdocument");
-//
-//            System.err.println("转码任务查询:开始执行第" + (rownum++) + "条,siteid:" + siteid + "tattachmentid:" + tattachmentid + "mpctaskid:" + mpctaskid);
-//            MpcFile file = mpcFactory.queryMpcTask(mpctaskid);
-//            if (file != null) {
-//                //转码成功的视频文件名称
-//                String objectname = file.getObject();
-//                System.err.println("转码任务查询:转码后名称" + objectname);
-//                String obsfilename = objectname + "/" + file.getOutput_file_name();
-//
-//                BucketFile bucketFile = new BucketFile(siteid);
-//                if (!bucketFile.doesObjectExist(obsfilename)) {
-//                    System.err.println("转码任务查询:没有找到实体文件" + obsfilename);
-//                    continue;
-//                }
-//                String fileurl = bucketFile.getFileUrl(obsfilename);
-//                System.err.println("转码任务查询:获取转码文件访问地址" + fileurl);
-//
-//                //生成缩略图附件信息
-//                SQLFactory sqlFactory = new SQLFactory(this, "子附件信息插入");
-//                sqlFactory.addParameter("fparentid", tattachmentid);
-//                sqlFactory.addParameter("tattachmentid", new Controller(new JSONObject()).createTableID("tattachment", "tattachmentid"));
-//                sqlFactory.addParameter("siteid", siteid);
-//                sqlFactory.addParameter("ownertable", ownertable);
-//                sqlFactory.addParameter("ownerid", ownerid);
-//                sqlFactory.addParameter("createby", "system");
-//                sqlFactory.addParameter("ftype", "hls");
-//                sqlFactory.addParameter("postfix", postfix);
-//                sqlFactory.addParameter("serialnumber", objectname);
-//                sqlFactory.addParameter("fdocument", fdocument);
-//                sqlFactory.addParameter("fobsurl", fileurl);
-//                sqlFactory.addParameter("contentlength", bucketFile.getObjectMetadata(obsfilename).getContentLength());
-//
-//                list.add(sqlFactory.getSQL());
-//                list.add("update tattachment set mpctaskstatus=1 where tattachmentid='" + tattachmentid + "'");
-//                bucketFile.close();
-//            } else {
-//                System.err.println("转码任务查询:转码未完成");
-//            }
-//        }
-//        if (!list.isEmpty()) {
-//            System.err.println("更新附件表转码后访问路径");
-//            String status = dbConnect.runSqlUpdate(list);
-//            if (!status.equals("true")) {
-//                System.err.println("转码任务查询:" + status);
-//            }
-//        }
-//    }
-//
-//}

+ 0 - 46
src/dsb/com/cnd3b/service/ObsVolumeQuery.java

@@ -1,46 +0,0 @@
-//package com.cnd3b.service;
-//
-//import com.cnd3b.common.BaseClass;
-//import com.cnd3b.common.data.db.SQLiteJDBC;
-//import com.cnd3b.utility.obs.BucketCESManage;
-//import p2.pao.PaoSetRemote;
-//import p2.application.tobsmag.tobsmag;
-//
-///**
-// * 存储容量定时刷新
-// */
-//public class ObsVolumeQuery extends BaseClass implements Runnable {
-//
-//    @Override
-//    public void run() {
-//        if (new SQLiteJDBC().checkServicesUsed("ObsVolumeQuery", true)) {
-//            PaoSetRemote tobsmagSet = null;
-//            tobsmag tobsmag = null;
-//            try {
-//                tobsmagSet = getP2ServerSystemPaoSet("tobsmag");
-//                int i = 0;
-//                while ((tobsmag = (tobsmag) tobsmagSet.getPao(i)) != null) {
-//                    if (!tobsmag.getPaoSet("tattachment").isEmpty()) {
-//                        try {
-//                            tobsmag.getVolume();
-//                        } catch (Exception e) {
-//                            printErrOut("获取存储容量" + tobsmag.getString("siteid"), e.getMessage());
-//                            e.printStackTrace();
-//                        }
-//                    }
-//                    new BucketCESManage(tobsmag.getString("siteid")).getData();
-//                    i++;
-//                }
-//                tobsmagSet.save();
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            } finally {
-//                try {
-//                    tobsmagSet.close();
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        }
-//    }
-//}

+ 0 - 255
src/dsb/com/cnd3b/service/OssService.java

@@ -1,255 +0,0 @@
-//package com.cnd3b.service;
-//
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.aliyuncs.DefaultAcsClient;
-//import com.aliyuncs.IAcsClient;
-//import com.aliyuncs.exceptions.ClientException;
-//import com.aliyuncs.exceptions.ServerException;
-//import com.aliyuncs.mts.model.v20140618.*;
-//import com.aliyuncs.profile.DefaultProfile;
-//import com.cnd3b.common.BaseClass;
-//import com.cnd3b.utility.WebRequest;
-//import org.apache.commons.lang.exception.ExceptionUtils;
-//import p2.common.parse.J;
-//
-//import java.io.UnsupportedEncodingException;
-//import java.net.URLEncoder;
-//
-//public class OssService extends BaseClass implements Runnable {
-//    @Override
-//    public void run() {
-//        System.err.println("OssService");
-//
-//    }
-//
-//    private static String accessKeyId = "LTAI5tASc17g95ABAqwUAqNS";
-//    private static String accessKeySecret = "UUs8gERP91X8HGeWgeOa6jsAIGQhhK";
-//    private static String mpsRegionId = "cn-beijing";
-//    private static String pipelineId = "189f4d23997941089318d5117efc1857";
-//    private static String templateId = "S00000001-200040";
-//    private static String ossLocation = "oss-cn-beijing";
-//    private static String ossBucket = "jiusheng11";
-//    private static String ossInputObject = "change/实木地暖地板技术视频.mov";
-//    private static String ossOutputObject = "change/实木地暖地板技术视频_1.mov";
-//
-//    public static void main(String[] args) throws UnsupportedEncodingException, ClientException {
-//
-////        transcoding();
-////        queryMediaListByURL();
-//
-////        AddMedia("http://jiusheng11.oss-cn-beijing.aliyuncs.com/11/实木地暖地板技术视频.mp4");
-//        //transcoding("11/实木地暖地板技术视频.mp4", "11/实木地暖地板技术视频_2.mov");
-//        submitMediaInfoJob("tt/英文版1分钟.mp4");
-////        submitAnalysisJob("tt/123.mp4");
-//    }
-//
-//    public static void transcoding(String ossInputObject, String ossOutputObject) {
-//        // 创建DefaultAcsClient实例并初始化
-//        DefaultProfile profile = DefaultProfile.getProfile(
-//                mpsRegionId,      // 地域ID
-//                accessKeyId,      // RAM账号的AccessKey ID
-//                accessKeySecret); // RAM账号Access Key Secret
-//        IAcsClient client = new DefaultAcsClient(profile);
-//        // 创建API请求并设置参数
-//        SubmitJobsRequest request = new SubmitJobsRequest();
-//        // Input
-//        JSONObject input = new JSONObject();
-//        input.put("Location", ossLocation);
-//        input.put("Bucket", ossBucket);
-//        try {
-//            input.put("Object", URLEncoder.encode(ossInputObject, "utf-8"));
-//        } catch (UnsupportedEncodingException e) {
-//            throw new RuntimeException("input URL encode failed");
-//        }
-//        request.setInput(input.toJSONString());
-//        // Output
-//        String outputOSSObject;
-//        try {
-//            outputOSSObject = URLEncoder.encode(ossOutputObject, "utf-8");
-//        } catch (UnsupportedEncodingException e) {
-//            throw new RuntimeException("output URL encode failed");
-//        }
-//        JSONObject output = new JSONObject();
-//        output.put("OutputObject", outputOSSObject);
-//        // Ouput->Container
-////        JSONObject container = new JSONObject();
-////        container.put("Format", "mp4");
-////        output.put("Container", container.toJSONString());
-//        // Ouput->Video
-////        JSONObject video = new JSONObject();
-////        video.put("Codec", "H.264");
-////        video.put("Bitrate", "1500");
-////        video.put("Width", "1280");
-////        video.put("Fps", "25");
-////        output.put("Video", video.toJSONString());
-//        // Ouput->Audio
-////        JSONObject audio = new JSONObject();
-////        audio.put("Codec", "AAC");
-////        audio.put("Bitrate", "128");
-////        audio.put("Channels", "2");
-////        audio.put("Samplerate", "44100");
-////        output.put("Audio", audio.toJSONString());
-//        // Ouput->TemplateId
-//        output.put("TemplateId", "S00000001-200010");
-//        JSONArray outputs = new JSONArray();
-//        outputs.add(output);
-//        request.setOutputs(outputs.toJSONString());
-//        request.setOutputBucket(ossBucket);
-//        request.setOutputLocation(ossLocation);
-//        // PipelineId
-//        request.setPipelineId(pipelineId);
-//        // 发起请求并处理应答或异常
-//        SubmitJobsResponse response;
-//
-//        try {
-//            response = client.getAcsResponse(request);
-//            System.out.println("RequestId is:" + response.getRequestId());
-//            if (response.getJobResultList().get(0).getSuccess()) {
-//                System.out.println("JobId is:" + response.getJobResultList().get(0).getJob().getJobId());
-//            } else {
-//                System.out.println("SubmitJobs Failed code:" + response.getJobResultList().get(0).getCode() +
-//                        " message:" + response.getJobResultList().get(0).getMessage());
-//            }
-//        } catch (ServerException e) {
-//            e.printStackTrace();
-//        } catch (ClientException e) {
-//            e.printStackTrace();
-//        }
-//
-//
-//    }
-//
-//
-//    //根据视频源OSS地址查询媒体信息, 如: 媒体ID, 媒体状态及其他属性
-//    private static void queryMediaListByURL() throws ClientException, UnsupportedEncodingException {
-//        String ossHost = "http://jiusheng11.oss-cn-beijing.aliyuncs.com/";
-//        String ossObject = "22/实木地暖地板技术视频.mp4";
-//        //ossObject需要符合rfc3986标准
-//        String rfc3986Object = encodeByRFC3986(ossObject);
-//        // 创建DefaultAcsClient实例并初始化
-//        DefaultProfile profile = DefaultProfile.getProfile(
-//                mpsRegionId,      // 地域ID
-//                accessKeyId,      // RAM账号的AccessKey ID
-//                accessKeySecret); // RAM账号Access Key Secret
-//        DefaultAcsClient client = new DefaultAcsClient(profile);
-//        //查询媒体
-//        QueryMediaListByURLRequest request2 = new QueryMediaListByURLRequest();
-//        request2.setFileURLs(ossHost + rfc3986Object);
-//        QueryMediaListByURLResponse response = client.getAcsResponse(request2);
-//        System.out.println(JSONObject.toJSONString(response.getMediaList()));
-//    }
-//
-//    private static String encodeByRFC3986(String object) throws UnsupportedEncodingException {
-//        StringBuilder builder = new StringBuilder();
-//        String[] segments = object.split("/");
-//        for (int i = 0; i < segments.length; i++) {
-//            builder.append(percentEncode(segments[i]));
-//            if (i != segments.length - 1) {
-//                builder.append("/");
-//            }
-//        }
-//        return builder.toString();
-//    }
-//
-//    private static String percentEncode(String value) throws UnsupportedEncodingException {
-//        if (value == null) {
-//            return null;
-//        }
-//        return URLEncoder.encode(value, "UTF-8").replace("+", "%20").replace("*", "%2A").replace("%7E", "~");
-//    }
-//
-//
-//    private static final String REGION = "cn-beijing";
-//    private static final String mtsEndpoint = "mts." + mpsRegionId + ".aliyuncs.com";
-//    private static DefaultAcsClient aliyunClient;
-//
-//
-//    public static void AddMedia(String fileURL) {
-//        try {
-//            DefaultProfile.addEndpoint(REGION, REGION, "Mts", mtsEndpoint);
-//        } catch (ClientException e) {
-//            System.out.print(ExceptionUtils.getStackTrace(e));
-//            System.exit(1);
-//        }
-//        aliyunClient = new DefaultAcsClient(DefaultProfile.getProfile(REGION, accessKeyId, accessKeySecret));
-//        AddMediaRequest request = new AddMediaRequest();
-//        request.setFileURL(fileURL);
-////        request.setMediaWorkflowId("829bed0300994057a49e4f16de95****");
-////        request.setMediaWorkflowId("064a10f717d84a92b537f51b2a8aae4a");
-//        try {
-//            AddMediaResponse response = aliyunClient.getAcsResponse(request);
-//            System.out.println(JSONObject.toJSONString(response));
-//        } catch (ServerException e) {
-//            System.out.println("Code:" + e.getErrCode() + " Msg:" + e.getMessage());
-//        } catch (ClientException e) {
-//            System.out.println("Code:" + e.getErrCode() + " Msg:" + e.getMessage());
-//        }
-//
-//    }
-//
-//    public static void submitMediaInfoJob(String Object) {
-//
-//        JSONObject jsonObject = new JSONObject();
-//        jsonObject.put("Bucket", ossBucket);
-//        jsonObject.put("Location", ossLocation);
-//        jsonObject.put("Object", Object);
-//        String json = jsonObject.toJSONString();
-//
-//
-//        try {
-//            DefaultProfile.addEndpoint(REGION, REGION, "Mts", mtsEndpoint);
-//        } catch (ClientException e) {
-//            System.out.print(ExceptionUtils.getStackTrace(e));
-//            System.exit(1);
-//        }
-//        aliyunClient = new DefaultAcsClient(DefaultProfile.getProfile(REGION, accessKeyId, accessKeySecret));
-//
-//        SubmitMediaInfoJobRequest request = new SubmitMediaInfoJobRequest();
-//        request.setInput(json);
-//        request.setPipelineId(pipelineId);
-//
-//        try {
-//            SubmitMediaInfoJobResponse response = aliyunClient.getAcsResponse(request);
-//            System.out.println(JSONObject.toJSONString(response));
-//        } catch (ClientException e) {
-//            e.printStackTrace();
-//        }
-//
-//
-//    }
-//
-//    public static void submitAnalysisJob(String Object) {
-//
-//        JSONObject jsonObject = new JSONObject();
-//        jsonObject.put("Bucket", ossBucket);
-//        jsonObject.put("Location", ossLocation);
-//        jsonObject.put("Object", Object);
-//        String json = jsonObject.toJSONString();
-//
-//
-//        try {
-//            DefaultProfile.addEndpoint(REGION, REGION, "Mts", mtsEndpoint);
-//        } catch (ClientException e) {
-//            System.out.print(ExceptionUtils.getStackTrace(e));
-//            System.exit(1);
-//        }
-//        aliyunClient = new DefaultAcsClient(DefaultProfile.getProfile(REGION, accessKeyId, accessKeySecret));
-//
-//        SubmitAnalysisJobRequest request = new SubmitAnalysisJobRequest();
-//        request.setInput(json);
-//        request.setPipelineId(pipelineId);
-//
-//        try {
-//            SubmitAnalysisJobResponse response = aliyunClient.getAcsResponse(request);
-//            System.out.println(JSONObject.toJSONString(response));
-//        } catch (ClientException e) {
-//            e.printStackTrace();
-//        }
-//
-//
-//    }
-//
-//
-//
-//}

+ 0 - 47
src/dsb/com/cnd3b/service/UserAutoLogOut.java

@@ -1,47 +0,0 @@
-package com.cnd3b.service;
-
-import com.cnd3b.common.BaseClass;
-import com.cnd3b.common.data.SQLFactory;
-import com.cnd3b.common.data.Row;
-import com.cnd3b.common.data.Rows;
-import com.cnd3b.common.data.db.DBConnect;
-import com.cnd3b.common.data.db.SQLiteJDBC;
-import com.cnd3b.common.parameter.parameter;
-
-import java.util.ArrayList;
-
-/**
- * 菓斤땐데菱땡꿴璂땐데榴檄
- */
-public class UserAutoLogOut extends BaseClass implements Runnable {
-
-    @Override
-    public void run() {
-        try {
-            if (new SQLiteJDBC().checkServicesUsed("UserAutoLogOut",false)) {
-                accountExpiration();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 瑯뵀마운돕퍅
-     */
-    public void accountExpiration() {
-        DBConnect dbConnect = new DBConnect();
-        SQLFactory factory = new SQLFactory(this, "呵槻瑯뵀꿴璂");
-        Rows rows = dbConnect.runSqlQuery(factory.getSQL());
-        ArrayList<String> sqllist = new ArrayList<>();
-        for (Row row : rows) {
-            String userid = row.getString("userid");
-            if (parameter.userIdList.containsKey(userid)) {
-                String token = parameter.userIdList.get(userid).getString("token");
-                parameter.tokenlist.remove(token);
-                sqllist.add("update tenterprise_users set accesstoken=null where accesstoken='" + token + "'");
-            }
-        }
-        new DBConnect().runSqlUpdate(sqllist);
-    }
-}

+ 0 - 49
src/dsb/com/cnd3b/service/WechatPayAutoQuery.java

@@ -1,49 +0,0 @@
-package com.cnd3b.service;
-
-import com.cnd3b.common.BaseClass;
-import com.cnd3b.common.data.Row;
-import com.cnd3b.common.data.Rows;
-import com.cnd3b.common.data.db.DBConnect;
-import com.cnd3b.common.data.db.SQLiteJDBC;
-import com.cnd3b.utility.wechatpay.apppay.apppay;
-import com.cnd3b.utility.wechatpay.nativepay.nativepay;
-
-/**
- * 峚陓隆等赻雄脤戙隆等袨怓
- */
-public class WechatPayAutoQuery extends BaseClass implements Runnable {
-
-    @Override
-    public void run() {
-        try {
-            if (new SQLiteJDBC().checkServicesUsed("WechatPayAutoQuery",false)) {
-                APP();
-                NATIVE();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void APP() {
-        DBConnect dbConnect = new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select*from twechatpayorder where trade_type='APP' and (isnull(return_code,'')!='SUCCESS' or isnull(result_code,'')!='SUCCESS' or isnull(trade_state,'')!='SUCCESS' ) and DATEADD(MINUTE,30,createdate)>GETDATE() and DATEADD(SECOND,30,createdate)<GETDATE()");
-        for (Row row : rows) {
-            apppay apppay = new apppay();
-            String out_trade_no=row.getString("out_trade_no");
-            apppay.queryOrder(out_trade_no);
-        }
-    }
-
-    public void NATIVE() throws Exception {
-        DBConnect dbConnect = new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select*from twechatpayorder where trade_type='NATIVE' and isnull(trade_state,'')!='SUCCESS' and DATEADD(MINUTE,30,createdate)>GETDATE() and DATEADD(SECOND,30,createdate)<GETDATE()");
-        nativepay nativepay = new nativepay();
-        nativepay.setup();
-        for (Row row : rows) {
-            String out_trade_no=row.getString("out_trade_no");
-            nativepay.queryOrder(out_trade_no);
-        }
-        nativepay.after();
-    }
-}

+ 31 - 31
src/dsb/com/cnd3b/utility/aliyun/oss/AliyunOSSUtil.java

@@ -170,37 +170,37 @@ public class AliyunOSSUtil {
         return object.toJSONString();
     }
 
-    /**
-     * 获取所有文件夹
-     *
-     * @return
-     */
-    public static String getAllFolders() {
-        OSS ossClient = new OSSClientBuilder().build(END_POINT, AccessKey_ID, AccessKey_Secret);
-        // 构造ListObjectsRequest请求。
-        ListObjectsRequest listObjectsRequest = new ListObjectsRequest(BUCKE_NAME_1);
-        // 列举文件。
-        ObjectListing listing = ossClient.listObjects(listObjectsRequest);
-        //遍历所有文件。
-        ArrayList<String> commonPrefixList = new ArrayList<>();
-        for (OSSObjectSummary objectSummary : listing.getObjectSummaries()) {
-//            System.out.println(objectSummary.getKey());
-            if (objectSummary.getKey().endsWith("/")) {
-                String key = objectSummary.getKey();
-                commonPrefixList.add(key);
-
-
-            }
-
-        }
-        JSONObject object = new JSONObject();
-        object.put("folder", commonPrefixList);
-
-        // 关闭OSSClient。
-        ossClient.shutdown();
-
-        return object.toJSONString();
-    }
+//    /**
+//     * 获取所有文件夹
+//     *
+//     * @return
+//     */
+//    public static String getAllFolders() {
+//        OSS ossClient = new OSSClientBuilder().build(END_POINT, AccessKey_ID, AccessKey_Secret);
+//        // 构造ListObjectsRequest请求。
+//        ListObjectsRequest listObjectsRequest = new ListObjectsRequest(BUCKE_NAME_1);
+//        // 列举文件。
+//        ObjectListing listing = ossClient.listObjects(listObjectsRequest);
+//        //遍历所有文件。
+//        ArrayList<String> commonPrefixList = new ArrayList<>();
+//        for (OSSObjectSummary objectSummary : listing.getObjectSummaries()) {
+////            System.out.println(objectSummary.getKey());
+//            if (objectSummary.getKey().endsWith("/")) {
+//                String key = objectSummary.getKey();
+//                commonPrefixList.add(key);
+//
+//
+//            }
+//
+//        }
+//        JSONObject object = new JSONObject();
+//        object.put("folder", commonPrefixList);
+//
+//        // 关闭OSSClient。
+//        ossClient.shutdown();
+//
+//        return object.toJSONString();
+//    }
 
     /**
      * 获取指定目录下的文件和文件夹