bug修改提交

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<List<CsLogsPO>> queryLog(){
+    @ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true)
+    public HttpResult<List<CsLogsPO>> queryLog(@RequestBody BaseParam baseParam){
         String username = RequestUtil.getUsername();
         String methodDescribe = getMethodDescribe("queryLog");
-        List<CsLogsPO> list = csLogsPOService.lambdaQuery().eq(CsLogsPO::getUserName, username).list();
+        List<CsLogsPO> list = csLogsPOService.lambdaQuery().eq(CsLogsPO::getUserName, username).
+                between(CsLogsPO::getCreateTime,baseParam.getSearchBeginTime(),baseParam.getSearchEndTime()).list();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java

@@ -129,7 +129,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
 
             AppProjectPO appProjectPO = appServiceMapper.selectById(vo.getProjectId());
             vo.setProjectName(appProjectPO.getName());
-            vo.setFilePath (fileStorageUtil.getFileUrl (vo.getFilePath ()));
+            vo.setFilePath (vo.getFilePath ());
             List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyTemplateService.queryByTopoId(temp.getTopoId());
             vo.setCsLineTopologyTemplateVOList(csLineTopologyTemplateVOS);
             return vo;
@@ -157,7 +157,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
 
             AppProjectPO appProjectPO = appServiceMapper.selectById(vo.getProjectId());
             vo.setProjectName(appProjectPO.getName());
-            vo.setFilePath (fileStorageUtil.getFileUrl (temp.getFilePath ( )));
+            vo.setFilePath (temp.getFilePath ( ));
            List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyTemplateService.queryByTopoId(temp.getTopoId());
             vo.setCsLineTopologyTemplateVOList(csLineTopologyTemplateVOS);
             return vo;

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.*;
-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.vo.CsLedgerVO;
 import com.njcn.csdevice.pojo.vo.DevCountVO;
-import com.njcn.csdevice.service.CsDeviceUserPOService;
+import com.njcn.csdevice.service.*;
-import com.njcn.csdevice.service.CsEquipmentDeliveryService;
-import com.njcn.csdevice.service.ICsLedgerService;
-import com.njcn.csdevice.service.RoleEngineerDevService;
 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<CsDeviceUserPOMapper,
 //    private final CsEquipmentAlarmFeignClient csEquipmentAlarmFeignClient;
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
     private final RoleEngineerDevService roleEngineerDevService;
+
+    private final AppLineTopologyDiagramService appLineTopologyDiagramService;
+
+    private final CsTouristDataPOService csTouristDataPOService;
+
+    private final CsLinePOService csLinePOService;
     private CsMarketDataMapper csMarketDataMapper;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -264,9 +264,18 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         csEquipmentDeliveryPO.setRunStatus(0);
         csEquipmentDeliveryMapper.updateById(csEquipmentDeliveryPO);
         this.lambdaUpdate().eq(CsDeviceUserPO::getDeviceId, eid).set(CsDeviceUserPO::getStatus,"0").update();
+        List<CsLedger> list1 = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, eid).list();
+        if(!com.alibaba.nacos.client.naming.utils.CollectionUtils.isEmpty(list1)){
+            List<String> 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<CsTouristDataPO> queryWrap = new QueryWrapper<>();
+        queryWrap.eq("device_id",eid);
+        csTouristDataPOService.getBaseMapper().delete(queryWrap);
 
         return true;
     }

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.*;
-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.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<CsEngineeringMapper, C
     private final RoleEngineerDevServiceImpl roleEngineerDevService;
 
     private final CsMarketDataMapper csMarketDataMapper;
+    private final CsTouristDataPOService csTouristDataPOService;
 
 
 
@@ -132,6 +131,9 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
             QueryWrapper<CsMarketData> csMarketData = new QueryWrapper<>();
             csMarketData.lambda().eq(CsMarketData::getEngineerId,csEngineeringAuditParm.getId());
             csMarketDataMapper.delete(csMarketData);
+            QueryWrapper<CsTouristDataPO> queryWrap = new QueryWrapper<>();
+            queryWrap.eq("enginer_id",csEngineeringAuditParm.getId());
+            csTouristDataPOService.getBaseMapper().delete(queryWrap);
 
         }
         if(StringUtils.isNotBlank(csEngineeringAuditParm.getName())){

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<CsEquipmentDeliv
 
     private final CsDeviceUserPOService csDeviceUserPOService;
 
+    private final AppLineTopologyDiagramService appLineTopologyDiagramService;
+
+    private final CsTouristDataPOService csTouristDataPOService;
+
     private final CsLinePOService csLinePOService;
 
     private final DicDataFeignClient dicDataFeignClient;
@@ -103,6 +108,19 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         wrapper.eq ("id", id);
         wrapper.set ("run_status", "0");
         boolean update = this.update (wrapper);
+        //删除deviceuser表里的设备，游客数据设备,删除监测点相关数据
+        List<CsLedger> list = csLedgerService.lambdaQuery().eq(CsLedger::getPid, id).list();
+        if(!CollectionUtils.isEmpty(list)){
+            List<String> 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<CsTouristDataPO> queryWrap = new QueryWrapper<>();
+        queryWrap.eq("device_id",id);
+        csTouristDataPOService.getBaseMapper().delete(queryWrap);
         return update;
     }
 
@@ -119,7 +137,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     public CsEquipmentDeliveryPO queryEquipmentPOByndid(String ndid) {
         QueryWrapper<CsEquipmentDeliveryPO> 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<CsEquipmentDeliv
         Page<CsEquipmentDeliveryVO> 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;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -188,7 +188,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> 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);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTopologyDiagramTemplateServiceImpl.java

@@ -49,8 +49,8 @@ public class CsTopologyDiagramTemplateServiceImpl extends ServiceImpl<CsTopology
         csTopologyDiagramTemplate.setName(issuesFile.getOriginalFilename());
         csTopologyDiagramTemplate.setStatus("1");
         boolean save = this.save(csTopologyDiagramTemplate);
-        String fileUrl = fileStorageUtil.getFileUrl(filePath);
+//        String fileUrl = fileStorageUtil.getFileUrl(filePath);
-        csTopologyDiagramTemplate.setFilePath(fileUrl);
+        csTopologyDiagramTemplate.setFilePath(filePath);
         return csTopologyDiagramTemplate;
     }
 
@@ -62,7 +62,7 @@ public class CsTopologyDiagramTemplateServiceImpl extends ServiceImpl<CsTopology
             CsTopologyDiagramTemplateVO vo = new CsTopologyDiagramTemplateVO();
             BeanUtils.copyProperties(temp, vo);
 
-            vo.setFilePath(fileStorageUtil.getFileUrl(vo.getFilePath()));
+            vo.setFilePath((vo.getFilePath()));
             List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOS = csLineTopologyTemplateService.queryByTopoId(temp.getId());
             vo.setCsLineTopologyTemplateVOList(csLineTopologyTemplateVOS);
             return vo;