代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabAbnormalController.java

@@ -90,14 +90,14 @@ public class LabAbnormalController extends BaseController {
         List<LabAbnormalVO> list = labAbnormalService.getEquipmentList(labAbnormal);
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<SysDictData> dictList = DictUtils.getDictCache("equipment_category");
-        Optional.ofNullable(list).filter(a->a.size()>0).orElseGet(Collections::emptyList).stream().forEach(a->{
+        Optional.ofNullable(list).filter(a-> !a.isEmpty()).orElseGet(Collections::emptyList).stream().forEach(a->{
             String dateString = formatter.format(a.getLastAbnormalTime());
             a.setLastAbnormalTimeStr(dateString);
             a.getHardwareOperateName();
-            String dictLabel = Optional.ofNullable(dictList).filter(b->b.size()>0).orElseGet(Collections::emptyList).stream().filter(b->b.getDictValue().equals(a.getEquipmentType()+"")).map(b->b.getDictLabel()).findFirst().orElse("");
+            String dictLabel = Optional.ofNullable(dictList).filter(b-> !b.isEmpty()).orElseGet(Collections::emptyList).stream().filter(b->b.getDictValue().equals(a.getEquipmentType()+"")).map(b->b.getDictLabel()).findFirst().orElse("");
             a.setTypeStr(dictLabel+"-"+a.getHardwareTypeName());
         });
-        ExcelUtil<LabAbnormalVO> util = new ExcelUtil<LabAbnormalVO>(LabAbnormalVO.class);
+        ExcelUtil<LabAbnormalVO> util = new ExcelUtil<>(LabAbnormalVO.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "异常设备数据", null, "异常设备导出数据表"+nowDate);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabApprovalController.java

@@ -69,7 +69,7 @@ public class LabApprovalController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabApproval labApproval) throws IOException {
         List<LabApprovalVO> list = labApprovalService.selectLabApprovalList(labApproval);
-        ExcelUtil<LabApprovalVO> util = new ExcelUtil<LabApprovalVO>(LabApprovalVO.class);
+        ExcelUtil<LabApprovalVO> util = new ExcelUtil<>(LabApprovalVO.class);
         util.exportExcel(response, list, "安全准入审批记录数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCeditScoreSiteController.java

@@ -54,7 +54,7 @@ public class LabCeditScoreSiteController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabCeditScoreSite labCeditScoreSite) throws IOException {
         List<LabCeditScoreSite> list = labCeditScoreSiteService.selectLabCeditScoreSiteList(labCeditScoreSite);
-        ExcelUtil<LabCeditScoreSite> util = new ExcelUtil<LabCeditScoreSite>(LabCeditScoreSite.class);
+        ExcelUtil<LabCeditScoreSite> util = new ExcelUtil<>(LabCeditScoreSite.class);
         util.exportExcel(response, list, "信用合格分设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordController.java

@@ -174,7 +174,7 @@ public class LabCheckRecordController extends BaseController {
     public void export(HttpServletResponse response, LabCheckRecordVO labCheckRecord) throws IOException {
         labCheckRecord.setIsFabu(1);//已发布的数据
         List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
-        ExcelUtil<LabCheckRecord> util = new ExcelUtil<LabCheckRecord>(LabCheckRecord.class);
+        ExcelUtil<LabCheckRecord> util = new ExcelUtil<>(LabCheckRecord.class);
         util.exportExcel(response, list, "安全检查数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordDetailsController.java

@@ -89,7 +89,7 @@ public class LabCheckRecordDetailsController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabCheckRecordDetails labCheckRecordDetails) throws IOException {
         List<LabCheckRecordDetails> list = labCheckRecordDetailsService.selectLabCheckRecordDetailsList(labCheckRecordDetails);
-        ExcelUtil<LabCheckRecordDetails> util = new ExcelUtil<LabCheckRecordDetails>(LabCheckRecordDetails.class);
+        ExcelUtil<LabCheckRecordDetails> util = new ExcelUtil<>(LabCheckRecordDetails.class);
         util.exportExcel(response, list, "安全检查隐患表数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordDetailslogController.java

@@ -70,7 +70,7 @@ public class LabCheckRecordDetailslogController extends BaseController
     public void export(HttpServletResponse response, LabCheckRecordDetailslog labCheckRecordDetailslog) throws IOException
     {
         List<LabCheckRecordDetailslog> list = labCheckRecordDetailslogService.selectLabCheckRecordDetailslogList(labCheckRecordDetailslog);
-        ExcelUtil<LabCheckRecordDetailslog> util = new ExcelUtil<LabCheckRecordDetailslog>(LabCheckRecordDetailslog.class);
+        ExcelUtil<LabCheckRecordDetailslog> util = new ExcelUtil<>(LabCheckRecordDetailslog.class);
         util.exportExcel(response, list, "隐患检查审核日志数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordReleaseController.java

@@ -79,7 +79,7 @@ public class LabCheckRecordReleaseController extends BaseController
     public void export(HttpServletResponse response, LabCheckRecordRelease labCheckRecordRelease) throws IOException
     {
         List<LabCheckRecordRelease> list = labCheckRecordReleaseService.selectLabCheckRecordReleaseList(labCheckRecordRelease);
-        ExcelUtil<LabCheckRecordRelease> util = new ExcelUtil<LabCheckRecordRelease>(LabCheckRecordRelease.class);
+        ExcelUtil<LabCheckRecordRelease> util = new ExcelUtil<>(LabCheckRecordRelease.class);
         util.exportExcel(response, list, "检查发布关系数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabControlController.java

@@ -57,7 +57,7 @@ public class LabControlController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabControlVO labControl) throws IOException {
         List<LabControlVO> list = labControlService.selectLabControlList(labControl);
-        ExcelUtil<LabControlVO> util = new ExcelUtil<LabControlVO>(LabControlVO.class);
+        ExcelUtil<LabControlVO> util = new ExcelUtil<>(LabControlVO.class);
         util.exportExcel(response, list, "控制记录数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabExitLightController.java

@@ -71,7 +71,7 @@ public class LabExitLightController extends BaseController
     public void export(HttpServletResponse response, LabExitLightVO labExitLightVO) throws IOException
     {
         List<LabExitLightVO> list = labExitLightService.selectLabExitLightList(labExitLightVO);
-        ExcelUtil<LabExitLightVO> util = new ExcelUtil<LabExitLightVO>(LabExitLightVO.class);
+        ExcelUtil<LabExitLightVO> util = new ExcelUtil<>(LabExitLightVO.class);
         util.exportExcel(response, list, "逃生指引灯数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHazardBookController.java

@@ -64,7 +64,7 @@ public class LabHazardBookController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabHazardBook labHazardBook) throws IOException {
         List<LabHazardBook> list = labHazardBookService.selectLabHazardBookList(labHazardBook);
-        ExcelUtil<LabHazardBook> util = new ExcelUtil<LabHazardBook>(LabHazardBook.class);
+        ExcelUtil<LabHazardBook> util = new ExcelUtil<>(LabHazardBook.class);
         util.exportExcel(response, list, "危化品安全技术说明书数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHazardController.java

@@ -164,19 +164,6 @@ public class LabHazardController extends BaseController {
         return ResultData.success(list);
     }
 
-//    /**
-//     * 导出危险源列表
-//     */
-//    @PreAuthorize(hasPermi = "laboratory:hazard:export")
-//    @Log(title = "危险源", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    @ApiOperation(value = "导出危险源列表")
-//    public void export(HttpServletResponse response, LabHazard labHazard) throws IOException {
-//        List<LabHazard> list = labHazardService.selectLabHazardList(labHazard);
-//        ExcelUtil<LabHazard> util = new ExcelUtil<LabHazard>(LabHazard.class);
-//        util.exportExcel(response, list, "危险源数据");
-//    }
-
     /**
      * 获取危险源详细信息
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNegativeListRecordsController.java

@@ -72,19 +72,6 @@ public class LabNegativeListRecordsController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出负面清单列表列表
-     */
-   /* @ApiOperation(value = "导出负面清单列表列表")
-    @PreAuthorize(hasPermi = "laboratory:negativeListRecords:export")
-    @Log(title = "负面清单列表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, LabNegativeListRecords labNegativeListRecords) throws IOException
-    {
-        List<LabNegativeListRecords> list = labNegativeListRecordsService.selectLabNegativeListRecordsList(labNegativeListRecords);
-        ExcelUtil<LabNegativeListRecords> util = new ExcelUtil<LabNegativeListRecords>(LabNegativeListRecords.class);
-        util.exportExcel(response, list, "负面清单列表数据");
-    }*/
 
     /**
      * 获取负面清单列表详细信息

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNegativeListSiteController.java

@@ -68,7 +68,7 @@ public class LabNegativeListSiteController extends BaseController
     public void export(HttpServletResponse response, LabNegativeListSite labNegativeListSite) throws IOException
     {
         List<LabNegativeListSite> list = labNegativeListSiteService.selectLabNegativeListSiteList(labNegativeListSite);
-        ExcelUtil<LabNegativeListSite> util = new ExcelUtil<LabNegativeListSite>(LabNegativeListSite.class);
+        ExcelUtil<LabNegativeListSite> util = new ExcelUtil<>(LabNegativeListSite.class);
         util.exportExcel(response, list, "负面清单设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNegativelistHistoryController.java

@@ -73,22 +73,6 @@ public class LabNegativelistHistoryController extends BaseController
         return getDataTable(list);
     }
 
-
-
-    /**
-     * 导出负面清单历史记录列表
-     *//*
-    @ApiOperation(value = "导出负面清单历史记录列表")
-    @PreAuthorize(hasPermi = "laboratory:negativeListHistory:export")
-    @Log(title = "负面清单历史记录", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, LabNegativelistHistory labNegativelistHistory) throws IOException
-    {
-        List<LabNegativelistHistory> list = labNegativelistHistoryService.selectLabNegativelistHistoryList(labNegativelistHistory);
-        ExcelUtil<LabNegativelistHistory> util = new ExcelUtil<LabNegativelistHistory>(LabNegativelistHistory.class);
-        util.exportExcel(response, list, "负面清单历史记录数据");
-    }*/
-
     /**
      * 获取负面清单历史记录详细信息
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNoticeconfigController.java

@@ -70,7 +70,7 @@ public class LabNoticeconfigController extends BaseController
     public void export(HttpServletResponse response, LabNoticeconfig labNoticeconfig) throws IOException
     {
         List<LabNoticeconfig> list = labNoticeconfigService.selectLabNoticeconfigList(labNoticeconfig);
-        ExcelUtil<LabNoticeconfig> util = new ExcelUtil<LabNoticeconfig>(LabNoticeconfig.class);
+        ExcelUtil<LabNoticeconfig> util = new ExcelUtil<>(LabNoticeconfig.class);
         util.exportExcel(response, list, "通知配置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabNotifyplanController.java

@@ -171,7 +171,7 @@ public class LabNotifyplanController extends BaseController
     public void export(HttpServletResponse response, LabNotifyplan labNotifyplan) throws IOException
     {
         List<LabNotifyplan> list = labNotifyplanService.selectLabNotifyplanList(labNotifyplan);
-        ExcelUtil<LabNotifyplan> util = new ExcelUtil<LabNotifyplan>(LabNotifyplan.class);
+        ExcelUtil<LabNotifyplan> util = new ExcelUtil<>(LabNotifyplan.class);
         util.exportExcel(response, list, "大屏通知计划数据");
     }
 
@@ -272,7 +272,7 @@ public class LabNotifyplanController extends BaseController
     public void exportModel(HttpServletResponse response) throws IOException
     {
         List<LabNotifyplanExcelVO> list = new ArrayList<>();
-        ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<LabNotifyplanExcelVO>(LabNotifyplanExcelVO.class);
+        ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<>(LabNotifyplanExcelVO.class);
         util.exportExcel(response, list, "工作计划模板");
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabOnepcController.java

@@ -53,7 +53,7 @@ public class LabOnepcController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabOnepc labOnepc) throws IOException {
         List<LabOnepc> list = labOnepcService.selectLabOnepcList(labOnepc);
-        ExcelUtil<LabOnepc> util = new ExcelUtil<LabOnepc>(LabOnepc.class);
+        ExcelUtil<LabOnepc> util = new ExcelUtil<>(LabOnepc.class);
         util.exportExcel(response, list, "一体机设备勾选数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabPhotoInspectionController.java

@@ -67,7 +67,7 @@ public class LabPhotoInspectionController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabPhotoInspection labPhotoInspection) throws IOException {
         List<LabPhotoInspection> list = labPhotoInspectionService.selectLabPhotoInspectionList(labPhotoInspection);
-        ExcelUtil<LabPhotoInspection> util = new ExcelUtil<LabPhotoInspection>(LabPhotoInspection.class);
+        ExcelUtil<LabPhotoInspection> util = new ExcelUtil<>(LabPhotoInspection.class);
         util.exportExcel(response, list, "拍照检查附件数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabPhotoNoteController.java

@@ -51,20 +51,6 @@ public class LabPhotoNoteController extends BaseController {
         return getDataTable(list);
     }
 
-//    /**
-//     * 导出随手拍记录列表
-//     */
-//    @ApiOperation(value = "导出随手拍记录列表")
-//    @PreAuthorize(hasPermi = "laboratory:photonote:export")
-//    @Log(title = "随手拍记录", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, LabPhotoNote labPhotoNote) throws IOException
-//    {
-//        List<LabPhotoNote> list = labPhotoNoteService.selectLabPhotoNoteList(labPhotoNote);
-//        ExcelUtil<LabPhotoNote> util = new ExcelUtil<LabPhotoNote>(LabPhotoNote.class);
-//        util.exportExcel(response, list, "随手拍记录数据");
-//    }
-
     /**
      * 获取随手拍记录详细信息
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabPintsScoreSiteController.java

@@ -68,7 +68,7 @@ public class LabPintsScoreSiteController extends BaseController
     public void export(HttpServletResponse response, LabPintsScoreSite labPintsScoreSite) throws IOException
     {
         List<LabPintsScoreSite> list = labPintsScoreSiteService.selectLabPintsScoreSiteList(labPintsScoreSite);
-        ExcelUtil<LabPintsScoreSite> util = new ExcelUtil<LabPintsScoreSite>(LabPintsScoreSite.class);
+        ExcelUtil<LabPintsScoreSite> util = new ExcelUtil<>(LabPintsScoreSite.class);
         util.exportExcel(response, list, "��值条件设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabProcessSiteController.java

@@ -65,7 +65,7 @@ public class LabProcessSiteController extends BaseController
     public void export(HttpServletResponse response, LabProcessSite labProcessSite) throws IOException
     {
         List<LabProcessSite> list = labProcessSiteService.selectLabProcessSiteList(labProcessSite);
-        ExcelUtil<LabProcessSite> util = new ExcelUtil<LabProcessSite>(LabProcessSite.class);
+        ExcelUtil<LabProcessSite> util = new ExcelUtil<>(LabProcessSite.class);
         util.exportExcel(response, list, "违��-处理方式设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanAbnormalLogController.java

@@ -59,7 +59,7 @@ public class LabRiskPlanAbnormalLogController extends BaseController {
     @ApiOperation(value = "导出风险异常日志列表")
     public void export(HttpServletResponse response, LabRiskPlanAbnormalLog labRiskPlanAbnormalLog) throws IOException {
         List<LabRiskPlanAbnormalLog> list = labRiskPlanAbnormalLogService.selectLabRiskPlanAbnormalLogList(labRiskPlanAbnormalLog);
-        ExcelUtil<LabRiskPlanAbnormalLog> util = new ExcelUtil<LabRiskPlanAbnormalLog>(LabRiskPlanAbnormalLog.class);
+        ExcelUtil<LabRiskPlanAbnormalLog> util = new ExcelUtil<>(LabRiskPlanAbnormalLog.class);
         util.exportExcel(response, list, "风险异常日志数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -95,7 +95,7 @@ public class LabRiskPlanController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabRiskPlan labRiskPlan) throws IOException {
         List<LabRiskPlan> list = labRiskPlanService.selectLabRiskPlanList(labRiskPlan);
-        ExcelUtil<LabRiskPlan> util = new ExcelUtil<LabRiskPlan>(LabRiskPlan.class);
+        ExcelUtil<LabRiskPlan> util = new ExcelUtil<>(LabRiskPlan.class);
         util.exportExcel(response, list, "风险预案数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanDistributionController.java

@@ -70,7 +70,7 @@ public class LabRiskPlanDistributionController extends BaseController
     public void export(HttpServletResponse response, LabRiskPlanDistribution labRiskPlanDistribution) throws IOException
     {
         List<LabRiskPlanDistributionVO> list = labRiskPlanDistributionService.selectLabRiskPlanDistributionList(labRiskPlanDistribution);
-        ExcelUtil<LabRiskPlanDistributionVO> util = new ExcelUtil<LabRiskPlanDistributionVO>(LabRiskPlanDistributionVO.class);
+        ExcelUtil<LabRiskPlanDistributionVO> util = new ExcelUtil<>(LabRiskPlanDistributionVO.class);
         util.exportExcel(response, list, "分配记录日志数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRotationChartController.java

@@ -72,7 +72,7 @@ public class LabRotationChartController extends BaseController
     public void export(HttpServletResponse response, LabRotationChart labRotationChart) throws IOException
     {
         List<LabRotationChart> list = labRotationChartService.selectLabRotationChartList(labRotationChart);
-        ExcelUtil<LabRotationChart> util = new ExcelUtil<LabRotationChart>(LabRotationChart.class);
+        ExcelUtil<LabRotationChart> util = new ExcelUtil<>(LabRotationChart.class);
         util.exportExcel(response, list, "轮播图数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeBookController.java

@@ -115,7 +115,7 @@ public class LabSafeBookController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSafeBook labSafeBook) throws IOException {
         List<LabSafeBook> list = labSafeBookService.selectLabSafeBookList(labSafeBook);
-        ExcelUtil<LabSafeBook> util = new ExcelUtil<LabSafeBook>(LabSafeBook.class);
+        ExcelUtil<LabSafeBook> util = new ExcelUtil<>(LabSafeBook.class);
         util.exportExcel(response, list, "实验室安全制度数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeClassifiedController.java

@@ -69,7 +69,7 @@ public class LabSafeClassifiedController extends BaseController
     public void export(HttpServletResponse response, LabSafeClassified labSafeClassified) throws IOException
     {
         List<LabSafeClassified> list = labSafeClassifiedService.selectLabSafeClassifiedList(labSafeClassified);
-        ExcelUtil<LabSafeClassified> util = new ExcelUtil<LabSafeClassified>(LabSafeClassified.class);
+        ExcelUtil<LabSafeClassified> util = new ExcelUtil<>(LabSafeClassified.class);
         util.exportExcel(response, list, "安全分级数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeClasstypeController.java

@@ -65,7 +65,7 @@ public class LabSafeClasstypeController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSafeClasstype labSafeClasstype) throws IOException {
         List<LabSafeClasstype> list = labSafeClasstypeService.selectLabSafeClasstypeList(labSafeClasstype);
-        ExcelUtil<LabSafeClasstype> util = new ExcelUtil<LabSafeClasstype>(LabSafeClasstype.class);
+        ExcelUtil<LabSafeClasstype> util = new ExcelUtil<>(LabSafeClasstype.class);
         util.exportExcel(response, list, "安全分级类型数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -227,7 +227,7 @@ public class LabSecurityApplyController extends BaseController
                 });
 
 
-        ExcelUtil<LabSecurityApplyExcelVO> util = new ExcelUtil<LabSecurityApplyExcelVO>(LabSecurityApplyExcelVO.class);
+        ExcelUtil<LabSecurityApplyExcelVO> util = new ExcelUtil<>(LabSecurityApplyExcelVO.class);
         util.exportExcel(response, excelList, "安全准入申请数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityMaterialController.java

@@ -64,7 +64,7 @@ public class LabSecurityMaterialController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSecurityMaterial labSecurityMaterial) throws IOException {
         List<LabSecurityMaterial> list = labSecurityMaterialService.selectLabSecurityMaterialList(labSecurityMaterial);
-        ExcelUtil<LabSecurityMaterial> util = new ExcelUtil<LabSecurityMaterial>(LabSecurityMaterial.class);
+        ExcelUtil<LabSecurityMaterial> util = new ExcelUtil<>(LabSecurityMaterial.class);
         util.exportExcel(response, list, "安全准入资格材料数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityMaterialDataController.java

@@ -73,7 +73,7 @@ public class LabSecurityMaterialDataController extends BaseController
     public void export(HttpServletResponse response, LabSecurityMaterialData labSecurityMaterialData) throws IOException
     {
         List<LabSecurityMaterialData> list = labSecurityMaterialDataService.selectLabSecurityMaterialDataList(labSecurityMaterialData);
-        ExcelUtil<LabSecurityMaterialData> util = new ExcelUtil<LabSecurityMaterialData>(LabSecurityMaterialData.class);
+        ExcelUtil<LabSecurityMaterialData> util = new ExcelUtil<>(LabSecurityMaterialData.class);
         util.exportExcel(response, list, "安全准入申请材料配置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityMaterialrelationController.java

@@ -67,7 +67,7 @@ public class LabSecurityMaterialrelationController extends BaseController
     public void export(HttpServletResponse response, LabSecurityMaterialrelation labSecurityMaterialrelation) throws IOException
     {
         List<LabSecurityMaterialrelation> list = labSecurityMaterialrelationService.selectLabSecurityMaterialrelationList(labSecurityMaterialrelation);
-        ExcelUtil<LabSecurityMaterialrelation> util = new ExcelUtil<LabSecurityMaterialrelation>(LabSecurityMaterialrelation.class);
+        ExcelUtil<LabSecurityMaterialrelation> util = new ExcelUtil<>(LabSecurityMaterialrelation.class);
         util.exportExcel(response, list, "安全准入申请材料关系数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecuritySubjectmaterialController.java

@@ -85,7 +85,7 @@ public class LabSecuritySubjectmaterialController extends BaseController
     public void export(HttpServletResponse response, LabSecuritySubjectmaterial labSecuritySubjectmaterial) throws IOException
     {
         List<LabSecuritySubjectmaterial> list = labSecuritySubjectmaterialService.selectLabSecuritySubjectmaterialList(labSecuritySubjectmaterial);
-        ExcelUtil<LabSecuritySubjectmaterial> util = new ExcelUtil<LabSecuritySubjectmaterial>(LabSecuritySubjectmaterial.class);
+        ExcelUtil<LabSecuritySubjectmaterial> util = new ExcelUtil<>(LabSecuritySubjectmaterial.class);
         util.exportExcel(response, list, "实验室和准入模板关系数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSemesterController.java

@@ -76,7 +76,7 @@ public class LabSemesterController extends BaseController
     public void export(HttpServletResponse response, LabSemester labSemester) throws IOException
     {
         List<LabSemester> list = labSemesterService.selectLabSemesterList(labSemester);
-        ExcelUtil<LabSemester> util = new ExcelUtil<LabSemester>(LabSemester.class);
+        ExcelUtil<LabSemester> util = new ExcelUtil<>(LabSemester.class);
         util.exportExcel(response, list, "学期设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSparseHardwareController.java

@@ -55,7 +55,7 @@ public class LabSparseHardwareController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSparseHardware labSparseHardware) throws IOException {
         List<LabSparseHardware> list = labSparseHardwareService.selectLabSparseHardwareList(labSparseHardware);
-        ExcelUtil<LabSparseHardware> util = new ExcelUtil<LabSparseHardware>(LabSparseHardware.class);
+        ExcelUtil<LabSparseHardware> util = new ExcelUtil<>(LabSparseHardware.class);
         util.exportExcel(response, list, "疏散硬件数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectAccessRecordController.java

@@ -70,7 +70,7 @@ public class LabSubjectAccessRecordController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectAccessRecordVo labSubjectAccessRecord) throws IOException {
         List<LabSubjectAccessRecordVo> list = labSubjectAccessRecordService.selectLabSubjectAccessRecordList(labSubjectAccessRecord);
-        ExcelUtil<LabSubjectAccessRecordVo> util = new ExcelUtil<LabSubjectAccessRecordVo>(LabSubjectAccessRecordVo.class);
+        ExcelUtil<LabSubjectAccessRecordVo> util = new ExcelUtil<>(LabSubjectAccessRecordVo.class);
         util.exportExcel(response, list, "实验室进出记录数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectController.java

@@ -200,7 +200,7 @@ public class LabSubjectController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubject labSubject) throws IOException {
         List<LabSubject> list = labSubjectService.selectLabSubjectList(labSubject);
-        ExcelUtil<LabSubject> util = new ExcelUtil<LabSubject>(LabSubject.class);
+        ExcelUtil<LabSubject> util = new ExcelUtil<>(LabSubject.class);
         util.exportExcel(response, list, "实验室数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectHardwarePositionController.java

@@ -63,7 +63,7 @@ public class LabSubjectHardwarePositionController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectHardwarePosition labSubjectHardwarePosition) throws IOException {
         List<LabSubjectHardwarePosition> list = labSubjectHardwarePositionService.selectLabSubjectHardwarePositionList(labSubjectHardwarePosition);
-        ExcelUtil<LabSubjectHardwarePosition> util = new ExcelUtil<LabSubjectHardwarePosition>(LabSubjectHardwarePosition.class);
+        ExcelUtil<LabSubjectHardwarePosition> util = new ExcelUtil<>(LabSubjectHardwarePosition.class);
         util.exportExcel(response, list, "实验室硬件位置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectLayoutController.java

@@ -103,7 +103,7 @@ public class LabSubjectLayoutController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectLayout labSubjectLayout) throws IOException {
         List<LabSubjectLayout> list = labSubjectLayoutService.selectLabSubjectLayoutList(labSubjectLayout);
-        ExcelUtil<LabSubjectLayout> util = new ExcelUtil<LabSubjectLayout>(LabSubjectLayout.class);
+        ExcelUtil<LabSubjectLayout> util = new ExcelUtil<>(LabSubjectLayout.class);
         util.exportExcel(response, list, "实验室布局数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectSecurityconfigureController.java

@@ -62,7 +62,7 @@ public class LabSubjectSecurityconfigureController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabSubjectSecurityconfigure labSubjectSecurityconfigure) throws IOException {
         List<LabSubjectSecurityconfigure> list = labSubjectSecurityconfigureService.selectLabSubjectSecurityconfigureList(labSubjectSecurityconfigure);
-        ExcelUtil<LabSubjectSecurityconfigure> util = new ExcelUtil<LabSubjectSecurityconfigure>(LabSubjectSecurityconfigure.class);
+        ExcelUtil<LabSubjectSecurityconfigure> util = new ExcelUtil<>(LabSubjectSecurityconfigure.class);
         util.exportExcel(response, list, "实验室和安全准入配置中间关联数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabValueSegmentSiteController.java

@@ -65,7 +65,7 @@ public class LabValueSegmentSiteController extends BaseController
     public void export(HttpServletResponse response, LabValueSegmentSite labValueSegmentSite) throws IOException
     {
         List<LabValueSegmentSite> list = labValueSegmentSiteService.selectLabValueSegmentSiteList(labValueSegmentSite);
-        ExcelUtil<LabValueSegmentSite> util = new ExcelUtil<LabValueSegmentSite>(LabValueSegmentSite.class);
+        ExcelUtil<LabValueSegmentSite> util = new ExcelUtil<>(LabValueSegmentSite.class);
         util.exportExcel(response, list, "违规-分值段设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabViolationController.java

@@ -130,7 +130,7 @@ public class LabViolationController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabViolationVO labViolation) throws IOException {
         List<LabViolationVO> list = labViolationService.selectLabViolationList(labViolation);
-        ExcelUtil<LabViolationVO> util = new ExcelUtil<LabViolationVO>(LabViolationVO.class);
+        ExcelUtil<LabViolationVO> util = new ExcelUtil<>(LabViolationVO.class);
         util.exportExcel(response, list, "违规记录数据");
     }
 
@@ -143,20 +143,6 @@ public class LabViolationController extends BaseController {
         return ResultData.success(labViolationService.selectLabViolationById(id));
     }
 
-   /* *//**
-     * 新增违规记录
-     *//*
-    @PreAuthorize(hasPermi = "laboratory:violation:add")
-    @Log(title = "old违规记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData add(@RequestBody LabViolationVO labViolationVO) {
-        labViolationVO.setUserId(tokenService.getLoginUser().getUserid());
-        labViolationVO.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName());
-        labViolationVO.setDeptId(tokenService.getLoginUser().getSysUser().getDeptId());
-        labViolationVO.setDeptName(tokenService.getLoginUser().getSysUser().getDeptName());
-        return ResultData.success(labViolationService.insertLabViolation(labViolationVO));
-    }*/
-
     /**
      * 修改违规记录
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabViolationHistoryRecordController.java

@@ -75,7 +75,7 @@ public class LabViolationHistoryRecordController extends BaseController
     public void export(HttpServletResponse response, LabViolationHistoryRecord labViolationHistoryRecord) throws IOException
     {
         List<LabViolationHistoryRecord> list = labViolationHistoryRecordService.selectLabViolationHistoryRecordList(labViolationHistoryRecord);
-        ExcelUtil<LabViolationHistoryRecord> util = new ExcelUtil<LabViolationHistoryRecord>(LabViolationHistoryRecord.class);
+        ExcelUtil<LabViolationHistoryRecord> util = new ExcelUtil<>(LabViolationHistoryRecord.class);
         util.exportExcel(response, list, "违规历史记录数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabViolationRecordController.java

@@ -68,7 +68,7 @@ public class LabViolationRecordController extends BaseController
     public void export(HttpServletResponse response, LabViolationRecord labViolationRecord) throws IOException
     {
         List<LabViolationRecord> list = labViolationRecordService.selectLabViolationRecordList(labViolationRecord);
-        ExcelUtil<LabViolationRecord> util = new ExcelUtil<LabViolationRecord>(LabViolationRecord.class);
+        ExcelUtil<LabViolationRecord> util = new ExcelUtil<>(LabViolationRecord.class);
         util.exportExcel(response, list, "违规记录数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabViolationScoreSiteController.java

@@ -66,7 +66,7 @@ public class LabViolationScoreSiteController extends BaseController
     public void export(HttpServletResponse response, LabViolationScoreSite labViolationScoreSite) throws IOException
     {
         List<LabViolationScoreSite> list = labViolationScoreSiteService.selectLabViolationScoreSiteList(labViolationScoreSite);
-        ExcelUtil<LabViolationScoreSite> util = new ExcelUtil<LabViolationScoreSite>(LabViolationScoreSite.class);
+        ExcelUtil<LabViolationScoreSite> util = new ExcelUtil<>(LabViolationScoreSite.class);
         util.exportExcel(response, list, "违规项扣分设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabViolationSiteController.java

@@ -83,7 +83,7 @@ public class LabViolationSiteController extends BaseController
     public void export(HttpServletResponse response, LabViolationSite labViolationSite) throws IOException
     {
         List<LabViolationSite> list = labViolationSiteService.selectLabViolationSiteList(labViolationSite);
-        ExcelUtil<LabViolationSite> util = new ExcelUtil<LabViolationSite>(LabViolationSite.class);
+        ExcelUtil<LabViolationSite> util = new ExcelUtil<>(LabViolationSite.class);
         util.exportExcel(response, list, "违规-违���项设置数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabWhitelistController.java

@@ -78,7 +78,7 @@ public class LabWhitelistController extends BaseController
     public void export(HttpServletResponse response, LabWhitelist labWhitelist) throws IOException
     {
         List<LabWhitelist> list = labWhitelistService.selectLabWhitelistList(labWhitelist);
-        ExcelUtil<LabWhitelist> util = new ExcelUtil<LabWhitelist>(LabWhitelist.class);
+        ExcelUtil<LabWhitelist> util = new ExcelUtil<>(LabWhitelist.class);
         util.exportExcel(response, list, "白名单数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpCardInfoController.java

@@ -91,7 +91,7 @@ public class LabXxpCardInfoController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, XxpCardInfo xxpCardInfo) throws IOException {
         List<XxpCardInfo> list = xxpCardInfoService.selectXxpCardInfoList(xxpCardInfo);
-        ExcelUtil<XxpCardInfo> util = new ExcelUtil<XxpCardInfo>(XxpCardInfo.class);
+        ExcelUtil<XxpCardInfo> util = new ExcelUtil<>(XxpCardInfo.class);
         util.exportExcel(response, list, "电子信息牌数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpClassifyController.java

@@ -114,7 +114,7 @@ public class LabXxpClassifyController extends BaseController
     public void export(HttpServletResponse response, XxpClassify xxpClassify) throws IOException
     {
         List<XxpClassify> list = xxpClassifyService.selectXxpClassifyList(xxpClassify);
-        ExcelUtil<XxpClassify> util = new ExcelUtil<XxpClassify>(XxpClassify.class);
+        ExcelUtil<XxpClassify> util = new ExcelUtil<>(XxpClassify.class);
         util.exportExcel(response, list, "信息牌类目数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpClassifyDetailedController.java

@@ -77,7 +77,7 @@ public class LabXxpClassifyDetailedController extends BaseController
     public void export(HttpServletResponse response, XxpClassifyDetailVO classifyDetailed) throws IOException
     {
         List<XxpClassifyDetailVO> list = classifyDetailedService.selectXxpClassifyDetailedList(classifyDetailed);
-        ExcelUtil<XxpClassifyDetailVO> util = new ExcelUtil<XxpClassifyDetailVO>(XxpClassifyDetailVO.class);
+        ExcelUtil<XxpClassifyDetailVO> util = new ExcelUtil<>(XxpClassifyDetailVO.class);
         util.exportExcel(response, list, "安全信息类目详情数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpDutyController.java

@@ -90,7 +90,7 @@ public class LabXxpDutyController extends BaseController
     public void export(HttpServletResponse response, XxpDuty xxpDuty) throws IOException
     {
         List<XxpDuty> list = xxpDutyService.selectXxpDutyList(xxpDuty);
-        ExcelUtil<XxpDuty> util = new ExcelUtil<XxpDuty>(XxpDuty.class);
+        ExcelUtil<XxpDuty> util = new ExcelUtil<>(XxpDuty.class);
         util.exportExcel(response, list, "值班数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -158,7 +158,7 @@ public class LabXxpInspectionController extends BaseController
     public void export(HttpServletResponse response, XxpInspection xxpInspection) throws IOException
     {
         List<XxpInspection> list = xxpInspectionService.selectXxpInspectionList(xxpInspection);
-        ExcelUtil<XxpInspection> util = new ExcelUtil<XxpInspection>(XxpInspection.class);
+        ExcelUtil<XxpInspection> util = new ExcelUtil<>(XxpInspection.class);
         util.exportExcel(response, list, "巡查数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpUserAuthController.java

@@ -91,7 +91,7 @@ public class LabXxpUserAuthController extends BaseController
     public void export(HttpServletResponse response, XxpUserAuth xxpUserAuth) throws IOException
     {
         List<XxpUserAuth> list = xxpUserAuthService.selectXxpUserAuthList(xxpUserAuth);
-        ExcelUtil<XxpUserAuth> util = new ExcelUtil<XxpUserAuth>(XxpUserAuth.class);
+        ExcelUtil<XxpUserAuth> util = new ExcelUtil<>(XxpUserAuth.class);
         util.exportExcel(response, list, "巡查数据");
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabNotifyplanServiceImpl.java

@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -71,8 +70,7 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
      * @return 大屏通知计划
      */
     @Override
-    public LabNotifyplanVO selectLabNotifyplanById(Long id)
-    {
+    public LabNotifyplanVO selectLabNotifyplanById(Long id) {
         LabNotifyplanVO labNotifyplanVO = labNotifyplanMapper.selectLabNotifyplanById(id);
 
         //数据为 工作计划类型时
@@ -81,17 +79,15 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
                 //url不为空时解析
                 if(labNotifyplanVO.getContentUrl()!=null){
                     SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
-                    ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<LabNotifyplanExcelVO>(LabNotifyplanExcelVO.class);
+                    ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<>(LabNotifyplanExcelVO.class);
 
                     InputStream intstream = null;
                     intstream = new URL(labNotifyplanVO.getContentUrl()).openStream();
                     List<LabNotifyplanExcelVO> excelList = null;
                     excelList = util.importExcel(intstream);
-                    /*labNotifyplanVO.setContent(excelList.get(0).getContent());
-                    labNotifyplanVO.setCompany(excelList.get(0).getCompany());*/
+
                     labNotifyplanVO.setExcelList(excelList);
-                    //Date date = (Date) sdf.parse(excelList.get(0).getCreateDate());
-                    //labNotifyplanVO.setCreateTime(date);
+
                     labNotifyplanVO.setExcelList(excelList);
                     intstream.close();
                 }
@@ -113,8 +109,7 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
      * @return 大屏通知计划
      */
     @Override
-    public List<LabNotifyplan> selectLabNotifyplanList(LabNotifyplan labNotifyplan)
-    {
+    public List<LabNotifyplan> selectLabNotifyplanList(LabNotifyplan labNotifyplan) {
         return labNotifyplanMapper.selectLabNotifyplanList(labNotifyplan);
     }
 
@@ -132,23 +127,14 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
         try {
             //是否需要解析excel 标识 remark=1
             if(list.size()>0 && "1".equals(labNotifyplan.getRemark())){
-                ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<LabNotifyplanExcelVO>(LabNotifyplanExcelVO.class);
-                SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
+                ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<>(LabNotifyplanExcelVO.class);
                     //url为空时跳出本次循环
                     if(list.get(0).getContentUrl()!=null) {
-                        /*String baseUrl=request.getServerName() ;
-                        String url="";
-                        if(baseUrl.contains("192.168")){
-                            url=fileConfigUtils.getLocalUrl()+list.get(0).getContentUrl();
-                        }else{
-                            url=fileConfigUtils.getRemoteUrl()+list.get(0).getContentUrl();
-                        }*/
                         //通过配置加载文件域名
                         String url = fileConfigUtils.getFileDomainApp() + list.get(0).getContentUrl();
                         url= UrlFormatUtils.getHttpsORHttpUrl(url);
 
                         //文件访问路径
-                        //String url = "http://192.168.1.17:9300//statics/2022/02/18/3d78b3c2-8108-4e78-a419-954e4b71a92a.xls";
                         intstream = new URL(url).openStream();
                         List<LabNotifyplanExcelVO> excelList = util.importExcel(intstream);
                         list.get(0).setExcelList(excelList);
@@ -194,37 +180,12 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
             //是否需要解析excel 标识 remark=1
             if(list.size()>0 && "1".equals(labNotifyplan.getRemark())){
                 ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<LabNotifyplanExcelVO>(LabNotifyplanExcelVO.class);
-                SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
                 //url为空时跳出本次循环
                 if(list.get(0).getContentUrl()!=null) {
-                    /*String baseUrl=request.getServerName() ;
-                    String url="";
-                    if(baseUrl.contains("192.168")){
-                        url=fileConfigUtils.getLocalUrl()+list.get(0).getContentUrl();
-                    }else{
-                        url=fileConfigUtils.getRemoteUrl()+list.get(0).getContentUrl();
-                    }*/
                     //通过配置加载文件域名
                     String url = fileConfigUtils.getFileDomainApp() + list.get(0).getContentUrl();
                     url= UrlFormatUtils.getHttpsORHttpUrl(url);
-
-                        /*//文件访问路径
-                        //String url = "http://192.168.1.17:9300//statics/2022/02/18/3d78b3c2-8108-4e78-a419-954e4b71a92a.xls";
-                        InputStream intstream = new URL(list.get(0).getContentUrl()).openStream();
-                        List<LabNotifyplanExcelVO> excelList = util.importExcel(intstream);
-                        //list.get(0).setContent(excelList.get(0).getContent());
-                        //list.get(0).setCompany(excelList.get(0).getCompany());
-                        Date date = (Date) sdf.parse(excelList.get(0).getCreateDate());
-                        String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(date);
-                        //String ss = sdf.format(Date.parse(excelList.get(0).getCreateDate()));
-                        *//*Date date = (Date) sdf.parse("Sat Jan 01 10:20:00 CST 2022");
-                        String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);*//*
-                        //list.get(0).setCreateTime(formatStr);
-                        excelList.get(0).setCreateDate(formatStr);
-                        list.get(0).setExcelList(excelList);
-                        intstream.close();*/
                     //文件访问路径
-                    //String url = "http://192.168.1.17:9300//statics/2022/02/18/3d78b3c2-8108-4e78-a419-954e4b71a92a.xls";
                     intstream = new URL(url).openStream();
                     List<LabNotifyplanExcelVO> excelList = util.importExcel(intstream);
                     list.get(0).setExcelList(excelList);
@@ -262,8 +223,7 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
      * @return 结果
      */
     @Override
-    public int insertLabNotifyplan(LabNotifyplan labNotifyplan, HttpServletRequest request)
-    {
+    public int insertLabNotifyplan(LabNotifyplan labNotifyplan, HttpServletRequest request) {
         //添加创建人
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         labNotifyplan.setUserId(sysUser.getUserId());
@@ -276,13 +236,6 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
         try {
             //为工作计划时 解析文件是否合格 主要是时间校验
             if(2==labNotifyplan.getType()){
-                /*String baseUrl=request.getServerName() ;
-                String url="";
-                if(baseUrl.contains("192.168")){
-                    url=fileConfigUtils.getLocalUrl()+ labNotifyplan.getContentUrl();
-                }else{
-                    url=fileConfigUtils.getRemoteUrl()+ labNotifyplan.getContentUrl();
-                }*/
                 //通过配置加载文件域名
                 String url = fileConfigUtils.getFileDomainApp() + labNotifyplan.getContentUrl();
                 url= UrlFormatUtils.getHttpsORHttpUrl(url);
@@ -321,8 +274,7 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
      * @return 结果
      */
     @Override
-    public int updateLabNotifyplan(LabNotifyplan labNotifyplan)
-    {
+    public int updateLabNotifyplan(LabNotifyplan labNotifyplan) {
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         labNotifyplan.setUpdateTime(DateUtils.getNowDate());
         labNotifyplan.setUpdateUserid(sysUser.getUserId());
@@ -367,27 +319,17 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
             //是否需要解析excel 标识 remark=1
             if(list.size()>0 && "1".equals(labNotifyplan.getRemark())){
                 ExcelUtil<LabNotifyplanExcelVO> util = new ExcelUtil<LabNotifyplanExcelVO>(LabNotifyplanExcelVO.class);
-                SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
-
-                        if(list.get(0).getContentUrl()!=null) {
-                            /*String baseUrl=request.getServerName() ;
-                            String url="";
-                            if(baseUrl.contains("192.168")){
-                                url=fileConfigUtils.getLocalUrl()+list.get(0).getContentUrl();
-                            }else{
-                                url=fileConfigUtils.getRemoteUrl()+list.get(0).getContentUrl();
-                            }*/
-                            //通过配置加载文件域名
-                            String url = fileConfigUtils.getFileDomainApp() + list.get(0).getContentUrl();
-                            url= UrlFormatUtils.getHttpsORHttpUrl(url);
+                    if(list.get(0).getContentUrl()!=null) {
+                        //通过配置加载文件域名
+                        String url = fileConfigUtils.getFileDomainApp() + list.get(0).getContentUrl();
+                        url= UrlFormatUtils.getHttpsORHttpUrl(url);
 
-                            //文件访问路径
-                            //String url = "http://192.168.1.17:9300//statics/2022/02/18/3d78b3c2-8108-4e78-a419-954e4b71a92a.xls";
-                            intstream = new URL(url).openStream();
-                            List<LabNotifyplanExcelVO> excelList = util.importExcel(intstream);
-                            list.get(0).setExcelList(excelList);
-                            intstream.close();
-                        }
+                        //文件访问路径
+                        intstream = new URL(url).openStream();
+                        List<LabNotifyplanExcelVO> excelList = util.importExcel(intstream);
+                        list.get(0).setExcelList(excelList);
+                        intstream.close();
+                    }
             }
         } catch (IOException e) {
             //e.printStackTrace();
@@ -411,10 +353,4 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
         }
         return list;
     }
-
-    public static void main(String[] args) throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
-        Date date = (Date) sdf.parse("Sat Jan 01 10:20:00 CST 2022");
-        String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
-    }
 }