From 3519b2bf0f97d5017f97447b6eafc2b4bd9487c4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 27 一月 2024 14:01:55 +0800
Subject: [PATCH] 设备管理添加导出按钮
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 6 ++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java | 6 ++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 24 +++++++++++++++++++++++-
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 51c41a8..c76195d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +13,9 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
@@ -23,6 +26,9 @@
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.ProductionIdModel;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -424,7 +430,23 @@
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcEquipment mdcEquipment) {
- return super.exportXls(request, mdcEquipment, MdcEquipment.class, "璁惧琛�");
+ // Step.1 缁勮鏌ヨ鏉′欢
+ QueryWrapper<MdcEquipment> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipment, request.getParameterMap());
+ //Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ String selections = request.getParameter("selections");
+ if (!oConvertUtils.isEmpty(selections)) {
+ queryWrapper.in("id", selections.split(","));
+ }
+ List<MdcEquipment> pageList = mdcEquipmentService.list(queryWrapper);
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, MdcEquipment.class);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ ExportParams exportParams = new ExportParams("璁惧鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "瀵煎嚭淇℃伅");
+// exportParams.setImageBasePath(upLoadPath);
+ mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+ mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+ return mv;
}
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 058f9bc..787e61d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -7,6 +7,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -100,7 +101,7 @@
/**
* 閲囬泦鍙傛暟琛�
*/
- @Excel(name = "閲囬泦鍙傛暟琛�", width = 15)
+ @Excel(name = "閲囬泦鍙傛暟琛�", width = 30)
@ApiModelProperty(value = "閲囬泦鍙傛暟琛�")
private String saveTableName;
/**
@@ -125,7 +126,8 @@
/**
* 璁惧鐘舵��
*/
- @Excel(name = "璁惧鐘舵��", width = 15)
+ @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "mdc_equipment_status")
+ @Dict(dicCode = "mdc_equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
private Integer equipmentStatus;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
index 6c79675..8acc779 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
@@ -81,13 +81,13 @@
equipmentRateJudge = Integer.valueOf(dictModelList1.get(0).getValue());
}
// 鑾峰彇鍒╃敤鐜囨甯稿��
- List<DictModel> dictModelList2 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_SPEED_JUDGE);
+ List<DictModel> dictModelList2 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_RATE_NORMAL);
Integer equipmentRateNormal = 20;
if (dictModelList2 != null && !dictModelList2.isEmpty()) {
equipmentRateNormal = Integer.valueOf(dictModelList2.get(0).getValue());
}
// 鑾峰彇璁惧鐘舵�佸ぉ鏁�
- List<DictModel> dictModelList3 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_RATE_NORMAL);
+ List<DictModel> dictModelList3 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_SPEED_JUDGE);
Integer equipmentStatusJudge = 5;
if (dictModelList3 != null && !dictModelList3.isEmpty()) {
equipmentStatusJudge = Integer.valueOf(dictModelList3.get(0).getValue());
@@ -107,6 +107,7 @@
if (flag) {
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鍒╃敤鐜囨姤璀︼紒");
messageDTO.setCategory("棰勮娑堟伅");
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
@@ -128,6 +129,7 @@
if (flag) {
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
messageDTO.setCategory("棰勮娑堟伅");
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
--
Gitblit v1.9.3