eganwu %!s(int64=3) %!d(string=hai) anos
pai
achega
ba058a869f

+ 2 - 1
src/dsb/com/cnd3b/common/data/SQL/附件查询_类型.sql

@@ -31,8 +31,9 @@ select t1.siteid
      , t1.createdate
      , t1.contentlength
      , t1.ftitle
+     , isnull(t1.sort, 0) sort
 from tattachment t1
 where t1.ownertable = $ownertable$
   and t1.ownerid in  $ownerid$
   and t1.ftype = $ftype$
-order by t1.tattachmentid
+order by t1.sort asc

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

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

+ 1 - 1
src/dsb/com/cnd3b/restcontroller/customer/wechatapplet/SQL/查询文件名称.sql

@@ -1,4 +1,4 @@
-SELECT tfolderid, fpath as folderpath, tfilename
+SELECT tfolderid, fpath as folderpath, tfilename, isdownload
 FROM tfolder
 where fpath in $fpath$
 ORDER BY tfolderid

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

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

+ 1 - 1
src/dsb/com/cnd3b/restcontroller/enterprise/datacenter/SQL/查询根目录.sql

@@ -1,4 +1,4 @@
-SELECT tfolderid, fpath, tfilename
+SELECT tfolderid, fpath, tfilename, isdownload
 FROM tfolder
 where fpath in $fpath$
 ORDER BY tfolderid

+ 30 - 0
src/dsb/com/cnd3b/restcontroller/enterprise/datacenter/datacenter.java

@@ -10,6 +10,7 @@ import com.cnd3b.common.data.Rows;
 import com.cnd3b.common.data.SQLFactory;
 import com.cnd3b.utility.aliyun.oss.AliyunOSSConfigConstant;
 import com.cnd3b.utility.aliyun.oss.AliyunOSSUtil;
+import org.bytedeco.javacpp.presets.opencv_core;
 import p2.common.parse.A;
 import p2.common.parse.S;
 import p2.pao.PaoRemote;
@@ -334,6 +335,35 @@ public class datacenter extends Controller {
 
     }
 
+    //批量设置是否可下载,包含下级文件夹
+    public String isDownload() {
+        JSONArray tfolderids = content.getJSONArray("tfolderids");
+        Boolean isdownload = content.getBooleanValue("isdownload");
+        String sql = "";
+        ArrayList<String> sqlList = new ArrayList<>();
+        for (Object obj : tfolderids) {
+            Long tfolderid = Long.valueOf(obj.toString());
+            String fpath = "";
+            Rows rows = dbConnect.runSqlQuery("SELECT fpath from tfolder WHERE tfolderid=" + tfolderid);
+            if (!rows.isEmpty()) {
+                fpath = rows.get(0).getString("fpath");
+
+                if (isdownload) {
+                    sql = "update  tfolder  set  isdownload=" + 1 + " WHERE fpath like '" + fpath + "%'";
+                } else {
+                    sql = "update  tfolder  set  isdownload=" + 0 + " WHERE fpath like '" + fpath + "%'";
+                }
+                sqlList.add(sql);
+            }
+        }
+
+
+        String res = dbConnect.runSqlUpdate(sqlList);
+
+        return getSucReturnObject().setData(res).toString();
+
+    }
+
     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 + "')";

+ 21 - 0
src/dsb/com/cnd3b/restcontroller/system/system/OSSManage.java

@@ -1,5 +1,6 @@
 package com.cnd3b.restcontroller.system.system;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
@@ -7,6 +8,7 @@ import com.aliyun.oss.model.*;
 import com.cnd3b.common.Controller;
 import com.cnd3b.utility.FileTypeHelper;
 import com.cnd3b.utility.aliyun.oss.AliyunOSSConfigConstant;
+import org.bytedeco.javacpp.presets.opencv_core;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSetRemote;
 import p2.util.P2Exception;
@@ -256,11 +258,13 @@ public class OSSManage extends Controller {
         //附件id
         String tattachmentid = content.getString("tattachmentid");
         String name = content.getString("filename");
+//        int sort = content.getIntValue("sort");
         //更新附件信息到附件表
         PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tattachment", "tattachmentid = '" + tattachmentid + "'");
         if (!paoSetRemote.isEmpty()) {
             PaoRemote paoRemote = paoSetRemote.getPao(0);
             paoRemote.setValue("ftitle", name, 11L);
+//            paoRemote.setValue("sort", sort, 11L);
             paoSetRemote.save();
         } else {
             return getErrReturnObject().setErrMsg("附件不存在").toString();
@@ -269,6 +273,23 @@ public class OSSManage extends Controller {
         return getSucReturnObject().toString();
     }
 
+    //批量更新序号
+    public String updateSort() throws P2Exception {
+        //附件id
+        JSONArray tattachmentids = content.getJSONArray("tattachmentids");
+
+        ArrayList<String> sqlList = new ArrayList<>();
+        int sort = 1;
+        for (Object obj : tattachmentids) {
+            sqlList.add(" UPDATE tattachment SET sort = " + sort + " WHERE tattachmentid=" + obj);
+            sort++;
+        }
+
+        dbConnect.runSqlUpdate(sqlList);
+
+        return getSucReturnObject().toString();
+    }
+
     /**
      * 获取现在时间
      *