修改bug

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

@@ -29,6 +29,7 @@ import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
 import com.njcn.csdevice.service.CsDevModelRelationService;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsGroupService;
+import com.njcn.csdevice.service.ICsLedgerService;
 import com.njcn.csdevice.util.InfluxDbParamUtil;
 import com.njcn.csdevice.utils.DataChangeUtil;
 import com.njcn.csharmonic.api.EventFeignClient;
@@ -92,6 +93,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     private final EpdFeignClient epdFeignClient;
 
     private final CsLineFeignClient csLineFeignClient;
+    private final ICsLedgerService iCsLedgerService;
 
     private final DicDataFeignClient dicDataFeignClient;
 
@@ -421,9 +423,12 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             csEventVOPage.getRecords().forEach(temp->{
                 //事件描述、相别、暂降幅值,需要特殊处理赋值
                 //事件描述
+                CsLedger dataById = iCsLedgerService.findDataById(temp.getLineId());
+                temp.setLineName(dataById.getName());
                 EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
                 if(ele!=null){
                     temp.setShowName(ele.getShowName());
+
                     //相别
                     List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
                     List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();

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

@@ -251,9 +251,11 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
         PortableOffMainLog portableOffMainLog = new PortableOffMainLog();
         portableOffMainLog.setId(IdUtil.fastSimpleUUID());
         portableOffMainLog.setStartTime(LocalDateTime.now());
-        portableOffMainLog.setProjectName(uploadDataParam.getPaths().stream()
+        String paths = uploadDataParam.getFiles().stream().map(MultipartFile::getOriginalFilename)
                 .reduce((s1, s2) -> getCommonPrefix(s1, s2))
-                .orElse(null));
+                .orElse(null);
+        String[] split = paths.split("/");
+        portableOffMainLog.setProjectName(split.length>0?split[split.length-1]:"/");
         int successcCount = 0;
         portableOffMainLog.setStatus("1");
 

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml

@@ -121,8 +121,8 @@
   <select id="queryEventPageWeb" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">
     select DISTINCT b.id id,
     b.device_id deviceId,b.line_id lineId,b.code code,
-    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location
+    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,d.name lineName
-    from  cs_event b inner join cs_equipment_delivery c on b.device_id=c.id  where 1=1
+    from  cs_event b inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did where 1=1
     and b.process=c.process
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime  != null and csEventUserQueryPage.endTime !=''">
       AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})