[清退] 培训、模版代码提交

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

@@ -91,7 +91,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
         List<String> idListString = idStringList.stream().filter(list2->!list2.equals("")).collect(Collectors.toList());
         System.out.println(idListString);
         List<Integer> devIds = idListString.stream().map(Integer::parseInt).collect(Collectors.toList());
-        return deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(devIds);
+        return deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(devIds).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList());
         }else {
             return new ArrayList<>();
         }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -97,7 +97,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo) {
         Units units=  unitsService.findById(repelManagementVo.getUnitId());
-        return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),DeviceLifeStatus.REPEL.id).stream().filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList()));
+        return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),DeviceLifeStatus.REPEL.id).stream().map(DeviceLibrary::setConfigName).filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList()));
     }
 
     private List<ModelNameGroup> toModelNameGroup(List<DeviceLibrary> deviceLibraries){
@@ -163,7 +163,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         DeviceRepelDetail deviceRepelDetail=repelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
         DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
         List<String> unitNames=unitsService.finAllDirectlUnderUnits().stream().map(Units::getName).collect(Collectors.toList());
-        return deviceLibraryDao.findAllByPackingIdInAndOwnUnitIn(StringUtils.stringToList(deviceRepel.getFielding()),unitNames);
+        return deviceLibraryDao.findAllByPackingIdInAndOwnUnitIn(StringUtils.stringToList(deviceRepel.getFielding()),unitNames).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList());
     }
 
 
@@ -216,7 +216,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
                     if (deviceRepelDetail.getOutboundFile()!=null){
                         deviceRepelDetail.setOutboundFiles(FilesUtil.stringFileToList(deviceRepelDetail.getOutboundFile()));
                     }
-                    deviceRepelDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllById(StringUtils.stringToList(deviceRepelDetail.getDeviceIds())));
+                    deviceRepelDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllById(StringUtils.stringToList(deviceRepelDetail.getDeviceIds())).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
                     list.add(deviceRepelDetail);
                 }
         );
@@ -233,7 +233,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
             List<String> idListString = idStringList.stream().filter(list2->!list2.equals("")).collect(Collectors.toList());
             System.out.println(idListString);
             List<Integer> devIds = idListString.stream().map(Integer::parseInt).collect(Collectors.toList());
-            return deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(devIds);
+            return deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(devIds).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList());
         }else {
             return new ArrayList<>();
         }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java

@@ -184,7 +184,6 @@ public class TrainThemeServiceImpl implements TrainThemeService {
         all.getContent().forEach(
                 trainTheme -> {
                     if (trainTheme!=null) {
-                        log.info("train id{}",trainTheme.getTrainId());
                         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
                         TrainThemeVo trainThemeVo = trainTheme.toTrainThemeVo();
                         trainThemeVo.setTaskId(taskBto.getId());

dev-union/src/main/resources/bill2.html

@@ -139,8 +139,6 @@
     </style>
 </head>
 <body>
-
-
     <div class="returnTablePrint">
         <div class="content">
             <div>