From 6e5aab4791a2599a07fa3c870542301cb1a5cd7f Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 14 Nov 2025 15:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentDeliveryController.java | 7 ++-- .../project/EngineeringController.java | 11 ++++++ .../service/CsEngineeringService.java | 2 ++ .../service/CsEquipmentDeliveryService.java | 2 +- .../impl/CsEngineeringServiceImpl.java | 35 +++++++++++++++---- .../impl/CsEquipmentDeliveryServiceImpl.java | 7 +++- 6 files changed, 53 insertions(+), 11 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index 52ddc7f..b95ffc6 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -407,10 +407,11 @@ public class EquipmentDeliveryController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getRunPortableDev") - @ApiOperation("获取在运的便携式设备") - public HttpResult> getRunPortableDev(){ + @ApiOperation("获取用户未绑定的在运的便携式设备") + @ApiImplicitParam(name = "userId", value = "用户id", required = true) + public HttpResult> getRunPortableDev(@RequestParam("userId") String userId){ String methodDescribe = getMethodDescribe("getRunPortableDev"); - List result = csEquipmentDeliveryService.getRunPortableDev(); + List result = csEquipmentDeliveryService.getRunPortableDev(userId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java index b626354..2f511ce 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java @@ -11,6 +11,7 @@ import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm; import com.njcn.csdevice.pojo.po.CsEngineeringPO; +import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.vo.CsEngineeringVO; import com.njcn.csdevice.service.CsEngineeringService; @@ -94,4 +95,14 @@ public class EngineeringController extends BaseController { CsEngineeringPO po = csEngineeringService.queryEngineeringById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getUnlinkedEngineering") + @ApiOperation("获取用户未绑定的工程信息") + @ApiImplicitParam(name = "userId", value = "用户id", required = true) + public HttpResult> getUnlinkedEngineering(@RequestParam("userId") String userId){ + String methodDescribe = getMethodDescribe("getUnlinkedEngineering"); + List result = csEngineeringService.getUnlinkedEngineering(userId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java index 03f0b81..9f7d50c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java @@ -57,4 +57,6 @@ public interface CsEngineeringService extends IService{ List getEngineerings(List list); CsEngineeringPO queryEngineeringById(String id); + + List getUnlinkedEngineering(String userId); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java index dd27534..0c84cd3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java @@ -193,6 +193,6 @@ public interface CsEquipmentDeliveryService extends IService getListByIds(List devList); - List getRunPortableDev(); + List getRunPortableDev(String userId); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java index 1f2555f..29acad5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java @@ -2,17 +2,20 @@ package com.njcn.csdevice.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; -import com.baomidou.mybatisplus.core.conditions.query.Query; +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 com.njcn.common.pojo.exception.BusinessException; +import com.njcn.csdevice.api.CsDeviceUserFeignClient; +import com.njcn.csdevice.api.CsLedgerFeignClient; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.mapper.CsEngineeringMapper; import com.njcn.csdevice.mapper.CsEngineeringUserMapper; import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.mapper.CsMarketDataMapper; +import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.param.CsEngineeringAddParm; import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm; @@ -20,7 +23,6 @@ import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm; import com.njcn.csdevice.pojo.po.*; import com.njcn.csdevice.pojo.vo.CsEngineeringVO; import com.njcn.csdevice.service.CsEngineeringService; -import com.njcn.csdevice.service.CsMarketDataService; import com.njcn.csdevice.service.CsTouristDataPOService; import com.njcn.redis.utils.RedisUtil; import com.njcn.system.api.AreaFeignClient; @@ -58,12 +60,10 @@ public class CsEngineeringServiceImpl extends ServiceImpl getUnlinkedEngineering(String userId) { + List list1 = new ArrayList<>(); + //根据用户信息获取设备信息 + List devList = csDeviceUserFeignClient.findDevByUserId(userId).getData(); + //根据设备查询工程信息 + if (CollectionUtil.isNotEmpty(devList)) { + List ledger = csLedgerFeignClient.getInfoByIds(devList).getData(); + ledger.forEach(item->{ + if (!Objects.equals(item.getEngineeringid(),"/")) { + list1.add(item.getEngineeringid()); + } + }); + } + //获取所有工程信息 + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(CsEngineeringPO::getStatus,"1"); + if (CollectionUtil.isNotEmpty(list1)) { + queryWrapper2.notIn(CsEngineeringPO::getId,list1); + } + return this.baseMapper.selectList(queryWrapper2); + } + public String getAreaById(String id){ diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 97bd9d9..d9726c3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -987,7 +987,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl getRunPortableDev() { + public List getRunPortableDev(String userId) { List result = new ArrayList<>(); DictTreeVO vo = dictTreeFeignClient.queryByCode(DicDataEnum.PORTABLE.getCode()).getData(); if (ObjectUtil.isNotNull(vo)) { @@ -995,6 +995,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl devList = csDeviceUserPOService.findDevByUserId(userId); + if (CollectionUtil.isNotEmpty(devList)) { + lambdaQueryWrapper.notIn(CsEquipmentDeliveryPO::getId,devList); + } result = this.list(lambdaQueryWrapper); } return result;