From eafb61d4b75fa30c7fd8b3d4917fad4ed1bfa088 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 31 三月 2025 10:48:18 +0800
Subject: [PATCH] art: 设备管理-设备检索接口
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 74 ++++++++++++++++++------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 9 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java | 26 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 15 +++++
4 files changed, 104 insertions(+), 20 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
index d79d405..6ede760 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import java.util.List;
@@ -36,4 +37,12 @@
* @return
*/
IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment);
+
+ /**
+ * 鍏抽敭瀛楁悳绱�
+ * @param keyword
+ * @param pageSize
+ * @return
+ */
+ List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize);
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index b8a21ff..1dea4cc 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -24,6 +25,7 @@
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,7 @@
/**
* @Description: 璁惧鍙拌处
* @Author: jeecg-boot
- * @Date: 2025-03-19
+ * @Date: 2025-03-19
* @Version: V1.0
*/
@Service
@@ -103,66 +105,98 @@
QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if(sysUser == null){
+ if (sysUser == null) {
return page;
}
- if(StringUtils.isNotBlank(sysUser.getEquipmentIds())){
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
queryWrapper.in("e.equipment_code", equipArr);
- }else {
+ } else {
//娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
}
//鏌ヨ鏉′欢杩囨护
- if(eamEquipment != null){
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentCode())){
+ if (eamEquipment != null) {
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentCode())) {
queryWrapper.like("e.equipment_code", eamEquipment.getEquipmentCode());
}
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentName())){
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentName())) {
queryWrapper.like("e.equipment_name", eamEquipment.getEquipmentName());
}
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())){
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())) {
queryWrapper.eq("e.equipment_importance", eamEquipment.getEquipmentImportance());
}
- if(StringUtils.isNotBlank(eamEquipment.getAssetStatus())){
+ if (StringUtils.isNotBlank(eamEquipment.getAssetStatus())) {
queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus());
}
- if(StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())){
+ if (StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())) {
queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus());
}
- if(StringUtils.isNotBlank(eamEquipment.getOperationSystem())){
+ if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
}
- if(StringUtils.isNotBlank(eamEquipment.getOrgId())){
+ if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
queryWrapper.like("e.org_id", eamEquipment.getOrgId());
}
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())){
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
}
//鎺掑簭
- if(StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())){
+ if (StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())) {
//queryWrapper.like("column", eamEquipment.getColumn());
String column = eamEquipment.getColumn();
- if(column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
}
- if(DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())){
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())) {
queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
- }else {
+ } else {
queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column));
}
- }else {
+ } else {
queryWrapper.orderByDesc("e.create_time");
}
- }else {
+ } else {
queryWrapper.orderByDesc("e.create_time");
}
- IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
+ IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
return ipage;
}
+ @Override
+ public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize) {
+ IPage<EamEquipment> page = new Page<>(1, pageSize);
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return Collections.emptyList();
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
+ }
+ if (StringUtils.isNotBlank(keyword)) {
+ queryWrapper.like("equipment_code", keyword);
+ queryWrapper.or().like("equipment_name", keyword);
+ }
+ IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
+ if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ pageResult.getRecords().forEach((record) -> {
+ resultList.add(new EquipmentSearchResult(record));
+ });
+ return resultList;
+ }
+ return Collections.emptyList();
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java
new file mode 100644
index 0000000..0a27828
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/vo/EquipmentSearchResult.java
@@ -0,0 +1,26 @@
+package org.jeecg.modules.eam.vo;
+
+import lombok.Data;
+import org.jeecg.modules.eam.entity.EamEquipment;
+
+import java.io.Serializable;
+
+@Data
+public class EquipmentSearchResult implements Serializable {
+ /**
+ * 瀛楀吀value
+ */
+ private String value;
+ /**
+ * 瀛楀吀鏂囨湰
+ */
+ private String text;
+
+ public EquipmentSearchResult() {
+ }
+
+ public EquipmentSearchResult(EamEquipment eamEquipment) {
+ this.value = eamEquipment.getId();
+ this.text = eamEquipment.getEquipmentCode() + "[" + eamEquipment.getEquipmentName() + "]";
+ }
+}
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 a451225..52d5cb1 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
@@ -14,6 +14,7 @@
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -278,4 +279,18 @@
return result;
}
+ /**
+ * 妫�绱㈣澶�
+ * @param keyword 鏌ヨ鍏抽敭璇� 璁惧缂栧彿锛岃澶囧悕绉版ā绯婂尮閰�
+ * @param pageSize 涓�娆¤繑鍥炲灏戣褰�
+ * @return
+ */
+ @ApiOperation(value = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃", notes = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃")
+ @GetMapping(value = "/asyncLoadEquipment")
+ public Result<?> asyncLoadEquipment(@RequestParam(name="keyword",required = false) String keyword,
+ @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) {
+ List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize);
+ return Result.ok(resultList);
+ }
+
}
--
Gitblit v1.9.3