From a3cb768d958e64625786857e0db69335875f5d8e Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 06 六月 2025 13:43:55 +0800
Subject: [PATCH] 消息类型更新
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index cb0d4f8..d38e4e2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -22,6 +22,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.Constructor;
import org.jeecg.modules.base.service.IConstructorService;
import org.jeecg.modules.base.service.IFactoryModelService;
@@ -37,13 +38,18 @@
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.vo.EquipmentExportVo;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -130,6 +136,9 @@
@Autowired
private ISysUserService sysUserService;
+
+ @Value("${jeecg.path.upload}")
+ private String upLoadPath;
/**
@@ -561,6 +570,43 @@
public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
return super.exportXls(request, equipment, Equipment.class, "璁惧鍙拌处瀵煎嚭");
}
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param equipment
+ */
+ //@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment:exportXls")
+ @RequestMapping(value = "/exportXlsNew")
+ public ModelAndView exportXlsNew(HttpServletRequest request, Equipment equipment) {
+ // Step.1 缁勮鏌ヨ鏉′欢
+// QueryWrapper<T> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ // 杩囨护閫変腑鏁版嵁
+// String selections = request.getParameter("selections");
+// if (oConvertUtils.isNotEmpty(selections)) {
+// List<String> selectionList = Arrays.asList(selections.split(","));
+// queryWrapper.in("id",selectionList);
+// }
+// // Step.2 鑾峰彇瀵煎嚭鏁版嵁
+// List<T> exportList = service.list(queryWrapper);
+
+ List<Map<String, Object>> mapList = equipmentService.exportXlsNew();
+
+ // Step.3 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ //姝ゅ璁剧疆鐨刦ilename鏃犳晥 ,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鍙拌处瀵煎嚭");
+ mv.addObject(NormalExcelConstants.CLASS, EquipmentExportVo.class);
+ //update-begin--Author:liusq Date:20210126 for锛氬浘鐗囧鍑烘姤閿欙紝ImageBasePath鏈缃�--------------------
+ ExportParams exportParams=new ExportParams("璁惧鍙拌处瀵煎嚭" + "鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "璁惧鍙拌处瀵煎嚭");
+ exportParams.setImageBasePath(upLoadPath);
+ //update-end--Author:liusq Date:20210126 for锛氬浘鐗囧鍑烘姤閿欙紝ImageBasePath鏈缃�----------------------
+ mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+ mv.addObject(NormalExcelConstants.DATA_LIST, mapList);
+ return mv;
+ }
// /**
// * 閫氳繃excel瀵煎叆鏁版嵁
@@ -1144,7 +1190,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle(headInfo);
messageDTO.setFromUser("鏁版嵁瀵煎叆灏忓姪鎵�-灏忓");
- messageDTO.setCategory("瀵煎叆鎿嶄綔闄勫姞淇℃伅");
+ messageDTO.setCategory("瀵煎叆淇℃伅");
messageDTO.setContent(exceptionInfo);
messageDTO.setToUser(user.getUsername());
sysBaseApi.sendSysAnnouncement(messageDTO);
--
Gitblit v1.9.3