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

初始化

pull/6/head
guoyuepeng 2023-11-08 08:53:50 +08:00
parent 9e993610b0
commit 71846cb62a
33 changed files with 1885 additions and 1182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,12 @@ 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;
import com.zcloud.entity.system.Department; import com.zcloud.entity.system.Department;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.firemanager.FirePointService; import com.zcloud.service.firemanager.FirePointService;
import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.UsersService; import com.zcloud.service.system.UsersService;
import com.zcloud.util.DateUtil; import com.zcloud.util.DateUtil;
import com.zcloud.util.InitPageDataUtil;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import com.zcloud.util.logAop.LogOperation; import com.zcloud.util.logAop.LogOperation;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
@ -15,7 +17,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; 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.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.*; import java.util.*;
@ -29,11 +33,42 @@ import java.util.*;
public class FirePointController extends BaseController { public class FirePointController extends BaseController {
@Autowired @Autowired
private FirePointService firePointService; private FirePointService firePointService;
@Autowired
private InitPageDataUtil initPageDataUtil;
@Autowired
private ImgFilesService imgFilesService;
@Autowired @Autowired
private DepartmentService departmentService; private DepartmentService departmentService;
@Autowired @Autowired
private UsersService usersService; private UsersService usersService;
/**
* 定位
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/getFirePointCheckPhotos")
@ResponseBody
public Object getFirePointCheckPhotos() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
List<PageData> checkImages = firePointService.getFirePointCheckPhotos(pd);
if (checkImages != null && checkImages.size() > 0) {
checkImages.forEach(item -> {
String[] checkImagesItems = item.getString("FILEPATHLIST").split("@@");
item.put("FILEPATH_LIST", checkImagesItems);
});
}
map.put("imgList", checkImages);
map.put("result", errInfo);
return map;
}
/** /**
* @Description: 消防点位列表 * @Description: 消防点位列表
* @Author: dearLin * @Author: dearLin
@ -63,14 +98,16 @@ public class FirePointController extends BaseController {
return map; return map;
} }
/**定位 /**
* 定位
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/savePosition") @RequestMapping(value = "/savePosition")
@ResponseBody @ResponseBody
public Object savePosition() throws Exception{ public Object savePosition() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -87,13 +124,17 @@ public class FirePointController extends BaseController {
*/ */
@RequestMapping("/getFirPointInfo") @RequestMapping("/getFirPointInfo")
@ResponseBody @ResponseBody
public Object info() { public Object info() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = getPageData(); PageData pd = getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData resdata = firePointService.findById(pd); PageData resdata = firePointService.findById(pd);
PageData imgPage = new PageData();
imgPage.put("FOREIGN_KEY",pd.getString("FIRE_POINT_ID"));
List<PageData> dataList = imgFilesService.listAll(imgPage);
map.put("res", resdata); map.put("res", resdata);
map.put("imgList", dataList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -107,13 +148,13 @@ public class FirePointController extends BaseController {
@LogOperation(value = "修改消防风险点位成功", exceptionInformation = "修改消防风险点位失败", isUpdate = true, updateId = "FIRE_POINT_ID") @LogOperation(value = "修改消防风险点位成功", exceptionInformation = "修改消防风险点位失败", isUpdate = true, updateId = "FIRE_POINT_ID")
@RequestMapping("/updFireRegionById") @RequestMapping("/updFireRegionById")
@ResponseBody @ResponseBody
public Object updFirePointById() { public Object updFirePointById(@RequestParam(value = "files",required = false) MultipartFile[] files) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = getPageData(); PageData pd = getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); pd.put("OPERATOR", Jurisdiction.getUsername());
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
firePointService.updFirePointById(pd); firePointService.updFirePointById(files,pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -157,7 +198,6 @@ public class FirePointController extends BaseController {
} }
/** /**
* @Description: 保存点位信息 * @Description: 保存点位信息
* @Author: dearLin * @Author: dearLin
@ -167,17 +207,16 @@ public class FirePointController extends BaseController {
@LogOperation(value = "新增消防风险点位成功", exceptionInformation = "新增消防风险点位失败") @LogOperation(value = "新增消防风险点位成功", exceptionInformation = "新增消防风险点位失败")
@RequestMapping(value = "/savePointInfo") @RequestMapping(value = "/savePointInfo")
@ResponseBody @ResponseBody
public Object saveInfo() { public Object saveInfo(@RequestParam(value = "files",required = false) MultipartFile[] files) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = getPageData(); PageData pd = getPageData();
pd.put("FIRE_POINT_ID", this.get32UUID()); String uuid = this.get32UUID();
pd.put("CREATOR", Jurisdiction.getUSER_ID()); pd.put("FIRE_POINT_ID", uuid);
initPageDataUtil.initSave(pd);
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("OPERATOR", Jurisdiction.getUSER_ID());
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
firePointService.savePointInfo(pd); firePointService.savePointInfo(pd);
imgFilesService.uploadPicture(files,"118",pd.getString("FIRE_POINT_ID"));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }

310
src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.entity.system.Department;
import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.keyProjects.AIWarningService; import com.zcloud.service.keyProjects.AIWarningService;
import com.zcloud.service.keyProjects.OutSourcedService; import com.zcloud.service.keyProjects.OutSourcedService;
import com.zcloud.service.keyProjects.VideoManagerService;
import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.UsersService; import com.zcloud.service.system.UsersService;
import com.zcloud.util.*; import com.zcloud.util.*;
@ -43,27 +44,30 @@ public class OutSourcedController extends BaseController {
private UsersService usersService; private UsersService usersService;
@Autowired @Autowired
private ImgFilesService imgfilesService; private ImgFilesService imgfilesService;
@Autowired
private VideoManagerService videoManagerService;
/**
/**新增 * 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/add") @RequestMapping(value = "/add")
@RequiresPermissions("outsourced:add") @RequiresPermissions("outsourced:add")
@ResponseBody @ResponseBody
public Object add(@RequestParam(value="file",required=false) MultipartFile file, public Object add(@RequestParam(value = "file", required = false) MultipartFile file,
@RequestParam(value="file1",required=false) MultipartFile file1, @RequestParam(value = "file1", required = false) MultipartFile file1,
@RequestParam(value="file2",required=false) MultipartFile file2, @RequestParam(value = "file2", required = false) MultipartFile file2,
@RequestParam(value="file3",required=false) MultipartFile file3, @RequestParam(value = "file3", required = false) MultipartFile file3,
@RequestParam(value="file4",required=false) MultipartFile file4, @RequestParam(value = "file4", required = false) MultipartFile file4,
@RequestParam(value="file5",required=false) MultipartFile file5, @RequestParam(value = "file5", required = false) MultipartFile file5,
@RequestParam(value="file6",required=false) MultipartFile file6, @RequestParam(value = "file6", required = false) MultipartFile file6,
@RequestParam(value="file7",required=false) MultipartFile file7, @RequestParam(value = "file7", required = false) MultipartFile file7,
@RequestParam(value="file8",required=false) MultipartFile file8, @RequestParam(value = "file8", required = false) MultipartFile file8,
@RequestParam(value="file9",required=false) MultipartFile[] file9) throws Exception{ @RequestParam(value = "file9", required = false) MultipartFile[] file9) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -80,7 +84,7 @@ public class OutSourcedController extends BaseController {
if (null != file && !file.isEmpty()) { 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)) { if (!"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);
@ -88,12 +92,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
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 + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile);
pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file1 && !file1.isEmpty()) { if (null != file1 && !file1.isEmpty()) {
String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -101,12 +105,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile);
pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file2 && !file2.isEmpty()) { if (null != file2 && !file2.isEmpty()) {
String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -114,12 +118,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile);
pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file3 && !file3.isEmpty()) { if (null != file3 && !file3.isEmpty()) {
String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -127,12 +131,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile);
pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file4 && !file4.isEmpty()) { if (null != file4 && !file4.isEmpty()) {
String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -140,12 +144,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile);
pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file5 && !file5.isEmpty()) { if (null != file5 && !file5.isEmpty()) {
String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -153,12 +157,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile);
pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file6 && !file6.isEmpty()) { if (null != file6 && !file6.isEmpty()) {
String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -166,12 +170,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile);
pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file7 && !file7.isEmpty()) { if (null != file7 && !file7.isEmpty()) {
String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -179,12 +183,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile);
pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file8 && !file8.isEmpty()) { if (null != file8 && !file8.isEmpty()) {
String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -192,28 +196,28 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile);
pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file9 && file9.length > 0 ) { if (null != file9 && file9.length > 0) {
//校验 //校验
for (int i=0;i<file9.length ;i++){ for (int i = 0; i < file9.length; i++) {
MultipartFile file9One = file9[i]; MultipartFile file9One = file9[i];
String suffixName = file9One.getOriginalFilename().substring(file9One.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file9One.getOriginalFilename().substring(file9One.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail"); map.put("result", "fail");
map.put("exception", "上传文件格式不正确"); map.put("exception", "上传文件格式不正确");
return map; return map;
} }
} }
for (int i=0;i<file9.length ;i++){ for (int i = 0; i < file9.length; i++) {
MultipartFile file9One = file9[i]; MultipartFile file9One = file9[i];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file9One.getOriginalFilename(). String fileName = this.get32UUID() + file9One.getOriginalFilename().
substring(file9One.getOriginalFilename().lastIndexOf(".")); substring(file9One.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file9One, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
PageData pdImg = new PageData(); PageData pdImg = new PageData();
String fileUpdateName = file9One.getOriginalFilename(); String fileUpdateName = file9One.getOriginalFilename();
pdImg.put("IMGFILES_ID", this.get32UUID()); pdImg.put("IMGFILES_ID", this.get32UUID());
@ -230,21 +234,23 @@ public class OutSourcedController extends BaseController {
// involvingCorps = Jurisdiction.getCORPINFO_ID()+","+involvingCorps; // involvingCorps = Jurisdiction.getCORPINFO_ID()+","+involvingCorps;
// pd.put("INVOLVING_CORPS",involvingCorps); // pd.put("INVOLVING_CORPS",involvingCorps);
//} //}
pd.put("INVOLVING_CORPS",Jurisdiction.getCORPINFO_ID()); pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
outsourcedService.save(pd); outsourcedService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**删除 /**
* 删除
*
* @param out * @param out
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@RequiresPermissions("outsourced:del") @RequiresPermissions("outsourced:del")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -253,31 +259,33 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/edit") @RequestMapping(value = "/edit")
@RequiresPermissions("outsourced:edit") @RequiresPermissions("outsourced:edit")
@ResponseBody @ResponseBody
public Object edit(@RequestParam(value="file",required=false) MultipartFile file, public Object edit(@RequestParam(value = "file", required = false) MultipartFile file,
@RequestParam(value="file1",required=false) MultipartFile file1, @RequestParam(value = "file1", required = false) MultipartFile file1,
@RequestParam(value="file2",required=false) MultipartFile file2, @RequestParam(value = "file2", required = false) MultipartFile file2,
@RequestParam(value="file3",required=false) MultipartFile file3, @RequestParam(value = "file3", required = false) MultipartFile file3,
@RequestParam(value="file4",required=false) MultipartFile file4, @RequestParam(value = "file4", required = false) MultipartFile file4,
@RequestParam(value="file5",required=false) MultipartFile file5, @RequestParam(value = "file5", required = false) MultipartFile file5,
@RequestParam(value="file6",required=false) MultipartFile file6, @RequestParam(value = "file6", required = false) MultipartFile file6,
@RequestParam(value="file7",required=false) MultipartFile file7, @RequestParam(value = "file7", required = false) MultipartFile file7,
@RequestParam(value="file8",required=false) MultipartFile file8, @RequestParam(value = "file8", required = false) MultipartFile file8,
@RequestParam(value="file9",required=false) MultipartFile[] file9) throws Exception{ @RequestParam(value = "file9", required = false) MultipartFile[] file9) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if (null != file && !file.isEmpty()) { 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)) { if (!"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);
@ -285,12 +293,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
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 + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile);
pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file1 && !file1.isEmpty()) { if (null != file1 && !file1.isEmpty()) {
String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -298,12 +306,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile);
pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file2 && !file2.isEmpty()) { if (null != file2 && !file2.isEmpty()) {
String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -311,12 +319,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile);
pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file3 && !file3.isEmpty()) { if (null != file3 && !file3.isEmpty()) {
String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -324,12 +332,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile);
pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file4 && !file4.isEmpty()) { if (null != file4 && !file4.isEmpty()) {
String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -337,12 +345,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile);
pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file5 && !file5.isEmpty()) { if (null != file5 && !file5.isEmpty()) {
String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -350,12 +358,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile);
pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file6 && !file6.isEmpty()) { if (null != file6 && !file6.isEmpty()) {
String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -363,12 +371,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile);
pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file7 && !file7.isEmpty()) { if (null != file7 && !file7.isEmpty()) {
String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -376,12 +384,12 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile);
pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file8 && !file8.isEmpty()) { if (null != file8 && !file8.isEmpty()) {
String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"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);
@ -389,28 +397,28 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile); Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile);
pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
} }
if (null != file9 && file9.length > 0 ) { if (null != file9 && file9.length > 0) {
//校验 //校验
for (int i=0;i<file9.length ;i++){ for (int i = 0; i < file9.length; i++) {
MultipartFile file9One = file9[i]; MultipartFile file9One = file9[i];
String suffixName = file9One.getOriginalFilename().substring(file9One.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); String suffixName = file9One.getOriginalFilename().substring(file9One.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail"); map.put("result", "fail");
map.put("exception", "上传文件格式不正确"); map.put("exception", "上传文件格式不正确");
return map; return map;
} }
} }
for (int i=0;i<file9.length ;i++){ for (int i = 0; i < file9.length; i++) {
MultipartFile file9One = file9[i]; MultipartFile file9One = file9[i];
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file9One.getOriginalFilename(). String fileName = this.get32UUID() + file9One.getOriginalFilename().
substring(file9One.getOriginalFilename().lastIndexOf(".")); substring(file9One.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file9One, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
PageData pdImg = new PageData(); PageData pdImg = new PageData();
String fileUpdateName = file9One.getOriginalFilename(); String fileUpdateName = file9One.getOriginalFilename();
pdImg.put("IMGFILES_ID", this.get32UUID()); pdImg.put("IMGFILES_ID", this.get32UUID());
@ -426,7 +434,7 @@ public class OutSourcedController extends BaseController {
//if (!pd.getString("INVOLVING_CORPS").contains(Jurisdiction.getCORPINFO_ID())) { //if (!pd.getString("INVOLVING_CORPS").contains(Jurisdiction.getCORPINFO_ID())) {
//involvingCorps = pd.getString("INVOLVING_CORPS"); //involvingCorps = pd.getString("INVOLVING_CORPS");
pd.put("INVOLVING_CORPS",Jurisdiction.getCORPINFO_ID()); pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
//} //}
outsourcedService.edit(pd); outsourcedService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -435,6 +443,7 @@ public class OutSourcedController extends BaseController {
/** /**
* 列表 * 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -445,17 +454,19 @@ public class OutSourcedController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if(!StringUtils.equals(Jurisdiction.getUsername(),"admin")){ if (!StringUtils.equals(Jurisdiction.getUsername(), "admin")) {
if(!StringUtils.equals(Jurisdiction.getCORPINFO_ID(),"1e6dbbe16004402f8d2c0e52afd9a676")&&!StringUtils.equals(Jurisdiction.getCORPINFO_ID(),"3a854eefa7894e06aaa1a2611bca80f6")&& if (!StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "1e6dbbe16004402f8d2c0e52afd9a676")
!StringUtils.equals(Jurisdiction.getCORPINFO_ID(),"020578a4c1f04bc692ee25145c2efbe5")&&!StringUtils.equals(Jurisdiction.getCORPINFO_ID(),"90966974de3c4b83aca6f8fd6432d5c2")){ && !StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "3a854eefa7894e06aaa1a2611bca80f6")
pd.put("DeptId",outsourcedService.getDeptId(Jurisdiction.getUSER_ID())); && !StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "020578a4c1f04bc692ee25145c2efbe5")
pd.put("UserId",Jurisdiction.getUSER_ID()); && !StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "90966974de3c4b83aca6f8fd6432d5c2")) {
pd.put("DeptId", outsourcedService.getDeptId(Jurisdiction.getUSER_ID()));
pd.put("UserId", Jurisdiction.getUSER_ID());
} }
} }
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
String corpinfo = Jurisdiction.getCORPINFO_ID(); String corpinfo = Jurisdiction.getCORPINFO_ID();
pd.put("CORPINFO_ID",corpinfo); pd.put("CORPINFO_ID", corpinfo);
page.setPd(pd); page.setPd(pd);
List<PageData> varList = outsourcedService.list(page); //列出OutSourced列表 List<PageData> varList = outsourcedService.list(page); //列出OutSourced列表
@ -468,39 +479,39 @@ public class OutSourcedController extends BaseController {
*/ */
List<String> outIds = new ArrayList<>(); List<String> outIds = new ArrayList<>();
for (PageData pageData:varList){ for (PageData pageData : varList) {
outIds.add(pageData.getString("OUTSOURCED_ID")); outIds.add(pageData.getString("OUTSOURCED_ID"));
} }
pd.put("outIds",outIds); pd.put("outIds", outIds);
List<PageData> userList = aiWarningService.getPeopleListByIds(pd); List<PageData> userList = aiWarningService.getPeopleListByIds(pd);
Map<String,String> putUserMap = new HashMap<>(); // key value Map<String, String> putUserMap = new HashMap<>(); // key value
for (PageData pageData :userList ){ for (PageData pageData : userList) {
String OUTSOURCED_ID =pageData.getString("OUTSOURCED_ID"); String OUTSOURCED_ID = pageData.getString("OUTSOURCED_ID");
if(Tools.notEmpty(pageData.getString("NAME"))){ if (Tools.notEmpty(pageData.getString("NAME"))) {
String userName = pageData.getString("NAME"); String userName = pageData.getString("NAME");
String userNames = userName; String userNames = userName;
if(putUserMap.containsKey(OUTSOURCED_ID)){ if (putUserMap.containsKey(OUTSOURCED_ID)) {
userNames = putUserMap.get(OUTSOURCED_ID) + ";" +userName; userNames = putUserMap.get(OUTSOURCED_ID) + ";" + userName;
}else{ } else {
userNames = userName; userNames = userName;
} }
putUserMap.put(OUTSOURCED_ID,userNames); putUserMap.put(OUTSOURCED_ID, userNames);
} }
} }
//* shuachu //* shuachu
for (PageData pageData :varList ){ for (PageData pageData : varList) {
String userNames = ""; String userNames = "";
String OUTSOURCED_ID =pageData.getString("OUTSOURCED_ID"); String OUTSOURCED_ID = pageData.getString("OUTSOURCED_ID");
if(putUserMap.containsKey(OUTSOURCED_ID)){ if (putUserMap.containsKey(OUTSOURCED_ID)) {
userNames = putUserMap.get(OUTSOURCED_ID); userNames = putUserMap.get(OUTSOURCED_ID);
if(userNames.length()>1){ if (userNames.length() > 1) {
pageData.put("userNames",userNames); pageData.put("userNames", userNames);
} }
}else{ } else {
pageData.put("userNames",""); pageData.put("userNames", "");
} }
} }
//* shuachu //* shuachu
@ -511,25 +522,27 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @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"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd = outsourcedService.findById(pd); //根据ID读取 pd = outsourcedService.findById(pd); //根据ID读取
PageData selectPageData = new PageData(); PageData selectPageData = new PageData();
selectPageData.put("CORPINFO_ID",pd.get("PUNISH_THE_PERSON")); selectPageData.put("CORPINFO_ID", pd.get("PUNISH_THE_PERSON"));
List<PageData> deptList = departmentService.listAll(selectPageData); //根据ID读取 List<PageData> deptList = departmentService.listAll(selectPageData); //根据ID读取
String userStr = pd.getString("PUNISH_THE_PERSON"); String userStr = pd.getString("PUNISH_THE_PERSON");
if (!Tools.isEmpty(userStr)) { if (!Tools.isEmpty(userStr)) {
String[] split = userStr.split(","); String[] split = userStr.split(",");
selectPageData.put("ids",split); selectPageData.put("ids", split);
// List<PageData> pageData = usersService.listUserAndDept(selectPageData); // List<PageData> pageData = usersService.listUserAndDept(selectPageData);
// 监管与企业的 // 监管与企业的
List<PageData> pageData = usersService.selectUserListByUserIds(selectPageData); List<PageData> pageData = usersService.selectUserListByUserIds(selectPageData);
@ -547,41 +560,45 @@ public class OutSourcedController extends BaseController {
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteAll") @RequestMapping(value = "/deleteAll")
@RequiresPermissions("outsourced:del") @RequiresPermissions("outsourced:del")
@ResponseBody @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"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS"); String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
outsourcedService.deleteAll(ArrayDATA_IDS); outsourcedService.deleteAll(ArrayDATA_IDS);
errInfo = "success"; errInfo = "success";
}else{ } else {
errInfo = "fail"; errInfo = "fail";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
/**导出到excel /**
* 导出到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/excel") @RequestMapping(value = "/excel")
@RequiresPermissions("toExcel") @RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{ public ModelAndView exportExcel() throws Exception {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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>(); List<String> titles = new ArrayList<String>();
titles.add("发包部门"); //1 titles.add("发包部门"); //1
titles.add("发包部门负责人"); //2 titles.add("发包部门负责人"); //2
@ -619,7 +636,7 @@ public class OutSourcedController extends BaseController {
dataMap.put("titles", titles); dataMap.put("titles", titles);
List<PageData> varOList = outsourcedService.listAll(pd); List<PageData> varOList = outsourcedService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>(); 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(); PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("CONTRACT_ID")); //1 vpd.put("var1", varOList.get(i).getString("CONTRACT_ID")); //1
vpd.put("var2", varOList.get(i).getString("CONTRACT_PIC")); //2 vpd.put("var2", varOList.get(i).getString("CONTRACT_PIC")); //2
@ -658,22 +675,24 @@ public class OutSourcedController extends BaseController {
} }
dataMap.put("varList", varList); dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView(); ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap); mv = new ModelAndView(erv, dataMap);
return mv; return mv;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/getListAllSel") @RequestMapping(value = "/getListAllSel")
@ResponseBody @ResponseBody
public Object getListAllSel() throws Exception{ public Object getListAllSel() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> varList = outsourcedService.listAll(pd); //根据ID读取 List<PageData> varList = outsourcedService.listAll(pd); //根据ID读取
map.put("pd", pd); map.put("pd", pd);
@ -695,8 +714,49 @@ public class OutSourcedController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
//校验当前重点工程是否存在未完成的隐患 （包含未整改，未处罚，ai报警未处置的）
PageData pageData = outsourcedService.jieshuOutSourced(pd);
if(!StringUtils.equals("0",pageData.getString("qr"))){
map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("qr")+"项待确认安全环保检查,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("zg"))){
map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("zg")+"项需整改的隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("ys"))){
map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("ys")+"项待验收隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("cf"))){
map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("cf")+"项待处罚隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("fk"))){
map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("fk")+"项处罚待反馈隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("ai"))){
map.put("result", errInfo);
map.put("msg","当前重点工程还有"+pageData.getString("ai")+"项AI报警待处置,请处理以后再结束");
map.put("code","500");
return map;
}
pd = outsourcedService.findById(pd); pd = outsourcedService.findById(pd);
outsourcedService.jie(pd); outsourcedService.jie(pd);
//清空摄像头与重点工程的关联关系
videoManagerService.updateAiByOUTSOURCED_ID(pd);
map.put("code","0");
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }

155
src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java
View File

@ -28,15 +28,17 @@ public class PersonnelManagementController extends BaseController {
@Autowired @Autowired
private PersonnelManagementService personnelmanagementService; private PersonnelManagementService personnelmanagementService;
/**新增 /**
* 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/add") @RequestMapping(value = "/add")
@RequiresPermissions("personnelmanagement:add") @RequiresPermissions("personnelmanagement:add")
@ResponseBody @ResponseBody
public Object add() throws Exception{ public Object add() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
pd.put("PERSONNELMANAGEMENT_ID", this.get32UUID()); //主键 pd.put("PERSONNELMANAGEMENT_ID", this.get32UUID()); //主键
@ -51,22 +53,24 @@ public class PersonnelManagementController extends BaseController {
return map; return map;
} }
/**删除 /**
* 删除
*
* @param out * @param out
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@RequiresPermissions("personnelmanagement:del") @RequiresPermissions("personnelmanagement:del")
@ResponseBody @ResponseBody
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID")); String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID"));
if("1".equals(state)){ if ("1".equals(state)) {
personnelmanagementService.delete(pd); personnelmanagementService.delete(pd);
}else { } else {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "只用添加人" + state + "可以删除相关方人员！"); map.put("msg", "只用添加人" + state + "可以删除相关方人员！");
@ -76,22 +80,24 @@ public class PersonnelManagementController extends BaseController {
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/edit") @RequestMapping(value = "/edit")
@RequiresPermissions("personnelmanagement:edit") @RequiresPermissions("personnelmanagement:edit")
@ResponseBody @ResponseBody
public Object edit() throws Exception{ public Object edit() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID")); String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID"));
if("1".equals(state)){ if ("1".equals(state)) {
personnelmanagementService.edit(pd); personnelmanagementService.edit(pd);
}else { } else {
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "只用添加人" + state + "可以删除相关方人员！"); map.put("msg", "只用添加人" + state + "可以删除相关方人员！");
@ -101,20 +107,22 @@ public class PersonnelManagementController extends BaseController {
return map; return map;
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/list") @RequestMapping(value = "/list")
@RequiresPermissions("personnelmanagement:list") @RequiresPermissions("personnelmanagement:list")
@ResponseBody @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"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = personnelmanagementService.list(page); //列出PersonnelManagement列表 List<PageData> varList = personnelmanagementService.list(page); //列出PersonnelManagement列表
map.put("varList", varList); map.put("varList", varList);
@ -123,15 +131,17 @@ public class PersonnelManagementController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@RequiresPermissions("personnelmanagement:edit") @RequiresPermissions("personnelmanagement:edit")
@ResponseBody @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"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -141,42 +151,46 @@ public class PersonnelManagementController extends BaseController {
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteAll") @RequestMapping(value = "/deleteAll")
@RequiresPermissions("personnelmanagement:del") @RequiresPermissions("personnelmanagement:del")
@ResponseBody @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"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS"); String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
personnelmanagementService.deleteAll(ArrayDATA_IDS); personnelmanagementService.deleteAll(ArrayDATA_IDS);
errInfo = "success"; errInfo = "success";
}else{ } else {
errInfo = "fail"; errInfo = "fail";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
/**判断特种作业证书编号是否存在 /**
* 判断特种作业证书编号是否存在
*
* @return * @return
*/ */
@RequestMapping(value="/hasCertificate") @RequestMapping(value = "/hasCertificate")
@ResponseBody @ResponseBody
public Object hasCertificate() throws Exception{ public Object hasCertificate() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if(personnelmanagementService.findByCertificate(pd) != null){ if (personnelmanagementService.findByCertificate(pd) != null) {
map.put("msg","特种作业证书编号已存在"); map.put("msg", "特种作业证书编号已存在");
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
@ -203,17 +217,19 @@ public class PersonnelManagementController extends BaseController {
} }
/**导出到excel /**
* 导出到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/excel") @RequestMapping(value = "/excel")
@RequiresPermissions("toExcel") @RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{ public ModelAndView exportExcel() throws Exception {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); 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>(); List<String> titles = new ArrayList<String>();
titles.add("添加人"); //1 titles.add("添加人"); //1
titles.add("添加单位"); //2 titles.add("添加单位"); //2
@ -237,7 +253,7 @@ public class PersonnelManagementController extends BaseController {
dataMap.put("titles", titles); dataMap.put("titles", titles);
List<PageData> varOList = personnelmanagementService.listAll(pd); List<PageData> varOList = personnelmanagementService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>(); 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(); PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("CREATOR")); //1 vpd.put("var1", varOList.get(i).getString("CREATOR")); //1
vpd.put("var2", varOList.get(i).getString("ADDUNITS")); //2 vpd.put("var2", varOList.get(i).getString("ADDUNITS")); //2
@ -262,36 +278,39 @@ public class PersonnelManagementController extends BaseController {
} }
dataMap.put("varList", varList); dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView(); ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap); mv = new ModelAndView(erv, dataMap);
return mv; return mv;
} }
/** /**
* 判断相关方下面是有相关方人员 * 判断相关方下面是有相关方人员
*
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/isTrueDelete") @RequestMapping(value = "/isTrueDelete")
@ResponseBody @ResponseBody
public Object isTrueDelete () throws Exception{ public Object isTrueDelete() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
List<PageData> pageData = personnelmanagementService.listAll(pd); List<PageData> pageData = personnelmanagementService.listAll(pd);
if(pageData.size()>0){ if (pageData.size() > 0) {
int number = 1; int number = 1;
map.put("number",number); map.put("number", number);
}else { } else {
int number = 0; int number = 0;
map.put("number",number); map.put("number", number);
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@RequestMapping(value="/resetPwd")
@RequestMapping(value = "/resetPwd")
@ResponseBody @ResponseBody
public Object resetPwd (Page page) throws Exception{ public Object resetPwd(Page page) throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -310,41 +329,43 @@ public class PersonnelManagementController extends BaseController {
/** /**
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/isTrueDeleteAll") @RequestMapping(value = "/isTrueDeleteAll")
@ResponseBody @ResponseBody
public Object isTrueDeleteAll () throws Exception{ public Object isTrueDeleteAll() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String[] UNITS_ID = pd.getString("UNITS_ID").split(","); String[] UNITS_ID = pd.getString("UNITS_ID").split(",");
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for(String IDS:UNITS_ID){ for (String IDS : UNITS_ID) {
list.add(IDS); list.add(IDS);
} }
pd.put("IDS",list); pd.put("IDS", list);
pd.put("UNITS_ID",""); pd.put("UNITS_ID", "");
List<PageData> pageData = personnelmanagementService.listAll(pd); List<PageData> pageData = personnelmanagementService.listAll(pd);
if(pageData.size()>0){ if (pageData.size() > 0) {
int number = 1; int number = 1;
map.put("number",number); map.put("number", number);
}else { } else {
int number = 0; int number = 0;
map.put("number",number); map.put("number", number);
} }
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/listAll") @RequestMapping(value = "/listAll")
@ResponseBody @ResponseBody
public Object listAll() throws Exception{ public Object listAll() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();

13
src/main/java/com/zcloud/controller/keyProjects/UnitsController.java
View File

@ -47,9 +47,9 @@ public class UnitsController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("UNITS_ID", this.get32UUID()); //主键 pd.put("UNITS_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除 pd.put("ISDELETE", "0"); //是否删除
if (null != file && !file.isEmpty()) { if (null != file && !file.isEmpty()) {
@ -67,8 +67,7 @@ public class UnitsController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + "/" + ffile + "/" + fileName); pd.put("FILEPATH", Const.FILEPATHFILE + "/" + ffile + "/" + fileName);
} }
pd.put("UNITS_ID", pd.getString("UNITS_ID")); // List<PageData> list = unitsService.listAll(pd);
List<PageData> list = unitsService.listAll(pd);
unitsService.save(pd); unitsService.save(pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -86,18 +85,16 @@ public class UnitsController extends BaseController {
public Object delete() throws Exception { public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData();
String state = unitsService.IsJudgeCreator(pd.getString("UNITS_ID")); String state = unitsService.IsJudgeCreator(pd.getString("UNITS_ID"));
if("1".equals(state)){ if("1".equals(state)){
unitsService.delete(pd); unitsService.delete(pd);
}else{ }else{
errInfo = "fail"; errInfo = "fail";
map.put("result", errInfo); map.put("result", errInfo);
map.put("msg", "只用添加人"+state+"可以删除相关方！"); map.put("msg", "只有添加人"+state+"可以删除相关方！");
return map; return map;
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }

4
src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java
View File

@ -47,8 +47,8 @@ public class VideoResourcesController extends BaseController {
pd.put("VIDEO_RESOURCES_ID", this.get32UUID()); //主键 pd.put("VIDEO_RESOURCES_ID", this.get32UUID()); //主键
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())); //操作日期
pd.put("OPERATOR", Jurisdiction.getUsername()); //操作人 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人
pd.put("CREATOR", Jurisdiction.getUsername()); //操作人 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //操作人
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人
pd.put("ISDELETE", "0"); //是否删除 pd.put("ISDELETE", "0"); //是否删除
videoResourcesService.save(pd); videoResourcesService.save(pd);

2
src/main/java/com/zcloud/controller/keyProjects/app/AppAIWarningController.java
View File

@ -154,8 +154,6 @@ public class AppAIWarningController extends BaseController {
imgAddPd.put("FOREIGN_KEY", hidden.getString("HIDDEN_ID")); imgAddPd.put("FOREIGN_KEY", hidden.getString("HIDDEN_ID"));
imgFilesService.save(imgAddPd); imgFilesService.save(imgAddPd);
} }
keyprojectHiddenService.save(hidden); keyprojectHiddenService.save(hidden);
try { try {
// this.DownloadPicturn(pd); // this.DownloadPicturn(pd);

20
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java
View File

@ -136,4 +136,24 @@ public class AppKeyProjectsController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**处罚管理列表 查询自己可以处罚的重点工程 角标计算逻辑 查询重点工程中所有处罚未选择是否处罚的隐患累加
* @throws Exception
*/
@RequestMapping(value="/getPUNISHlist")
@ResponseBody
public Object getPUNISHlist(Page page) throws Exception{
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());
page.setPd(pd);
List<PageData> varList = outsourcedService.getPUNISHlist(page); //列出OutSourced列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
} }

29
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
View File

@ -46,6 +46,9 @@ public class AppKeyprojectCheckController extends BaseController {
@Autowired @Autowired
private PersonnelManagementService personnelmanagementService; private PersonnelManagementService personnelmanagementService;
@Autowired
private KeyprojectPunishService keyprojectpunishService;
/**新增 /**新增
* @param * @param
* @throws Exception * @throws Exception
@ -150,7 +153,7 @@ public class AppKeyprojectCheckController extends BaseController {
} }
/**删除 /**删除
* @param out * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value="/delete")
@ -274,6 +277,9 @@ public class AppKeyprojectCheckController extends BaseController {
pd.put("zgImgs", imgFilesService.listAll(pd2));//整改图片 pd.put("zgImgs", imgFilesService.listAll(pd2));//整改图片
pd2.put("TYPE",5); pd2.put("TYPE",5);
pd.put("ysImgs", imgFilesService.listAll(pd2));//整改图片 pd.put("ysImgs", imgFilesService.listAll(pd2));//整改图片
PageData findTicketData = new PageData();
findTicketData.put("HIDDEN_ID",pd.getString("HIDDEN_ID"));
pd.put("punishForm",keyprojectpunishService.findById(findTicketData));
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -363,4 +369,25 @@ public class AppKeyprojectCheckController extends BaseController {
return map; return map;
} }
/**重点工程处罚列表 包含 未选择处罚结果的隐患 已下发处罚但为反馈的隐患 不处罚的隐患
* @param page
* @throws Exception
*/
@RequestMapping(value="/punishlist")
@ResponseBody
public Object punishlist(Page page) throws Exception{
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());
page.setPd(pd);
List<PageData> varList = keyprojectHiddenService.getpunishlist(page); //列出KeyprojectCheck列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
} }

145
src/main/java/com/zcloud/controller/xgf/XgfCorpController.java
View File

@ -30,46 +30,50 @@ public class XgfCorpController extends BaseController {
private String url; private String url;
@Value("${qa-regulatory-gwj.api.url}") @Value("${qa-regulatory-gwj.api.url}")
private String regulatoryUrl; private String regulatoryUrl;
/** /**
* 相关方单位账号管理-列表 * 相关方单位账号管理-列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/getCorpInfoList") @RequestMapping(value = "/getCorpInfoList")
@ResponseBody @ResponseBody
public Object getCorpInfoList(Page page) throws Exception{ public Object getCorpInfoList(Page page) throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("SUPERVISE_CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号 if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号
pd.put("SUPERVISE_DEPARTMENT_ID", ""); pd.put("SUPERVISE_DEPARTMENT_ID", "");
}else{ } else {
pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
} }
Map result = HttpClientService.doPost(url + "/api/corpinfo/list", pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/list", pd);
return result; return result;
} }
@RequestMapping("/unitCorpCount") @RequestMapping("/unitCorpCount")
public Map<String,Object> getUnitCorpCount(){ public Map<String, Object> getUnitCorpCount() {
Map<String,Object> result = restTemplate.getForObject(url + "/api/corpinfo/unitCorpInfo", Map.class); Map<String, Object> result = restTemplate.getForObject(url + "/api/corpinfo/unitCorpInfo", Map.class);
String errInfo = "success"; String errInfo = "success";
List<PageData> unitCorp = (List<PageData>)result.get("unitCorp"); List<PageData> unitCorp = (List<PageData>) result.get("unitCorp");
int size = unitCorp.size(); int size = unitCorp.size();
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("unitCorpCount",size); map.put("unitCorpCount", size);
map.put("result",errInfo); map.put("result", errInfo);
return map; return map;
} }
/** /**
* 监管端编辑企业信息 * 监管端编辑企业信息
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/editCorpInfo") @RequestMapping(value = "/editCorpInfo")
@ResponseBody @ResponseBody
public Object editCorpInfo() throws Exception{ public Object editCorpInfo() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -81,26 +85,30 @@ public class XgfCorpController extends BaseController {
/** /**
* 监管端删除企业信息 * 监管端删除企业信息
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteCorpInfo") @RequestMapping(value = "/deleteCorpInfo")
@ResponseBody @ResponseBody
public Object deleteCorpInfo() throws Exception{ public Object deleteCorpInfo() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Map result = HttpClientService.doPost(url + "/api/corpinfo/deleteCorpInfo", pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/deleteCorpInfo", pd);
return result; return result;
} }
/**导出到excel
/**
* 导出到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/excelAll") @RequestMapping(value = "/excelAll")
// @RequiresPermissions("toExcel") // @RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{ public ModelAndView exportExcel() throws Exception {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
@ -108,26 +116,26 @@ public class XgfCorpController extends BaseController {
Map<String, Object> dataMap = new HashMap<String, Object>(); Map<String, Object> dataMap = new HashMap<String, Object>();
List<String> titles = new ArrayList<String>(); List<String> titles = new ArrayList<String>();
titles.add("序号"); //1 titles.add("序号"); //1
titles.add("企业状态"); //2 titles.add("相关方单位名称"); //2
titles.add("股份主管部门"); //3 titles.add("企业状态"); //3
titles.add("基层单位主管公司"); //4 titles.add("股份主管部门"); //4
titles.add("基层单位主管部门"); //5 titles.add("股份监管部门"); //5
titles.add("相关方单位名称"); //6 titles.add("基层单位主管部门"); //6
titles.add("统一社会信用代码"); //7 titles.add("基层单位监管部门"); //7
titles.add("经营地址"); //8 titles.add("统一社会信用代码"); //8
titles.add("法人"); //9 titles.add("经营地址"); //9
titles.add("联系人"); //10 titles.add("法人"); //10
titles.add("联系电话"); //11 titles.add("联系人"); //11
titles.add("用工形式"); //12 titles.add("联系电话"); //12
titles.add("选取形式"); //13 titles.add("用工形式"); //13
titles.add("流动人员比例%"); //14 titles.add("选取形式"); //14
titles.add("添加人"); //15 titles.add("添加人"); //15
titles.add("添加时间"); //16 titles.add("添加时间"); //16
dataMap.put("titles", titles); dataMap.put("titles", titles);
pd.put("SUPERVISE_CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号 if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号
pd.put("SUPERVISE_DEPARTMENT_ID", ""); pd.put("SUPERVISE_DEPARTMENT_ID", "");
}else{ } else {
pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
} }
Map result = HttpClientService.doPost(url + "/api/corpinfo/unitCorpInfo", pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/unitCorpInfo", pd);
@ -137,35 +145,35 @@ public class XgfCorpController extends BaseController {
for (int i = 0; i < varOList.size(); i++) { for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData(); PageData vpd = new PageData();
vpd.put("var1", i + 1); vpd.put("var1", i + 1);
vpd.put("var2", varOList.get(i).get("RELEVANT_UNIT_NAME"));
if (varOList.get(i).get("STATE").equals("0")) { if (varOList.get(i).get("STATE").equals("0")) {
vpd.put("var2", "未填报"); vpd.put("var3", "未填报");
} else if (varOList.get(i).get("STATE").equals("1")) { } else if (varOList.get(i).get("STATE").equals("1")) {
vpd.put("var2", "待审核"); vpd.put("var3", "待审核");
} else if (varOList.get(i).get("STATE").equals("2")) { } else if (varOList.get(i).get("STATE").equals("2")) {
vpd.put("var2", "已审核"); vpd.put("var3", "已审核");
} else if (varOList.get(i).get("STATE").equals("3")) { } else if (varOList.get(i).get("STATE").equals("3")) {
vpd.put("var2", "已打回"); vpd.put("var3", "已打回");
} else if (varOList.get(i).get("STATE").equals("4")) { } else if (varOList.get(i).get("STATE").equals("4")) {
vpd.put("var2", "已填报"); vpd.put("var3", "已填报");
} }
vpd.put("var3", varOList.get(i).get("MAIN_DEPARTMENT_NAME")); vpd.put("var4", varOList.get(i).get("MAIN_DEPARTMENT_NAME"));
vpd.put("var4", varOList.get(i).get("SUPERVISE_CORPINFO_NAME")); vpd.put("var5", varOList.get(i).get("MANAGER_DEPARTMENT_NAME"));
vpd.put("var5", varOList.get(i).get("SUPERVISE_DEPARTMENT_NAME")); vpd.put("var6", varOList.get(i).get("SUPERVISE_CORPINFO_DEPT_NAME"));
vpd.put("var6", varOList.get(i).get("RELEVANT_UNIT_NAME")); vpd.put("var7", varOList.get(i).get("COMPETENT_DEPT_NAME"));
vpd.put("var7", varOList.get(i).get("SOCIAL_CODE")); vpd.put("var8", varOList.get(i).get("SOCIAL_CODE"));
vpd.put("var8", varOList.get(i).get("BUSINESS_ADDRESS")); vpd.put("var9", varOList.get(i).get("BUSINESS_ADDRESS"));
vpd.put("var9", varOList.get(i).get("LEGAL_PERSON")); vpd.put("var10", varOList.get(i).get("LEGAL_PERSON"));
vpd.put("var10", varOList.get(i).get("CONTACT_PERSON")); vpd.put("var11", varOList.get(i).get("CONTACT_PERSON"));
vpd.put("var11", varOList.get(i).get("CONTACT_TEL")); vpd.put("var12", varOList.get(i).get("CONTACT_TEL"));
vpd.put("var12", varOList.get(i).get("EMPLOYMENT_FORM_NAME")); vpd.put("var13", varOList.get(i).get("EMPLOYMENT_FORM_NAME"));
if (varOList.get(i).get("SELECT_FORM").equals("competitive_negotiation")) { if (varOList.get(i).get("SELECT_FORM").equals("competitive_negotiation")) {
vpd.put("var13", "竞争性谈判"); vpd.put("var14", "竞争性谈判");
} }
if (varOList.get(i).get("SELECT_FORM").equals("invite_tenders")) { if (varOList.get(i).get("SELECT_FORM").equals("invite_tenders")) {
vpd.put("var13", "招标"); vpd.put("var14", "招标");
} }
vpd.put("var14", varOList.get(i).get("FLOATING_PERCENT"));
vpd.put("var15", varOList.get(i).get("CREATOR_NAME")); vpd.put("var15", varOList.get(i).get("CREATOR_NAME"));
vpd.put("var16", varOList.get(i).get("CREATTIME").toString().replace("T", " ").replace(".000+0000", "")); vpd.put("var16", varOList.get(i).get("CREATTIME").toString().replace("T", " ").replace(".000+0000", ""));
varList.add(vpd); varList.add(vpd);
@ -175,49 +183,55 @@ public class XgfCorpController extends BaseController {
mv = new ModelAndView(erv, dataMap); mv = new ModelAndView(erv, dataMap);
return mv; return mv;
} }
/** /**
* 查询相关方统一社会信用代码是否唯一 * 查询相关方统一社会信用代码是否唯一
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/resetPassword") @RequestMapping(value = "/resetPassword")
@ResponseBody @ResponseBody
public Object resetPassword() throws Exception{ public Object resetPassword() throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Map result = HttpClientService.doPost(url + "/api/corpinfo/resetPasswordByCorpInfoId", pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/resetPasswordByCorpInfoId", pd);
return result; return result;
} }
/** /**
* 相关方单位人员-人员基础信息管理-list * 相关方单位人员-人员基础信息管理-list
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/getCorpInfoDetail") @RequestMapping(value = "/getCorpInfoDetail")
@ResponseBody @ResponseBody
public Object getCorpInfoDetail() throws Exception{ public Object getCorpInfoDetail() throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Map result = HttpClientService.doPost(url + "/api/corpinfo/getDataForEditByCorpInfoIdForApi", pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/getDataForEditByCorpInfoIdForApi", pd);
return result; return result;
} }
/** 审核 /**
* 审核
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/examine") @RequestMapping(value = "/examine")
@ResponseBody @ResponseBody
public Object examine () throws Exception{ public Object examine() throws Exception {
Map<String,Object> map = new HashMap<String,Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATTIME",DateUtil.date2Str(new Date())); pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATOR",Jurisdiction.getUSER_ID()); pd.put("OPERATOR", Jurisdiction.getUSER_ID());
String type = pd.getString("STATE"); //2 通过 3.未通过 String type = pd.getString("STATE"); //2 通过 3.未通过
if("2".equals(type)){ if ("2".equals(type)) {
pd.put("STATE", "2"); // 审核状态改为通过 pd.put("STATE", "2"); // 审核状态改为通过
} else if ("3".equals(type)) { } else if ("3".equals(type)) {
pd.put("STATE", "3"); // 审核状态改为打回 pd.put("STATE", "3"); // 审核状态改为打回
@ -230,11 +244,12 @@ public class XgfCorpController extends BaseController {
/** /**
* 显示列表ztree * 显示列表ztree
*
* @return * @return
*/ */
@RequestMapping(value="/listTree2") @RequestMapping(value = "/listTree2")
@ResponseBody @ResponseBody
public Object listTree2()throws Exception{ public Object listTree2() throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
Map result = HttpClientService.doPost(regulatoryUrl + "/department/listTree", pd); Map result = HttpClientService.doPost(regulatoryUrl + "/department/listTree", pd);

2
src/main/java/com/zcloud/mapper/datasource/firemanager/FirePointMapper.java
View File

@ -77,4 +77,6 @@ public interface FirePointMapper {
void deleteAll(PageData pd); void deleteAll(PageData pd);
void removeQualifiedByQIds(PageData pd); void removeQualifiedByQIds(PageData pd);
List<PageData> getFirePointCheckPhotos(PageData pd);
} }

8
src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java
View File

@ -150,5 +150,13 @@ public interface KeyprojectHiddenMapper {
void deleteByKey(PageData key); void deleteByKey(PageData key);
PageData keyprojectcount(PageData pd); PageData keyprojectcount(PageData pd);
/**重点工程处罚列表 包含 未选择处罚结果的隐患 已下发处罚但为反馈的隐患 不处罚的隐患
* @param page
* @throws Exception
*/
List<PageData> getpunishlistPage(Page page);
} }

10
src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java
View File

@ -63,5 +63,15 @@ public interface OutSourcedMapper{
*/ */
void jie(PageData pd); void jie(PageData pd);
/**
* 当前用户处罚重点工程列表 用于APP
* @param page
* @return
*/
List<PageData> getPUNISHlistPage(Page page);
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
} }

2
src/main/java/com/zcloud/mapper/dsno2/keyProjects/VideoManagerMapper.java
View File

@ -73,5 +73,7 @@ public interface VideoManagerMapper {
List<PageData> getCameraPosition(PageData pageData); List<PageData> getCameraPosition(PageData pageData);
void editByResourcesId(PageData pd); void editByResourcesId(PageData pd);
void updateAiByOUTSOURCED_ID(PageData pd);
} }

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

@ -3,6 +3,7 @@ package com.zcloud.service.bus;
import java.util.List; import java.util.List;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import org.springframework.web.multipart.MultipartFile;
/** /**
* 说明：图片管理 * 说明：图片管理
@ -95,6 +96,6 @@ public interface ImgFilesService{
void hideImg(PageData forward); void hideImg(PageData forward);
public List<PageData> getListByKeyAndType (Object key ) throws Exception; public List<PageData> getListByKeyAndType (Object key ) throws Exception;
void uploadPicture(MultipartFile[] files, String TYPE, String FOREIGN_KEY);
} }

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

@ -1,9 +1,12 @@
package com.zcloud.service.bus.impl; package com.zcloud.service.bus.impl;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.zcloud.util.Tools; import com.zcloud.util.*;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -11,6 +14,7 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.bus.ImgFilesMapper; import com.zcloud.mapper.datasource.bus.ImgFilesMapper;
import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.bus.ImgFilesService;
import org.springframework.web.multipart.MultipartFile;
/** /**
* 说明：图片管理 * 说明：图片管理
@ -152,5 +156,71 @@ public class ImgFilesServiceImpl implements ImgFilesService{
} }
return new ArrayList<>(); return new ArrayList<>();
} }
@Override
public void uploadPicture(MultipartFile[] files, String TYPE, String FOREIGN_KEY) {
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();
if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
return ;
}
}
for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i];
// 保存文件
File tempFile = new File(file.getOriginalFilename());
try {
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
} catch (IOException e) {
throw new RuntimeException(e);
}
if(!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型
return ;
}
tempFile.delete();
if(TYPE.equals("2")) {//先删除原四色图
PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",FOREIGN_KEY);
pd2.put("TYPE",TYPE);
List<PageData> four = null;
try {
four = listAll(pd2);
} catch (Exception e) {
throw new RuntimeException(e);
}
for (PageData pageData : four) {
File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH"));
old.delete();
try {
delete(pageData);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = UuidUtil.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
try {
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
} catch (Exception e) {
throw new RuntimeException(e);
}
PageData pd = new PageData();
pd.put("IMGFILES_ID", UuidUtil.get32UUID());
pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pd.put("TYPE", TYPE);
pd.put("FOREIGN_KEY", FOREIGN_KEY);
try {
save(pd);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
}
} }

5
src/main/java/com/zcloud/service/firemanager/FirePointService.java
View File

@ -2,6 +2,7 @@ package com.zcloud.service.firemanager;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -18,7 +19,7 @@ public interface FirePointService {
PageData findById(PageData pd); PageData findById(PageData pd);
void updFirePointById(PageData pd); void updFirePointById(MultipartFile[] files,PageData pd);
boolean delFirePointByIds(PageData pd); boolean delFirePointByIds(PageData pd);
@ -42,4 +43,6 @@ public interface FirePointService {
void removeFirePointByIds(PageData pd); void removeFirePointByIds(PageData pd);
void removeQualifiedByQIds(PageData pd); void removeQualifiedByQIds(PageData pd);
List<PageData> getFirePointCheckPhotos(PageData pd);
} }

23
src/main/java/com/zcloud/service/firemanager/impl/FirePointServiceImpl.java
View File

@ -7,6 +7,7 @@ import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -15,6 +16,7 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.firemanager.FirePointMapper; import com.zcloud.mapper.datasource.firemanager.FirePointMapper;
import com.zcloud.service.firemanager.FirePointService; import com.zcloud.service.firemanager.FirePointService;
import org.springframework.web.multipart.MultipartFile;
/** /**
* 说明：TODO 作者：wangxuan 官网：www.zcloudchina.com * 说明：TODO 作者：wangxuan 官网：www.zcloudchina.com
@ -24,6 +26,8 @@ public class FirePointServiceImpl implements FirePointService {
@Resource @Resource
private FirePointMapper firePointMapper; private FirePointMapper firePointMapper;
@Resource @Resource
private ImgFilesService imgFilesService;
@Resource
private InitPageDataUtil initPageDataUtil; private InitPageDataUtil initPageDataUtil;
@Override @Override
@ -32,6 +36,7 @@ public class FirePointServiceImpl implements FirePointService {
return firePointMapper.datalistPage(page); return firePointMapper.datalistPage(page);
} }
@Override
public void savePosition(PageData pd)throws Exception{ public void savePosition(PageData pd)throws Exception{
firePointMapper.savePosition(pd); firePointMapper.savePosition(pd);
} }
@ -43,8 +48,17 @@ public class FirePointServiceImpl implements FirePointService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updFirePointById(PageData pd) { public void updFirePointById(MultipartFile[] files, PageData pd) {
firePointMapper.updFirePointById(pd); firePointMapper.updFirePointById(pd);
String waitRemoveDataIds = pd.getString("WAIT_REMOVE_DATA_IDS",null);
if (waitRemoveDataIds != null) {
try {
imgFilesService.deleteAll(waitRemoveDataIds.split(","));
} catch (Exception e) {
throw new RuntimeException(e);
}
}
imgFilesService.uploadPicture(files,"118",pd.getString("FIRE_POINT_ID"));
} }
@Override @Override
@ -76,6 +90,7 @@ public class FirePointServiceImpl implements FirePointService {
* @return * @return
* @throws Exception * @throws Exception
*/ */
@Override
public Map<String, PageData> getAllByCorpIdForExcel(PageData pd) throws Exception { public Map<String, PageData> getAllByCorpIdForExcel(PageData pd) throws Exception {
Map<String, PageData> listAllMap = new HashMap<>(); Map<String, PageData> listAllMap = new HashMap<>();
List<PageData> listAll = firePointMapper.getAllList(pd); List<PageData> listAll = firePointMapper.getAllList(pd);
@ -88,6 +103,7 @@ public class FirePointServiceImpl implements FirePointService {
return listAllMap; return listAllMap;
} }
@Override
public PageData saveFroExcel(String name, String bianma, String qyID, String departId, String userID) public PageData saveFroExcel(String name, String bianma, String qyID, String departId, String userID)
throws Exception { throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
@ -135,4 +151,9 @@ public class FirePointServiceImpl implements FirePointService {
public void removeQualifiedByQIds(PageData pd) { public void removeQualifiedByQIds(PageData pd) {
firePointMapper.removeQualifiedByQIds(pd); firePointMapper.removeQualifiedByQIds(pd);
} }
@Override
public List<PageData> getFirePointCheckPhotos(PageData pd) {
return firePointMapper.getFirePointCheckPhotos(pd);
}
} }

2
src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java
View File

@ -178,5 +178,7 @@ public interface KeyprojectHiddenService {
* @throws Exception * @throws Exception
*/ */
public PageData keyprojectcount(PageData pd)throws Exception; public PageData keyprojectcount(PageData pd)throws Exception;
List<PageData> getpunishlist(Page page);
} }

10
src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java
View File

@ -64,5 +64,15 @@ public interface OutSourcedService{
*/ */
public void jie(PageData pd)throws Exception; public void jie(PageData pd)throws Exception;
/**
* 当前用户处罚重点工程列表 用于APP
* @param page
* @return
*/
public List<PageData> getPUNISHlist(Page page)throws Exception;
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
} }

2
src/main/java/com/zcloud/service/keyProjects/VideoManagerService.java
View File

@ -71,5 +71,7 @@ public interface VideoManagerService {
List<PageData> getCameraPosition(PageData pageData); List<PageData> getCameraPosition(PageData pageData);
void updateAiByOUTSOURCED_ID(PageData pd);
} }

5
src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java
View File

@ -248,5 +248,10 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService {
public PageData keyprojectcount(PageData pd) throws Exception { public PageData keyprojectcount(PageData pd) throws Exception {
return hiddenMapper.keyprojectcount(pd); return hiddenMapper.keyprojectcount(pd);
} }
@Override
public List<PageData> getpunishlist(Page page) {
return hiddenMapper.getpunishlistPage(page);
}
} }

9
src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java
View File

@ -89,5 +89,14 @@ public class OutSourcedServiceImpl implements OutSourcedService {
outsourcedMapper.jie(pd); outsourcedMapper.jie(pd);
} }
@Override
public List<PageData> getPUNISHlist(Page page) throws Exception {
return outsourcedMapper.getPUNISHlistPage(page);
}
@Override
public PageData jieshuOutSourced(PageData pd) {
return outsourcedMapper.jieshuOutSourced(pd);
}
} }

4
src/main/java/com/zcloud/service/keyProjects/impl/PersonnelManagementServiceImpl.java
View File

@ -119,13 +119,13 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
PageData unitPd = personnelmanagementMapper.findById(pd); PageData unitPd = personnelmanagementMapper.findById(pd);
String state = "0"; String state = "0";
if(!Tools.isEmpty(unitPd)){ if(!Tools.isEmpty(unitPd)){
String loginUserid = Jurisdiction.getUsername(); String loginUserid = Jurisdiction.getUSER_ID();
String cratorUserId = unitPd.getString("CREATOR"); String cratorUserId = unitPd.getString("CREATOR");
if(loginUserid.equals(cratorUserId)){ if(loginUserid.equals(cratorUserId)){
state ="1"; state ="1";
} }
else { else {
state =cratorUserId; state =Jurisdiction.getName();
} }
} }
return state; return state;

62
src/main/java/com/zcloud/service/keyProjects/impl/UnitsServiceImpl.java
View File

@ -25,63 +25,79 @@ public class UnitsServiceImpl implements UnitsService {
@Autowired @Autowired
private UnitsMapper unitsMapper; private UnitsMapper unitsMapper;
/**新增 /**
* 新增
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void save(PageData pd)throws Exception{ public void save(PageData pd) throws Exception {
unitsMapper.save(pd); unitsMapper.save(pd);
} }
/**删除 /**
* 删除
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void delete(PageData pd)throws Exception{ public void delete(PageData pd) throws Exception {
unitsMapper.delete(pd); unitsMapper.delete(pd);
} }
/**修改 /**
* 修改
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void edit(PageData pd)throws Exception{ public void edit(PageData pd) throws Exception {
unitsMapper.edit(pd); unitsMapper.edit(pd);
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
public List<PageData> list(Page page)throws Exception{ public List<PageData> list(Page page) throws Exception {
return unitsMapper.datalistPage(page); return unitsMapper.datalistPage(page);
} }
/**列表(全部) /**
* 列表(全部)
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAll(PageData pd)throws Exception{ public List<PageData> listAll(PageData pd) throws Exception {
return unitsMapper.listAll(pd); return unitsMapper.listAll(pd);
} }
/**通过id获取数据 /**
* 通过id获取数据
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd) throws Exception {
return unitsMapper.findById(pd); return unitsMapper.findById(pd);
} }
/**批量删除 /**
* 批量删除
*
* @param ArrayDATA_IDS * @param ArrayDATA_IDS
* @throws Exception * @throws Exception
*/ */
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ public void deleteAll(String[] ArrayDATA_IDS) throws Exception {
unitsMapper.deleteAll(ArrayDATA_IDS); unitsMapper.deleteAll(ArrayDATA_IDS);
} }
/** /**
* 获取该相关方名称是否重复 * 获取该相关方名称是否重复
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -89,28 +105,30 @@ public class UnitsServiceImpl implements UnitsService {
public PageData findByName(PageData pd) throws Exception { public PageData findByName(PageData pd) throws Exception {
return unitsMapper.findByName(pd); return unitsMapper.findByName(pd);
} }
public PageData findByCode(PageData pd) throws Exception { public PageData findByCode(PageData pd) throws Exception {
return unitsMapper.findByCode(pd); return unitsMapper.findByCode(pd);
} }
/** /**
* 判断操作人是为添加人 * 判断操作人是为添加人
*
* @param unitsID 相关方单位id * @param unitsID 相关方单位id
* @return 1 可以删除 ,其他的时候返回添加人姓名 * @return 1 可以删除 ,其他的时候返回添加人姓名
* @throws Exception * @throws Exception
*/ */
public String IsJudgeCreator(String unitsID) throws Exception { public String IsJudgeCreator(String unitsID) throws Exception {
PageData pd = new PageData(); PageData pd = new PageData();
pd.put("UNITS_ID",unitsID); pd.put("UNITS_ID", unitsID);
PageData unitPd = unitsMapper.findById(pd); PageData unitPd = unitsMapper.findById(pd);
String state = "0"; String state = "0";
if(!Tools.isEmpty(unitPd)){ if (!Tools.isEmpty(unitPd)) {
String loginUserid = Jurisdiction.getUsername(); String loginUserid = Jurisdiction.getUSER_ID();
String cratorUserId = unitPd.getString("CREATOR"); String cratorUserId = unitPd.getString("CREATOR");
if(loginUserid.equals(cratorUserId)){ if (loginUserid.equals(cratorUserId)) {
state ="1"; state = "1";
} } else {
else { state = Jurisdiction.getName();
state =cratorUserId;
} }
} }
return state; return state;

5
src/main/java/com/zcloud/service/keyProjects/impl/VideoManagerServiceImpl.java
View File

@ -116,5 +116,10 @@ public class VideoManagerServiceImpl implements VideoManagerService {
public List<PageData> getCameraPosition(PageData pageData) { public List<PageData> getCameraPosition(PageData pageData) {
return videomanagerMapper.getCameraPosition(pageData); return videomanagerMapper.getCameraPosition(pageData);
} }
@Override
public void updateAiByOUTSOURCED_ID(PageData pd) {
videomanagerMapper.updateAiByOUTSOURCED_ID(pd);
}
} }

8
src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
View File

@ -51,6 +51,8 @@
f.ISRECEIVE, f.ISRECEIVE,
f.PROVINCE, f.PROVINCE,
f.CITY, f.CITY,
f.SAFETY_NAME,
f.SAFETY_PHONE,
f.COUNTRY, f.COUNTRY,
f.ADDRESS_BUSINESS, f.ADDRESS_BUSINESS,
f.CORP_STATE, f.CORP_STATE,
@ -256,6 +258,12 @@
FOURTYPE=#{FOURTYPE}, FOURTYPE=#{FOURTYPE},
</if> </if>
PROVINCE=#{PROVINCE}, PROVINCE=#{PROVINCE},
<if test="SAFETY_PHONE != null and SAFETY_PHONE != ''">
SAFETY_PHONE=#{SAFETY_PHONE},
</if>
<if test="SAFETY_NAME != null and SAFETY_NAME != ''">
SAFETY_NAME=#{SAFETY_NAME},
</if>
CITY=#{CITY}, CITY=#{CITY},
ASCRIPTION=#{ASCRIPTION}, ASCRIPTION=#{ASCRIPTION},
COR_ORDER=#{COR_ORDER}, COR_ORDER=#{COR_ORDER},

26
src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
View File

@ -205,4 +205,30 @@
AND p.CORPINFO_ID = #{CORPINFO_ID} AND p.CORPINFO_ID = #{CORPINFO_ID}
order by p.OPERATTIME desc order by p.OPERATTIME desc
</select> </select>
<select id="getFirePointCheckPhotos" resultType="com.zcloud.entity.PageData">
SELECT
GROUP_CONCAT( img.FILEPATH SEPARATOR '@@' ) FILEPATHLIST,
u.`NAME` CREATOR_NAME,
cl.FIRE_CHECK_ID,
cl.FIRE_CHECK_STANDARD_NAME,
frp.EQUIPMENT_POINT_ID,
frp.FIRE_POINT_ID,
frp.FIRE_RECORD_ID,
frp.CREATTIME
FROM
`qa-gwj-prevention`.bus_fire_checklist cl
LEFT JOIN `qa-gwj-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id
AND cl.ISDELETE = 0
LEFT JOIN `qa-gwj-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY
LEFT JOIN `qa-gwj-prevention`.sys_user u on frp.CREATOR = u.USER_ID
WHERE
frp.ISDELETE = 0
AND frp.FIRE_POINT_ID = #{FIRE_POINT_ID}
AND frp.P_ISCHECKED = 0
GROUP BY
cl.FIRE_CHECK_ID
ORDER BY
frp.CREATTIME DESC
limit 1
</select>
</mapper> </mapper>

9
src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
View File

@ -881,10 +881,13 @@
<if test="pd.STARTTIME != null and pd.STARTTIME != ''"> <if test="pd.STARTTIME != null and pd.STARTTIME != ''">
and fr.CHECK_TIME between #{pd.STARTTIME,jdbcType=VARCHAR} and #{pd.ENDTIME,jdbcType=VARCHAR} and fr.CHECK_TIME between #{pd.STARTTIME,jdbcType=VARCHAR} and #{pd.ENDTIME,jdbcType=VARCHAR}
</if> </if>
<if test="pd.STATUS != null and pd.STATUS != ''">
and fr.FINISHED = #{pd.STATUS}
<!-- bug 12428--> <!-- bug 12428-->
AND CONCAT( date_format( CURRENT_DATE ()- 1, '%Y-%m-%d' ), ' 00:00:00' ) BETWEEN fr.PERIODSTART AND fr.PERIODEND <if test="pd.STATUS != null and pd.STATUS == '0'.toString()">
and temp.FINISHED is null
</if>
<if test="pd.STATUS != null and pd.STATUS == '1'.toString()">
and temp.FINISHED is not null
-- AND CONCAT( date_format( CURRENT_DATE ()- 1, '%Y-%m-%d' ), ' 00:00:00' ) BETWEEN fr.PERIODSTART AND fr.PERIODEND
</if> </if>
<if test="pd.OVERTIME != null and pd.OVERTIME != ''">and fr.SUPPLEMENTARY = #{pd.OVERTIME}</if> <if test="pd.OVERTIME != null and pd.OVERTIME != ''">and fr.SUPPLEMENTARY = #{pd.OVERTIME}</if>
<if test="pd.USERNAME != null and pd.USERNAME !=''">and su.NAME like concat(#{pd.USERNAME},'%')</if> <if test="pd.USERNAME != null and pd.USERNAME !=''">and su.NAME like concat(#{pd.USERNAME},'%')</if>

105
src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
View File

@ -267,6 +267,9 @@
<if test="ISPUNISH != null and ISPUNISH != ''"> <if test="ISPUNISH != null and ISPUNISH != ''">
ISPUNISH = #{ISPUNISH}, ISPUNISH = #{ISPUNISH},
</if> </if>
<if test="PUNISH_PERSON != null and PUNISH_PERSON != ''">
PUNISH_PERSON = #{PUNISH_PERSON},
</if>
<if test="HIDDENLEVEL != null and HIDDENLEVEL != ''"> <if test="HIDDENLEVEL != null and HIDDENLEVEL != ''">
HIDDENLEVEL = #{HIDDENLEVEL}, HIDDENLEVEL = #{HIDDENLEVEL},
</if> </if>
@ -335,6 +338,24 @@
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 --> LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID
<if test="pd.CREATOR != null and pd.CREATOR !=''" >
left join (
SELECT
f.HIDDEN_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND f.STATE = '2'
AND f.CREATOR = #{pd.CREATOR}
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
) t on t.HIDDEN_ID = f.HIDDEN_ID
</if>
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''"> <if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''">
and bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} and bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
@ -368,7 +389,11 @@
) )
</if> </if>
GROUP BY f.HIDDEN_ID GROUP BY f.HIDDEN_ID
order by f.CREATTIME desc, f.STATE desc order by
<if test="pd.CREATOR != null and pd.CREATOR !=''" >
t.HIDDEN_ID desc,
</if>
f.CREATTIME desc, f.STATE desc
</select> </select>
<!-- 隐患导出EXCEL（企业隐患管理使用） --> <!-- 隐患导出EXCEL（企业隐患管理使用） -->
@ -1496,9 +1521,24 @@
<select id="keyprojectcount" parameterType="pd" resultType="pd"> <select id="keyprojectcount" parameterType="pd" resultType="pd">
select count(1) as AI_COUNT, select count(1) as AI_COUNT,
(select count(1) ( SELECT COUNT(t.HIDDEN_ID) FROM (
from bus_keyproject_hidden f SELECT
where f.ISDELETE = '0' and f.STATE = 2 and f.CREATOR = #{loginUserId}) as HIDDEN_COUNT, f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
and f.ISPUNISH is null
and (
bo.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
OR boai.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
)
) t ) as HIDDEN_COUNT,
( SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM ( ( SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM (
SELECT SELECT
f.HIDDEN_ID f.HIDDEN_ID
@ -1506,27 +1546,14 @@
BUS_KEYPROJECT_HIDDEN f BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE WHERE
f.ISDELETE = '0' f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' ) AND f.SOURCE IN ( '4', '5', '1' )
AND f.STATE = '2' AND f.STATE = '2'
AND f.CREATOR = #{loginUserId} AND f.CREATOR = #{loginUserId}
AND bo.OUTSOURCED_ID IS NOT NULL AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
UNION ALL
SELECT
f.HIDDEN_ID
FROM
BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND bo.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
AND f.STATE in ('2','4')
AND ( f.ISPUNISH = '' OR f.ISPUNISH IS NULL )
) t)CF_COUNT ) t)CF_COUNT
from `qa-gwj-regulatory`.bus_aiwarning f from `qa-gwj-regulatory`.bus_aiwarning f
where f.ISDELETE = '0' where f.ISDELETE = '0'
@ -1539,4 +1566,44 @@
and aip.ISDELETE = 0 and aip.ISDELETE = 0
) )
</select> </select>
<select id="getpunishlistPage" parameterType="page" resultType="pd">
SELECT
u.UNITS_NAME,
per.`NAME` as PERSON_NAME,
ifnull(v.`NAME`,vv.`NAME`) as CREATOR_NAME,
c.KEYPROJECTCHECK_ID,
p.KEYPROJECTPUNISH_ID,
p.HANDLED,
p.REASON,
vi.`NAME` as RECTIFICATIONOR_NAME,
h.*
FROM
`qa-gwj-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN `qa-gwj-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN `qa-gwj-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
WHERE
h.ISDELETE = '0'
<if test="pd.HANDLED==1">
and (P.HANDLED = '0' OR P.HANDLED IS NULL)
</if>
<if test="pd.HANDLED==2">
and P.HANDLED = '1'
</if>
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
h.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
ORDER BY
h.ISPUNISH ASC,
p.HANDLED DESC
</select>
</mapper> </mapper>

245
src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
View File

@ -237,6 +237,7 @@
f.*, f.*,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME, (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME, ( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME, (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME, (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
(select GROUP_CONCAT(t.NAME) from ( (select GROUP_CONCAT(t.NAME) from (
@ -246,7 +247,7 @@
`qa-gwj-prevention`.OA_DEPARTMENT t `qa-gwj-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME, ) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
isd.NAME DEPARTMENT_NAME, -- isd.NAME DEPARTMENT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME, isdd.NAME MANAGER_DEPARTMENT_NAME,
isu.NAME USER_NAME, isu.NAME USER_NAME,
pci.NAME Q_COMPETENT_DEPT_NAME, pci.NAME Q_COMPETENT_DEPT_NAME,
@ -257,7 +258,7 @@
p.`NAME` as UNITS_PIC_NAME p.`NAME` as UNITS_PIC_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
LEFT JOIN `qa-gwj-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID -- LEFT JOIN `qa-gwj-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all isu ON isu.USER_ID = f.CONTRACT_PIC LEFT JOIN `qa-gwj-prevention`.vi_user_all isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
@ -278,6 +279,8 @@
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME, (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME, ( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME, (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.NAME) from ( (select GROUP_CONCAT(t.NAME) from (
SELECT SELECT
CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID
@ -285,13 +288,11 @@
`qa-gwj-prevention`.OA_DEPARTMENT t `qa-gwj-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME, ) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
isd.NAME DEPARTMENT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME, isdd.NAME MANAGER_DEPARTMENT_NAME,
isu.NAME USER_NAME, isu.NAME USER_NAME,
b.UNITS_NAME as UNITS_NAME, b.UNITS_NAME as UNITS_NAME,
isu.NAME as AIWARNING_PEOPLE, isu.NAME as AIWARNING_PEOPLE,
pci.NAME Q_COMPETENT_DEPT_NAME, pci.NAME Q_COMPETENT_DEPT_NAME,
pcij.NAME Q_DEPARTMENT_NAME,
(select count(1) from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT, (select count(1) from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT, (select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
(select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT, (select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
@ -299,20 +300,38 @@
vua.NAME OUTSOURCED_CREATOR_NAME, vua.NAME OUTSOURCED_CREATOR_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME p.`NAME` as UNITS_PIC_NAME
<if test="pd.UserId != null and pd.UserId !=''">
,ifnull(dbsl.co,0) as co
</if>
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_units b using (UNITS_ID) left join bus_units b using (UNITS_ID)
LEFT JOIN `qa-gwj-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_AIWARNING_PEOPLE AP ON AP.CONTRACT_PIC_ID = isu.USER_ID
LEFT JOIN `qa-gwj-prevention`.vi_department_all ida ON ida.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.SYS_USER su ON su.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
-- 这个判断是隐患管理排序以及隐患管理的角标
<if test="pd.UserId != null and pd.UserId !=''">
left join (SELECT t.OUTSOURCED_ID,COUNT( distinct t.HIDDEN_ID) co FROM (
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND f.STATE = '2'
AND f.CREATOR = #{pd.UserId}
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
) t GROUP BY t.OUTSOURCED_ID ) dbsl on dbsl.OUTSOURCED_ID = f.OUTSOURCED_ID
</if>
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 --> <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and and
@ -331,6 +350,8 @@
b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or or
f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
) )
</if> </if>
<if test="pd.OUTSOURCED_NAME != null and pd.OUTSOURCED_NAME !=''"> <if test="pd.OUTSOURCED_NAME != null and pd.OUTSOURCED_NAME !=''">
@ -372,7 +393,11 @@
or f.CREATOR = #{pd.UserId} or f.CREATOR = #{pd.UserId}
) )
</if> </if>
ORDER BY f.OPERATTIME DESC ORDER BY
<if test="pd.UserId != null and pd.UserId !=''">
dbsl.co DESC,
</if>
f.OPERATTIME DESC
</select> </select>
<select id="getDeptId" resultType="string"> <select id="getDeptId" resultType="string">
@ -456,4 +481,206 @@
where where
OUTSOURCED_ID = #{OUTSOURCED_ID} OUTSOURCED_ID = #{OUTSOURCED_ID}
</update> </update>
<select id="getPUNISHlistPage" parameterType="page" resultType="pd">
select
f.*,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
(select GROUP_CONCAT(t.NAME) from (
SELECT
CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID
FROM
`qa-gwj-prevention`.OA_DEPARTMENT t
LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
isu.NAME USER_NAME,
b.UNITS_NAME as UNITS_NAME,
isu.NAME as AIWARNING_PEOPLE,
pci.NAME Q_COMPETENT_DEPT_NAME,
(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT,
vua.NAME OUTSOURCED_CREATOR_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
,ifnull(cfsl.co,0) as cfcount
from
<include refid="tableName"></include> f
left join bus_units b using (UNITS_ID)
LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
left join (SELECT PUN.OUTSOURCED_ID,COUNT( distinct PUN.HIDDEN_ID) co FROM (
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
and f.ISPUNISH is null
) PUN GROUP BY PUN.OUTSOURCED_ID ) cfsl on cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
<!-- 根据需求自己加检索条件-->
f.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
and f.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{pd.PUNISHUser} ), '%' )
AND f.STATE = '1'
ORDER BY
cfsl.co DESC,
f.OPERATTIME DESC
</select>
<select id="jieshuOutSourced" parameterType="pd" resultType="pd">
SELECT
o.OUTSOURCED_ID,
IFNULL( QR.qr, 0 ) qr,
IFNULL( ZG.zg, 0 ) zg,
IFNULL( YS.ys, 0 ) ys,
IFNULL( CF.cf, 0 ) cf,
IFNULL( FK.fk, 0 ) fk,
IFNULL( AI.ai, 0 ) ai
FROM
`qa-gwj-regulatory`.bus_outsourced o
<!-- 检查待确认 -->
LEFT JOIN (
SELECT
COUNT( 1 ) qr,
c.OUTSOURCED_ID
FROM
`qa-gwj-prevention`.bus_keyprojectcheck c
WHERE
c.INSPECTION_STATUS = 0
AND c.ISDELETE = 0
GROUP BY
c.OUTSOURCED_ID
) QR ON QR.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 隐患待整改 -->
LEFT JOIN (
SELECT
COUNT( f.OUTSOURCED_ID ) zg,
f.OUTSOURCED_ID
FROM
(
SELECT
h.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.bus_keyproject_hidden h
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
WHERE
h.STATE = 1
AND h.ISDELETE = 0
) f
GROUP BY
f.OUTSOURCED_ID
) ZG ON ZG.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 隐患待验收 -->
LEFT JOIN (
SELECT
COUNT( DISTINCT t.OUTSOURCED_ID ) ys,
t.OUTSOURCED_ID
FROM
(
SELECT
f.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND f.STATE = '2'
) t
GROUP BY
t.OUTSOURCED_ID
) YS ON YS.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 隐患待处罚 -->
LEFT JOIN (
SELECT
COUNT( DISTINCT t.OUTSOURCED_ID ) cf,
t.OUTSOURCED_ID
FROM
(
SELECT
f.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND (f.ISPUNISH is NULL OR f.ISPUNISH = '')
) t
GROUP BY
t.OUTSOURCED_ID
) CF on CF.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 处罚待反馈 -->
LEFT JOIN (
SELECT
COUNT( DISTINCT t.OUTSOURCED_ID ) fk,
t.OUTSOURCED_ID
FROM
(
SELECT
p.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
`qa-gwj-prevention`.bus_keyprojectpunish p
LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f on p.HIDDEN_ID = f.HIDDEN_ID
LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
p.ISDELETE = '0'
AND p.HANDLED = '0'
) t
GROUP BY
t.OUTSOURCED_ID
) FK ON FK.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- ai报警待处置 -->
LEFT JOIN (
SELECT
count( 1 ) AS ai ,t.OUTSOURCED_ID
FROM
`qa-gwj-regulatory`.bus_aiwarning f
LEFT JOIN (
SELECT DISTINCT
vi.VIDEOMANAGER_ID,
aip.OUTSOURCED_ID
FROM
`qa-gwj-regulatory`.bus_aiwarning_people aip
LEFT JOIN `qa-gwj-regulatory`.bus_videomanager vi ON vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
WHERE
aip.ISDELETE = 0
AND vi.VIDEOMANAGER_ID IS NOT NULL
) t ON t.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
WHERE
f.ISDELETE = 0
AND f.STATUS = 0
GROUP BY t.OUTSOURCED_ID
) AI ON AI.OUTSOURCED_ID = o.OUTSOURCED_ID
WHERE o.OUTSOURCED_ID=#{OUTSOURCED_ID}
</select>
</mapper> </mapper>

11
src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml
View File

@ -196,19 +196,26 @@
f.COUNTY, f.COUNTY,
f.VILLAGE, f.VILLAGE,
f.STREET, f.STREET,
f.FILEPATH f.FILEPATH,
vua.`NAME` CREATOR_NAME,
vua.CORP_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
LEFT JOIN `qa-gwj-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
where where
f.UNITS_ID = #{UNITS_ID} f.UNITS_ID = #{UNITS_ID}
and f.ISDELETE = 0
</select> </select>
<!-- 列表 --> <!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd"> <select id="datalistPage" parameterType="page" resultType="pd">
select select
<include refid="Field"></include> <include refid="Field"></include>,
vua.`NAME` CREATOR_NAME,
vua.CORP_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
LEFT JOIN `qa-gwj-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and and

10
src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml
View File

@ -282,5 +282,13 @@
</if> </if>
</select> </select>
<update id="updateAiByOUTSOURCED_ID" parameterType="pd">
update
<include refid="tableName"></include>
set
PLATFORMVIDEOMANAGEMENT_ID = null,
VIDEO_RESOURCES_ID = null
where
OUTSOURCED_ID = #{OUTSOURCED_ID}
</update>
</mapper> </mapper>

16
src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml
View File

@ -16,6 +16,7 @@
f.VIDEO_RESOURCES_ID, f.VIDEO_RESOURCES_ID,
f.UNITS_ID, f.UNITS_ID,
f.MODEL, f.MODEL,
f.UNIT_USE,
f.PERSON, f.PERSON,
f.PHONE, f.PHONE,
f.VIDEONAME, f.VIDEONAME,
@ -32,6 +33,7 @@
VIDEOURL, VIDEOURL,
UNITS_ID, UNITS_ID,
MODEL, MODEL,
UNIT_USE,
PERSON, PERSON,
PHONE, PHONE,
CODE, CODE,
@ -50,6 +52,7 @@
#{VIDEOURL}, #{VIDEOURL},
#{UNITS_ID}, #{UNITS_ID},
#{MODEL}, #{MODEL},
#{UNIT_USE},
#{PERSON}, #{PERSON},
#{PHONE}, #{PHONE},
#{CODE}, #{CODE},
@ -89,6 +92,7 @@
set set
UNITS_ID= #{UNITS_ID}, UNITS_ID= #{UNITS_ID},
MODEL= #{MODEL}, MODEL= #{MODEL},
UNIT_USE = #{UNIT_USE},
PERSON = #{PERSON}, PERSON = #{PERSON},
REMAKE = #{REMAKE}, REMAKE = #{REMAKE},
PHONE= #{PHONE}, PHONE= #{PHONE},
@ -124,10 +128,13 @@
<select id="datalistPage" parameterType="page" resultType="pd"> <select id="datalistPage" parameterType="page" resultType="pd">
select select
<include refid="Field"></include>, <include refid="Field"></include>,
vua.`NAME` CREATOR_NAME,
vua.CORP_NAME,
COUNT(v.VIDEOMANAGER_ID) ITEM_COUNT COUNT(v.VIDEOMANAGER_ID) ITEM_COUNT
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
LEFT JOIN bus_videomanager v ON f.VIDEO_RESOURCES_ID = v.VIDEO_RESOURCES_ID and v.ISDELETE = '0' LEFT JOIN bus_videomanager v ON f.VIDEO_RESOURCES_ID = v.VIDEO_RESOURCES_ID and v.ISDELETE = '0'
LEFT JOIN `qa-gwj-prevention`.`vi_user_all` vua on f.CREATOR = vua.USER_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
<!--企业端看自己的建的和监管端建的--> <!--企业端看自己的建的和监管端建的-->
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"> <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
@ -137,13 +144,18 @@
<if test="pd.VIDEONAME != null and pd.VIDEONAME != ''"><!-- 关键词检索 --> <if test="pd.VIDEONAME != null and pd.VIDEONAME != ''"><!-- 关键词检索 -->
and and
( (
f.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.VIDEONAME}),'%') f.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.VIDEONAME}),'%') or (f.CODE LIKE CONCAT(CONCAT('%', #{pd.VIDEONAME}),'%'))
) )
</if> </if>
<if test="pd.UNITS_ID != null and pd.UNITS_ID != ''"> <if test="pd.UNITS_ID != null and pd.UNITS_ID != ''">
and f.UNITS_ID = #{pd.UNITS_ID} and f.UNITS_ID = #{pd.UNITS_ID}
</if> </if>
<if test="pd.PERSONNELMANAGEMENT_ID != null and pd.PERSONNELMANAGEMENT_ID != ''">
and f.PERSON like CONCAT(CONCAT('%', #{pd.PERSONNELMANAGEMENT_ID}),'%')
</if>
<if test="pd.UNIT_USE != null and pd.UNIT_USE != ''">
and f.UNIT_USE like CONCAT(CONCAT('%', #{pd.UNIT_USE}),'%')
</if>
GROUP BY f.OPERATTIME desc GROUP BY f.OPERATTIME desc
</select> </select>