From c127accdddb76d11847f41b5685f5ef5e9e988d7 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 13 三月 2024 09:14:42 +0800 Subject: [PATCH] 设备管理问题修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java index 384511c..4a8bed4 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java @@ -11,9 +11,11 @@ import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; @@ -21,6 +23,8 @@ import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.service.*; import org.jeecg.modules.eam.vo.InspectionStandardImportVo; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.service.*; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +33,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -64,6 +69,19 @@ @Autowired private IInspectionCycleService inspectionCycleService; + + @Autowired + private ISysBaseAPI sysBaseApi; + @Autowired + private ISysUserService sysUserService; + @Resource + private ISysRoleService sysRoleService; + @Resource + private ISysDictService sysDictService; + @Resource + private ISysDictItemService sysDictItemService; + @Resource + private ISysUserRoleService sysUserRoleService; /** * 鍒嗛〉鍒楄〃鏌ヨ * @@ -142,6 +160,8 @@ isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId()); dailyInspectionStandardDetailService.save(isd); } + //娑堟伅鎻愰啋 + this.inspectionStandardAlert(dailyInspectionStandard.getApprovalStatus(),dailyInspectionStandard.getNum()); return Result.OK("娣诲姞鎴愬姛锛�"); } @@ -179,6 +199,8 @@ isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId()); dailyInspectionStandardDetailService.save(isd); } + //娑堟伅鎻愰啋 + this.inspectionStandardAlert(dailyInspectionStandard.getApprovalStatus(),dailyInspectionStandard.getNum()); return Result.OK("缂栬緫鎴愬姛!"); } @@ -570,12 +592,81 @@ } boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard); if (b){ + if(!"5".equals(approvalStatus)){//宸茬紪鍒� + this.inspectionStandardAlert(approvalStatus,dailyInspectionStandard.getNum()); + } + return Result.OK("瀹℃牳鎴愬姛!"); }else{ return Result.error("瀹℃牳澶辫触!"); } } + /** + *鐐规鏍囧噯绛惧娴佺▼娑堟伅鎻愰啋 + * qsw 2024-3-11 + */ + void inspectionStandardAlert(String approvalStatus,String standardNum){ + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false); + SysDictItem sysDictItem = null; + String roleDictItem = ""; + if("1".equals(approvalStatus)){//宸茬紪鍒� + roleDictItem = "鐐规鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + }else if("2".equals(approvalStatus)){//椹冲洖缂栧埗 + roleDictItem = "鐐规鏍囧噯缂栧埗"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯缂栧埗") + .eq("dict_id",sysDict.getId()),false); + }else if("3".equals(approvalStatus)){//宸插鏍� + roleDictItem = "鐐规鏍囧噯瀹℃壒"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯瀹℃壒") + .eq("dict_id",sysDict.getId()),false); + }else if("4".equals(approvalStatus)){//椹冲洖瀹℃牳 + roleDictItem = "鐐规鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + } +// else if("5".equals(approvalStatus)){//閫氳繃 +// roleDictItem = "鐐规鏍囧噯瀹℃壒"; +// sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() +// .eq("item_text","鐐规鏍囧噯瀹℃壒") +// .eq("dict_id",sysDict.getId()),false); +// } + String roleCode = sysDictItem.getItemValue(); + SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false); + List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId())); + for(SysUserRole sysUserRole:sysUserRoles){ + SysUser user = sysUserService.getById(sysUserRole.getUserId()); + String msg = ""; + if("1".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯缂栧埗鎴愬姛锛岃鍒拌嚜涓荤淮鎶ょ偣妫�鏍囧噯椤甸潰瀹℃牳锛�"; + }else if("2".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯宸查┏鍥烇紝璇峰埌鑷富缁存姢鐐规鏍囧噯椤甸潰鏌ョ湅锛�"; + }else if("3".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯瀹℃牳閫氳繃锛岃鍒拌嚜涓荤淮鎶ょ偣妫�鏍囧噯椤甸潰瀹℃壒锛�"; + }else if("4".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯宸查┏鍥烇紝璇峰埌鑷富缁存姢鐐规鏍囧噯椤甸潰鏌ョ湅锛�"; + } +// else if("5".equals(approvalStatus)){ +// msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+standardNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘璁ら�氳繃锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒"; +// } + MessageDTO messageDTO = new MessageDTO(); + messageDTO.setTitle("鑷富缁存姢鐐规鏍囧噯绛惧娑堟伅鎻愰啋锛�"); + messageDTO.setContent(msg); + messageDTO.setCategory(roleDictItem); + messageDTO.setFromUser("鑷富缁存姢鐐规鏍囧噯绛惧娑堟伅鎻愰啋鎻愰啋灏忓姪鎵�"); + messageDTO.setToUser(user.getUsername()); + sysBaseApi.sendSysAnnouncement(messageDTO); + } + } + /** * 鎵归噺 绛惧娴佺▼ -- Gitblit v1.9.3