diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index 275ae9bd..f696040b 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -827,11 +827,16 @@ public class AppHotWorkApplicationController extends BaseController { return map; } } else { - hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们 + //先判断延时监火是否为选择部门 + hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们（选择部门） if (hotUserList.size() < 1) { - map.put("result", "error"); - map.put("msg", "获取审批人意见失败！请联系管理员"); - return map; + //如果查询部门查不到就根据人查询 + hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人（选择人） + if (hotUserList.size() != 1) { + map.put("result", "error"); + map.put("msg", "获取审批人意见失败！请联系管理员"); + return map; + } } } diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java index 548935fb..81a82b4e 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java @@ -69,38 +69,38 @@ public class AppHotWorkApplicationDelayedController extends BaseController { map.put("msg", "文件格式不正确！"); return map; } - Image srcImg = ImageIO.read(file.getInputStream()); - //获取图片的宽 - int srcImgWidth = srcImg.getWidth(null); - //获取图片的高 - int srcImgHeight = srcImg.getHeight(null); - - BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB); - // 加水印 - //创建画笔 - Graphics2D g = bufImg.createGraphics(); - //srcImg 为上面获取到的原始图片的图片对象 - g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); - //根据图片的背景设置水印颜色 - g.setColor(new Color(255,255,255,128)); - //设置字体 画笔字体样式为微软雅黑，加粗，文字大小为60pt - g.setFont(new Font("微软雅黑", Font.BOLD, 20)); - //设置水印的坐标 - int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2; - int y=srcImgHeight / 2; - //画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标 - g.drawString(DateUtil.date2Str(new Date()), x, y); - g.dispose(); - //将加完水印的图片暂存到内存中 - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ImageIO.write(bufImg, suffixName, bos); - ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - +// Image srcImg = ImageIO.read(file.getInputStream()); +// //获取图片的宽 +// int srcImgWidth = srcImg.getWidth(null); +// //获取图片的高 +// int srcImgHeight = srcImg.getHeight(null); +// +// BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB); +// // 加水印 +// //创建画笔 +// Graphics2D g = bufImg.createGraphics(); +// //srcImg 为上面获取到的原始图片的图片对象 +// g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); +// //根据图片的背景设置水印颜色 +// g.setColor(new Color(255,255,255,128)); +// //设置字体 画笔字体样式为微软雅黑，加粗，文字大小为60pt +// g.setFont(new Font("微软雅黑", Font.BOLD, 20)); +// //设置水印的坐标 +// int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2; +// int y=srcImgHeight / 2; +// //画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标 +// g.drawString(DateUtil.date2Str(new Date()), x, y); +// g.dispose(); +// //将加完水印的图片暂存到内存中 +// ByteArrayOutputStream bos = new ByteArrayOutputStream(); +// ImageIO.write(bufImg, suffixName, bos); +// ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); +// String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); - //通过流的方式上传文件 - Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); + Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); +// 通过流的方式上传文件 +// Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); pd.put("FILEPATH",Const.FILEPATHYHTP + corpInfoId + "/" + ffile + "/" + fileName); } hotworkapplicationdelayedService.save(pd); diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index a66edc34..1308325e 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -237,6 +237,7 @@ public class CorpInfoController extends BaseController { * @throws Exception */ @RequestMapping(value="/goEdit") + @RequiresPermissions("corpinfo_edit_self:list") @ResponseBody public Object goEdit() throws Exception{ Map map = new HashMap(); diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java index 49fedbd9..598e6913 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java @@ -1310,7 +1310,8 @@ public class HotWorkApplicationController extends BaseController { }else if("2".equals(type)){ // 项目发包单位负责人 hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); - }else if("4".equals(type)){ // 现场管辖单位负责人 +// }else if("4".equals(type)){ // 现场管辖单位负责人 + }else if("3".equals(type)){ // 现场管辖单位负责人 hot.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); hot.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); hot.put("UNIT_LEADER_NAME",userPageData.getString("userName")); diff --git a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java index e1e70a74..5f6e8c11 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java @@ -9,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -31,7 +32,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.RiskWarningService; -/** +/** * 说明：风险提示 * 作者：luoxiaobao * 时间：2021-04-27 @@ -40,10 +41,13 @@ import com.zcloud.service.bus.RiskWarningService; @Controller @RequestMapping("/riskwarning") public class RiskWarningController extends BaseController { - + + @Value("${http.file.url}") + private String fileUrl; + @Autowired private RiskWarningService riskwarningService; - + /**新增 * @param * @throws Exception @@ -62,7 +66,7 @@ public class RiskWarningController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if (null != file && !file.isEmpty()) { 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)) { @@ -85,7 +89,7 @@ public class RiskWarningController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -102,7 +106,7 @@ public class RiskWarningController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -119,7 +123,7 @@ public class RiskWarningController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -134,7 +138,7 @@ public class RiskWarningController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = riskwarningService.list(page); //列出RiskWarning列表 map.put("varList", varList); @@ -142,7 +146,7 @@ public class RiskWarningController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -159,8 +163,8 @@ public class RiskWarningController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -171,7 +175,7 @@ public class RiskWarningController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -184,7 +188,7 @@ public class RiskWarningController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**下载 * @param * @throws Exception @@ -197,7 +201,7 @@ public class RiskWarningController extends BaseController { pd = riskwarningService.findById(pd); String FILEPATH = pd.get("FILEPATH").toString(); System.out.println(FILEPATH.length()); - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?28:61, FILEPATH.length())); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?28:61, FILEPATH.length())); } /**导出到excel * @param @@ -239,5 +243,5 @@ public class RiskWarningController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/VideoController.java b/src/main/java/com/zcloud/controller/bus/VideoController.java index e030c1e2..e8f232ca 100644 --- a/src/main/java/com/zcloud/controller/bus/VideoController.java +++ b/src/main/java/com/zcloud/controller/bus/VideoController.java @@ -8,6 +8,7 @@ import java.util.Map; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +29,7 @@ import com.zcloud.util.PathUtil; import com.zcloud.util.Smb; import com.zcloud.util.Tools; -/** +/** * 说明：视频管理 * 作者：luoxiaobao * 时间：2021-01-15 @@ -37,10 +38,13 @@ import com.zcloud.util.Tools; @Controller @RequestMapping("/video") public class VideoController extends BaseController { - + + @Value("${http.file.url}") + private String fileUrl; + @Autowired private VideoService videoService; - + /**新增 * @param * @throws Exception @@ -74,15 +78,15 @@ public class VideoController extends BaseController { String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); //Smb.1sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); //pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - Smb.sshSftp(file, fileName,Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("FILEPATH", Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + Smb.sshSftp(file, fileName,fileUrl + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("FILEPATH", fileUrl + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } - + videoService.save(pd); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -99,7 +103,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -116,7 +120,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -142,7 +146,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -159,8 +163,8 @@ public class VideoController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**列表 数据置顶 * @param * @throws Exception @@ -187,7 +191,7 @@ public class VideoController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } + } /**批量删除 * @param * @throws Exception @@ -198,7 +202,7 @@ public class VideoController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -211,7 +215,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -275,7 +279,7 @@ public class VideoController extends BaseController { pd.put("CORPINFO_TYPE", "2"); pd.put("TYPE", "1"); List ptVarList = videoService.listAll(pd); //平台视频 - + map.put("ptVarList", ptVarList); map.put("cpvarList", cpvarList); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java index 5a775b37..053d3a30 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java @@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyDrillAttachmentService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -27,6 +28,9 @@ import java.util.*; @RequestMapping("/emergencydrillattachment") public class EmergencyDrillAttachmentController extends BaseController { + @Value("${http.file.url}") + private String fileUrl; + @Autowired private EmergencyDrillAttachmentService emergencydrillattachmentService; @@ -256,7 +260,7 @@ public class EmergencyDrillAttachmentController extends BaseController { // FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME); //// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用 //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java index cc60b268..2613798c 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java @@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyDrillReportService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -27,6 +28,9 @@ import java.util.*; @RequestMapping("/emergencydrillreport") public class EmergencyDrillReportController extends BaseController { + @Value("${http.file.url}") + private String fileUrl; + @Autowired private EmergencyDrillReportService emergencydrillreportService; @@ -258,7 +262,7 @@ public class EmergencyDrillReportController extends BaseController { // FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME); //// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用 //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java index e54008f6..16c9c80a 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java @@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyPlanService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -27,6 +28,9 @@ import java.util.*; @RequestMapping("/emergencyplan") public class EmergencyPlanController extends BaseController { + @Value("${http.file.url}") + private String fileUrl; + @Autowired private EmergencyPlanService emergencyplanService; @@ -283,7 +287,7 @@ public class EmergencyPlanController extends BaseController { // FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME); //// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用 //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index a0720aec..0d7c1be6 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -11,6 +11,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -34,18 +35,21 @@ import com.zcloud.util.Tools; import org.apache.shiro.authz.annotation.RequiresPermissions; -/** +/** * 说明：文件管理 - * 作者：zCloud + * 作者：zCloud * 官网： */ @Controller @RequestMapping("/mfolder") public class MfolderController extends BaseController { - + + @Value("${http.file.url}") + private String fileUrl; + @Autowired private MfolderService mfolderService; - + /**创建目录 * @param * @throws Exception @@ -64,13 +68,13 @@ public class MfolderController extends BaseController { pd.put("UNAME", Jurisdiction.getName()); //上传者 pd.put("MASTER", Jurisdiction.getUsername()); //所属人 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 - pd.put("FILESIZE", ""); - pd.put("SHARE", "no"); + pd.put("FILESIZE", ""); + pd.put("SHARE", "no"); mfolderService.save(pd); map.put("result", errInfo); return map; } - + /**上传文件 * @param * @throws Exception @@ -120,11 +124,11 @@ public class MfolderController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - - + + /** * 上传文件 - * + * * @param * @throws Exception */ @@ -186,7 +190,7 @@ public class MfolderController extends BaseController { map.put("result", errInfo); // 返回结果 return map; } - + /**上传文件 * @param * @throws Exception @@ -212,7 +216,7 @@ public class MfolderController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 String realName = file.getOriginalFilename(); String[] fileFullNames = realName.split("\\.");//上传文件全名 @@ -235,7 +239,7 @@ public class MfolderController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**删除 * @param out * @throws Exception @@ -263,7 +267,7 @@ public class MfolderController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -280,7 +284,7 @@ public class MfolderController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -300,7 +304,7 @@ public class MfolderController extends BaseController { MFOLDER_ID = null == pd.get("MFOLDER_ID")?"":pd.get("MFOLDER_ID").toString(); pd.put("MFOLDER_ID", MFOLDER_ID); //当作上级ID } - + // if(Tools.notEmpty(SHARE) && "yes".equals(SHARE)) { // pd.put("SHARE", "yes"); // }else { @@ -351,7 +355,7 @@ public class MfolderController extends BaseController { fileType = "video"; //视频文件类型 } varList.get(i).put("extension_name", extension_name); //文件拓展名 - varList.get(i).put("fileType", fileType); //用于文件图标 + varList.get(i).put("fileType", fileType); //用于文件图标 } map.put("varList", varList); map.put("page", page); @@ -385,9 +389,9 @@ public class MfolderController extends BaseController { map.put("result", errInfo); return map; } - + /**预览txt,java,php,等文本文件 - * @return + * @return */ @RequestMapping(value="/viewTxt") @ResponseBody @@ -403,7 +407,7 @@ public class MfolderController extends BaseController { map.put("result", errInfo); return map; } - + /**批量操作 * @param * @throws Exception @@ -414,7 +418,7 @@ public class MfolderController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -428,7 +432,7 @@ public class MfolderController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**下载 * @param response * @throws Exception @@ -441,17 +445,17 @@ public class MfolderController extends BaseController { pd = mfolderService.findById(pd); String FILEPATH = pd.getString("FILEPATH"); // String fileName = pd.getString("NAME"); - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length())); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length())); } catch (Exception e) { e.printStackTrace(); throw new NofileException("=========要下载的文件已经没有了========="); } } - + /** * 初始化标签 * 较大及以上等级风险管控方案 - * @throws Exception + * @throws Exception */ public void initialize () throws Exception { PageData pData = new PageData(); @@ -469,12 +473,12 @@ public class MfolderController extends BaseController { pd.put("UNAME", "init"); //上传者 pd.put("MASTER", Jurisdiction.getUsername()); //所属人 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 - pd.put("FILESIZE", ""); - pd.put("SHARE", "no"); + pd.put("FILESIZE", ""); + pd.put("SHARE", "no"); mfolderService.save(pd); } } - + } /* @@ -483,7 +487,7 @@ public class MfolderController extends BaseController { class NofileException extends Exception { private static final long serialVersionUID = 1L; - + public NofileException() { super(); } @@ -499,5 +503,5 @@ class NofileException extends Exception { public NofileException(Throwable cause) { super(cause); } - + } diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java index af2d0a63..db262675 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -31,18 +32,21 @@ import com.zcloud.util.Tools; import net.sf.json.JSONArray; -/** +/** * 说明：文件管理 - * 作者：zCloud + * 作者：zCloud * 官网： */ @Controller @RequestMapping("/mfolderStipulate") public class MfolderStipulateController extends BaseController { - + + @Value("${http.file.url}") + private String fileUrl; + @Autowired private MfolderStipulateService mfolderService; - + /**创建目录 * @param * @throws Exception @@ -61,12 +65,12 @@ public class MfolderStipulateController extends BaseController { pd.put("UNAME", Jurisdiction.getName()); //上传者 pd.put("MASTER", Jurisdiction.getUsername()); //所属人 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 - pd.put("FILESIZE", ""); + pd.put("FILESIZE", ""); mfolderService.save(pd); map.put("result", errInfo); return map; } - + /**上传文件 * @param * @throws Exception @@ -103,7 +107,7 @@ public class MfolderStipulateController extends BaseController { //pd.put("REMARKS", REMARKS); //备注 //pd.put("SHARE", SHARE); //是否共享 //pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件 - + pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 mfolderService.save(pd); //存入数据库表 @@ -113,7 +117,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**上传文件 * @param * @throws Exception @@ -149,15 +153,15 @@ public class MfolderStipulateController extends BaseController { //pd.put("REMARKS", REMARKS); //备注 //pd.put("SHARE", SHARE); //是否共享 //pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件 - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 } mfolderService.edit(pd); //存入数据库表 map.put("result", errInfo); //返回结果 return map; } - - + + /**去修改页面获取数据 * @param * @throws Exception @@ -174,8 +178,8 @@ public class MfolderStipulateController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**上传文件 * @param * @throws Exception @@ -201,7 +205,7 @@ public class MfolderStipulateController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 String realName = file.getOriginalFilename(); String[] fileFullNames = realName.split("\\.");//上传文件全名 @@ -248,7 +252,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -265,7 +269,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -285,7 +289,7 @@ public class MfolderStipulateController extends BaseController { MFOLDER_ID = null == pd.get("MFOLDER_ID")?"":pd.get("MFOLDER_ID").toString(); pd.put("MFOLDER_ID", MFOLDER_ID); //当作上级ID } - + // if(Tools.notEmpty(SHARE) && "yes".equals(SHARE)) { // pd.put("SHARE", "yes"); // }else { @@ -337,7 +341,7 @@ public class MfolderStipulateController extends BaseController { fileType = "video"; //视频文件类型 } varList.get(i).put("extension_name", extension_name); //文件拓展名 - varList.get(i).put("fileType", fileType); //用于文件图标 + varList.get(i).put("fileType", fileType); //用于文件图标 } map.put("varList", varList); map.put("page", page); @@ -370,9 +374,9 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**预览txt,java,php,等文本文件 - * @return + * @return */ @RequestMapping(value="/viewTxt") @ResponseBody @@ -388,7 +392,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**批量操作 * @param * @throws Exception @@ -399,7 +403,7 @@ public class MfolderStipulateController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -413,7 +417,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**下载 * @param response * @throws Exception @@ -426,12 +430,12 @@ public class MfolderStipulateController extends BaseController { pd = mfolderService.findById(pd); String FILEPATH = pd.getString("FILEPATH"); // String fileName = pd.getString("NAME"); - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length())); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length())); } catch (Exception e) { throw new NofileStiException("=========要下载的文件已经没有了========="); } } - + } /* @@ -440,7 +444,7 @@ public class MfolderStipulateController extends BaseController { class NofileStiException extends Exception { private static final long serialVersionUID = 1L; - + public NofileStiException() { super(); } @@ -456,5 +460,5 @@ class NofileStiException extends Exception { public NofileStiException(Throwable cause) { super(cause); } - + } diff --git a/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java b/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java index c30e063c..71ddef6f 100644 --- a/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java +++ b/src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java @@ -11,6 +11,7 @@ import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.DictionariesService; import com.zcloud.service.system.UsersService; import com.zcloud.util.Jurisdiction; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -48,7 +49,12 @@ public class HomeHighRiskWorkController extends BaseController { /*风险管控 数据统计*/ //获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]） - PageData data = highworkService.statisticsHighRiskWorkByState(pd); + PageData data = new PageData(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { //一公司 + data = highworkService.statisticsHighRiskWorkByStateFirst(pd); + } else { + data = highworkService.statisticsHighRiskWorkByState(pd); + } map.put("pd", data); map.put("result", errInfo); @@ -70,7 +76,12 @@ public class HomeHighRiskWorkController extends BaseController { pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 page.setPd(pd); - List varList = highworkService.listHighRiskWork(page); + List varList = new ArrayList<>(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { // 一公司 + varList = highworkService.listHighRiskWorkFirst(page); + } else { + varList = highworkService.listHighRiskWork(page); + } map.put("varList", varList); map.put("result", errInfo); return map; @@ -93,7 +104,12 @@ public class HomeHighRiskWorkController extends BaseController { Map chartData = new HashMap(); List legendData = Arrays.asList(new String[]{"动火作业", "临时用电作业", "盲板作业", "高处作业", "有限空间作业", "吊装作业"}); - List workChart = highworkService.statisticsAllHighRiskWork(pd); //统计高危作业里各作业数 + List workChart = new ArrayList<>(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { //一公司 + workChart = highworkService.statisticsAllHighRiskWorkFirst(pd); //统计高危作业里各作业数 + } else { + workChart = highworkService.statisticsAllHighRiskWork(pd); //统计高危作业里各作业数 + } List seriesData = new ArrayList(); for (int i = 0; i < legendData.size(); i++) { PageData pie = new PageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java index 1669cef6..952c989c 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java @@ -24,6 +24,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.session.Session; import org.apache.xmlgraphics.xmp.schemas.pdf.PDFAAdapter; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -45,6 +46,9 @@ import java.util.stream.Collectors; @RequestMapping("/safetyenvironmental") public class SafetyEnvironmentalController extends BaseController { + @Value("${http.file.url}") + private String fileUrl; + @Autowired private SafetyEnvironmentalService safetyenvironmentalService; @Autowired @@ -653,7 +657,7 @@ public class SafetyEnvironmentalController extends BaseController { String FILEPATH = pd.getString("INSPECTED_EXPLAIN_FILEPATH"); String FILENAME = pd.getString("INSPECTED_EXPLAIN_FILENAME"); //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); @@ -674,7 +678,7 @@ public class SafetyEnvironmentalController extends BaseController { String FILEPATH = pd.getString("INSPECTED_EXPLAIN_FILEPATH"); String FILENAME = pd.getString("INSPECTED_EXPLAIN_FILENAME"); //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 3bf99a20..9b536ed7 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -8,6 +8,7 @@ import com.zcloud.util.Tools; import com.zcloud.util.hk.HKUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -54,6 +55,9 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); + if(!ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } map.put("result", "success"); return map; } @@ -67,6 +71,9 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp"); + if(!ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } map.put("result", "success"); return map; } @@ -80,6 +87,9 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.cameraSearch(pd); + if(!ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } map.put("result", "success"); return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java index 3de397ac..cd435f83 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java @@ -6,6 +6,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.keyProjects.OutSourcedService; import com.zcloud.service.keyProjects.PersonnelManagementService; import com.zcloud.service.keyProjects.UnitsService; +import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.service.system.DictionariesService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; @@ -38,6 +39,9 @@ public class AppKeyProjectsController extends BaseController { @Autowired private PersonnelManagementService personnelmanagementService; + @Autowired + private VideoManagerService videomanagerService; + /**列表 * @throws Exception */ @@ -156,4 +160,127 @@ public class AppKeyProjectsController extends BaseController { map.put("result", errInfo); return map; } + + + /** 隐患列表 查询进行中的重点工程以及排序 + * @throws Exception + */ + @RequestMapping(value="/listHiddenOutsourced") + @ResponseBody + public Object listHiddenOutsourced(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + String UserId = pd.getString("UserId"); + if(!StringUtils.equals("1",UserId)){ + String CORPINFO_ID = pd.getString("CORPINFO_ID"); +// -- 河港机械 河港港工 河港检测 + if(!StringUtils.equals(CORPINFO_ID,"1e6dbbe16004402f8d2c0e52afd9a676") + &&!StringUtils.equals(CORPINFO_ID,"3a854eefa7894e06aaa1a2611bca80f6")&& + !StringUtils.equals(CORPINFO_ID,"020578a4c1f04bc692ee25145c2efbe5") + &&!StringUtils.equals(CORPINFO_ID,"90966974de3c4b83aca6f8fd6432d5c2")){ + pd.put("DeptId",outsourcedService.getDeptId(UserId)); + pd.put("UserId",UserId); + + } + } + page.setPd(pd); + List varList = outsourcedService.listHiddenOutsourced(page); //列出OutSourced列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/videomanagerList") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + page.setPd(pd); + List varList = videomanagerService.listApp(page); //列出VideoManager列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/getOutsourced") + @ResponseBody + public Object getOutsourced() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = outsourcedService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** 修改工程状态 + * @param + * @throws Exception + */ + @RequestMapping(value="/updateState") + @ResponseBody + public Object updateState() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + outsourcedService.updateState(pd); //获取同时绑定的重点工程信息如果大于1表示还有其他重点工程 + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/outSouceslistPage") + @ResponseBody + public Object outSouceslistPage(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + String UserId = pd.getString("UserId"); + if(!StringUtils.equals("1",UserId)){ + String CORPINFO_ID = pd.getString("CORPINFO_ID"); +// -- 河港机械 河港港工 河港检测 + if(!StringUtils.equals(CORPINFO_ID,"1e6dbbe16004402f8d2c0e52afd9a676") + &&!StringUtils.equals(CORPINFO_ID,"3a854eefa7894e06aaa1a2611bca80f6")&& + !StringUtils.equals(CORPINFO_ID,"020578a4c1f04bc692ee25145c2efbe5") + &&!StringUtils.equals(CORPINFO_ID,"90966974de3c4b83aca6f8fd6432d5c2")){ + pd.put("DeptId",outsourcedService.getDeptId(UserId)); + pd.put("UserId",UserId); + + } + } + page.setPd(pd); + List varList = outsourcedService.outSouceslistPage(page); //列出OutSourced列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + + } diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java index 726483dd..08f0b7a1 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java @@ -10,6 +10,7 @@ import com.zcloud.service.majordangersource.MajorDangerSourceLogService; import com.zcloud.service.majordangersource.MonitoringDeviceDisableService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -35,6 +36,9 @@ import javax.servlet.http.HttpServletResponse; @RequestMapping("/majordangersource") public class MajorDangerSourceController extends BaseController { + @Value("${http.file.url}") + private String fileUrl; + @Autowired private MajorDangerSourceService majordangersourceService; @@ -352,7 +356,7 @@ public class MajorDangerSourceController extends BaseController { // FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME); //// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用 //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); diff --git a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java index aab3949d..b0a73ea4 100644 --- a/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java +++ b/src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java @@ -7,6 +7,7 @@ import com.zcloud.service.majordangersource.MajorDangerSourceLogService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -15,7 +16,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; import java.util.*; -/** +/** * 说明：重大危险源 * 作者：luoxiaobao * 时间：2022-03-22 @@ -24,10 +25,13 @@ import java.util.*; @Controller @RequestMapping("/majordangersourcelog") public class MajorDangerSourceLogController extends BaseController { - + + @Value("${http.file.url}") + private String fileUrl; + @Autowired private MajorDangerSourceLogService majorDangerSourceLogService; - + /**新增 * @param * @throws Exception @@ -51,7 +55,7 @@ public class MajorDangerSourceLogController extends BaseController { map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -70,7 +74,7 @@ public class MajorDangerSourceLogController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -89,7 +93,7 @@ public class MajorDangerSourceLogController extends BaseController { map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -112,7 +116,7 @@ public class MajorDangerSourceLogController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -163,7 +167,7 @@ public class MajorDangerSourceLogController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -184,7 +188,7 @@ public class MajorDangerSourceLogController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -267,11 +271,11 @@ public class MajorDangerSourceLogController extends BaseController { // FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME); //// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用 //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); } } - + } diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 6c888b4e..8fab9475 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -66,6 +66,23 @@ public class OpenApiController extends BaseController { return map; } + /** + * 显示列表ztree + * @return + */ + @RequestMapping(value="/corpDepartment/listTree") + @ResponseBody + public Object listTreeRe()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + JSONArray arr = JSONArray.fromObject(departmentService.listAllCorpDepartment("0")); + String json = arr.toString(); + json = json.replaceAll("DEPARTMENT_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDepartment", "nodes").replaceAll("hasDepartment", "checked").replaceAll("treeurl", "url"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + } + /**列表 * @throws Exception */ diff --git a/src/main/java/com/zcloud/controller/system/ButtonrightsController.java b/src/main/java/com/zcloud/controller/system/ButtonrightsController.java index 2be7d301..d02e5a6d 100644 --- a/src/main/java/com/zcloud/controller/system/ButtonrightsController.java +++ b/src/main/java/com/zcloud/controller/system/ButtonrightsController.java @@ -1,9 +1,11 @@ package com.zcloud.controller.system; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.zcloud.service.bus.CorpInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,53 +30,62 @@ import com.zcloud.util.Tools; @Controller @RequestMapping(value="/buttonrights") public class ButtonrightsController extends BaseController { - + @Autowired private ButtonrightsService buttonrightsService; @Autowired private RoleService roleService; + @Autowired + private CorpInfoService corpInfoService; @Autowired private FhButtonService fhButtonService; @Autowired private FHlogService FHLOG; - + /**列表 * @throws Exception */ @RequestMapping(value="/list") - @RequiresPermissions("buttonrights:list") @ResponseBody public Object list() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if(Tools.isEmpty(pd.getString("ROLE_ID"))){ - pd.put("ROLE_ID", "1"); //默认列出第一组角色(初始设计系统用户组不能删除) - } + PageData pd = this.getPageData(); +// if(Tools.isEmpty(pd.getString("ROLE_ID"))){ +// pd.put("ROLE_ID", "1"); //默认列出第一组角色(初始设计系统用户组不能删除) +// } +// PageData fpd = new PageData(); +// fpd.put("ROLE_ID", "0"); + + + + String corpId = Jurisdiction.getCORPINFO_ID(); + pd.put("CORPINFO_ID", corpId); + PageData corp = corpInfoService.findById(pd); PageData fpd = new PageData(); - fpd.put("ROLE_ID", "0"); - List roleList = roleService.listAllRolesByPId(fpd); //列出组(页面横向排列的一级组) + fpd.put("CORPINFO_ID",corp.getString("ROLE_NAME")); + fpd.put("ROLE_ID",corp.getString("ROLE_NAME")); + pd.put("ROLE_ID",corp.getString("ROLE_NAME")); + Role roleList = roleService.getRoleById(corp.getString("ROLE_NAME")); //列出组(页面横向排列的一级组) List roleList_z = roleService.listAllRolesByPId(pd); //列出此组下架角色 List buttonlist = fhButtonService.listAll(pd); //列出所有按钮 List roleFhbuttonlist = buttonrightsService.listAll(pd); //列出所有角色按钮关联数据 pd = roleService.findById(pd); //取得点击的角色组(横排的) map.put("pd", pd); - map.put("roleList", roleList); + map.put("roleList", Collections.singletonList(roleList)); map.put("roleList_z", roleList_z); map.put("buttonlist", buttonlist); map.put("roleFhbuttonlist", roleFhbuttonlist); map.put("result", errInfo); return map; } - + /**点击按钮处理关联表 * @return * @throws Exception */ @RequestMapping(value="/upRb") @ResponseBody - @RequiresPermissions("buttonrights:edit") public Object updateRolebuttonrightd()throws Exception{ Map map = new HashMap(); PageData pd = new PageData(); @@ -90,5 +101,5 @@ public class ButtonrightsController extends BaseController { map.put("result", errInfo); return map; } - + } diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index e69a771a..512463d5 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -70,19 +70,22 @@ public class LoginController extends BaseController { @Autowired private PhotoService photoService; - @Value("${czks-useridentity}") - private String czksIdentity; - @Value("${czks-baseimgpath}") - private String czksBaseimgpath; - @Value("${czks-backendaddr}") - private String czksBackendaddr; +// @Value("${czks-useridentity}") +// private String czksIdentity; +// @Value("${czks-baseimgpath}") +// private String czksBaseimgpath; +// @Value("${czks-backendaddr}") +// private String czksBackendaddr; +// +// @Value("${gwj-useridentity}") +// private String gwjIdentity; +// @Value("${gwj-baseimgpath}") +// private String gwjBaseimgpath; +// @Value("${gwj-backendaddr}") +// private String gwjBackendaddr; + @Autowired + private CorpPathService corpPathService; - @Value("${gwj-useridentity}") - private String gwjIdentity; - @Value("${gwj-baseimgpath}") - private String gwjBaseimgpath; - @Value("${gwj-backendaddr}") - private String gwjBackendaddr; /** * 请求登录验证用户接口 * @@ -184,24 +187,24 @@ public class LoginController extends BaseController { return map; } // 判断是不是沧州矿石的用户 - if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) { - // 沧州矿石的用户 - // 用户标识 - map.put("USER_IDENTITY", czksIdentity); - // 图片路径 - map.put("baseImgPath", czksBaseimgpath); - // 后台地址 - map.put("BACKENDADDR", czksBackendaddr); - } - if ("".equals(pd.getString("USER_IDENTITY"))) { - // 港股的用户 - // 用户标识 - map.put("USER_IDENTITY", gwjIdentity); - // 图片路径 - map.put("baseImgPath", gwjBaseimgpath); - // 后台地址 - map.put("BACKENDADDR", gwjBackendaddr); - } +// if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) { +// // 沧州矿石的用户 +// // 用户标识 +// map.put("USER_IDENTITY", czksIdentity); +// // 图片路径 +// map.put("baseImgPath", czksBaseimgpath); +// // 后台地址 +// map.put("BACKENDADDR", czksBackendaddr); +// } +// if ("".equals(pd.getString("USER_IDENTITY"))) { +// // 港股的用户 +// // 用户标识 +// map.put("USER_IDENTITY", gwjIdentity); +// // 图片路径 +// map.put("baseImgPath", gwjBaseimgpath); +// // 后台地址 +// map.put("BACKENDADDR", gwjBackendaddr); +// } PageData cpd = corpinfoService.findById(pd); //System.out.println(cpd.getString("ISUSE")); if (cpd != null) { @@ -284,6 +287,19 @@ public class LoginController extends BaseController { session.setAttribute(Const.ISSUPERVISE, dpd.getString("ISSUPERVISE")); //把当前用户放入session FHLOG.save(USERNAME, "成功登录系统", ip); //记录日志 + + //查询该用户或企业的图片和后端地址 + if (!Tools.isEmpty(pd.getString("CORPINFO_ID")) && !pd.getString("CORPINFO_ID").equals("1")) { + PageData pathData = corpPathService.getCorpPathByCorpId(pd); + map.put("baseImgPath",pathData.getString("PIC_PATH")); + map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY")); + map.put("BACKENDADDR", pathData.getString("BACK_END_PATH")); + } else { + PageData pathData = corpPathService.getCorpPathByPersonInfo(pd); + map.put("baseImgPath",pathData.getString("PIC_PATH")); + map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY")); + map.put("BACKENDADDR", pathData.getString("BACK_END_PATH")); + } } } else { token.clear(); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 8beec699..098ad1d2 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -1718,7 +1718,6 @@ public class UsersController extends BaseController { * * @param parentId 部门父节点id * @param departMap 全部部门信息 - * @param valName 部门名称 * @return 从子节点开始往上循序 */ public String getParentName(String parentId, Map departMap) { @@ -2401,5 +2400,22 @@ public class UsersController extends BaseController { map.put("result", errInfo); return map; } + /** + * @param + * @throws Exception + */ + @RequestMapping(value = "/getRegUserInfo") + @ResponseBody + public Object getRegUserInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("LOCK_STATUS", "0"); + pd.put("ERROR_COUNT", 0); + map.put("list",usersService.getRegUserInfo(pd)); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java index 471f614e..dd083313 100644 --- a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java +++ b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java @@ -11,6 +11,7 @@ import com.zcloud.service.tzsb.SpecialEquipmentService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -31,6 +32,9 @@ import java.util.*; @RequestMapping("/specialequipment") public class SpecialEquipmentController extends BaseController { + @Value("${http.file.url}") + private String fileUrl; + @Autowired private SpecialEquipmentService specialequipmentService; @Autowired @@ -488,7 +492,7 @@ public class SpecialEquipmentController extends BaseController { // FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME); //// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用 //服务器 - FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME); + FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME); } catch (Exception e) { e.printStackTrace(); throw new Exception("=========文件下载异常：可能要下载的文件已经没有了========="); diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index d3c4f6e1..353793ec 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -3,15 +3,18 @@ package com.zcloud.controller.xgf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.util.Const; -import com.zcloud.util.HttpClientService; -import com.zcloud.util.Jurisdiction; +import com.zcloud.service.xgf.TrainUsersService; +import com.zcloud.service.xgf.TrainingBatchService; +import com.zcloud.util.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -25,47 +28,68 @@ public class FlowTrainController extends BaseController { @Value("${preventionxgf.api.url}") private String xgfUrl; - @RequestMapping(value="/batchList") + @Resource + private TrainingBatchService trainingbatchService; + + @Resource + private TrainUsersService trainUsersService; + + @RequestMapping(value = "/batchList") @ResponseBody - public Object batchList(Page page) throws Exception{ + public Object batchList(Page page) throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = trainingbatchService.list(page); //列出TrainingBatch列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", "success"); + return map; + } + + @RequestMapping(value = "/batchUserList") + @ResponseBody + public Object batchUserList(Page page) throws Exception { + PageData request = this.getPageData(); + PageData condition = new PageData(); + condition.put("TRAINING_BATCH_ID", request.get("TRAINING_BATCH_ID")); + page.setPd(condition); + List varList = trainingbatchService.batchUserlistPage(page); + + PageData response = new PageData(); + response.put("varList", varList); + response.put("page", page); + response.put("total", page.getTotalResult()); + response.put("result", "success"); + return response; + } + + @RequestMapping(value = "/batchAudit") + @ResponseBody + public Object batchAudit(Page page) throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - pd.put("MAndTUserId",Jurisdiction.getUSER_ID()); - Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/audit", pd); return result; } - @RequestMapping(value="/batchUserList") - @ResponseBody - public Object batchUserList(Page page) throws Exception{ - PageData pd = new PageData(); - pd = this.getPageData(); - Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/batchUserList" +getPageUrl(page), pd); - return result; - } - - @RequestMapping(value="/batchAudit") - @ResponseBody - public Object batchAudit(Page page) throws Exception{ - PageData pd = new PageData(); - pd = this.getPageData(); - Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/audit" , pd); - return result; - } - - private String getPageUrl(Page page){ - return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + private String getPageUrl(Page page) { + return "?showCount=" + page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); } /** * 分公司端-相关方流动人员培训审核-查看用户信息 + * * @return * @throws Exception */ - @RequestMapping(value="/getUserDetailById") + @RequestMapping(value = "/getUserDetailById") @ResponseBody - public Object getCorpUserList() throws Exception{ - Map map = new HashMap(); + public Object getCorpUserList() throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -73,24 +97,71 @@ public class FlowTrainController extends BaseController { return result; } - @RequestMapping(value="/approveUser") + @RequestMapping(value = "/approveUser") @ResponseBody - public Object approveUser() throws Exception{ - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("loginUserId",Jurisdiction.getUSER_ID()); - Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainusers/approveUser", pd); - return result; + public Object approveUser() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + trainUsersService.approveUser(pd); + map.put("result", "success"); + return map; } - @RequestMapping(value="/getDetailsById") + + @RequestMapping(value = "/getDetailsById") @ResponseBody - public Object getDetailsById() throws Exception{ - PageData pd = new PageData(); - pd = this.getPageData(); - if(!Jurisdiction.getUsername().equals("admin")){ - pd.put("AUDIT_USER_ID", Jurisdiction.getUSER_ID()); + public Object getDetailsById() throws Exception { + PageData request = this.getPageData(); + PageData condition = new PageData(); + condition.put("TRAINING_BATCH_ID", request.get("TRAINING_BATCH_ID")); + PageData entity = trainingbatchService.findById(condition); + switch (entity.getString("STEP_STATUS")) { + case "0": + if (entity.getString("TERRITORIALITY_USER_ID").equals(Jurisdiction.getUSER_ID())) { + entity.put("step", "TERRITORIALITY_STATE"); + } + break; + case "1": + if (entity.getString("MANAGER_USER_ID").equals(Jurisdiction.getUSER_ID())) { + entity.put("step", "MANAGER_STATE"); + } + break; + case "2": + if (entity.getString("SUPERVISION_USER_ID").equals(Jurisdiction.getUSER_ID())) { + entity.put("step", "SUPERVISION_STATE"); + } + break; + default: + break; } - Map result = HttpClientService.doPost(xgfUrl+ "/openApi/trainingbatch/getDetailsById", pd); - return result; + PageData response = new PageData(); + response.put("pd", entity); + response.put("result", "success"); + return response; + } + + @RequestMapping(value = "/endApproval") + @ResponseBody + public Object endApproval() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + trainUsersService.endApproval(pd); + map.put("result", "success"); + return map; + } + + @RequestMapping(value = "/oldBatchList") + @ResponseBody + public Object oldBatchList(Page page) throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = trainingbatchService.oldBatchList(page); //列出TrainingBatch列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", "success"); + return map; } } diff --git a/src/main/java/com/zcloud/entity/system/Role.java b/src/main/java/com/zcloud/entity/system/Role.java index b83ae519..369c8beb 100644 --- a/src/main/java/com/zcloud/entity/system/Role.java +++ b/src/main/java/com/zcloud/entity/system/Role.java @@ -15,6 +15,16 @@ public class Role { private String EDIT_QX; //修改权限(存放的除权后的菜单ID)有修改权限的菜单ID private String CHA_QX; //查看权限(存放的除权后的菜单ID)有查看权限的菜单ID private String RNUMBER; //编号(在处理类中新增的时候自动生成) + private String DEPT_TYPE; + + public String getDEPT_TYPE() { + return DEPT_TYPE; + } + + public void setDEPT_TYPE(String DEPT_TYPE) { + this.DEPT_TYPE = DEPT_TYPE; + } + private String Level; //用户等级 public String getROLE_ID() { diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java index 092cbf84..7cc81fa2 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java @@ -100,5 +100,17 @@ public interface HighWorkMapper{ List listAllHighRiskWorkLocation(PageData pd); void editacceptancapplication(PageData pd); + + List listHighRiskWorkFirst(Page page); + + PageData statisticsHighRiskWorkByStateFirst(PageData pd); + + /** + * 统计高危作业里各作业数（一公司） + * @param pd + * @return + * @throws Exception + */ + List statisticsAllHighRiskWorkFirst(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index 5b9f4d3d..5fdb5712 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -177,5 +177,9 @@ public interface DepartmentMapper{ PageData getInfo(PageData pd) throws Exception; List listTreeManageAndCorpHasOrder(PageData pd); + + List listSubCorpDepartmentByParentId(String parentId); + + PageData findByCorpDepartmentId(PageData condition); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java index 569023c7..931dc169 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java @@ -75,5 +75,20 @@ public interface OutSourcedMapper{ PageData jieshuOutSourced(PageData pd); void updateState(PageData pd); + + /** 重点工程隐患 列表 + * @param page + * @throws Exception + */ + List hiddenOutsourcedlistPage(Page page); + + /** + * 重点工程管理列表 + * @param page + * @return + */ + List outSouceslistPage(Page page); + + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/VideoManagerMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/VideoManagerMapper.java index bce67b13..8215607b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/VideoManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/VideoManagerMapper.java @@ -75,5 +75,7 @@ public interface VideoManagerMapper { void editByResourcesId(PageData pd); void updateAiByOUTSOURCED_ID(PageData pd); + + List dataApplistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java b/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java index efb6cfe7..635369d9 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HighWorkService.java @@ -103,5 +103,29 @@ public interface HighWorkService{ * @throws Exception */ List listAllHighRiskWorkLocation(PageData pd)throws Exception; + + /** + * 作业实时情况展示（一公司） + * @param page + * @return + * @throws Exception + */ + List listHighRiskWorkFirst(Page page)throws Exception; + + /** + * 获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]）（一公司） + * @param pd + * @return + * @throws Exception + */ + PageData statisticsHighRiskWorkByStateFirst(PageData pd)throws Exception; + + /** + * 统计高危作业里各作业数（一公司） + * @param pd + * @return + * @throws Exception + */ + List statisticsAllHighRiskWorkFirst(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java index 15fd4ce5..11068f77 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java @@ -176,5 +176,26 @@ public class HighWorkServiceImpl implements HighWorkService { public List listAllHighRiskWorkLocation(PageData pd) throws Exception { return highworkMapper.listAllHighRiskWorkLocation(pd); } + + @Override + public List listHighRiskWorkFirst(Page page) throws Exception { + return highworkMapper.listHighRiskWorkFirst(page); + } + + @Override + public PageData statisticsHighRiskWorkByStateFirst(PageData pd) throws Exception { + return highworkMapper.statisticsHighRiskWorkByStateFirst(pd); + } + + /** + * 统计高危作业里各作业数（一公司） + * @param pd + * @return + * @throws Exception + */ + @Override + public List statisticsAllHighRiskWorkFirst(PageData pd) throws Exception { + return highworkMapper.statisticsAllHighRiskWorkFirst(pd); + } } diff --git a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java index bf05b77d..e575f688 100644 --- a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java @@ -76,5 +76,21 @@ public interface OutSourcedService{ PageData jieshuOutSourced(PageData pd); void updateState(PageData pd); + + /** 查询隐患的重点工程列表 排序规则不一致 + * @param page + * @throws Exception + */ + public List listHiddenOutsourced(Page page)throws Exception; + + /** + * 重点工程管理列表APP + * @param page + * @return + * @throws Exception + */ + public List outSouceslistPage(Page page)throws Exception; + + } diff --git a/src/main/java/com/zcloud/service/keyProjects/VideoManagerService.java b/src/main/java/com/zcloud/service/keyProjects/VideoManagerService.java index aa472aa9..4b7c0f25 100644 --- a/src/main/java/com/zcloud/service/keyProjects/VideoManagerService.java +++ b/src/main/java/com/zcloud/service/keyProjects/VideoManagerService.java @@ -73,5 +73,7 @@ public interface VideoManagerService { void updateAiByOUTSOURCED_ID(PageData pd); + + List listApp(Page page); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java index af090e91..a4e51674 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java @@ -106,5 +106,15 @@ public class OutSourcedServiceImpl implements OutSourcedService { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); outsourcedMapper.updateState(pd); } + + @Override + public List listHiddenOutsourced(Page page) throws Exception { + return outsourcedMapper.hiddenOutsourcedlistPage(page); + } + + @Override + public List outSouceslistPage(Page page) throws Exception { + return outsourcedMapper.outSouceslistPage(page); + } } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/VideoManagerServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/VideoManagerServiceImpl.java index af6a8611..b0dfdba5 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/VideoManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/VideoManagerServiceImpl.java @@ -121,5 +121,10 @@ public class VideoManagerServiceImpl implements VideoManagerService { public void updateAiByOUTSOURCED_ID(PageData pd) { videomanagerMapper.updateAiByOUTSOURCED_ID(pd); } + + @Override + public List listApp(Page page) { + return videomanagerMapper.dataApplistPage(page); + } } diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index a79792c5..7c30e2a1 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -227,5 +227,9 @@ public interface DepartmentService{ PageData getDepartmentInfo(PageData pd) throws Exception; List listTreeManageAndCorpHasOrder(PageData pd); + + List listAllCorpDepartment(String number) throws Exception; + + PageData getCorpDepartment(PageData condition) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index ec65f300..68111e4d 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -364,4 +364,6 @@ public interface UsersService { Object getPersonPositioningStatistics(PageData pd) throws Exception; Object getCurrentLocationCount(PageData pd); + + List getRegUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 13c86e06..5be056e3 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import com.zcloud.entity.system.Menu; import com.zcloud.mapper.datasource.system.SupervisionDepartmentMapper; +import com.zcloud.mapper.dsno2.system.Department2Mapper; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.UuidUtil; @@ -33,6 +34,9 @@ public class DepartmentServiceImpl implements DepartmentService{ @Resource private DepartmentMapper departmentMapper; + + @Resource + private Department2Mapper department2Mapper; /**新增 * @param pd * @throws Exception @@ -419,5 +423,36 @@ public class DepartmentServiceImpl implements DepartmentService{ public List listTreeManageAndCorpHasOrder(PageData pd) { return departmentMapper.listTreeManageAndCorpHasOrder(pd); } + + @Override + public List listAllCorpDepartment(String parentId) throws Exception{ + List departmentList = this.listSubCorpDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listAllCorpDepartment(depar.getDEPARTMENT_ID())); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + @Override + public PageData getCorpDepartment(PageData condition) throws Exception { + return departmentMapper.findByCorpDepartmentId(condition); + } + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubCorpDepartmentByParentId(String parentId) throws Exception { + return departmentMapper.listSubCorpDepartmentByParentId(parentId); + } + + + + } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 91506371..10b33486 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -623,4 +623,9 @@ public class UsersServiceImpl implements UsersService { return map; } + + @Override + public List getRegUserInfo(PageData pd) { + return usersMapper.getUsersInfo(pd); + } } diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index ef400d4c..80f20580 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -8,6 +8,8 @@ package com.zcloud.util; public class Const { public static final String SESSION_USER = "SESSION_USER"; //session用的用户 + public static final String SESSION_DEPT = "SESSION_DEPT"; //session用的用户 + public static final String SESSION_USERROL = "SESSION_USERROL"; //用户对象(包含角色信息) public static final String SESSION_ROLE_RIGHTS = "SESSION_ROLE_RIGHTS"; //角色菜单权限 public static final String SHIROSET = "SHIROSET"; //菜单权限标识 diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java index 3e07fff8..2366abae 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java @@ -18,6 +18,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.session.Session; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.servlet.view.document.AbstractXlsView; import com.zcloud.entity.PageData; @@ -31,6 +32,9 @@ import net.coobird.thumbnailator.Thumbnails; */ public class HiddenExcelImgToSessionView extends AbstractXlsView{ + @Value("${http.file.url}") + private String fileUrl; + @Override protected void buildExcelDocument(Map model, Workbook workbook, HttpServletRequest request, @@ -38,7 +42,7 @@ public class HiddenExcelImgToSessionView extends AbstractXlsView{ // TODO Auto-generated method stub String proPath = PathUtil.getProjectpath(); Session session = Jurisdiction.getSession(); - String beji = Const.HTTPFILEURL; + String beji = fileUrl; //beji =beji.replaceAll("\\\\", "/"); // String beji = "https://qgqy.qhdsafety.com/file/"; Date date = new Date(); diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgView.java b/src/main/java/com/zcloud/util/HiddenExcelImgView.java index cb1f84e9..a447a4bf 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgView.java @@ -26,6 +26,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.usermodel.Workbook; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.servlet.view.document.AbstractXlsView; import com.zcloud.entity.PageData; @@ -37,13 +38,16 @@ import com.zcloud.entity.PageData; */ public class HiddenExcelImgView extends AbstractXlsView{ + @Value("${http.file.url}") + private String fileUrl; + @Override protected void buildExcelDocument(Map model, Workbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception { // TODO Auto-generated method stub String proPath = PathUtil.getProjectpath(); - String beji = Const.HTTPFILEURL; + String beji = fileUrl; //beji =beji.replaceAll("\\\\", "/"); Date date = new Date(); diff --git a/src/main/java/com/zcloud/util/HttpClientService.java b/src/main/java/com/zcloud/util/HttpClientService.java index 2adb7701..64be5883 100644 --- a/src/main/java/com/zcloud/util/HttpClientService.java +++ b/src/main/java/com/zcloud/util/HttpClientService.java @@ -365,46 +365,9 @@ public class HttpClientService { } public static Map doPost(String url, PageData pd) { - /* 正式上面总是显示一次断一次，未找到原因 - MultiValueMap requestBody = new LinkedMultiValueMap(); - pd.forEach((key, value) -> { - requestBody.add(key.toString(), value.toString()); - }); - System.out.println(requestBody); - Map responseBody = new HashMap(); - TcpClient tcpClient = TcpClient.create() - .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000) // Connection Timeout - .doOnConnected(connection -> - connection.addHandlerLast(new ReadTimeoutHandler(10)) // Read Timeout - .addHandlerLast(new WriteTimeoutHandler(10))); // Write Timeout - WebClient client = WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.from(tcpClient))).build(); - client.post() - .uri(url) - .header("Source","zcloud") - .contentType(MediaType.APPLICATION_FORM_URLENCODED) - .body(BodyInserters.fromFormData(requestBody)) - .exchange() - .flatMap(response -> { - System.out.println("Status code: " + response.statusCode().value()); - return response.bodyToMono(JSONObject.class); - }) - .doOnSuccess(body -> { - System.out.println("success"); - responseBody.putAll(body); - }) - .doOnError(throwable -> { - responseBody.put("msg",throwable.getMessage()); - System.out.println("Error occurred: " + throwable.getMessage()); - }) - .block(); - return responseBody; - */ JSONObject jsonObject = null; HttpResponse response = null; List nameValuePairList = new ArrayList(); -// pd.forEach((key, value) -> { // 这个遍历不好使 -// System.out.println("键：" + key.toString() + "，值：" + value.toString()); -// }); Map map = (Map)pd; System.out.print("参数：{"); for(Map.Entry entry : map.entrySet()){ diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index c0c9adec..91e41c46 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -60,9 +60,8 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://192.168.0.79:8088 # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 - -preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? smb.host=39.103.224.166 smb.port=22 @@ -75,7 +74,7 @@ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.0.31:9876 +rocketmq.name-server=172.24.151.16:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -91,8 +90,8 @@ mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -corp.default.pic-path=https://qgqy.qhdsafety.com/file/ -corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ +corp.default.pic-path=https://qgqy.qhdsafety.com/ +corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ #用户标识 @@ -104,3 +103,5 @@ czks-backendaddr=http://192.168.0.79:8091/ gwj-useridentity=GWJ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ +# ?????? +http.file.url=https://qgqy.qhdsafety.com/file/ diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 0027d285..f34dccb4 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -1,11 +1,13 @@ + + datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.247:3306/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=root +datasource.no1.password=Mysql@zcloud88888 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.247:3306/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=root +datasource.no2.password=Mysql@zcloud88888 #druid??? @@ -58,24 +60,14 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://192.168.0.79:8088 # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 - -preventionxgf.api.url=http://192.168.0.79:8088/ -qa-regulatory-gwj.api.url=http://192.168.0.79:8092/ - +preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=192.168.192.201 smb.port=22 smb.user=root -smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ -# 沧州矿石用户标识 -czks-useridentity=CZKS -czks-baseimgpath=https://qgqy.qhdsafety.com/file/ -czks-backendaddr=http://192.168.0.79:8091/ -# 港务局用户标识 -gwj-useridentity=GWJ -gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ -gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ +smb.password=SJSKAQHBGLXT@20220311 +smb.basePath=/mnt/qask/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit @@ -97,16 +89,18 @@ mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -corp.default.pic-path=https://qgqy.qhdsafety.com/file/ -corp.default.back-end-path=http://192.168.151.57:8092/ -#对接人员定位 -perLoc.url=http://192.168.210.32:8084 -perLoc.userName=qaaqadmin -perLoc.pwd=Cfd2023@ -#数据同步 -mq.topic.docking=docking -mq.group.docking=scheduled_tasks_docking -base.info.USER_IDENTITY=GWJ -base.info.baseImgPath=https://qgqy.qhdsafety.com/file/ -base.info.BACKENDADDR=http://192.168.0.31:8992/qa-regulatory-gwj/ +corp.default.pic-path=https://qgqy.qhdsafety.com/ +corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +http.file.url=https://qgqy.qhdsafety.com/file/ + + +#�û���ʶ +# ���ݿ�ʯ +czks-useridentity=CZKS +czks-baseimgpath=https://wwag.qhdsafety.com/file/ +czks-backendaddr=http://192.168.0.79:8091/ +# ����� +gwj-useridentity=GWJ +gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ +gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index a8b10804..40b507c2 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -84,22 +84,8 @@ mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -# 沧州矿石用户标识 -czks-useridentity=CZKS -czks-baseimgpath=https://qgqy.qhdsafety.com/file/ -czks-backendaddr=http://192.168.0.31:7811/qa-regulatory-czks/ -# 港务局用户标识 -gwj-useridentity=GWJ -gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ -gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ -#对接人员定位 -perLoc.url=http://192.168.210.32:8084 -perLoc.userName=qaaqadmin -perLoc.pwd=Cfd2023@ -#数据同步 -mq.topic.docking=docking -mq.group.docking=scheduled_tasks_docking -base.info.USER_IDENTITY=GWJ -base.info.baseImgPath=https://qgqy.qhdsafety.com/file/ -base.info.BACKENDADDR=http://192.168.0.31:8992/qa-regulatory-gwj/ +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ +# ?????? +http.file.url=http://192.168.192.201:8991/file/ diff --git a/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml index 8851147b..aa62c068 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml @@ -877,4 +877,519 @@ ) f + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml index c717f435..9ba0ada9 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml @@ -134,21 +134,23 @@ + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 925e4e48..f01431e2 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -91,7 +91,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JCR, CORPINFO_ID, CARDNO, - USER_IDENTITY, ISDELETE @@ -132,7 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.JCR, f.CORPINFO_ID, f.CARDNO, - f.USER_IDENTITY, f.ISDELETE @@ -1403,4 +1401,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.CARDNO = #{CARDNO} + diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 7f2e8852..963cb222 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -295,16 +295,13 @@ b.UNITS_NAME as UNITS_NAME, isu.NAME as AIWARNING_PEOPLE, pci.NAME Q_COMPETENT_DEPT_NAME, - (select count(1) from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT, + cc.co 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_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_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(dbsl.co,0) as co - from f left join bus_units b using (UNITS_ID) @@ -315,25 +312,7 @@ 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 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 - + LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and @@ -396,9 +375,7 @@ ) ORDER BY - - dbsl.co DESC, - + cc.co DESC, f.OPERATTIME DESC @@ -697,4 +674,231 @@ where OUTSOURCED_ID = #{OUTSOURCED_ID} + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml index fb13f861..b6cefcf0 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml @@ -291,4 +291,23 @@ where OUTSOURCED_ID = #{OUTSOURCED_ID} + + + +