diff --git a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java index 6f2cb1cb..fd09c065 100644 --- a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java +++ b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java @@ -1,16 +1,15 @@ package com.zcloud.controller.app; -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.zcloud.aspect.DockAnnotation; +import com.zcloud.controller.base.BaseController; import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.mq.DockSendMessageService; import com.zcloud.util.*; +import org.apache.commons.io.FileUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; @@ -19,13 +18,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import org.apache.commons.io.FileUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.service.bus.ImgFilesService; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 说明:图片管理 @@ -51,6 +49,7 @@ public class AppImgFilesController extends BaseController { @RequestMapping(value = "/add", headers = "content-type=multipart/form-data") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object finish( @RequestParam(value = "FFILE", required = false) MultipartFile[] files, @RequestParam(value = "TYPE", required = false) String TYPE, @@ -92,7 +91,7 @@ public class AppImgFilesController extends BaseController { File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH")); old.delete(); imgfilesService.delete(pageData); - pageData.put("delete","1"); + pageData.put("delete", "1"); TenCorpDto tenCorpDto = new TenCorpDto(); tenCorpDto.setMessage("删除文件消息"); tenCorpDto.setId(UuidUtil.get32UUID()); @@ -113,7 +112,7 @@ public class AppImgFilesController extends BaseController { pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("TYPE", TYPE); pd.put("FOREIGN_KEY", FOREIGN_KEY); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile+ "/", IMGFILES_ID, FOREIGN_KEY, TYPE); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/", IMGFILES_ID, FOREIGN_KEY, TYPE); imgfilesService.save(pd); } } @@ -244,7 +243,7 @@ public class AppImgFilesController extends BaseController { file.delete(); imgfilesService.delete(pd); TenCorpDto tenCorpDto = new TenCorpDto(); - pd.put("delete","1"); + pd.put("delete", "1"); tenCorpDto.setData(pd); dockSendMessageService.sendMessagePictureDelete(tenCorpDto); map.put("result", errInfo); //返回结果 diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 4c4d214d..c65f0121 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -56,7 +56,7 @@ public class AppKeyprojectCheckController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody - @DockAnnotation(isAdd = true) + @DockAnnotation(hasAnnex = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -138,7 +138,7 @@ public class AppKeyprojectCheckController extends BaseController { hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); } - pd.put("HIDDEN", hiddenList); + pd.put("HIDDEN", JSON.toJSONString(hiddenList)); } try { //这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过,发的话 找到对应人以及对应手机号 发送对应模板短信啊 @@ -266,8 +266,8 @@ public class AppKeyprojectCheckController extends BaseController { List situationList = keyprojectcheckInfoService.listAll(pd); pd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID")); - pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd)); - pd.put("situationList", situationList); + pd.put("hiddenList", JSON.toJSONString(keyprojectHiddenService.listAllInspection(pd))); + pd.put("situationList", JSON.toJSONString(situationList)); map.put("pd", pd); map.put("result", errInfo); return map;