diff --git a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java index 5b994163..11ea96fa 100644 --- a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java +++ b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java @@ -25,13 +25,13 @@ public class ResourceController extends Controller { /** * 获取知识库分页数据 * - * @param type_id 文档类型,1:文档 (word,ppt,pdf等),2:数据库(excel) + * @param type_id 文档类型,1:文档 (word,ppt,pdf等),2:数据库(excel) * @param keyword 搜索关键词 - * @param page 第几页 - * @param limit 每页几条 + * @param page 第几页 + * @param limit 每页几条 */ @Before(GET.class) - public void getZskPage(int type_id,String keyword, int page, int limit) { + public void getZskPage(int type_id, String keyword, int page, int limit) { //根据上传人员ID获取他所隶属的行政区划ID String person_id = getCookie("person_id"); //身份ID @@ -39,7 +39,7 @@ public class ResourceController extends Controller { //行政区划码 String area_code = rm.getAreaCode(identity_id, person_id); - Page list = rm.getZskPage(person_id,type_id,keyword,area_code, page, limit); + Page list = rm.getZskPage(person_id, type_id, keyword, area_code, page, limit); renderJson(CommonUtil.renderJsonForLayUI(list)); } @@ -74,7 +74,7 @@ public class ResourceController extends Controller { uploadFile.getFile().renameTo(targetFile); //保存到数据库记录 - rm.uploadZskDocument(fileName, key, type_id, identity_id, area_code,person_id); + rm.uploadZskDocument(fileName, key, type_id, identity_id, area_code, person_id); //返回 Kv kv = Kv.create(); @@ -98,4 +98,21 @@ public class ResourceController extends Controller { kv.set("message", "保存成功"); renderJson(kv); } + + /** + * 下载知识库文档 + * + * @param id 知识库文档ID + */ + @Before(GET.class) + @IsNumericInterface({"id"}) + @IsLoginInterface({}) + public void download(int id) { + Record record = rm.getZskDocument(id); + String name = record.getStr("name"); + String file_name = record.getStr("file_name"); + String f = BaseApplication.PropKit.get("upload.path")+"/" + file_name; + //提供下载 + renderFile(new File(f), name); + } } diff --git a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java index c94837ea..ca506c5c 100644 --- a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java +++ b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java @@ -121,4 +121,14 @@ public class ResourceModel { record.set("person_id", person_id); Db.save("t_zsk_files", "id", record); } + + /** + * 功能:获取知识库文档 + * @param id + * @return + */ + public Record getZskDocument(int id){ + String sql = "select * from t_zsk_files where id=?"; + return Db.findFirst(sql, id); + } }