guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
z 2023-12-22 16:38:02 +08:00
parent d7bf791dfc c1431c47db
commit bd49c64ae5
18 changed files with 2155 additions and 1935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3222
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

File diff suppressed because it is too large Load Diff

612
src/main/java/com/zcloud/controller/app/AppImgFilesController.java
View File

@ -7,6 +7,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -34,327 +37,360 @@ import com.zcloud.service.bus.ImgFilesService;
@RequestMapping("/app/imgfiles") @RequestMapping("/app/imgfiles")
public class AppImgFilesController extends BaseController { public class AppImgFilesController extends BaseController {
@Autowired @Autowired
private ImgFilesService imgfilesService; private ImgFilesService imgfilesService;
@Autowired
private DockSendMessageService dockSendMessageService;
/**完成 /**
* @param * 完成
* @throws Exception *
*/ * @param
@RequestMapping(value="/add", headers = "content-type=multipart/form-data") * @throws Exception
@ResponseBody */
@Transactional @RequestMapping(value = "/add", headers = "content-type=multipart/form-data")
public Object finish( @ResponseBody
@RequestParam(value="FFILE",required=false) MultipartFile[] files, @Transactional
@RequestParam(value="TYPE",required=false) String TYPE, public Object finish(
@RequestParam(value="FOREIGN_KEY",required=false) String FOREIGN_KEY @RequestParam(value = "FFILE", required = false) MultipartFile[] files,
) throws Exception{ @RequestParam(value = "TYPE", required = false) String TYPE,
Map<String,Object> map = new HashMap<String,Object>(); @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY
String errInfo = "success"; ) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
} }
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i]; MultipartFile file = files[i];
// 保存文件 // 保存文件
File tempFile = new File(file.getOriginalFilename()); File tempFile = new File(file.getOriginalFilename());
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型 if (!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型
tempFile.delete(); tempFile.delete();
map.put("result", "failed"); map.put("result", "failed");
map.put("exception", "上传图片格式不正确，请重新上传"); map.put("exception", "上传图片格式不正确，请重新上传");
return map; return map;
} }
if (tempFile.exists()) { if (tempFile.exists()) {
tempFile.delete(); tempFile.delete();
} }
if(TYPE.equals("2") || TYPE.equals("102")) {//先删除原四色图 if (TYPE.equals("2") || TYPE.equals("102")) {//先删除原四色图
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",FOREIGN_KEY); pd2.put("FOREIGN_KEY", FOREIGN_KEY);
pd2.put("TYPE",TYPE); pd2.put("TYPE", TYPE);
List<PageData> four = imgfilesService.listAll(pd2); List<PageData> four = imgfilesService.listAll(pd2);
for (PageData pageData : four) { for (PageData pageData : four) {
File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH")); File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
old.delete(); old.delete();
imgfilesService.delete(pageData); imgfilesService.delete(pageData);
} pageData.put("delete","1");
} TenCorpDto tenCorpDto = new TenCorpDto();
PageData pd = new PageData(); tenCorpDto.setMessage("删除文件消息");
pd = this.getPageData(); tenCorpDto.setId(UuidUtil.get32UUID());
String ffile = DateUtil.getDays(); tenCorpDto.setTopic("docking");
tenCorpDto.setProducer_name("qa-prevention-czks");
tenCorpDto.setData(pageData);
dockSendMessageService.sendMessagePictureDelete(tenCorpDto);
}
}
PageData pd = new PageData();
pd = this.getPageData();
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 // 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 + pd.getString("CORPINFO_ID") + "/" + ffile); String IMGFILES_ID = this.get32UUID();
pd.put("IMGFILES_ID", IMGFILES_ID);
pd.put("IMGFILES_ID", this.get32UUID()); pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("TYPE", TYPE);
pd.put("TYPE", TYPE); pd.put("FOREIGN_KEY", FOREIGN_KEY);
pd.put("FOREIGN_KEY", FOREIGN_KEY); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile+ "/", IMGFILES_ID, FOREIGN_KEY, TYPE);
imgfilesService.save(pd); imgfilesService.save(pd);
} }
} }
map.put("result", errInfo);
map.put("result", errInfo); return map;
return map; }
}
/**新增 /**
* @param * 新增
* @throws Exception *
*/ * @param
@RequestMapping(value="/add64") * @throws Exception
@ResponseBody */
public Object add64() throws Exception{ @RequestMapping(value = "/add64")
Map<String,Object> map = new HashMap<String,Object>(); @ResponseBody
String errInfo = "success"; public Object add64() throws Exception {
PageData pd = new PageData(); Map<String, Object> map = new HashMap<String, Object>();
pd = this.getPageData(); String errInfo = "success";
MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("FILEPATH")); PageData pd = new PageData();
String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); pd = this.getPageData();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("FILEPATH"));
errInfo = "fail"; String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
map.put("result", errInfo); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("msg", "文件格式不正确！"); errInfo = "fail";
return map; map.put("result", errInfo);
} map.put("msg", "文件格式不正确！");
String ffile = DateUtil.getDays(); return map;
String fileName = this.get32UUID()+img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")); }
Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); String ffile = DateUtil.getDays();
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); String fileName = this.get32UUID() + img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
pd.put("IMGFILES_ID", this.get32UUID()); Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("TYPE", pd.getString("TYPE")); pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("FOREIGN_KEY", pd.getString("FOREIGN_KEY")); pd.put("IMGFILES_ID", this.get32UUID());
imgfilesService.save(pd); pd.put("TYPE", pd.getString("TYPE"));
map.put("pd", pd); pd.put("FOREIGN_KEY", pd.getString("FOREIGN_KEY"));
map.put("result", errInfo); imgfilesService.save(pd);
return map; map.put("pd", pd);
} map.put("result", errInfo);
return map;
}
/**完成 /**
* @param * 完成
* @throws Exception *
*/ * @param
@RequestMapping(value="/edit", headers = "content-type=multipart/form-data") * @throws Exception
@ResponseBody */
@Transactional @RequestMapping(value = "/edit", headers = "content-type=multipart/form-data")
public Object edit( @ResponseBody
@RequestParam(value="FFILE",required=false) MultipartFile[] files, @Transactional
@RequestParam(value="TYPE",required=false) String TYPE, public Object edit(
@RequestParam(value="FOREIGN_KEY",required=false) String FOREIGN_KEY @RequestParam(value = "FFILE", required = false) MultipartFile[] files,
) throws Exception{ @RequestParam(value = "TYPE", required = false) String TYPE,
Map<String,Object> map = new HashMap<String,Object>(); @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY
String errInfo = "success"; ) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "文件格式不正确！"); map.put("msg", "文件格式不正确！");
return map; return map;
} }
} }
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",FOREIGN_KEY); pd2.put("FOREIGN_KEY", FOREIGN_KEY);
pd2.put("TYPE",TYPE); pd2.put("TYPE", TYPE);
List<PageData> four = imgfilesService.listAll(pd2); List<PageData> four = imgfilesService.listAll(pd2);
for (PageData pageData : four) { for (PageData pageData : four) {
File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH")); File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
old.delete(); old.delete();
imgfilesService.delete(pageData); imgfilesService.delete(pageData);
} }
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i]; MultipartFile file = files[i];
// 保存文件 // 保存文件
File tempFile = new File(file.getOriginalFilename()); File tempFile = new File(file.getOriginalFilename());
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
if(!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型 if (!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型
tempFile.delete(); tempFile.delete();
map.put("result", "failed"); map.put("result", "failed");
map.put("exception", "上传图片格式不正确，请重新上传"); map.put("exception", "上传图片格式不正确，请重新上传");
return map; return map;
} }
if (tempFile.exists()) { if (tempFile.exists()) {
tempFile.delete(); tempFile.delete();
} }
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 // 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 + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("IMGFILES_ID", this.get32UUID()); pd.put("IMGFILES_ID", this.get32UUID());
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("TYPE", TYPE); pd.put("TYPE", TYPE);
pd.put("FOREIGN_KEY", FOREIGN_KEY); pd.put("FOREIGN_KEY", FOREIGN_KEY);
imgfilesService.save(pd); imgfilesService.save(pd);
} }
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**删除 /**
* @param out * 删除
* @throws Exception *
*/ * @param out
@RequestMapping(value="/delete") * @throws Exception
@ResponseBody */
public Object delete() throws Exception{ @RequestMapping(value = "/delete")
Map<String,String> map = new HashMap<String,String>(); @ResponseBody
String errInfo = "success"; public Object delete() throws Exception {
PageData pd = new PageData(); Map<String, String> map = new HashMap<String, String>();
pd = this.getPageData(); String errInfo = "success";
pd = imgfilesService.findById(pd); //根据ID读取 PageData pd = new PageData();
File file = new File(PathUtil.getProjectpath()+pd.getString("FILEPATH")); pd = this.getPageData();
file.delete(); pd = imgfilesService.findById(pd); //根据ID读取
imgfilesService.delete(pd); File file = new File(PathUtil.getProjectpath() + pd.getString("FILEPATH"));
map.put("result", errInfo); //返回结果 file.delete();
return map; imgfilesService.delete(pd);
} TenCorpDto tenCorpDto = new TenCorpDto();
pd.put("delete","1");
tenCorpDto.setData(pd);
dockSendMessageService.sendMessagePictureDelete(tenCorpDto);
map.put("result", errInfo); //返回结果
return map;
}
/**修改 /**
* @param * 修改
* @throws Exception *
*/ * @param
@RequestMapping(value="/edit") * @throws Exception
@RequiresPermissions("imgfiles:edit") */
@ResponseBody @RequestMapping(value = "/edit")
public Object edit() throws Exception{ @RequiresPermissions("imgfiles:edit")
Map<String,Object> map = new HashMap<String,Object>(); @ResponseBody
String errInfo = "success"; public Object edit() throws Exception {
PageData pd = new PageData(); Map<String, Object> map = new HashMap<String, Object>();
pd = this.getPageData(); String errInfo = "success";
imgfilesService.edit(pd); PageData pd = new PageData();
map.put("result", errInfo); pd = this.getPageData();
return map; imgfilesService.edit(pd);
} map.put("result", errInfo);
return map;
}
/**列表 /**
* @param page * 列表
* @throws Exception *
*/ * @param page
@RequestMapping(value="/list") * @throws Exception
@RequiresPermissions("imgfiles:list") */
@ResponseBody @RequestMapping(value = "/list")
public Object list(Page page) throws Exception{ @RequiresPermissions("imgfiles:list")
Map<String,Object> map = new HashMap<String,Object>(); @ResponseBody
String errInfo = "success"; public Object list(Page page) throws Exception {
PageData pd = new PageData(); Map<String, Object> map = new HashMap<String, Object>();
pd = this.getPageData(); String errInfo = "success";
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 PageData pd = new PageData();
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); pd = this.getPageData();
page.setPd(pd); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
List<PageData> varList = imgfilesService.list(page); //列出ImgFiles列表 if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
map.put("varList", varList); page.setPd(pd);
map.put("page", page); List<PageData> varList = imgfilesService.list(page); //列出ImgFiles列表
map.put("result", errInfo); map.put("varList", varList);
return map; map.put("page", page);
} map.put("result", errInfo);
return map;
}
/**去修改页面获取数据 /**
* @param * 去修改页面获取数据
* @throws Exception *
*/ * @param
@RequestMapping(value="/goEdit") * @throws Exception
@RequiresPermissions("imgfiles:edit") */
@ResponseBody @RequestMapping(value = "/goEdit")
public Object goEdit() throws Exception{ @RequiresPermissions("imgfiles:edit")
Map<String,Object> map = new HashMap<String,Object>(); @ResponseBody
String errInfo = "success"; public Object goEdit() throws Exception {
PageData pd = new PageData(); Map<String, Object> map = new HashMap<String, Object>();
pd = this.getPageData(); String errInfo = "success";
pd = imgfilesService.findById(pd); //根据ID读取 PageData pd = new PageData();
map.put("pd", pd); pd = this.getPageData();
map.put("result", errInfo); pd = imgfilesService.findById(pd); //根据ID读取
return map; map.put("pd", pd);
} map.put("result", errInfo);
return map;
}
/**批量删除 /**
* @param * 批量删除
* @throws Exception *
*/ * @param
@RequestMapping(value="/deleteAll") * @throws Exception
@RequiresPermissions("imgfiles:del") */
@ResponseBody @RequestMapping(value = "/deleteAll")
public Object deleteAll() throws Exception{ @RequiresPermissions("imgfiles:del")
Map<String,Object> map = new HashMap<String,Object>(); @ResponseBody
String errInfo = "success"; public Object deleteAll() throws Exception {
PageData pd = new PageData(); Map<String, Object> map = new HashMap<String, Object>();
pd = this.getPageData(); String errInfo = "success";
String DATA_IDS = pd.getString("DATA_IDS"); PageData pd = new PageData();
if(Tools.notEmpty(DATA_IDS)){ pd = this.getPageData();
String ArrayDATA_IDS[] = DATA_IDS.split(","); String DATA_IDS = pd.getString("DATA_IDS");
imgfilesService.deleteAll(ArrayDATA_IDS); if (Tools.notEmpty(DATA_IDS)) {
errInfo = "success"; String ArrayDATA_IDS[] = DATA_IDS.split(",");
}else{ imgfilesService.deleteAll(ArrayDATA_IDS);
errInfo = "fail"; errInfo = "success";
} } else {
map.put("result", errInfo); //返回结果 errInfo = "fail";
return map; }
} map.put("result", errInfo); //返回结果
return map;
}
/**导出到excel /**
* @param * 导出到excel
* @throws Exception *
*/ * @param
@RequestMapping(value="/excel") * @throws Exception
@RequiresPermissions("toExcel") */
public ModelAndView exportExcel() throws Exception{ @RequestMapping(value = "/excel")
ModelAndView mv = new ModelAndView(); @RequiresPermissions("toExcel")
PageData pd = new PageData(); public ModelAndView exportExcel() throws Exception {
pd = this.getPageData(); ModelAndView mv = new ModelAndView();
Map<String,Object> dataMap = new HashMap<String,Object>(); PageData pd = new PageData();
List<String> titles = new ArrayList<String>(); pd = this.getPageData();
titles.add("路径"); //1 Map<String, Object> dataMap = new HashMap<String, Object>();
titles.add("类型"); //2 List<String> titles = new ArrayList<String>();
titles.add("外键"); //3 titles.add("路径"); //1
dataMap.put("titles", titles); titles.add("类型"); //2
List<PageData> varOList = imgfilesService.listAll(pd); titles.add("外键"); //3
List<PageData> varList = new ArrayList<PageData>(); dataMap.put("titles", titles);
for(int i=0;i<varOList.size();i++){ List<PageData> varOList = imgfilesService.listAll(pd);
PageData vpd = new PageData(); List<PageData> varList = new ArrayList<PageData>();
vpd.put("var1", varOList.get(i).getString("FILEPATH")); //1 for (int i = 0; i < varOList.size(); i++) {
vpd.put("var2", varOList.get(i).get("TYPE").toString()); //2 PageData vpd = new PageData();
vpd.put("var3", varOList.get(i).getString("FOREIGN_KEY")); //3 vpd.put("var1", varOList.get(i).getString("FILEPATH")); //1
varList.add(vpd); vpd.put("var2", varOList.get(i).get("TYPE").toString()); //2
} vpd.put("var3", varOList.get(i).getString("FOREIGN_KEY")); //3
dataMap.put("varList", varList); varList.add(vpd);
ObjectExcelView erv = new ObjectExcelView(); }
mv = new ModelAndView(erv,dataMap); dataMap.put("varList", varList);
return mv; ObjectExcelView erv = new ObjectExcelView();
} mv = new ModelAndView(erv, dataMap);
return mv;
}
/**查询图片集合 /**
* @param * 查询图片集合
* @throws Exception *
*/ * @param
@RequestMapping(value="/listImgs") * @throws Exception
@ResponseBody */
public Object listImgs() throws Exception{ @RequestMapping(value = "/listImgs")
Map<String,Object> map = new HashMap<String,Object>(); @ResponseBody
String errInfo = "success"; public Object listImgs() throws Exception {
PageData pd = new PageData(); Map<String, Object> map = new HashMap<String, Object>();
pd = this.getPageData(); String errInfo = "success";
List<PageData> imgs = imgfilesService.listAll(pd); //根据ID读取 PageData pd = new PageData();
map.put("imgs", imgs); pd = this.getPageData();
map.put("result", errInfo); List<PageData> imgs = imgfilesService.listAll(pd); //根据ID读取
return map; map.put("imgs", imgs);
} map.put("result", errInfo);
return map;
}
} }

4
src/main/java/com/zcloud/controller/filemanager/MfolderController.java
View File

@ -118,7 +118,9 @@ public class MfolderController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
mfolderService.save(pd); //存入数据库表 mfolderService.save(pd); //存入数据库表
//存自己表里的附件 使用文件全路径加文件名的方式 示例 //存自己表里的附件 使用文件全路径加文件名的方式 示例
// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg@@d3bc85d1bbe84b75b1e6e8b6182dc547.jpg // /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
// @@
// d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
"@@" "@@"
+fileName); +fileName);

95
src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java Normal file
View File

@ -0,0 +1,95 @@
package com.zcloud.controller.firemanager;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.fireresources.FireResourcesService;
import com.zcloud.util.DateUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/fireResources")
public class FireResourcesController extends BaseController {
@Resource
private FireResourcesService fireResourcesService;
@RequestMapping(value = "/list")
@ResponseBody
public Object page(Page page) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
page.setPd(pd);
//获取当前人的公司id
List<PageData> varList = fireResourcesService.datalistPage(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/getById")
@ResponseBody
public Object getById() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pddata = this.getPageData();
//获取当前人的公司id
PageData pd = fireResourcesService.getDataById(pddata);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
String FIRERESOURCES_ID = this.get32UUID();
pd.put("FIRERESOURCES_ID", FIRERESOURCES_ID);
pd.put("CREATIME", DateUtil.date2Str(new Date()));
pd.put("OPERATIME", DateUtil.date2Str(new Date()));
pd.put("ISDELETE", "0");
fireResourcesService.save(pd,files);
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATIME", DateUtil.date2Str(new Date()));
pd.put("ISDELETE", "0");
fireResourcesService.edit(pd,files);
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/delete")
@ResponseBody
public Object delete(Page page) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
fireResourcesService.delete(pd);
map.put("result", errInfo);
return map;
}
}

67
src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
View File

@ -1,19 +1,21 @@
package com.zcloud.controller.firemanager.app; package com.zcloud.controller.firemanager.app;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.firemanager.FireDeviceMapper; import com.zcloud.mapper.datasource.firemanager.FireDeviceMapper;
import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.firemanager.*; import com.zcloud.service.firemanager.*;
import com.zcloud.util.DateUtil; import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.util.InitPageDataUtil; import com.zcloud.util.InitPageDataUtil;
import com.zcloud.util.Jurisdiction;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
@ -24,7 +26,8 @@ import java.util.stream.Collectors;
* 作者：wangxuan * 作者：wangxuan
* 官网：www.zcloudchina.com * 官网：www.zcloudchina.com
*/ */
@RestController @Controller
@ResponseBody
@RequestMapping("/app/fireRecordManger") @RequestMapping("/app/fireRecordManger")
public class AppFireRecordController extends BaseController { public class AppFireRecordController extends BaseController {
@ -35,7 +38,8 @@ public class AppFireRecordController extends BaseController {
@Resource @Resource
private ImgFilesService imgFilesService; private ImgFilesService imgFilesService;
@Resource
private DockSendMessageService dockSendMessageService;
@Resource @Resource
private FireCheckStandardService fireCheckStandardService; private FireCheckStandardService fireCheckStandardService;
@Autowired @Autowired
@ -47,7 +51,6 @@ public class AppFireRecordController extends BaseController {
@Autowired @Autowired
private FirePointService firePointService; private FirePointService firePointService;
@Resource @Resource
private InitPageDataUtil initPageDataUtil; private InitPageDataUtil initPageDataUtil;
@ -67,7 +70,7 @@ public class AppFireRecordController extends BaseController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pageData = this.getPageData(); PageData pageData = this.getPageData();
pageData.put("TYPE",115); pageData.put("TYPE", 115);
List<PageData> dataList = fireQualifiedPhotosService.getPointQualifiedPhotos(pageData); List<PageData> dataList = fireQualifiedPhotosService.getPointQualifiedPhotos(pageData);
map.put("varList", dataList); map.put("varList", dataList);
map.put("result", errInfo); map.put("result", errInfo);
@ -104,6 +107,7 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/checkList/v2") @RequestMapping("/checkList/v2")
@ResponseBody
public Object checkListV2(Page page) { public Object checkListV2(Page page) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -134,6 +138,7 @@ public class AppFireRecordController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/** /**
* @Description: 清单列表总数 * @Description: 清单列表总数
* @Author: dearLin * @Author: dearLin
@ -173,6 +178,7 @@ public class AppFireRecordController extends BaseController {
map.put("varList", res); map.put("varList", res);
return map; return map;
} }
/** /**
* @Description: 所有清单的检查记录最外层 * @Description: 所有清单的检查记录最外层
* @Author: dearLin * @Author: dearLin
@ -194,6 +200,7 @@ public class AppFireRecordController extends BaseController {
map.put("varList", res); map.put("varList", res);
return map; return map;
} }
/** /**
* @Description: 清单下的检查记录 * @Description: 清单下的检查记录
* @Author: dearLin * @Author: dearLin
@ -274,7 +281,7 @@ public class AppFireRecordController extends BaseController {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = this.getPageData(); PageData pageData = this.getPageData();
List<PageData>varList = fireRecordService.getDeviceRecordByPoint(pageData); List<PageData> varList = fireRecordService.getDeviceRecordByPoint(pageData);
map.put("varList", varList); map.put("varList", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -306,41 +313,41 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/editDeviceCheck") @RequestMapping("/editDeviceCheck")
@DockAnnotation
public Object editDeviceCheck() throws Exception { public Object editDeviceCheck() throws Exception {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData(); PageData pd = this.getPageData();
List<PageData> list = JSONObject.parseArray(pd.getString("CHECK_DATA"), PageData.class); List<PageData> list = JSONObject.parseArray(pd.getString("CHECK_DATA"), PageData.class);
ArrayList<PageData> dataArrayList = new ArrayList<>();
// 点位下设备检查记录 // 点位下设备检查记录
list.forEach(itemCheck -> { list.forEach(itemCheck -> {
PageData itemCheckData = new PageData(); PageData itemCheckData = new PageData();
itemCheckData.putAll(itemCheck); itemCheckData.putAll(itemCheck);
itemCheckData.put("FOREIGN_KEY", itemCheck.getString("EQUIPMENT_RECORD_ID")); itemCheckData.put("FOREIGN_KEY", itemCheck.getString("EQUIPMENT_RECORD_ID"));
itemCheckData.put("TYPE", "14"); itemCheckData.put("TYPE", "14");
List<PageData> data = null; List<PageData> data = imgFilesService.listAll(itemCheckData);
try {
data = imgFilesService.listAll(itemCheckData);
} catch (Exception e) {
throw new RuntimeException(e);
}
// 不合格 // 不合格
if (!"0".equals(itemCheckData.getString("ISNORMAL"))) { if (!"0".equals(itemCheckData.getString("ISNORMAL"))) {
// 删除合格得照片 // 删除合格得照片
data.forEach(item -> { data.forEach(item -> {
imgFilesService.delete(item);
TenCorpDto tenCorpDto = new TenCorpDto();
tenCorpDto.setData(item);
try { try {
imgFilesService.delete(item); dockSendMessageService.sendMessagePictureDelete(tenCorpDto);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}); });
} }
fireRecordService.editDeviceCheckByApp(itemCheckData); fireRecordService.editDeviceCheckByApp(itemCheckData);
dataArrayList.add(itemCheckData);
}); });
// todo 校验一下有没有点位图片
// fireRecordService.modifyPointRecord(pd);
map.put("result", errInfo); map.put("result", errInfo);
pd.put("dataArrayList",dataArrayList);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -352,12 +359,14 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/editDeviceCheckFine") @RequestMapping("/editDeviceCheckFine")
@DockAnnotation
public Object editDeviceCheckFine() throws Exception { public Object editDeviceCheckFine() throws Exception {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData(); PageData pd = this.getPageData();
fireRecordService.modifyPointRecord(pd); fireRecordService.modifyPointRecord(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -369,7 +378,8 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/getOtherHidden") @RequestMapping("/getOtherHidden")
private Object getOtherHidden() throws Exception { @ResponseBody
public Object getOtherHidden() throws Exception {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = getPageData(); PageData pageData = getPageData();
@ -402,12 +412,15 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/addOtherHidden") @RequestMapping("/addOtherHidden")
private Object addOtherHidden() throws Exception { @ResponseBody
@DockAnnotation
public Object addOtherHidden() throws Exception {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = getPageData(); PageData pageData = getPageData();
fireRecordService.addOtherHidden(pageData); PageData dockData = fireRecordService.addOtherHidden(pageData);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map; return map;
} }
@ -419,12 +432,14 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/delOtherHidden") @RequestMapping("/delOtherHidden")
private Object delOtherHidden() throws Exception { @DockAnnotation
public Object delOtherHidden() throws Exception {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = getPageData(); PageData pageData = getPageData();
fireRecordService.delOtherHidden(pageData); fireRecordService.delOtherHidden(pageData);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pageData));
return map; return map;
} }
@ -437,10 +452,12 @@ public class AppFireRecordController extends BaseController {
* @Return: java.lang.Object * @Return: java.lang.Object
*/ */
@RequestMapping("/finish") @RequestMapping("/finish")
private Object save() throws Exception { @DockAnnotation
public Object finish() throws Exception {
String errInfo = "success"; String errInfo = "success";
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = this.getPageData(); PageData pageData = this.getPageData();
map.put("dockData",JSON.toJSONString(pageData));
fireRecordService.finishByApp(pageData); fireRecordService.finishByApp(pageData);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -542,7 +559,7 @@ public class AppFireRecordController extends BaseController {
if (deviceListByPointId.size() > 0) { if (deviceListByPointId.size() > 0) {
deviceListByPointId.forEach(item -> { deviceListByPointId.forEach(item -> {
String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@"); String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@");
item.put("FIRE_CHECK_STANDARD_ITEM",fireCheckStandardItems); item.put("FIRE_CHECK_STANDARD_ITEM", fireCheckStandardItems);
}); });
} }

21
src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -78,6 +79,7 @@ public class AppGFBreakGroundController extends BaseController {
@RequestMapping(value="/add") @RequestMapping(value="/add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@DockAnnotation(hasAnnex = true)
public Object add( public Object add(
@RequestParam(value="FFILE",required=false) MultipartFile[] files @RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{ ) throws Exception{
@ -86,6 +88,7 @@ public class AppGFBreakGroundController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
PageData pd2 = new PageData(); PageData pd2 = new PageData();
ArrayList<String> sendPicturesList = new ArrayList<>();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
DecimalFormat dft=new DecimalFormat("00"); DecimalFormat dft=new DecimalFormat("00");
int year = calendar.get(Calendar.YEAR); int year = calendar.get(Calendar.YEAR);
@ -104,16 +107,20 @@ public class AppGFBreakGroundController extends BaseController {
pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
if (files != null && files.length > 0) { if (files != null && files.length > 0) {
MultipartFile file = files[0]; MultipartFile file = files[0];
String ffile = DateUtil.getDays(); 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 + pd.getString("CORPINFO_ID") + "/" + ffile); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName
+"@@"+fileName
);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
} }
GFbreakGroundService.save(pd); GFbreakGroundService.save(pd);
PageData breakGroundPageData = new PageData();
PageData breakGroundLogPageData = new PageData();
breakGroundPageData.putAll(pd);
if(pd.get("APPLY_STATUS").equals("1")) { if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData(); PageData log = new PageData();
log.put("BREAKGROUNDLOG_ID", this.get32UUID()); log.put("BREAKGROUNDLOG_ID", this.get32UUID());
@ -122,8 +129,8 @@ public class AppGFBreakGroundController extends BaseController {
log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date())); log.put("CREATTIME", DateUtil.date2Str(new Date()));
GFbreakGroundLogService.save(log); GFbreakGroundLogService.save(log);
breakGroundLogPageData.putAll(log);
List<PageData> paramsList = new ArrayList<PageData>();
// 发短信 // 发短信
PageData mes = new PageData(); PageData mes = new PageData();
mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid
@ -131,7 +138,6 @@ public class AppGFBreakGroundController extends BaseController {
mes.put("SMSCode", "SMS_227245922");// 短信模板编码 mes.put("SMSCode", "SMS_227245922");// 短信模板编码
mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
// 参数集合 // 参数集合
List<PageData> paramsList = new ArrayList<PageData>();
// 第1个参数 // 第1个参数
PageData params1 = new PageData(); PageData params1 = new PageData();
params1.put("name", "number");// 存入短信模板中的参数名称 params1.put("name", "number");// 存入短信模板中的参数名称
@ -155,8 +161,11 @@ public class AppGFBreakGroundController extends BaseController {
paramsList.add(params4); paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList); sendMessageUtil.sendMessages(mes, paramsList);
} }
PageData dockData = new PageData();
dockData.put("breakGroundPageData",breakGroundPageData);
dockData.put("breakGroundLogPageData",breakGroundLogPageData);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(dockData));
return map; return map;
} }
/**修改 /**修改

6
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
View File

@ -399,6 +399,7 @@ public class SafetyEnvironmentalController extends BaseController {
@RequestMapping(value = "/explain") @RequestMapping(value = "/explain")
@RequiresPermissions("safetyenvironmental:edit") @RequiresPermissions("safetyenvironmental:edit")
@ResponseBody @ResponseBody
@DockAnnotation(isAdd = true)
public Object explain() throws Exception { public Object explain() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -421,12 +422,13 @@ public class SafetyEnvironmentalController extends BaseController {
pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
} }
safetyenvironmentalService.explain(pd); PageData log = safetyenvironmentalService.explain(pd);
pd.put("log",JSON.toJSONString(log));
pd.put("inspector", Jurisdiction.getUSER_ID()); pd.put("inspector", Jurisdiction.getUSER_ID());
noticeCorpUtil.FailPleadind(pd); noticeCorpUtil.FailPleadind(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }

4
src/main/java/com/zcloud/service/bus/ImgFilesService.java
View File

@ -23,7 +23,7 @@ public interface ImgFilesService{
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void delete(PageData pd)throws Exception; public void delete(PageData pd);
/**删除 /**删除
* @param pd * @param pd
@ -47,7 +47,7 @@ public interface ImgFilesService{
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAll(PageData pd)throws Exception; public List<PageData> listAll(PageData pd);
/**通过id获取数据 /**通过id获取数据
* @param pd * @param pd

2
src/main/java/com/zcloud/service/bus/impl/HiddenExamineServiceImpl.java
View File

@ -145,7 +145,7 @@ public class HiddenExamineServiceImpl implements HiddenExamineService {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATTIME",DateUtil.date2Str(new Date())); pd.put("OPERATTIME",DateUtil.date2Str(new Date()));
hiddenexamineMapper.save(pd); hiddenexamineMapper.save(pd);
return pd; return pd;
} }
public PageData appSave(PageData pd)throws Exception{ public PageData appSave(PageData pd)throws Exception{

12
src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java
View File

@ -5,6 +5,8 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -28,7 +30,8 @@ public class ImgFilesServiceImpl implements ImgFilesService{
@Autowired @Autowired
private ImgFilesMapper imgfilesMapper; private ImgFilesMapper imgfilesMapper;
@Autowired
private DockSendMessageService dockSendMessageService;
/**新增 /**新增
* @param pd * @param pd
* @throws Exception * @throws Exception
@ -41,8 +44,10 @@ public class ImgFilesServiceImpl implements ImgFilesService{
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void delete(PageData pd)throws Exception{ @Override
public void delete(PageData pd){
imgfilesMapper.delete(pd); imgfilesMapper.delete(pd);
} }
/**删除 /**删除
@ -73,7 +78,8 @@ public class ImgFilesServiceImpl implements ImgFilesService{
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAll(PageData pd)throws Exception{ @Override
public List<PageData> listAll(PageData pd){
return imgfilesMapper.listAll(pd); return imgfilesMapper.listAll(pd);
} }

2
src/main/java/com/zcloud/service/firemanager/FireRecordService.java
View File

@ -45,7 +45,7 @@ public interface FireRecordService {
List<PageData> getOtherHiddenListByApp(PageData pageData) throws Exception; List<PageData> getOtherHiddenListByApp(PageData pageData) throws Exception;
void addOtherHidden(PageData pageData); PageData addOtherHidden(PageData pageData);
void delOtherHidden(PageData pageData); void delOtherHidden(PageData pageData);

4
src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
View File

@ -409,7 +409,7 @@ public class FireRecordServiceImpl implements FireRecordService {
@Override @Override
@Transactional @Transactional
public void addOtherHidden(PageData pageData) { public PageData addOtherHidden(PageData pageData) {
String hiddenId = (String) pageData.get("HIDDEN_ID"); String hiddenId = (String) pageData.get("HIDDEN_ID");
PageData dataList = fireRecordMapper.getOtherHiddenListByApp(pageData); PageData dataList = fireRecordMapper.getOtherHiddenListByApp(pageData);
String hiddenidlist = null; String hiddenidlist = null;
@ -425,7 +425,7 @@ public class FireRecordServiceImpl implements FireRecordService {
pageData.put("HIDDENIDLIST", hiddenId); pageData.put("HIDDENIDLIST", hiddenId);
} }
fireRecordMapper.addOtherHidden(pageData); fireRecordMapper.addOtherHidden(pageData);
return pageData;
} }
@Override @Override

4
src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java
View File

@ -83,8 +83,8 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService {
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd)throws Exception{
PageData pageData = GFblindboardMapper.findById(pd); PageData pageData = GFblindboardMapper.findById(pd);
//调用接口 获取用户信息 //调用接口 获取用户信息
String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); //String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER"));
pageData.put("WORK_USER",workUser); //pageData.put("WORK_USER",workUser);
return pageData; return pageData;
} }

4
src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java
View File

@ -82,8 +82,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService {
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd)throws Exception{
PageData pageData = GFhighworkMapper.findById(pd); PageData pageData = GFhighworkMapper.findById(pd);
//调用接口 获取用户信息 //调用接口 获取用户信息
String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); //String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER"));
pageData.put("PROJECT_MANAGER",workUser); //pageData.put("PROJECT_MANAGER",workUser);
return pageData; return pageData;
} }

4
src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java
View File

@ -90,10 +90,12 @@ public interface SafetyEnvironmentalService{
/** /**
* 申辩不成立时归档 * 申辩不成立时归档
*
* @param pd * @param pd
* @return
* @throws Exception * @throws Exception
*/ */
void explain(PageData pd)throws Exception; PageData explain(PageData pd)throws Exception;
/** /**
* 分公司安全环保检查考核分数统计 * 分公司安全环保检查考核分数统计

3
src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
View File

@ -582,7 +582,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
} }
@Override @Override
public void explain(PageData pd) throws Exception { public PageData explain(PageData pd) throws Exception {
PageData data = safetyenvironmentalMapper.findById(pd); PageData data = safetyenvironmentalMapper.findById(pd);
pd.put("STATE", "101"); // 101.检查已归档，待指派 pd.put("STATE", "101"); // 101.检查已归档，待指派
pd.put("INSPECTION_SOURCE",data.getString("INSPECTION_SOURCE")); pd.put("INSPECTION_SOURCE",data.getString("INSPECTION_SOURCE"));
@ -616,6 +616,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
explain.put("OPERATTIME",DateUtil.date2Str(new Date())); explain.put("OPERATTIME",DateUtil.date2Str(new Date()));
safetyEnvironmentalExplainService.edit(explain); safetyEnvironmentalExplainService.edit(explain);
} }
return log;
} }
@Override @Override

1
src/main/java/com/zcloud/service/mq/DockSendMessageService.java
View File

@ -6,6 +6,7 @@ public interface DockSendMessageService {
void sendMessage(TenCorpDto tenCorpDto) throws Exception; void sendMessage(TenCorpDto tenCorpDto) throws Exception;
void sendMessagePicture(TenCorpDto tenCorpDto) throws Exception; void sendMessagePicture(TenCorpDto tenCorpDto) throws Exception;
void sendMessagePictureDelete(TenCorpDto tenCorpDto) throws Exception;
void SendDelayQueue(TenCorpDto tenCorpDto); void SendDelayQueue(TenCorpDto tenCorpDto);
void SendDelayQueue(String message); void SendDelayQueue(String message);

23
src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java
View File

@ -84,6 +84,29 @@ public class DockSendMessageServiceImpl implements DockSendMessageService {
} }
} }
@Override
public void sendMessagePictureDelete(TenCorpDto tenCorpDto) throws Exception {
try {
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
log.put("CREATE_TIME", DateUtil.getTime());
mqMessageLogMapper.save(log);
System.out.println("生产者:" + tenCorpDto.toString());
SendResult sendResult = rocketMQTemplate.syncSend(this.dockingPicture, tenCorpDto.toString());
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {
e.printStackTrace();
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID());
log.put("ERROR_MESSAGE", e.getMessage());
log.put("TYPE", "0");
log.put("TIME", DateUtil.getTime());
mqErrorMessageLogMapper.save(log);
}
}
@Override @Override
public void SendDelayQueue(TenCorpDto tenCorpDto) { public void SendDelayQueue(TenCorpDto tenCorpDto) {
PageData log = tenCorpDto.getPd(); PageData log = tenCorpDto.getPd();