From 6fd010bf00760a6a8c85306740ec5dfe73988040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 2 Jan 2024 11:45:13 +0800 Subject: [PATCH] 'commit' --- .../填报系统填报流程设计.eddx | Bin 0 -> 23582 bytes .../Collect/Controller/CollectController.java | 74 ++++++++++++++++-- .../QingLong/Collect/Model/CollectModel.java | 47 +++++++++++ src/main/resource/Sql/Collect.sql | 10 +++ 4 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 Doc/自定义上报的后续设计思路/填报系统填报流程设计.eddx diff --git a/Doc/自定义上报的后续设计思路/填报系统填报流程设计.eddx b/Doc/自定义上报的后续设计思路/填报系统填报流程设计.eddx new file mode 100644 index 0000000000000000000000000000000000000000..a74cd12015cf932f47930aa017a6a7d430793ae9 GIT binary patch literal 23582 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 literal 0 HcmV?d00001 diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index c693f133..76a88971 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -10,15 +10,13 @@ import com.dsideal.QingLong.Interceptor.IsLoginInterface; import com.dsideal.QingLong.Interceptor.IsNumericInterface; import com.dsideal.QingLong.Interceptor.LayUiPageInfoInterface; import com.dsideal.QingLong.LoginPerson.Model.LoginPersonModel; -import com.dsideal.QingLong.Util.AsposeUtil; -import com.dsideal.QingLong.Util.CommonUtil; -import com.dsideal.QingLong.Util.PoiUtil; -import com.dsideal.QingLong.Util.SessionKit; +import com.dsideal.QingLong.Util.*; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; +import com.jfinal.kit.PathKit; import com.jfinal.kit.PropKit; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; @@ -706,7 +704,7 @@ public class CollectController extends Controller { @EmptyInterface({"deadline_time"}) public void publishJob(int job_id, String deadline_time, int shiZhiSchool, int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, String groupIds) throws ParseException { - cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds,groupIds); + cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds, groupIds); Map map = new HashMap<>(); map.put("success", true); map.put("message", "保存成功!"); @@ -876,6 +874,70 @@ public class CollectController extends Controller { /***** 以下为Form表单式填报模块 *********************************/ + /** + * 功能:Form表单上传图片或其它附件 + */ + @Before({POST.class}) + public void uploadFile() { + UploadFile uf = getFile();//得到文件对象 + String fileName = uf.getFileName(); + String suffix = fileName.substring(fileName.lastIndexOf(".") + 1).trim(); + if (!suffix.equals("doc") && !suffix.equals("docx") + && !suffix.equals("xls") && !suffix.equals("xlsx") + && !suffix.equals("pdf") + && !suffix.equals("jpg") && !suffix.equals("jpeg") && !suffix.equals("png")) { + renderJson(CommonUtil.returnMessageJson(false, "上传文件类型错误!系统只允许上传文档和图片格式!")); + return; + } + //判断文件大小大于20mb则返回错误信息,并终止上传,删除上传文件 + long size = uf.getFile().length(); + if (size > 1024 * 1024 * 20) { + Kv kv = Kv.by("success", false).set("message", "文件大小大于20MB,请检查是否正确!!"); + renderJson(kv); + return; + } + if (!FileUtil.exist(basePath)) FileUtil.mkdir(basePath); + String file_id = UUID.randomUUID().toString().toUpperCase(); + String filePath = basePath + file_id + "." + suffix; + uf.getFile().renameTo(new File(filePath)); + //计算文件大小 + String file_size = FileSizeUtil.getAutoFileOrFilesSize(filePath); + + //操作人员 + String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); + //根据人员ID,获取人员所在的单位ID + LoginPersonModel personModel = new LoginPersonModel(); + Record rs = personModel.getLoginInfoByPersonId(person_id); + String bureau_id = rs.getStr("bureau_id"); + int job_id = getInt("job_id"); + String input_id = get("input_id"); + //记录到数据库 + cm.saveUploadFile(job_id, input_id, bureau_id, person_id, fileName, file_id, suffix, file_size); + //返回结果 + Kv kv = Kv.by("success", true); + kv.set("message", "上传成功!"); + kv.set("url", "/Excel/" + file_id + "." + suffix); + kv.set("file_id", file_id); + kv.set("file_size", file_size); + kv.set("fileName", fileName); + renderJson(kv); + } + + /** + * 功能:获取指定任务,指定单位(人员)上传的附件列表 + * + * @param job_id + * @param input_id + * @param bureau_id + * @param person_id + */ + @Before({GET.class}) + @IsLoginInterface({}) + public void getJobUploadList(String job_id, String input_id, String bureau_id, String person_id) { + List list = cm.getJobUploadList(job_id, input_id, bureau_id, person_id); + renderJson(CommonUtil.renderJsonForLayUI(list)); + } + /** * 功能:增加一个表单式的新任务 * @@ -904,7 +966,7 @@ public class CollectController extends Controller { return; } //检查字段名是否重复 - if (cm.checkColumnNameDuplicate(json)) { + if (!cm.checkColumnNameDuplicate(json)) { Map map = new HashMap<>(); map.put("success", false); map.put("message", "表名" + table_name + "中存在重复列名或与保留字冲突,不能创建,请检查!"); diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index ce6f3226..328353f4 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -7,9 +7,12 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.dsideal.QingLong.Collect.Const.DataTypeConst; import com.dsideal.QingLong.Global.Model.GlobalModel; +import com.dsideal.QingLong.Interceptor.IsLoginInterface; import com.dsideal.QingLong.Util.ChineseCharacterUtil; import com.dsideal.QingLong.Util.CommonUtil; import com.dsideal.QingLong.Util.PoiUtil; +import com.jfinal.aop.Before; +import com.jfinal.ext.interceptor.GET; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; @@ -1179,4 +1182,48 @@ public class CollectModel { List list = Db.find(sqlPara); return list; } + + /** + * 功能:用户填写form表单时,记录他上传的文件信息 + * + * @param job_id + * @param input_id + * @param bureau_id + * @param person_id + * @param fileName + * @param file_id + * @param suffix + * @param file_size + */ + public int saveUploadFile(int job_id, String input_id, String bureau_id, String person_id, String fileName, String file_id, String suffix, String file_size) { + Record record = new Record(); + record.set("job_id", job_id); + record.set("bureau_id", bureau_id); + record.set("person_id", person_id); + record.set("fileName", fileName); + record.set("file_id", file_id); + record.set("suffix", suffix); + record.set("file_size", file_size); + record.set("input_id", input_id); + Db.save("t_collect_uploadfile", "id", record); + return record.getInt("id"); + } + + /** + * 功能:获取指定任务,指定单位(人员)上传的附件列表 + * + * @param job_id + * @param input_id + * @param bureau_id + * @param person_id + */ + public List getJobUploadList(String job_id, String input_id, String bureau_id, String person_id) { + Kv kv = Kv.create(); + kv.set("job_id", job_id); + kv.set("input_id", input_id); + if (!StrKit.isBlank(bureau_id)) kv.set("bureau_id", bureau_id); + if (!StrKit.isBlank(person_id)) kv.set("person_id", person_id); + SqlPara sqlPara = Db.getSqlPara("Collect.getJobUploadList", kv); + return Db.find(sqlPara); + } } \ No newline at end of file diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql index ba914b8f..2680a1ee 100644 --- a/src/main/resource/Sql/Collect.sql +++ b/src/main/resource/Sql/Collect.sql @@ -68,4 +68,14 @@ #sql("getGroup") select org_id as bureau_id,org_name as bureau_name from t_base_organization where org_id in #para(idList, "in") #end + -- 功能:获取指定任务,指定单位(人员)上传的附件列表 + #sql("getJobUploadList") + select * from t_collect_uploadfile where job_id=#para(job_id) and input_id=#para(input_id) + #if(bureau_id) + and bureau_id=#para(bureau_id) + #end + #if(person_id) + and person_id=#para(person_id) + #end + #end #end