档案，学习，特种设备

src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java

@@ -1,5 +1,7 @@
 package com.zcloud.controller.bus;
 
+import com.alibaba.fastjson.JSON;
+import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.bus.ArchivesFilesService;
@@ -38,6 +40,7 @@ public class ArchivesFilesController extends BaseController {
 	 */
 	@RequestMapping(value="/add")
 	@ResponseBody
+	@DockAnnotation(hasAnnex = true)
 	public Object add(
 			@RequestParam(value="FFILE",required=false) MultipartFile[] files,
 			@RequestParam(value="TYPE",required=false) String TYPE,
@@ -52,7 +55,7 @@ public class ArchivesFilesController extends BaseController {
 		pd.put("TYPE", TYPE);
 		pd.put("YEAR", YEAR);
 		pd.put("STUDYTASK_ID", STUDYTASK_ID);
-
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		if (files != null && files.length > 0) {
 			for (int i = 0; i < files.length; i++) {
 				String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@@ -72,11 +75,14 @@ public class ArchivesFilesController extends BaseController {
 				Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
 
 				pd.put("FILE_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
+				sendPicturesList.add(pd.getString("FILE_PATH")+"@@"+fileName);
 			}
 		}
 
 		archivesfilesService.save(pd);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
 		return map;
 	}
 	/**删除
@@ -85,6 +91,7 @@ public class ArchivesFilesController extends BaseController {
 	 */
 	@RequestMapping(value="/delete")
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -93,6 +100,7 @@ public class ArchivesFilesController extends BaseController {
 		Smb.deleteFile(pd.getString("FILE_PATH"));
 		archivesfilesService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 

src/main/java/com/zcloud/controller/bus/StudySectionController.java

@@ -43,19 +43,22 @@ public class StudySectionController extends BaseController {
     @Autowired
     private StudySectionService studysectionService;
 
-	/**新增
+    /**
+     * 新增
+     *
      * @param
      * @throws Exception
      */
-	@RequestMapping(value="/add")
+    @RequestMapping(value = "/add")
     @RequiresPermissions("studysection:add")
     @ResponseBody
     @DockAnnotation(hasAnnex = true)
-	public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
+    public Object add(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-		Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        ArrayList<String> sendPicturesList = new ArrayList<>();
         pd.put("STUDYSECTION_ID", this.get32UUID());    //主键
         pd.put("CREATOR", Jurisdiction.getUsername());    //添加人
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
@@ -63,9 +66,8 @@ 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<String> fileList = new ArrayList<>();
         if (null != file && !file.isEmpty()) {
-			String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
+            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)) {
                 errInfo = "fail";
                 map.put("result", errInfo);
@@ -75,60 +77,58 @@ public class StudySectionController extends BaseController {
             String ffile = DateUtil.getDays();
 //			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("."));
+            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);
+            sendPicturesList.add(pd.getString("FILEPATH") + "@@" + fileName);
         }
         studysectionService.save(pd);
-		map.put("dockData", pd);
-		if (fileList.size() > 0) {
-			map.put("sendPicturesList", JSON.toJSONString(fileList));
-		}
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
+        map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
         return map;
     }
 
-	/**删除
+    /**
+     * 删除
+     *
      * @param out
      * @throws Exception
      */
-	@RequestMapping(value="/delete")
+    @RequestMapping(value = "/delete")
     @RequiresPermissions("studysection:del")
     @ResponseBody
-	@DockAnnotation
+    public Object delete() throws Exception {
-	public Object delete() throws Exception{
+        Map<String, String> map = new HashMap<String, String>();
-		Map<String,Object> map = new HashMap<String,Object>();
         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
      */
-	@RequestMapping(value="/edit")
+    @RequestMapping(value = "/edit")
     @RequiresPermissions("studysection:edit")
     @ResponseBody
-	@DockAnnotation(hasAnnex = true)
+    public Object edit(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
-	public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
+        Map<String, Object> map = new HashMap<String, Object>();
-		Map<String,Object> map = new HashMap<String,Object>();
         String errInfo = "success";
         PageData pd = new PageData();
 
         pd = this.getPageData();
         pd.put("OPERATOR", Jurisdiction.getUsername());    //修改人
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
-		List<String> fileList = new ArrayList<>();
         if (null != file && !file.isEmpty()) {
-			String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
+            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)) {
                 errInfo = "fail";
                 map.put("result", errInfo);
@@ -136,41 +136,38 @@ public class StudySectionController extends BaseController {
                 return map;
             }
             String ffile = DateUtil.getDays();
-    		String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            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
      */
-	@RequestMapping(value="/list")
+    @RequestMapping(value = "/list")
     @RequiresPermissions("studysection:list")
     @ResponseBody
-	public Object list(Page page) throws Exception{
+    public Object list(Page page) throws Exception {
-		Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
         String KEYWORDS = pd.getString("KEYWORDS");                        //关键词检索条件
-		if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+        if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         page.setPd(pd);
         List<PageData> varList = studysectionService.list(page);    //列出StudySection列表
-		if(varList != null && varList.size() > 0) {
+        if (varList != null && varList.size() > 0) {
-			for(PageData var : varList) {
+            for (PageData var : varList) {
-				if(var.get("FILEPATH") != null && Tools.notEmpty(var.getString("FILEPATH").toString())) {
+                if (var.get("FILEPATH") != null && Tools.notEmpty(var.getString("FILEPATH").toString())) {
                     String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1);
                     var.put("extension_name", suffix);
                 }
@@ -183,15 +180,17 @@ public class StudySectionController extends BaseController {
         return map;
     }
 
-	 /**去修改页面获取数据
+    /**
+     * 去修改页面获取数据
+     *
      * @param
      * @throws Exception
      */
-	@RequestMapping(value="/goEdit")
+    @RequestMapping(value = "/goEdit")
     @RequiresPermissions("studysection:edit")
     @ResponseBody
-	public Object goEdit() throws Exception{
+    public Object goEdit() throws Exception {
-		Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
@@ -201,41 +200,45 @@ public class StudySectionController extends BaseController {
         return map;
     }
 
-	 /**批量删除
+    /**
+     * 批量删除
+     *
      * @param
      * @throws Exception
      */
-	@RequestMapping(value="/deleteAll")
+    @RequestMapping(value = "/deleteAll")
     @RequiresPermissions("studysection:del")
     @ResponseBody
-	public Object deleteAll() throws Exception{
+    public Object deleteAll() throws Exception {
-		Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
         String DATA_IDS = pd.getString("DATA_IDS");
-		if(Tools.notEmpty(DATA_IDS)){
+        if (Tools.notEmpty(DATA_IDS)) {
             String ArrayDATA_IDS[] = DATA_IDS.split(",");
             studysectionService.deleteAll(ArrayDATA_IDS);
             errInfo = "success";
-		}else{
+        } else {
             errInfo = "fail";
         }
         map.put("result", errInfo);                //返回结果
         return map;
     }
 
-	 /**导出到excel
+    /**
+     * 导出到excel
+     *
      * @param
      * @throws Exception
      */
-	@RequestMapping(value="/excel")
+    @RequestMapping(value = "/excel")
     @RequiresPermissions("toExcel")
-	public ModelAndView exportExcel() throws Exception{
+    public ModelAndView exportExcel() throws Exception {
         ModelAndView mv = new ModelAndView();
         PageData pd = new PageData();
         pd = this.getPageData();
-		Map<String,Object> dataMap = new HashMap<String,Object>();
+        Map<String, Object> dataMap = new HashMap<String, Object>();
         List<String> titles = new ArrayList<String>();
         titles.add("所属行业");    //1
         titles.add("所属专业");    //2
@@ -253,7 +256,7 @@ public class StudySectionController extends BaseController {
         dataMap.put("titles", titles);
         List<PageData> varOList = studysectionService.listAll(pd);
         List<PageData> varList = new ArrayList<PageData>();
-		for(int i=0;i<varOList.size();i++){
+        for (int i = 0; i < varOList.size(); i++) {
             PageData vpd = new PageData();
             vpd.put("var1", varOList.get(i).getString("INDUSTRY"));        //1
             vpd.put("var2", varOList.get(i).getString("CORP_TYPE"));        //2
@@ -272,7 +275,7 @@ public class StudySectionController extends BaseController {
         }
         dataMap.put("varList", varList);
         ObjectExcelView erv = new ObjectExcelView();
-		mv = new ModelAndView(erv,dataMap);
+        mv = new ModelAndView(erv, dataMap);
         return mv;
     }
 

src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java

@@ -1,5 +1,7 @@
 package com.zcloud.controller.bus;
 
+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;
@@ -39,6 +41,7 @@ public class TrainingScheduleController extends BaseController {
 	 */
 	@RequestMapping(value="/add")
 	@ResponseBody
+	@DockAnnotation
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -53,6 +56,7 @@ public class TrainingScheduleController extends BaseController {
 		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//企业ID
 		trainingscheduleService.save(pd);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 
@@ -62,6 +66,7 @@ public class TrainingScheduleController extends BaseController {
 	 */
 	@RequestMapping(value="/delete")
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -69,6 +74,7 @@ public class TrainingScheduleController extends BaseController {
 		pd = this.getPageData();
 		trainingscheduleService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 
@@ -78,6 +84,7 @@ public class TrainingScheduleController extends BaseController {
 	 */
 	@RequestMapping(value="/edit")
 	@ResponseBody
+	@DockAnnotation
 	public Object edit() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -87,6 +94,7 @@ public class TrainingScheduleController extends BaseController {
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		trainingscheduleService.edit(pd);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 

src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.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;
@@ -46,11 +48,13 @@ public class CurriculumController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("curriculum:add")
 	@ResponseBody
+	@DockAnnotation(hasAnnex = true)
 	public Object add(@RequestParam(value="FFILE",required=false) MultipartFile FFILE) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		pd.put("CURRICULUM_ID", this.get32UUID());	//主键
 		pd.put("CREATOR", Jurisdiction.getUsername());	//添加人
 		pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
@@ -74,10 +78,13 @@ public class CurriculumController extends BaseController {
 			String fileName = this.get32UUID()+FFILE.getOriginalFilename().substring(FFILE.getOriginalFilename().lastIndexOf("."));
 			Smb.sshSftp(FFILE, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("CAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("CAPTURE")+"@@"+fileName);
 		}
 		curriculumService.save(pd);
 		map.put("pd", pd);
 		map.put("result", errInfo);
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 
@@ -88,6 +95,7 @@ public class CurriculumController extends BaseController {
 	@RequestMapping(value="/delete")
 	@RequiresPermissions("curriculum:del")
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -104,6 +112,7 @@ public class CurriculumController extends BaseController {
 		}
 		curriculumService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 
@@ -114,11 +123,13 @@ public class CurriculumController extends BaseController {
 	@RequestMapping(value="/edit")
 	@RequiresPermissions("curriculum:edit")
 	@ResponseBody
+	@DockAnnotation(hasAnnex = true)
 	public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile FFILE) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		if (null != FFILE && !FFILE.isEmpty()) {
@@ -137,10 +148,13 @@ public class CurriculumController extends BaseController {
 			String fileName = this.get32UUID()+FFILE.getOriginalFilename().substring(FFILE.getOriginalFilename().lastIndexOf("."));
 			Smb.sshSftp(FFILE, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("CAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("CAPTURE")+"@@"+fileName);
 		}
 		curriculumService.edit(pd);
 		map.put("pd", pd);
 		map.put("result", errInfo);
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
+		map.put("dockData",JSON.toJSONString(pd));
 		return map;
 	}
 

src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.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;
@@ -42,12 +44,14 @@ public class DataCoursewareController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("courseware:add")
 	@ResponseBody
+	@DockAnnotation
 	public Object add(@RequestParam(value="cfile",required=false) MultipartFile cfile,
 					  @RequestParam(value="ccfile",required=false) MultipartFile ccfile) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		pd.put("DATACOURSEWARE_ID", this.get32UUID());	//主键
 		pd.put("CREATOR", Jurisdiction.getUsername());	//添加人
 		pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
@@ -72,6 +76,7 @@ public class DataCoursewareController extends BaseController {
 			String fileName = this.get32UUID()+cfile.getOriginalFilename().substring(cfile.getOriginalFilename().lastIndexOf("."));
 			Smb.sshSftp(cfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("COURSEWAREFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("COURSEWAREFILES")+"@@"+fileName);
 		}
 		if (null != ccfile && !ccfile.isEmpty()) {
 			String suffixName = ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@@ -89,9 +94,12 @@ public class DataCoursewareController extends BaseController {
 			String fileName = this.get32UUID()+ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf("."));
 			Smb.sshSftp(ccfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("COURSEWARECAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("COURSEWARECAPTURE")+"@@"+fileName);
 		}
 		datacoursewareService.save(pd);
 		map.put("pd", pd);
+		map.put("dockData", JSON.toJSONString(pd));
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
 		map.put("result", errInfo);
 		return map;
 	}
@@ -103,6 +111,7 @@ public class DataCoursewareController extends BaseController {
 	@RequestMapping(value="/delete")
 	@RequiresPermissions("courseware:del")
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -126,6 +135,7 @@ public class DataCoursewareController extends BaseController {
 		questionService.deleteByCoursewareIds(pd);
 		datacoursewareService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 
@@ -136,13 +146,14 @@ public class DataCoursewareController extends BaseController {
 	@RequestMapping(value="/edit")
 	@RequiresPermissions("courseware:edit")
 	@ResponseBody
+	@DockAnnotation
 	public Object edit(@RequestParam(value="cfile",required=false) MultipartFile cfile,
 					   @RequestParam(value="ccfile",required=false) MultipartFile ccfile) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
-
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		PageData d = datacoursewareService.findById(pd);
 		//已经不修改了，还删附件是什么意思
 //		Smb.deleteFile(d.getString("COURSEWAREFILES"));
@@ -165,6 +176,7 @@ public class DataCoursewareController extends BaseController {
 			String fileName = this.get32UUID()+cfile.getOriginalFilename().substring(cfile.getOriginalFilename().lastIndexOf("."));
 			Smb.sshSftp(cfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("COURSEWAREFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("COURSEWAREFILES")+"@@"+fileName);
 		}
 		if (null != ccfile) {
 			String suffixName = ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@@ -182,10 +194,13 @@ public class DataCoursewareController extends BaseController {
 			String fileName = this.get32UUID()+ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf("."));
 			Smb.sshSftp(ccfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("COURSEWARECAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("COURSEWARECAPTURE")+"@@"+fileName);
 		}
 		datacoursewareService.edit(pd);
 		map.put("pd", pd);
 		map.put("result", errInfo);
+		map.put("dockData",JSON.toJSONString(pd));
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
 		return map;
 	}
 
@@ -355,6 +370,7 @@ public class DataCoursewareController extends BaseController {
 	@RequestMapping(value="/editState")
 	@RequiresPermissions("courseware:edit")
 	@ResponseBody
+	@DockAnnotation
 	public Object editState() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -364,6 +380,7 @@ public class DataCoursewareController extends BaseController {
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		datacoursewareService.editByState(pd);
 		map.put("result", errInfo);
+		map.put("dockData",JSON.toJSONString(pd));
 		return map;
 	}
 }

src/main/java/com/zcloud/controller/onlinexxks/QuestionController.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;
@@ -42,6 +44,7 @@ public class QuestionController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -56,6 +59,7 @@ public class QuestionController extends BaseController {
 		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//企业ID
 		questionService.save(pd);
 		map.put("pd", pd);
+		map.put("dockData", JSON.toJSONString(pd));
 		map.put("result", errInfo);
 		return map;
 	}
@@ -67,6 +71,7 @@ public class QuestionController extends BaseController {
 	@RequestMapping(value="/delete")
 	@RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -76,6 +81,7 @@ public class QuestionController extends BaseController {
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		questionService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 
@@ -86,11 +92,19 @@ public class QuestionController extends BaseController {
 	@RequestMapping(value="/edit")
 	@RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object edit() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		if (Tools.notEmpty(pd.getString("dockData"))) {
+			// 咱们的对接流程 如有异常 使用 throw new BizException();
+			PageData dockData = JSON.parseObject(pd.getString("dockData"), PageData.class);
+
+			// 正常返回
+			return ReturnMap.ok();
+		}
 		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		questionService.edit(pd);
@@ -147,6 +161,7 @@ public class QuestionController extends BaseController {
 	@RequestMapping(value="/deleteAll")
 	@RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object deleteAll() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -160,6 +175,8 @@ public class QuestionController extends BaseController {
 			pd.put("ArrayDATA_IDS", ArrayDATA_IDS);	//待删除ids
 			questionService.deleteAll(pd);
 			errInfo = "success";
+			map.put("dockData", JSON.toJSONString(pd));				//返回结果
+
 		}else{
 			errInfo = "fail";
 		}
@@ -293,13 +310,14 @@ public class QuestionController extends BaseController {
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional
+	@DockAnnotation
 	public Object readExcel2(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
 		StringBuffer errorStr = new StringBuffer();
 		PageData pd = new PageData();
 		pd = this.getPageData(); // COURSEWAREID
-
+		ArrayList<PageData> dataArrayList =  new ArrayList<>();
 		if (null != file && !file.isEmpty()) {
 			String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
 			if (!"xls".equals(suffixName)) {
@@ -446,6 +464,7 @@ public class QuestionController extends BaseController {
 							pageData.put("ISDELETE", "0");	//是否删除(0:有效 1：删除)
 							pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//企业ID
 							questionService.save(pageData);
+							dataArrayList.add(pageData);
 						}
 						errorStr.append("成功导入"+listAll.size()+"条数据!");
 					}else {
@@ -472,6 +491,8 @@ public class QuestionController extends BaseController {
 		map.put("msg",errorStr.toString());				//返回结果
 		map.put("isExcel","1");				//返回类型
 		map.put("resultStr", errorStr.toString());
+		pd.put("dataArrayList",dataArrayList);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 }

src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.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;
@@ -40,6 +42,7 @@ public class StageexampaperInputController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions( value = {"stageexampaper:add", "curriculum:add"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -58,6 +61,7 @@ public class StageexampaperInputController extends BaseController {
 
 		List<PageData> saveStageList = stageexampaperinputService.getSaveStage(pd);
 		if(null != saveStageList){
+			pd.put("saveStageList",saveStageList);
 			stageexampaperinputService.save(pd);
 			stageExamPaperInputQuestionService.saveAll(pd, saveStageList);
 		}else{
@@ -65,6 +69,7 @@ public class StageexampaperInputController extends BaseController {
 			map.put("msg", "培训行业类型或岗位培训类型对应的习题数量不足，无法生成试卷，请重新选择！");
 		}
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 
@@ -75,6 +80,7 @@ public class StageexampaperInputController extends BaseController {
 	@RequestMapping(value="/delete")
 	@RequiresPermissions( value = {"stageexampaper:del", "curriculum:del"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -82,6 +88,7 @@ public class StageexampaperInputController extends BaseController {
 		pd = this.getPageData();
 		stageexampaperinputService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 
@@ -257,6 +264,7 @@ public class StageexampaperInputController extends BaseController {
 	@RequestMapping(value="/editState")
 	@RequiresPermissions( value = {"stageexampaper:edit", "curriculum:edit"}, logical = Logical.OR)
 	@ResponseBody
+	@DockAnnotation
 	public Object editState() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -266,6 +274,7 @@ public class StageexampaperInputController extends BaseController {
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//操作时间
 		stageexampaperinputService.editState(pd);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 }

src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.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;
@@ -44,6 +46,7 @@ public class StudyTaskController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("studytask:add")
 	@ResponseBody
+	@DockAnnotation
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -73,6 +76,7 @@ public class StudyTaskController extends BaseController {
 		stageStudentRelationService.saveFromPagerV2(pd); // 任务-人员
 
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 

src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java

@@ -57,6 +57,7 @@ public class VideoCoursewareController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        ArrayList<String> sendPicturesList = new ArrayList<>();
         pd.put("VIDEOCOURSEWARE_ID", this.get32UUID());    //主键
         pd.put("CREATOR", Jurisdiction.getUsername());    //添加人
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
@@ -81,6 +82,7 @@ public class VideoCoursewareController extends BaseController {
             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);
+            sendPicturesList.add(pd.getString("VIDEOFILES")+"@@"+fileName);
             // 将MultipartFile file转换成为File
             File f_file = FileUtil.MultipartFileToFile(vfile);
             MultimediaObject instance = new MultimediaObject(f_file);
@@ -107,10 +109,12 @@ public class VideoCoursewareController extends BaseController {
             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);
+            sendPicturesList.add(pd.getString("VIDEOCAPTURE")+"@@"+fileName);
         }
         videocoursewareService.save(pd);
         map.put("pd", pd);
         map.put("dockData", JSON.toJSONString(pd));
+        map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
         map.put("result", errInfo);
         return map;
     }
@@ -124,6 +128,7 @@ public class VideoCoursewareController extends BaseController {
     @RequestMapping(value = "/delete")
     @RequiresPermissions("courseware:del")
     @ResponseBody
+    @DockAnnotation
     public Object delete() throws Exception {
         Map<String, String> map = new HashMap<String, String>();
         String errInfo = "success";
@@ -148,6 +153,7 @@ public class VideoCoursewareController extends BaseController {
         questionService.deleteByCoursewareIds(pd);
         videocoursewareService.delete(pd);
         map.put("result", errInfo);                //返回结果
+        map.put("dockData", JSON.toJSONString(pd));                //返回结果
         return map;
     }
 
@@ -160,6 +166,7 @@ public class VideoCoursewareController extends BaseController {
     @RequestMapping(value = "/edit")
     @RequiresPermissions("courseware:edit")
     @ResponseBody
+    @DockAnnotation(hasAnnex = true)
     public Object edit(@RequestParam(value = "vfile", required = false) MultipartFile vfile,
                        @RequestParam(value = "vcfile", required = false) MultipartFile vcfile) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -167,6 +174,7 @@ public class VideoCoursewareController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         PageData d = videocoursewareService.findById(pd);
+        ArrayList<String> sendPicturesList = new ArrayList<>();
         pd.put("OPERATOR", Jurisdiction.getUsername());    //修改人
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
         if (null != vfile) {
@@ -185,6 +193,7 @@ public class VideoCoursewareController extends BaseController {
             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);
+            sendPicturesList.add(pd.getString("VIDEOFILES")+"@@"+fileName);
             // 将MultipartFile file转换成为File
             File f_file = FileUtil.MultipartFileToFile(vfile);
             MultimediaObject instance = new MultimediaObject(f_file);
@@ -211,9 +220,12 @@ public class VideoCoursewareController extends BaseController {
             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);
+            sendPicturesList.add(pd.getString("VIDEOCAPTURE")+"@@"+fileName);
         }
         videocoursewareService.edit(pd);
         map.put("pd", pd);
+        map.put("dockData", JSON.toJSONString(pd));
+        map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
         map.put("result", errInfo);
         return map;
     }
@@ -379,6 +391,7 @@ public class VideoCoursewareController extends BaseController {
     @RequestMapping(value = "/editState")
     @RequiresPermissions("courseware:edit")
     @ResponseBody
+    @DockAnnotation
     public Object editState() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -388,6 +401,7 @@ public class VideoCoursewareController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
         videocoursewareService.editByState(pd);
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
         return map;
     }
 }

src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java

@@ -1,5 +1,7 @@
 package com.zcloud.controller.tzsb;
 
+import com.alibaba.fastjson.JSON;
+import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.controller.bus.ImgFilesController;
 import com.zcloud.entity.Page;
@@ -45,6 +47,7 @@ public class SpecialEquipmentAqxjController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("specialequipmentaqxj:add")
 	@ResponseBody
+	@DockAnnotation(hasAnnex = true)
 	public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] FILES,
 					  @RequestParam(value="TYPE",required=false) String[] TYPE) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
@@ -75,6 +78,7 @@ public class SpecialEquipmentAqxjController extends BaseController {
 			imgFilesController.finish(fileList.toArray(fileArr),type,pd.getString("SPECIALEQUIPMENTAQXJ_ID"));
 		}
 		map.put("pd", pd);
+		map.put("dockData", JSON.toJSONString(pd));
 		map.put("result", errInfo);
 		return map;
 	}

src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java

@@ -1,5 +1,7 @@
 package com.zcloud.controller.tzsb;
 
+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;
@@ -49,11 +51,13 @@ public class SpecialEquipmentController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("specialequipment:add")
 	@ResponseBody
+	@DockAnnotation(hasAnnex = true)
 	public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		pd.put("SPECIALEQUIPMENT_ID", this.get32UUID());	//主键
 		pd.put("CREATOR", Jurisdiction.getUsername());	//添加人
 		pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
@@ -78,8 +82,11 @@ public class SpecialEquipmentController extends BaseController {
 			Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("TECHNICALFILENAME", file.getOriginalFilename());
 			pd.put("TECHNICALFILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("TECHNICALFILEPATH")+"@@"+fileName);
 		}
+		PageData dockData = new PageData();
 		specialequipmentService.save(pd);
+		dockData.putAll(pd);
 		map.put("pd", pd);
 
 		PageData changeData = new PageData();
@@ -137,7 +144,10 @@ public class SpecialEquipmentController extends BaseController {
 //		changeData.put("REMARKS_BEFORE", pd.getString("REMARKS"));	//备注（前）
 		changeData.put("REMARKS_AFTER", pd.getString("REMARKS"));	//备注（后）
 		specialequipmentchangeService.save(changeData);
+		dockData.put("changeData",changeData);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(dockData));
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
 		return map;
 	}
 
@@ -148,6 +158,7 @@ public class SpecialEquipmentController extends BaseController {
 	@RequestMapping(value="/delete")
 	@RequiresPermissions("specialequipment:del")
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
@@ -192,7 +203,9 @@ public class SpecialEquipmentController extends BaseController {
 		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		specialequipmentService.delete(pd);
+		pd.put("changeData",changeData);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 
@@ -203,13 +216,14 @@ public class SpecialEquipmentController extends BaseController {
 	@RequestMapping(value="/edit")
 	@RequiresPermissions("specialequipment:edit")
 	@ResponseBody
+	@DockAnnotation(hasAnnex = true)
 	public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		PageData updateBefour = specialequipmentService.findById(pd);
-
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		PageData changeData = new PageData();
 		changeData.put("SPECIALEQUIPMENTCHANGE_ID", this.get32UUID());	//主键
 		changeData.put("SPECIALEQUIPMENT_ID", updateBefour.getString("SPECIALEQUIPMENT_ID"));	//主键
@@ -262,6 +276,7 @@ public class SpecialEquipmentController extends BaseController {
 			Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			pd.put("TECHNICALFILENAME", file.getOriginalFilename());
 			pd.put("TECHNICALFILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			sendPicturesList.add(pd.getString("TECHNICALFILEPATH") + "@@"+ fileName);
 		}
 		specialequipmentService.edit(pd);
 		changeData.put("EQUIPMENTNAME_AFTER", pd.getString("EQUIPMENTNAME"));	//设备名称（后）
@@ -294,8 +309,13 @@ public class SpecialEquipmentController extends BaseController {
 		changeData.put("TECHNICALFILEPATH_AFTER", pd.getString("TECHNICALFILEPATH"));	//设备技术档案（附件）路径（后）
 		changeData.put("REMARKS_AFTER", pd.getString("REMARKS"));	//备注（后）
 		specialequipmentchangeService.save(changeData);
+		PageData dockData = new PageData();
+		dockData.putAll(pd);
+		dockData.put("changeData",changeData);
 		map.put("pd", pd);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(dockData));
+		map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
 		return map;
 	}
 
@@ -347,6 +367,7 @@ public class SpecialEquipmentController extends BaseController {
 	@RequestMapping(value="/deleteAll")
 	@RequiresPermissions("specialequipment:del")
 	@ResponseBody
+	@DockAnnotation
 	public Object deleteAll() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -355,6 +376,7 @@ public class SpecialEquipmentController extends BaseController {
 		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
 		String DATA_IDS = pd.getString("DATA_IDS");
+		ArrayList<PageData> changeDataList = new ArrayList<>();
 		if(Tools.notEmpty(DATA_IDS)){
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
 			pd.put("ArrayDATA_IDS", ArrayDATA_IDS);	//待删除ids
@@ -397,10 +419,15 @@ public class SpecialEquipmentController extends BaseController {
 				changeData.put("TECHNICALFILEPATH_AFTER", updateBefour.getString("TECHNICALFILEPATH"));	//设备技术档案（附件）路径（前）
 				changeData.put("REMARKS_AFTER", updateBefour.getString("REMARKS"));	//备注（前）
 				specialequipmentchangeService.save(changeData);
+				changeDataList.add(changeData);
 			}
 
 			specialequipmentService.deleteAll(pd);
 			errInfo = "success";
+			pd.put("changeDataList",changeDataList);
+			map.put("dockData", JSON.toJSONString(pd));				//返回结果
+			map.put("result", errInfo);				//返回结果
+
 		}else{
 			errInfo = "fail";
 		}