1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -152,6 +152,15 @@ public class DriverInfoController {
         return driverInfoService.batchSubmission(hyDriverInfo);
     }
 
+    /**
+     * 管局上报
+     */
+    @Log(title = "管局上报")
+    @PostMapping("/api/administrationReport")
+    public String administrationReport(@RequestBody HyDriverInfo hyDriverInfo){
+        return driverInfoService.administrationReport(hyDriverInfo);
+    }
+
 
     /**
      * 后台管理司机信息上报列表

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverInfoService.java

@@ -75,6 +75,13 @@ public interface IDriverInfoService extends IService<HyDriverInfo> {
      */
     String batchSubmission(HyDriverInfo hyDriverInfo) throws IOException , ParseException;
 
+    /**
+     * 管局上报
+     * @param hyDriverInfo
+     * @return
+     */
+    String administrationReport(HyDriverInfo hyDriverInfo);
+
 
     /**
      * 后台管理司机信息上报列表

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -17,6 +17,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 import com.yh.saas.plugin.yiliangyiyun.util.MonitoringSystemReporting;
+import com.yh.saas.plugin.yiliangyiyun.util.TestJson;
 import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -169,6 +170,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         page.setTotal(dataCount == null ? 0 : dataCount);
         page.setCurrent(driverViewInfo.getCurrentPage());
         page.setSize(driverViewInfo.getPageSize());
+        TestJson.sendTest();
         return page;
     }
 
@@ -525,6 +527,32 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         return "ok";
     }
 
+    /**
+     * 管局上报
+     * @param hyDriverInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String administrationReport (HyDriverInfo hyDriverInfo){
+        if (!CollectionUtils.isEmpty(hyDriverInfo.getHyDriverInfoList())){
+            for (HyDriverInfo hyDriverInfo1 : hyDriverInfo.getHyDriverInfoList()){
+                //监测系统上报
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try{
+                            MonitoringSystemReporting.testDriverRoot(hyDriverInfo1);
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
+            }
+        }
+        return "ok";
+    }
+
 
     /**
      * 后台管理司机信息上报列表