From 997193fb5f5ae72c993ba9f9d358af551fa6b22a Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 30 Aug 2023 15:35:35 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/equipment/CsLogController.java | 7 ++++-- .../impl/AppTopologyDiagramServiceImpl.java | 4 +-- .../impl/CsDeviceUserPOServiceImpl.java | 25 +++++++++++++------ .../impl/CsEngineeringServiceImpl.java | 10 +++++--- .../impl/CsEquipmentDeliveryServiceImpl.java | 22 ++++++++++++++-- .../service/impl/CsLedgerServiceImpl.java | 2 +- .../CsTopologyDiagramTemplateServiceImpl.java | 6 ++--- 7 files changed, 54 insertions(+), 22 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java index 6711198..2eb5662 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsLogController.java @@ -12,6 +12,7 @@ import com.njcn.csdevice.pojo.param.CsMarketDataParam; import com.njcn.csdevice.pojo.po.CsLogsPO; import com.njcn.csdevice.service.impl.CsLogsPOService; import com.njcn.web.controller.BaseController; +import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.utils.RequestUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -57,10 +58,12 @@ public class CsLogController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryLog") @ApiOperation("查询日志") - public HttpResult> queryLog(){ + @ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true) + public HttpResult> queryLog(@RequestBody BaseParam baseParam){ String username = RequestUtil.getUsername(); String methodDescribe = getMethodDescribe("queryLog"); - List list = csLogsPOService.lambdaQuery().eq(CsLogsPO::getUserName, username).list(); + List list = csLogsPOService.lambdaQuery().eq(CsLogsPO::getUserName, username). + between(CsLogsPO::getCreateTime,baseParam.getSearchBeginTime(),baseParam.getSearchEndTime()).list(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java index 710eef8..37d0a5f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java @@ -129,7 +129,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl csLineTopologyTemplateVOS = csLineTopologyTemplateService.queryByTopoId(temp.getTopoId()); vo.setCsLineTopologyTemplateVOList(csLineTopologyTemplateVOS); return vo; @@ -157,7 +157,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl csLineTopologyTemplateVOS = csLineTopologyTemplateService.queryByTopoId(temp.getTopoId()); vo.setCsLineTopologyTemplateVOList(csLineTopologyTemplateVOS); return vo; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java index 735e75e..96a766d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java @@ -13,16 +13,10 @@ import com.njcn.csdevice.mapper.CsDeviceUserPOMapper; import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper; import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.mapper.CsMarketDataMapper; -import com.njcn.csdevice.pojo.po.CsDeviceUserPO; -import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; -import com.njcn.csdevice.pojo.po.CsLedger; -import com.njcn.csdevice.pojo.po.CsMarketData; +import com.njcn.csdevice.pojo.po.*; import com.njcn.csdevice.pojo.vo.CsLedgerVO; import com.njcn.csdevice.pojo.vo.DevCountVO; -import com.njcn.csdevice.service.CsDeviceUserPOService; -import com.njcn.csdevice.service.CsEquipmentDeliveryService; -import com.njcn.csdevice.service.ICsLedgerService; -import com.njcn.csdevice.service.RoleEngineerDevService; +import com.njcn.csdevice.service.*; import com.njcn.cswarn.api.CsEquipmentAlarmFeignClient; import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; @@ -57,6 +51,12 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl list1 = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, eid).list(); + if(!com.alibaba.nacos.client.naming.utils.CollectionUtils.isEmpty(list1)){ + List collect = list1.stream().map(CsLedger::getId).collect(Collectors.toList()); + csLinePOService.lambdaUpdate().in(CsLinePO::getLineId,collect).set(CsLinePO::getStatus,0).update(); + appLineTopologyDiagramService.lambdaUpdate().in(AppLineTopologyDiagramPO::getLineId,collect).set(AppLineTopologyDiagramPO::getStatus,0).update(); + } //删除监测点，设备 iCsLedgerService.lambdaUpdate().eq(CsLedger::getId,eid).set(CsLedger::getState,0).update(); iCsLedgerService.lambdaUpdate().eq(CsLedger::getPid,eid).set(CsLedger::getState,0).update(); + QueryWrapper queryWrap = new QueryWrapper<>(); + queryWrap.eq("device_id",eid); + csTouristDataPOService.getBaseMapper().delete(queryWrap); return true; } 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 b3c5f4f..8b03324 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 @@ -17,13 +17,11 @@ import com.njcn.csdevice.pojo.param.CsEngineeringAddParm; 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.CsEngineeringUserPO; -import com.njcn.csdevice.pojo.po.CsLedger; -import com.njcn.csdevice.pojo.po.CsMarketData; +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; import com.njcn.system.pojo.po.Area; @@ -62,6 +60,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl csMarketData = new QueryWrapper<>(); csMarketData.lambda().eq(CsMarketData::getEngineerId,csEngineeringAuditParm.getId()); csMarketDataMapper.delete(csMarketData); + QueryWrapper queryWrap = new QueryWrapper<>(); + queryWrap.eq("enginer_id",csEngineeringAuditParm.getId()); + csTouristDataPOService.getBaseMapper().delete(queryWrap); } if(StringUtils.isNotBlank(csEngineeringAuditParm.getName())){ 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 92d8692..fe45a8d 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 @@ -40,6 +40,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; +import java.util.stream.Collectors; /** * @@ -64,6 +65,10 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl list = csLedgerService.lambdaQuery().eq(CsLedger::getPid, id).list(); + if(!CollectionUtils.isEmpty(list)){ + List collect = list.stream().map(CsLedger::getId).collect(Collectors.toList()); + csLinePOService.lambdaUpdate().in(CsLinePO::getLineId,collect).set(CsLinePO::getStatus,0).update(); + appLineTopologyDiagramService.lambdaUpdate().in(AppLineTopologyDiagramPO::getLineId,collect).set(AppLineTopologyDiagramPO::getStatus,0).update(); + } + csLedgerService.lambdaUpdate().eq(CsLedger::getId,id).set(CsLedger::getState,0).update(); + csLedgerService.lambdaUpdate().eq(CsLedger::getPid,id).set(CsLedger::getState,0).update(); + csDeviceUserPOService.lambdaUpdate().eq(CsDeviceUserPO::getDeviceId,id).set(CsDeviceUserPO::getStatus,0).update(); + QueryWrapper queryWrap = new QueryWrapper<>(); + queryWrap.eq("device_id",id); + csTouristDataPOService.getBaseMapper().delete(queryWrap); return update; } @@ -119,7 +137,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl wrapper = new QueryWrapper(); wrapper.eq ("ndid", ndid); - wrapper.eq("status",1); + wrapper.eq("run_status",1); CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.baseMapper.selectOne (wrapper); return csEquipmentDeliveryPO; } @@ -204,7 +222,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); page.getRecords().forEach(item->{ if (!Objects.isNull(item.getQrPath())){ - item.setQrPath(fileStorageUtil.getFileUrl(item.getQrPath())); + item.setQrPath(item.getQrPath()); } }); return page; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 680643e..022251c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -188,7 +188,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i vo.setId(po.getId()); vo.setPid(po.getProjectId()); vo.setName(po.getName()); - vo.setPath(fileStorageUtil.getFileUrl(po.getFilePath())); + vo.setPath(po.getFilePath()); return vo; }).collect(Collectors.toList()); temp.setChildren(collect); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTopologyDiagramTemplateServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTopologyDiagramTemplateServiceImpl.java index 7d38a75..3e8c76b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTopologyDiagramTemplateServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTopologyDiagramTemplateServiceImpl.java @@ -49,8 +49,8 @@ public class CsTopologyDiagramTemplateServiceImpl extends ServiceImpl csLineTopologyTemplateVOS = csLineTopologyTemplateService.queryByTopoId(temp.getId()); vo.setCsLineTopologyTemplateVOList(csLineTopologyTemplateVOS); return vo;