From b057d96317bc504e4cdb2a09ef4363d05479204b Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 27 Dec 2023 14:50:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=9B=AD=E5=9C=B0=E3=80=81?= =?UTF-8?q?=E6=95=99=E8=82=B2=E5=9F=B9=E8=AE=AD=E5=8A=9F=E8=83=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/PersonObtainEvidenceController.java | 56 +++++++----- .../bus/StudySectionController.java | 52 +++++++---- .../bus/TrainingInfoController.java | 46 ++++++---- .../bus/TrainingPlanController.java | 51 +++++++---- .../controller/bus/VideoController.java | 44 ++++++---- .../MfolderStipulateController.java | 87 ++++++++++++------- 6 files changed, 217 insertions(+), 119 deletions(-) diff --git a/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java b/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java index 3bba07e3..dc7da92d 100644 --- a/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java +++ b/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,7 +36,7 @@ import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.PostService; import com.zcloud.service.system.UsersService; -/** +/** * 说明：人员取证情况 * 作者：luoxiaobao * 时间：2020-12-29 @@ -52,7 +54,7 @@ public class PersonObtainEvidenceController extends BaseController { private DepartmentService departmentService; @Autowired private PostService postService; - + /**新增 * @param * @throws Exception @@ -60,6 +62,7 @@ public class PersonObtainEvidenceController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("personobtainevidence:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -72,6 +75,7 @@ public class PersonObtainEvidenceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -84,12 +88,15 @@ public class PersonObtainEvidenceController extends BaseController { String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("IMGPATH", Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } personobtainevidenceService.save(pd); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -97,8 +104,9 @@ public class PersonObtainEvidenceController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("personobtainevidence:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -106,9 +114,10 @@ public class PersonObtainEvidenceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 personobtainevidenceService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", pd); return map; } - + /**修改 * @param * @throws Exception @@ -116,6 +125,7 @@ public class PersonObtainEvidenceController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("personobtainevidence:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -123,6 +133,7 @@ public class PersonObtainEvidenceController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -135,12 +146,15 @@ public class PersonObtainEvidenceController extends BaseController { String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("IMGPATH", Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } personobtainevidenceService.edit(pd); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -163,7 +177,7 @@ public class PersonObtainEvidenceController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -184,7 +198,7 @@ public class PersonObtainEvidenceController extends BaseController { // PageData dept = new PageData(); // dept.put("DEPARTMENT_ID",ZDEPARTMENT_ID); // dept=departmentService.findById(dept); - + //获取部门下拉树 List zdepartmentPdList = new ArrayList(); @@ -192,7 +206,7 @@ public class PersonObtainEvidenceController extends BaseController { dept.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); dept=this.departmentService.findByCorpId(dept); String ZDEPARTMENT_ID = dept.getString("DEPARTMENT_ID"); - + PageData node = new PageData(); node.put("id", dept.get("DEPARTMENT_ID")); node.put("parentId", dept.get("PARENT_ID")); @@ -211,13 +225,13 @@ public class PersonObtainEvidenceController extends BaseController { PageData post = new PageData(); post.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); post.put("STATUS", 0); - List postList = postService.listAll(post); + List postList = postService.listAll(post); map.put("postList", postList); map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**获取部门下拉树 * @param @@ -242,7 +256,7 @@ public class PersonObtainEvidenceController extends BaseController { // PageData dept = new PageData(); // dept.put("DEPARTMENT_ID",ZDEPARTMENT_ID); // dept=this.departmentService.findById(dept); - + PageData node = new PageData(); node.put("id", dept.get("DEPARTMENT_ID")); node.put("parentId", dept.get("PARENT_ID")); @@ -251,7 +265,7 @@ public class PersonObtainEvidenceController extends BaseController { zdepartmentPdList.add(node); JSONArray arr = JSONArray.fromObject(departmentService.listAllDepartmentToSelect(ZDEPARTMENT_ID,zdepartmentPdList)); map.put("zTreeNodes", (null == arr ?"":"{\"treeNodes\":" + arr.toString() + "}")); - + PageData loginDept = new PageData(); loginDept.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); loginDept = departmentService.findById(loginDept); @@ -259,7 +273,7 @@ public class PersonObtainEvidenceController extends BaseController { // PageData post = new PageData(); // post.put("DEPARTMENT_ID", ZDEPARTMENT_ID); // post.put("STATUS", 0); -// List postList = this.postService.listAll(post); +// List postList = this.postService.listAll(post); // map.put("postList", postList); map.put("result", errInfo); @@ -267,9 +281,9 @@ public class PersonObtainEvidenceController extends BaseController { map.put("USER_ID", Jurisdiction.getUSER_ID()); map.put("DEPT_NAME", loginDept.get("NAME")); return map; - } - - + } + + /**批量删除 * @param * @throws Exception @@ -280,7 +294,7 @@ public class PersonObtainEvidenceController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -293,7 +307,7 @@ public class PersonObtainEvidenceController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -352,5 +366,5 @@ public class PersonObtainEvidenceController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/StudySectionController.java b/src/main/java/com/zcloud/controller/bus/StudySectionController.java index 9511ad0c..020d57e1 100644 --- a/src/main/java/com/zcloud/controller/bus/StudySectionController.java +++ b/src/main/java/com/zcloud/controller/bus/StudySectionController.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +30,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.StudySectionService; -/** +/** * 说明：学习园地 * 作者：luoxiaobao * 时间：2021-01-07 @@ -37,10 +39,10 @@ import com.zcloud.service.bus.StudySectionService; @Controller @RequestMapping("/studysection") public class StudySectionController extends BaseController { - + @Autowired private StudySectionService studysectionService; - + /**新增 * @param * @throws Exception @@ -48,6 +50,7 @@ public class StudySectionController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("studysection:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -60,6 +63,7 @@ public class StudySectionController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -72,14 +76,19 @@ public class StudySectionController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } studysectionService.save(pd); + map.put("dockData", pd); + if (fileList.size() > 0) { + map.put("sendPicturesList", JSON.toJSONString(fileList)); + } map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -87,18 +96,20 @@ public class StudySectionController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("studysection:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 studysectionService.delete(pd); + map.put("dockData", pd); map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -106,6 +117,7 @@ public class StudySectionController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("studysection:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -114,6 +126,7 @@ public class StudySectionController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -124,15 +137,20 @@ public class StudySectionController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } studysectionService.edit(pd); + map.put("dockData", pd); + if (fileList.size() > 0) { + map.put("sendPicturesList", JSON.toJSONString(fileList)); + } map.put("result", errInfo); return map; } - - + + /**列表 * @param page * @throws Exception @@ -156,7 +174,7 @@ public class StudySectionController extends BaseController { String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); var.put("extension_name", suffix); } - + } } map.put("varList", varList); @@ -164,7 +182,7 @@ public class StudySectionController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -181,8 +199,8 @@ public class StudySectionController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -193,7 +211,7 @@ public class StudySectionController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -206,7 +224,7 @@ public class StudySectionController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -257,5 +275,5 @@ public class StudySectionController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java b/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java index 4580d7a2..88a1c57f 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +30,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.TrainingInfoService; -/** +/** * 说明：培训情况 * 作者：luoxiaobao * 时间：2020-12-29 @@ -37,10 +39,10 @@ import com.zcloud.service.bus.TrainingInfoService; @Controller @RequestMapping("/traininginfo") public class TrainingInfoController extends BaseController { - + @Autowired private TrainingInfoService traininginfoService; - + /**新增 * @param * @throws Exception @@ -48,6 +50,7 @@ public class TrainingInfoController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("traininginfo:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -60,6 +63,7 @@ public class TrainingInfoController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileLst = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -70,14 +74,17 @@ public class TrainingInfoController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileLst.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } traininginfoService.save(pd); map.put("result", errInfo); + map.put("dockData", pd); + map.put("sendPicturesList", fileLst); return map; } - + /**删除 * @param out * @throws Exception @@ -85,8 +92,9 @@ public class TrainingInfoController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("traininginfo:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -94,9 +102,10 @@ public class TrainingInfoController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 traininginfoService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", pd); return map; } - + /**修改 * @param * @throws Exception @@ -104,6 +113,7 @@ public class TrainingInfoController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("traininginfo:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -111,6 +121,7 @@ public class TrainingInfoController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileLst = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -121,14 +132,17 @@ public class TrainingInfoController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileLst.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } traininginfoService.edit(pd); map.put("result", errInfo); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileLst)); return map; } - + /**列表 * @param page * @throws Exception @@ -154,7 +168,7 @@ public class TrainingInfoController extends BaseController { String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); var.put("extension_name", suffix); } - + } } map.put("varList", varList); @@ -162,7 +176,7 @@ public class TrainingInfoController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -179,8 +193,8 @@ public class TrainingInfoController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -191,7 +205,7 @@ public class TrainingInfoController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -204,7 +218,7 @@ public class TrainingInfoController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -255,5 +269,5 @@ public class TrainingInfoController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java b/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java index f89dc158..d2557f4e 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java @@ -7,6 +7,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; +import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +33,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.TrainingPlanService; -/** +/** * 说明：培训计划 * 作者：luoxiaobao * 时间：2020-12-28 @@ -39,10 +42,10 @@ import com.zcloud.service.bus.TrainingPlanService; @Controller @RequestMapping("/trainingplan") public class TrainingPlanController extends BaseController { - + @Autowired private TrainingPlanService trainingplanService; - + /**新增 * @param * @throws Exception @@ -50,6 +53,7 @@ public class TrainingPlanController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("trainingplan:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -62,6 +66,7 @@ public class TrainingPlanController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -72,14 +77,17 @@ public class TrainingPlanController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } trainingplanService.save(pd); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -87,8 +95,9 @@ public class TrainingPlanController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("trainingplan:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -96,9 +105,10 @@ public class TrainingPlanController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 trainingplanService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockDate", pd); return map; } - + /**修改 * @param * @throws Exception @@ -106,6 +116,7 @@ public class TrainingPlanController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("trainingplan:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -114,6 +125,7 @@ public class TrainingPlanController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -126,14 +138,17 @@ public class TrainingPlanController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } trainingplanService.edit(pd); + map.put("dockData", pd); map.put("result", errInfo); + map.put("sendPicturesList", JSON.toJSONString(fileList)); return map; } - + /**列表 * @param page * @throws Exception @@ -157,7 +172,7 @@ public class TrainingPlanController extends BaseController { String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); var.put("extension_name", suffix); } - + } } map.put("varList", varList); @@ -165,7 +180,7 @@ public class TrainingPlanController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -182,8 +197,8 @@ public class TrainingPlanController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -194,7 +209,7 @@ public class TrainingPlanController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -207,7 +222,7 @@ public class TrainingPlanController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -258,9 +273,9 @@ public class TrainingPlanController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - - + + /**列表 * @param page * @throws Exception @@ -278,5 +293,5 @@ public class TrainingPlanController extends BaseController { map.put("result", errInfo); return map; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/VideoController.java b/src/main/java/com/zcloud/controller/bus/VideoController.java index e030c1e2..131a41ce 100644 --- a/src/main/java/com/zcloud/controller/bus/VideoController.java +++ b/src/main/java/com/zcloud/controller/bus/VideoController.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.zcloud.aspect.DockAnnotation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,7 +29,7 @@ import com.zcloud.util.PathUtil; import com.zcloud.util.Smb; import com.zcloud.util.Tools; -/** +/** * 说明：视频管理 * 作者：luoxiaobao * 时间：2021-01-15 @@ -37,10 +38,10 @@ import com.zcloud.util.Tools; @Controller @RequestMapping("/video") public class VideoController extends BaseController { - + @Autowired private VideoService videoService; - + /**新增 * @param * @throws Exception @@ -48,6 +49,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("video:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -60,6 +62,7 @@ public class VideoController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("TYPE", "0"); //是否置顶 0否 1是 // pd.put("CORPINFO_TYPE", "1"); //上传状态（管理员上传 0企业上传1） + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -76,13 +79,16 @@ public class VideoController extends BaseController { //pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); Smb.sshSftp(file, fileName,Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } - + videoService.save(pd); + map.put("dockData", pd); + map.put("sendPicturesList", fileList); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -90,16 +96,18 @@ public class VideoController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("video:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); videoService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", pd); return map; } - + /**修改 * @param * @throws Exception @@ -107,6 +115,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("video:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -114,9 +123,10 @@ public class VideoController extends BaseController { pd = this.getPageData(); videoService.edit(pd); map.put("result", errInfo); + map.put("dockData", pd); return map; } - + /**列表 * @param page * @throws Exception @@ -142,7 +152,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -150,6 +160,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/goEdit") @RequiresPermissions("video:edit") @ResponseBody + @DockAnnotation public Object goEdit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -157,10 +168,11 @@ public class VideoController extends BaseController { pd = this.getPageData(); pd = videoService.findById(pd); //根据ID读取 map.put("pd", pd); + map.put("dockData", pd); map.put("result", errInfo); return map; - } - + } + /**列表 数据置顶 * @param * @throws Exception @@ -168,6 +180,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/editZhiding") @RequiresPermissions("video:edit") @ResponseBody + @DockAnnotation public Object editZhiding() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -185,9 +198,10 @@ public class VideoController extends BaseController { pd.put("TYPE", "1"); videoService.editZhiding(pd);//置顶信息 map.put("pd", pd); + map.put("dockData", pd); map.put("result", errInfo); return map; - } + } /**批量删除 * @param * @throws Exception @@ -198,7 +212,7 @@ public class VideoController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -211,7 +225,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -275,7 +289,7 @@ public class VideoController extends BaseController { pd.put("CORPINFO_TYPE", "2"); pd.put("TYPE", "1"); List ptVarList = videoService.listAll(pd); //平台视频 - + map.put("ptVarList", ptVarList); map.put("cpvarList", cpvarList); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java index af2d0a63..f8f317e8 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java @@ -1,12 +1,11 @@ package com.zcloud.controller.filemanager; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,18 +30,18 @@ import com.zcloud.util.Tools; import net.sf.json.JSONArray; -/** +/** * 说明：文件管理 - * 作者：zCloud + * 作者：zCloud * 官网： */ @Controller @RequestMapping("/mfolderStipulate") public class MfolderStipulateController extends BaseController { - + @Autowired private MfolderStipulateService mfolderService; - + /**创建目录 * @param * @throws Exception @@ -50,6 +49,7 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("mfolderStipulate:add") @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -61,12 +61,13 @@ public class MfolderStipulateController extends BaseController { pd.put("UNAME", Jurisdiction.getName()); //上传者 pd.put("MASTER", Jurisdiction.getUsername()); //所属人 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 - pd.put("FILESIZE", ""); + pd.put("FILESIZE", ""); mfolderService.save(pd); + map.put("dockData", pd); map.put("result", errInfo); return map; } - + /**上传文件 * @param * @throws Exception @@ -74,6 +75,7 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/upload") @RequiresPermissions("mfolderStipulate:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add( @RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); @@ -93,7 +95,9 @@ public class MfolderStipulateController extends BaseController { // fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 + pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + List fileList = new ArrayList<>(); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); //pd.put("NAME", NAME); //文件名 //pd.put("PARENT_ID", PARENT_ID); //目录ID pd.put("CTIME", DateUtil.date2Str(new Date())); //创建时间 @@ -103,9 +107,11 @@ public class MfolderStipulateController extends BaseController { //pd.put("REMARKS", REMARKS); //备注 //pd.put("SHARE", SHARE); //是否共享 //pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件 - + pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); mfolderService.save(pd); //存入数据库表 }else{ errInfo = "fail"; @@ -113,7 +119,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**上传文件 * @param * @throws Exception @@ -121,6 +127,7 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/editUpload") @RequiresPermissions("mfolderStipulate:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object editUpload( @RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); @@ -128,6 +135,7 @@ public class MfolderStipulateController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); String ffile = DateUtil.getDays(), fileName = ""; + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -141,6 +149,8 @@ public class MfolderStipulateController extends BaseController { fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 + + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); //pd.put("NAME", NAME); //文件名 //pd.put("PARENT_ID", PARENT_ID); //目录ID pd.put("UNAME", Jurisdiction.getName()); //上传者,当前用户的姓名 @@ -149,15 +159,19 @@ public class MfolderStipulateController extends BaseController { //pd.put("REMARKS", REMARKS); //备注 //pd.put("SHARE", SHARE); //是否共享 //pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件 - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 } mfolderService.edit(pd); //存入数据库表 + map.put("dockData", pd); + if (fileList.size() > 0) { + map.put("sendPicturesList", JSON.toJSONString(fileList)); + } map.put("result", errInfo); //返回结果 return map; } - - + + /**去修改页面获取数据 * @param * @throws Exception @@ -174,14 +188,15 @@ public class MfolderStipulateController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**上传文件 * @param * @throws Exception */ @RequestMapping(value="/uploadAll") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object uploadAll( @RequestParam(value="file",required=false) MultipartFile file, @RequestParam(value="FH_ID",required=false) String MFOLDER_ID @@ -201,8 +216,10 @@ public class MfolderStipulateController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 + List fileList = new ArrayList<>(); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); String realName = file.getOriginalFilename(); String[] fileFullNames = realName.split("\\.");//上传文件全名 String extension =fileFullNames[fileFullNames.length-1];//上传文件文件后缀 @@ -218,6 +235,8 @@ public class MfolderStipulateController extends BaseController { pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 mfolderService.save(pd); //存入数据库表 + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); }else{ errInfo = "fail"; } @@ -231,8 +250,9 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("mfolderStipulate:del") @ResponseBody + @DockAnnotation public Object delete(@RequestParam String MFOLDER_ID,@RequestParam String FILEPATH) throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd.put("parentId", MFOLDER_ID); @@ -244,11 +264,12 @@ public class MfolderStipulateController extends BaseController { } pd.put("MFOLDER_ID", MFOLDER_ID); mfolderService.delete(pd); + map.put("dockData", pd); } map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -256,16 +277,18 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("mfolderStipulate:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); mfolderService.edit(pd); + map.put("dockData", pd); map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -285,7 +308,7 @@ public class MfolderStipulateController extends BaseController { MFOLDER_ID = null == pd.get("MFOLDER_ID")?"":pd.get("MFOLDER_ID").toString(); pd.put("MFOLDER_ID", MFOLDER_ID); //当作上级ID } - + // if(Tools.notEmpty(SHARE) && "yes".equals(SHARE)) { // pd.put("SHARE", "yes"); // }else { @@ -337,7 +360,7 @@ public class MfolderStipulateController extends BaseController { fileType = "video"; //视频文件类型 } varList.get(i).put("extension_name", extension_name); //文件拓展名 - varList.get(i).put("fileType", fileType); //用于文件图标 + varList.get(i).put("fileType", fileType); //用于文件图标 } map.put("varList", varList); map.put("page", page); @@ -370,9 +393,9 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**预览txt,java,php,等文本文件 - * @return + * @return */ @RequestMapping(value="/viewTxt") @ResponseBody @@ -388,7 +411,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**批量操作 * @param * @throws Exception @@ -399,7 +422,7 @@ public class MfolderStipulateController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -413,7 +436,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**下载 * @param response * @throws Exception @@ -431,7 +454,7 @@ public class MfolderStipulateController extends BaseController { throw new NofileStiException("=========要下载的文件已经没有了========="); } } - + } /* @@ -440,7 +463,7 @@ public class MfolderStipulateController extends BaseController { class NofileStiException extends Exception { private static final long serialVersionUID = 1L; - + public NofileStiException() { super(); } @@ -456,5 +479,5 @@ class NofileStiException extends Exception { public NofileStiException(Throwable cause) { super(cause); } - + }