From b05a5219977388cc84124f593503cd3eaf083730 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 19 Dec 2023 11:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filemanager/MfolderController.java | 5 +- .../onlinexxks/VideoCoursewareController.java | 660 +++++++++--------- .../system/DictionariesController.java | 48 ++ .../zcloud/entity/system/DepartmentMenu.java | 77 ++ .../datasource/system/DictionariesMapper.java | 3 + .../impl/FireQualifiedPhotosServiceImpl.java | 10 +- .../mq/impl/SendMessageServiceImpl.java | 2 +- .../service/system/DictionariesService.java | 3 + .../system/impl/DictionariesServiceImpl.java | 6 + src/main/resources/application-dev.properties | 4 +- .../datasource/system/DictionariesMapper.xml | 14 + 11 files changed, 506 insertions(+), 326 deletions(-) create mode 100644 src/main/java/com/zcloud/entity/system/DepartmentMenu.java diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index d5c8a4b4..b0a088ac 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.filemanager; +import com.alibaba.fastjson.JSON; import com.zcloud.aspect.DockAnnotation; import net.sf.json.JSONArray; @@ -70,7 +71,7 @@ public class MfolderController extends BaseController { pd.put("SHARE", "no"); mfolderService.save(pd); map.put("result", errInfo); - map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -240,12 +241,12 @@ public class MfolderController extends BaseController { } /**删除 - * @param out * @throws Exception */ @RequestMapping(value="/delete") @RequiresPermissions("mfolder:del") @ResponseBody + @DockAnnotation public Object delete(@RequestParam String MFOLDER_ID,@RequestParam String FILEPATH) throws Exception{ Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java b/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java index 85d56896..66af9a8b 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.onlinexxks; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -32,338 +34,360 @@ import java.util.*; @RequestMapping("/videocourseware") public class VideoCoursewareController extends BaseController { - @Autowired - private VideoCoursewareService videocoursewareService; - @Autowired - private QuestionService questionService; - @Autowired - private KcmiddlekjService kcmiddlekjService; - /**新增 - * @param - * @throws Exception - */ - @RequestMapping(value="/add") - @RequiresPermissions("courseware:add") - @ResponseBody - public Object add(@RequestParam(value="vfile",required=false) MultipartFile vfile, - @RequestParam(value="vcfile",required=false) MultipartFile vcfile) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("VIDEOCOURSEWARE_ID", this.get32UUID()); //主键 - pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - pd.put("STATE", "0"); //课件状态 0启用、1禁用 - if (null != vfile && !vfile.isEmpty()) { - String suffixName = vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); - //本地 + @Autowired + private VideoCoursewareService videocoursewareService; + @Autowired + private QuestionService questionService; + @Autowired + private KcmiddlekjService kcmiddlekjService; + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @RequiresPermissions("courseware:add") + @ResponseBody + @DockAnnotation(isAdd = true, hasAnnex = true) + public Object add(@RequestParam(value = "vfile", required = false) MultipartFile vfile, + @RequestParam(value = "vcfile", required = false) MultipartFile vcfile) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("VIDEOCOURSEWARE_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + pd.put("STATE", "0"); //课件状态 0启用、1禁用 + if (null != vfile && !vfile.isEmpty()) { + String suffixName = vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); + //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 - //服务器 - String fileName = this.get32UUID()+vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - // 将MultipartFile file转换成为File - File f_file = FileUtil.MultipartFileToFile(vfile); - MultimediaObject instance = new MultimediaObject(f_file); - MultimediaInfo result = instance.getInfo(); - System.out.println("视频时长："+result.getDuration()); - double videoTime = (double)result.getDuration() / 1000.0; - pd.put("VIDEOTIME", videoTime+""); - pd.put("CLASSHOUR", Math.floor(videoTime / 60)); - f_file.delete(); - } - if (null != vcfile && !vcfile.isEmpty()) { - String suffixName = vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); - //本地 + //服务器 + String fileName = this.get32UUID() + vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + // 将MultipartFile file转换成为File + File f_file = FileUtil.MultipartFileToFile(vfile); + MultimediaObject instance = new MultimediaObject(f_file); + MultimediaInfo result = instance.getInfo(); + System.out.println("视频时长：" + result.getDuration()); + double videoTime = (double) result.getDuration() / 1000.0; + pd.put("VIDEOTIME", videoTime + ""); + pd.put("CLASSHOUR", Math.floor(videoTime / 60)); + f_file.delete(); + } + if (null != vcfile && !vcfile.isEmpty()) { + String suffixName = vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); + //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 - //服务器 - String fileName = this.get32UUID()+vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - } - videocoursewareService.save(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + //服务器 + String fileName = this.get32UUID() + vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + } + videocoursewareService.save(pd); + map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); + map.put("result", errInfo); + return map; + } - /**删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/delete") - @RequiresPermissions("courseware:del") - @ResponseBody - public Object delete() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData d = videocoursewareService.findById(pd); - Smb.deleteFile(d.getString("VIDEOFILES")); - Smb.deleteFile(d.getString("VIDEOCAPTURE")); - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - String ArrayDATA_IDS[] = { pd.getString("VIDEOCOURSEWARE_ID") }; - pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids - pd.put("COURSEWARETYPE", "1"); //课件类型 + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @RequiresPermissions("courseware:del") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData d = videocoursewareService.findById(pd); + Smb.deleteFile(d.getString("VIDEOFILES")); + Smb.deleteFile(d.getString("VIDEOCAPTURE")); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + String ArrayDATA_IDS[] = {pd.getString("VIDEOCOURSEWARE_ID")}; + pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids + pd.put("COURSEWARETYPE", "1"); //课件类型 - pd.put("CURRICULUM_ID", pd.getString("VIDEOCOURSEWARE_ID")); //课件类型 - String count = kcmiddlekjService.countByCourseWareId(pd); - if(!"0".equals(count)){ - map.put("result", "erroe"); //返回结果 - map.put("msg", "该课件已经在课程中发布！"); - return map; - } - questionService.deleteByCoursewareIds(pd); - videocoursewareService.delete(pd); - map.put("result", errInfo); //返回结果 - return map; - } + pd.put("CURRICULUM_ID", pd.getString("VIDEOCOURSEWARE_ID")); //课件类型 + String count = kcmiddlekjService.countByCourseWareId(pd); + if (!"0".equals(count)) { + map.put("result", "erroe"); //返回结果 + map.put("msg", "该课件已经在课程中发布！"); + return map; + } + questionService.deleteByCoursewareIds(pd); + videocoursewareService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/edit") - @RequiresPermissions("courseware:edit") - @ResponseBody - public Object edit(@RequestParam(value="vfile",required=false) MultipartFile vfile, - @RequestParam(value="vcfile",required=false) MultipartFile vcfile) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData d = videocoursewareService.findById(pd); - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if (null != vfile ) { - String suffixName = vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); - //本地 + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @RequiresPermissions("courseware:edit") + @ResponseBody + public Object edit(@RequestParam(value = "vfile", required = false) MultipartFile vfile, + @RequestParam(value = "vcfile", required = false) MultipartFile vcfile) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData d = videocoursewareService.findById(pd); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if (null != vfile) { + String suffixName = vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); + //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 - //服务器 - String fileName = this.get32UUID()+vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - // 将MultipartFile file转换成为File - File f_file = FileUtil.MultipartFileToFile(vfile); - MultimediaObject instance = new MultimediaObject(f_file); - MultimediaInfo result = instance.getInfo(); - System.out.println("视频时长："+result.getDuration()); - double videoTime = (double)result.getDuration() / 1000.0; - pd.put("VIDEOTIME", videoTime+""); - pd.put("CLASSHOUR", Math.floor(videoTime / 60)); - f_file.delete(); - } - if (null != vcfile) { - String suffixName = vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); - //本地 + //服务器 + String fileName = this.get32UUID() + vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + // 将MultipartFile file转换成为File + File f_file = FileUtil.MultipartFileToFile(vfile); + MultimediaObject instance = new MultimediaObject(f_file); + MultimediaInfo result = instance.getInfo(); + System.out.println("视频时长：" + result.getDuration()); + double videoTime = (double) result.getDuration() / 1000.0; + pd.put("VIDEOTIME", videoTime + ""); + pd.put("CLASSHOUR", Math.floor(videoTime / 60)); + f_file.delete(); + } + if (null != vcfile) { + String suffixName = vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); + //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 - //服务器 - String fileName = this.get32UUID()+vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - } - videocoursewareService.edit(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + //服务器 + String fileName = this.get32UUID() + vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + } + videocoursewareService.edit(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/list") - @RequiresPermissions("courseware:list") - @ResponseBody - public Object list(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - page.setPd(pd); - List varList = videocoursewareService.list(page); //列出VideoCourseware列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @RequiresPermissions("courseware:list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = videocoursewareService.list(page); //列出VideoCourseware列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @ResponseBody - public Object goEdit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = videocoursewareService.findById(pd); //根据ID读取 - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = videocoursewareService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**批量删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteAll") - @RequiresPermissions("courseware:del") - @ResponseBody - public Object deleteAll() throws Exception{ - 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())); //修改时间 - String DATA_IDS = pd.getString("DATA_IDS"); - if(Tools.notEmpty(DATA_IDS)){ - String ArrayDATA_IDS[] = DATA_IDS.split(","); - pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids - List pdList = videocoursewareService.findByIds(pd); - for (PageData d : pdList) { - Smb.deleteFile(d.getString("VIDEOFILES")); - Smb.deleteFile(d.getString("VIDEOCAPTURE")); - } - pd.put("COURSEWARETYPE", "1"); //课件类型 - questionService.deleteByCoursewareIds(pd); - videocoursewareService.deleteAll(pd); - errInfo = "success"; - }else{ - errInfo = "fail"; - } - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @RequiresPermissions("courseware:del") + @ResponseBody + public Object deleteAll() throws Exception { + 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())); //修改时间 + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids + List pdList = videocoursewareService.findByIds(pd); + for (PageData d : pdList) { + Smb.deleteFile(d.getString("VIDEOFILES")); + Smb.deleteFile(d.getString("VIDEOCAPTURE")); + } + pd.put("COURSEWARETYPE", "1"); //课件类型 + questionService.deleteByCoursewareIds(pd); + videocoursewareService.deleteAll(pd); + errInfo = "success"; + } else { + errInfo = "fail"; + } + map.put("result", errInfo); //返回结果 + return map; + } - /**导出到excel - * @param - * @throws Exception - */ - @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") - public ModelAndView exportExcel() throws Exception{ - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); - Map dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("课件名称"); //1 - titles.add("主讲人"); //2 - titles.add("课件介绍"); //3 - titles.add("课件文件路径"); //4 - titles.add("课件截图"); //5 - titles.add("使用人员"); //6 - titles.add("添加人"); //7 - titles.add("添加时间"); //8 - titles.add("修改人"); //9 - titles.add("修改时间"); //10 - titles.add("是否删除(0:有效 1：删除)"); //11 - titles.add("企业ID"); //12 - dataMap.put("titles", titles); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - List varOList = videocoursewareService.listAll(pd); - List varList = new ArrayList(); - for(int i=0;i dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("课件名称"); //1 + titles.add("主讲人"); //2 + titles.add("课件介绍"); //3 + titles.add("课件文件路径"); //4 + titles.add("课件截图"); //5 + titles.add("使用人员"); //6 + titles.add("添加人"); //7 + titles.add("添加时间"); //8 + titles.add("修改人"); //9 + titles.add("修改时间"); //10 + titles.add("是否删除(0:有效 1：删除)"); //11 + titles.add("企业ID"); //12 + dataMap.put("titles", titles); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varOList = videocoursewareService.listAll(pd); + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varOList.get(i).getString("COURSEWARENAME")); //1 + vpd.put("var2", varOList.get(i).getString("SPEAKER")); //2 + vpd.put("var3", varOList.get(i).getString("COURSEWAREINTRODUCE")); //3 + vpd.put("var4", varOList.get(i).getString("VIDEOFILES")); //4 + vpd.put("var5", varOList.get(i).getString("VIDEOCAPTURE")); //5 + vpd.put("var6", varOList.get(i).getString("VIDEOUSERS")); //6 + vpd.put("var7", varOList.get(i).getString("CREATOR")); //7 + vpd.put("var8", varOList.get(i).getString("CREATTIME")); //8 + vpd.put("var9", varOList.get(i).getString("OPERATOR")); //9 + vpd.put("var10", varOList.get(i).getString("OPERATTIME")); //10 + vpd.put("var11", varOList.get(i).get("ISDELETE").toString()); //11 + vpd.put("var12", varOList.get(i).getString("CORPINFO_ID")); //12 + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/getSelect") - @ResponseBody - public Object getSelect(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - List varList = videocoursewareService.getSelect(pd); //列出VideoCourseware列表 - map.put("list", varList); - map.put("result", errInfo); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editState") - @RequiresPermissions("courseware:edit") - @ResponseBody - public Object editState() throws Exception{ - 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())); //修改时间 - videocoursewareService.editByState(pd); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getSelect") + @ResponseBody + public Object getSelect(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varList = videocoursewareService.getSelect(pd); //列出VideoCourseware列表 + map.put("list", varList); + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editState") + @RequiresPermissions("courseware:edit") + @ResponseBody + public Object editState() throws Exception { + 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())); //修改时间 + videocoursewareService.editByState(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/system/DictionariesController.java b/src/main/java/com/zcloud/controller/system/DictionariesController.java index 4454d61a..84d6bb45 100644 --- a/src/main/java/com/zcloud/controller/system/DictionariesController.java +++ b/src/main/java/com/zcloud/controller/system/DictionariesController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.zcloud.entity.system.DepartmentMenu; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +35,53 @@ public class DictionariesController extends BaseController { @Autowired private DictionariesService dictionariesService; + + @RequestMapping(value = "/listAllDictMent") + @RequiresPermissions("dictionaries:list") + @ResponseBody + public Object listAllDictMent() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + List menusBase = dictionariesService.listMentDictionByPId("0"); + List menuLNotBase = dictionariesService.listMentDictionByPId(""); + for (DepartmentMenu menu : menusBase) { + menu.setLabel(menu.getName()); + List menus = iterateMenus(menuLNotBase, menu.getId()); + menu.setMenuChildren(menus); + menu.setChildren(menus); + } + + JSONArray arr = JSONArray.fromObject(menusBase); + String json = arr.toString(); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + } + public List iterateMenus(List menuVoList, String pid) { + List result = new ArrayList(); + for (DepartmentMenu menu : menuVoList) { + if("0".equals(menu.getpId())) { + continue; + } + menu.setLabel(menu.getName()); + // 获取菜单的id + String menuid = menu.getId(); + // 获取菜单的父id + String parentid = menu.getpId(); + if(Tools.isEmpty(pid)) { + continue; + } + if (parentid.equals(pid)) { + // 递归查询当前子菜单的子菜单 + List iterateMenu = iterateMenus(menuVoList,menuid); + menu.setMenuChildren(iterateMenu); + menu.setChildren(iterateMenu); + result.add(menu); + } + } + return result; + } + /** * 显示列表ztree * @return diff --git a/src/main/java/com/zcloud/entity/system/DepartmentMenu.java b/src/main/java/com/zcloud/entity/system/DepartmentMenu.java new file mode 100644 index 00000000..e5ad736b --- /dev/null +++ b/src/main/java/com/zcloud/entity/system/DepartmentMenu.java @@ -0,0 +1,77 @@ +package com.zcloud.entity.system; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public class DepartmentMenu { + + private String id; + private String name; + private String pId; + private List menuChildren; + + + private String label; + private List children; + private String value; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + public List getMenuChildren() { + return menuChildren; + } + + public void setMenuChildren(List menuChildren) { + this.menuChildren = menuChildren; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getValue() { + return id; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java index b7c8ad88..631a71c6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.entity.system.DepartmentMenu; import com.zcloud.entity.system.Dictionaries; /** @@ -106,4 +107,6 @@ public interface DictionariesMapper { */ List getIdsByRecuByParentId(String parentId); List getIdsByParentIds(List parentIds); + + List listMentDictionByPId(String s); } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireQualifiedPhotosServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireQualifiedPhotosServiceImpl.java index 9f52ec41..9273d635 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireQualifiedPhotosServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireQualifiedPhotosServiceImpl.java @@ -70,9 +70,13 @@ public class FireQualifiedPhotosServiceImpl implements FireQualifiedPhotosServic MultipartFile file = files[i]; String ffile = DateUtil.getDays(); String fileName = UuidUtil.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - imgPd.put("IMGFILES_ID",UuidUtil.get32UUID()); - imgPd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + String IMGFILES_ID = UuidUtil.get32UUID(); + String FILEPATH = Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName; + // 当使用了bus_imgfiles mq的方式存图片 + // 不使用 bus_imgfiles的话存pd里边用接口消费 + Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,QUALIFIED_PHOTOS_ID,"115"); + imgPd.put("IMGFILES_ID",IMGFILES_ID); + imgPd.put("FILEPATH", FILEPATH); imgFilesService.save(imgPd); } fireQualifiedPhotosMapper.save(pd); diff --git a/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java index 37d9ea32..c850bf44 100644 --- a/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java @@ -22,7 +22,7 @@ import javax.annotation.Resource; @Service public class SendMessageServiceImpl implements SendMessageService { - @Value("${mq.topic.info}") + @Value("${mq.topic.docking}") private String info; @Resource diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index 09efd842..c4c3805c 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -5,6 +5,7 @@ import java.util.Map; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.entity.system.DepartmentMenu; import com.zcloud.entity.system.Dictionaries; /** @@ -150,4 +151,6 @@ public interface DictionariesService { * @throws Exception */ public List getIdsByParentIds(List parentIds) throws Exception; + + List listMentDictionByPId(String s); } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index 367da87b..a9b84bc8 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.zcloud.entity.system.DepartmentMenu; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -256,4 +257,9 @@ public class DictionariesServiceImpl implements DictionariesService { return dictionariesMapper.getIdsByParentIds(parentIds); } + @Override + public List listMentDictionByPId(String s) { + return dictionariesMapper.listMentDictionByPId(s); + } + } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 3c34c68b..88f83259 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,11 +1,11 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.17:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://192.168.0.247:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root datasource.no1.password=root datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.17:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://192.168.0.247:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root datasource.no2.password=root diff --git a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml index 9f5c464d..d3ac3ee3 100644 --- a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml @@ -266,4 +266,18 @@ #{PARENT_ID} +