From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
new file mode 100644
index 0000000..523b03d
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java
@@ -0,0 +1,47 @@
+package org.jeecg.modules.dnc.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dnc.entity.DeviceCharacters;
+import org.jeecg.modules.dnc.exception.ExceptionCast;
+import org.jeecg.modules.dnc.mapper.DeviceCharactersMapper;
+import org.jeecg.modules.dnc.request.DeviceCharactersRequest;
+import org.jeecg.modules.dnc.response.CommonCode;
+import org.jeecg.modules.dnc.service.IDeviceCharactersService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class DeviceCharactersServiceImpl extends ServiceImpl<DeviceCharactersMapper, DeviceCharacters> implements IDeviceCharactersService {
+ @Override
+ public Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {
+
+ if(page < 1 || size < 1) {
+ ExceptionCast.cast(CommonCode.INVALID_PAGE);
+ }
+ IPage<DeviceCharacters> pageData = new Page<>(page, size);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List<String> productIdList = Arrays.asList(user.getProductionIds().split(","));
+ LambdaQueryChainWrapper<DeviceCharacters> lambdaQuery = super.lambdaQuery();
+ if(deviceCharactersRequest != null) {
+ lambdaQuery.like(StrUtil.isNotEmpty(deviceCharactersRequest.getDeviceNo()),DeviceCharacters::getDeviceNo, deviceCharactersRequest.getDeviceNo());
+ lambdaQuery.eq(StrUtil.isNotEmpty(deviceCharactersRequest.getDepartId()),DeviceCharacters::getDepartId, deviceCharactersRequest.getDepartId());
+ lambdaQuery.like(StrUtil.isNotEmpty(deviceCharactersRequest.getControlSystem()),DeviceCharacters::getControlSystem, deviceCharactersRequest.getControlSystem());
+ lambdaQuery.like(StrUtil.isNotEmpty(deviceCharactersRequest.getCharacters()),DeviceCharacters::getCharacters, deviceCharactersRequest.getCharacters());
+ lambdaQuery.ge(StrUtil.isNotEmpty(deviceCharactersRequest.getStartTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getStartTime());
+ lambdaQuery.le(StrUtil.isNotEmpty(deviceCharactersRequest.getEndTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getEndTime());
+ }
+ lambdaQuery.in(DeviceCharacters::getDepartId, productIdList);
+ lambdaQuery.orderByDesc(DeviceCharacters::getCreateTime);
+ IPage<DeviceCharacters> userIPage = lambdaQuery.page(pageData);
+ return Result.ok(userIPage);
+ }
+}
--
Gitblit v1.9.3