fix(单位代管库): 单位代管库的接口实现修改

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -98,18 +98,25 @@ public class TrainJobController {
 
     @Autowired
     TaskService taskService;
+
     @Autowired
     TrainTaskService trainTaskService;
+
     @Autowired
     TaskLogService taskLogService;
+
     @Autowired
     TrainUserDao trainUserDao;
+
     @Autowired
     UserLogService userLogService;
+
     @Autowired
     BlockChainUtil blockChainUtil;
+
     @Autowired
     MessageService messageService;
+
     @Autowired
     TrainUnitDao trainUnitDao;
 

dev-union/src/main/resources/application-dev.properties

@@ -6,6 +6,8 @@ spring.datasource.password=root
 spring.jpa.hibernate.ddl-auto=update
 #file.path=C:/Users/dengdiyi/Documents/file/
 # spring boot admin
+file.path=/Users/zjm/code/test-tu/
+preview.path=http://192.168.102.169:8087/file/
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087w
 block.flag=true

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -69,7 +69,7 @@ public class UnitsController {
     @GetMapping(value = "/areaDirectlyUnder")
     @ApiOperation(value = "查询直属代管单位列表", notes = "查询直属代管单位列表")
     public ResponseEntity selectOrganizationUnits2(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
-        return ResponseEntity.ok(unitsService.findLeftNavigation(securityUser));
+        return ResponseEntity.ok(unitsService.findLeftNavigation2(securityUser));
     }
 
     @GetMapping(value = "/findAll/GreaterThanEqual/{level}")

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -371,8 +371,11 @@ public class UnitsServiceImpl implements UnitsService {
 
     @Override
     public LeftNavigation findLeftNavigation2(SecurityUser securityUser) {
-        List<LeftNavigation> leftNavigationList2 = unitsDao.findAllByType(2).stream().filter(units1 -> !units1.getName().equals("省机科技管理处") && !units1.getName().equals("省机通信报务处") && units1.getEscrow() == 1).map(Units::toLeftNavigation).collect(Collectors.toList());
-        LeftNavigation leftNavigation2 = new LeftNavigation(0, "省直属", leftNavigationList2, UUID.randomUUID().toString(), 1, 22, null);
+        //直属信息
+        AreaExhibition areaExhibition= areaExhibitionCache.findById(4);
+        LeftNavigation leftNavigation2 = areaExhibition.toLeftNavigation();
+        List<LeftNavigation> leftNavigationList2 = unitsCache.findAllByAreaExhibitionId(areaExhibition.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
+        leftNavigation2.setLeftNavigations(leftNavigationList2);
         return leftNavigation2;
     }