From 9cc00de219965372f23708fa08d04347745668f9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:51:48 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 32 ++++++++++
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 | 26 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java | 9 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 6 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 14 +++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java | 7 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java | 10 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java | 6 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 11 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 7 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 13 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 6 ++
13 files changed, 143 insertions(+), 10 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..9ff87ae 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
@@ -23,6 +23,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 +427,28 @@
*/
@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());
+ List<MdcEquipment> pageList = mdcEquipmentService.exportXlsList(mdcEquipment);
+ List<String> equipmentIds = pageList.stream().map(MdcEquipment::getId).collect(Collectors.toList());
+ if (!equipmentIds.isEmpty()) {
+ Map<String, String> equDepNames = mdcEquipmentService.getDepNamesByEquipmentIds(equipmentIds);
+ Map<String, String> equProNames = mdcEquipmentService.getProNamesByEquipmentIds(equipmentIds);
+ pageList.forEach(item -> {
+ item.setOrgCodeTxt(equDepNames.get(item.getId()));
+ item.setProductionName(equProNames.get(item.getId()));
+ });
+ }
+ 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/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index d62cdb5..7d2a24c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -8,10 +8,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
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.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
@@ -258,7 +260,9 @@
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃", notes = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
@GetMapping(value = "/getWorkshopList")
public Result<List<MdcWorkshopInfo>> getWorkshopList() {
- List<MdcWorkshopInfo> list = mdcWorkshopInfoService.list();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ List<MdcWorkshopInfo> list = mdcWorkshopInfoService.listByUser(userId);
return Result.OK(list);
}
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..cc47df4 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;
@@ -46,13 +47,13 @@
/**
* 鎶ヨ鍙�
*/
- @Excel(name = "鎶ヨ鍙�", width = 15)
+ //@Excel(name = "鎶ヨ鍙�", width = 15)
@ApiModelProperty(value = "鎶ヨ鍙�")
private String alarm;
/**
* 閲囬泦鏃堕棿
*/
- @Excel(name = "閲囬泦鏃堕棿", width = 15)
+ //@Excel(name = "閲囬泦鏃堕棿", width = 15)
@ApiModelProperty(value = "閲囬泦鏃堕棿")
private String collectTime;
/**
@@ -64,7 +65,7 @@
/**
* 璁惧瀹炴椂鐘舵��
*/
- @Excel(name = "璁惧瀹炴椂鐘舵��", width = 15)
+ //@Excel(name = "璁惧瀹炴椂鐘舵��", width = 15)
@ApiModelProperty(value = "璁惧瀹炴椂鐘舵��")
private Integer oporation;
/**
@@ -100,7 +101,7 @@
/**
* 閲囬泦鍙傛暟琛�
*/
- @Excel(name = "閲囬泦鍙傛暟琛�", width = 15)
+ @Excel(name = "閲囬泦鍙傛暟琛�", width = 30)
@ApiModelProperty(value = "閲囬泦鍙傛暟琛�")
private String saveTableName;
/**
@@ -125,14 +126,17 @@
/**
* 璁惧鐘舵��
*/
- @Excel(name = "璁惧鐘舵��", width = 15)
+ @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "mdc_equipment_status")
+ @Dict(dicCode = "mdc_equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
private Integer equipmentStatus;
/**閮ㄩ棬鍚嶇О*/
+ @Excel(name = "閮ㄩ棬鍚嶇О", width = 15)
private transient String orgCodeTxt;
/**浜х嚎鍚嶇О*/
+ @Excel(name = "杞﹂棿鍚嶇О", width = 15)
private transient String productionName;
@TableField(exist = false)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
index 870b590..e9621f3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
@@ -45,5 +45,11 @@
@ApiModelProperty(value = "璁惧缂栧彿棰滆壊")
private String equipmentIdColor;
+ /**
+ * 鑿滃崟鏉冮檺缂栫爜锛屼緥濡傦細鈥渟ys:schedule:list,sys:schedule:info鈥�,澶氫釜閫楀彿闅斿紑
+ */
+ @ApiModelProperty(value = "鑿滃崟鏉冮檺缂栫爜")
+ private String perms;
+
}
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");
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
index 0f32435..4cab5f9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
@@ -98,4 +98,11 @@
@InterceptorIgnore(tenantLine = "1")
MdcEquipmentDto getWorkLineLast(@Param("tableName") String saveTableName);
+
+ /**
+ * 瀵煎嚭list
+ * @param mdcEquipment
+ * @return
+ */
+ List<MdcEquipment> exportXlsList(@Param("mdcEquipment") MdcEquipment mdcEquipment);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
index ba8cada..70fbff3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
@@ -18,8 +18,17 @@
/**
* 澶у睆淇℃伅
+ *
* @param workshopId
* @return
*/
List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("workshopId") String workshopId);
+
+ /**
+ * 澶у睆杞﹂棿鍒楄〃
+ *
+ * @param userId
+ * @return
+ */
+ List<MdcWorkshopInfo> listByUser(@Param("userId") String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 298d26e..492e4b3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -239,7 +239,7 @@
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
<if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
- AND t3.production_name LIKE CONCAT(CONCAT('%',#{mdcEquipment.productionName}),'%')
+ AND t3.id = #{ mdcEquipment.productionName } OR t3.parent_id = #{ mdcEquipment.productionName }
</if>
</where>
order by t1.sort_no
@@ -250,4 +250,34 @@
select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc
</select>
+ <select id="exportXlsList" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
+ SELECT
+ t1.*
+ FROM
+ mdc_equipment t1
+ LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id
+ LEFT JOIN mdc_production t3 ON t2.production_id = t3.id
+ <where>
+ <if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' ">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%')
+ </if>
+ <if test="mdcEquipment.equipmentName != null and mdcEquipment.equipmentName != '' ">
+ AND t1.equipment_name LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentName}),'%')
+ </if>
+ <if test="mdcEquipment.equipmentModel != null and mdcEquipment.equipmentModel != '' ">
+ AND t1.equipment_name = #{mdcEquipment.equipmentModel}
+ </if>
+ <if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' ">
+ AND t1.equipmentType = #{mdcEquipment.equipmentType}
+ </if>
+ <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
+ AND t1.drive_type = #{mdcEquipment.driveType}
+ </if>
+ <if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
+ AND t3.id = #{ mdcEquipment.productionName } OR t3.parent_id = #{ mdcEquipment.productionName }
+ </if>
+ </where>
+ order by t1.sort_no
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index f0f340f..e286929 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -25,4 +25,17 @@
AND a.CollectTime= b.maxgdtime
AND mew.workshop_id = #{ workshopId }
</select>
+
+ <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
+ SELECT
+ DISTINCT t1.*
+ FROM
+ mdc_workshop_info t1
+ LEFT JOIN sys_permission t2 ON t1.perms = t2.perms
+ LEFT JOIN sys_role_permission t3 ON t2.id = t3.permission_id
+ LEFT JOIN sys_role t4 ON t4.id = t3.role_id
+ LEFT JOIN sys_user_role t5 ON t5.role_id = t4.id
+ WHERE
+ t5.user_id = #{ userId }
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index 4ea1405..1880efa 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -182,5 +182,11 @@
*/
void monitoringSpeedProcess();
+ /**
+ * 瀵煎嚭List
+ * @param mdcEquipment
+ * @return
+ */
+ List<MdcEquipment> exportXlsList(MdcEquipment mdcEquipment);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
index ce53b6c..5bfd91e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
@@ -19,4 +19,11 @@
* 澶у睆淇℃伅
*/
List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId);
+
+ /**
+ * 杞﹂棿澶у睆鍒楄〃
+ * @param userId
+ * @return
+ */
+ List<MdcWorkshopInfo> listByUser(String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index a0fb120..5eb7085 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -766,4 +766,15 @@
}
+ /**
+ * 瀵煎嚭list
+ *
+ * @param mdcEquipment
+ * @return
+ */
+ @Override
+ public List<MdcEquipment> exportXlsList(MdcEquipment mdcEquipment) {
+ return this.baseMapper.exportXlsList(mdcEquipment);
+ }
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
index c3b18d37..6e7b036 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
@@ -28,4 +28,14 @@
public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
return this.baseMapper.getBigScreenInfo(workshopId);
}
+
+ /**
+ * 澶у睆杞﹂棿鍒楄〃
+ * @param userId
+ * @return
+ */
+ @Override
+ public List<MdcWorkshopInfo> listByUser(String userId) {
+ return this.baseMapper.listByUser(userId);
+ }
}
--
Gitblit v1.9.3