修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/VideoTypeEnum.java

@@ -30,7 +30,7 @@ public enum VideoTypeEnum {
 
 	public static String getCode(String name) {
 		for (VideoTypeEnum c : VideoTypeEnum.values()) {
-			if (c.getName() == name) {
+			if (c.getName().equals(name)) {
 				return c.code;
 			}
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FilePatrolReportServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
-import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.MyByteArrayMultipartFile;
 import com.yeejoin.equipmanage.common.enums.WordTemplateTypeEum;
 import com.yeejoin.equipmanage.common.exception.BaseException;
@@ -15,6 +13,7 @@ import com.yeejoin.equipmanage.common.exception.CommonException;
 import com.yeejoin.equipmanage.common.utils.WordTemplateUtils;
 import com.yeejoin.equipmanage.mapper.AnalysisReportLogMapper;
 import com.yeejoin.equipmanage.service.IFirePatrolReportService;
+import lombok.extern.slf4j.Slf4j;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
@@ -44,6 +43,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.*;
 
+@Slf4j
 @Service
 public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 
@@ -120,10 +120,13 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		int uncomplete_task_count = task_count - complete_task_count;
 		// 未完成任务数
 		map.put("uncomplete_task_count", uncomplete_task_count);
+		double complete_task_percent;
 		if (0 == task_count) {
-			throw new RuntimeException("巡检计划总数是0，请检查同步服务！");
+			complete_task_percent = 0.0;
+			log.error("-----------------------------当天巡检计划总数是 0，请检查同步服务！-----------------------------");
+		} else {
+			complete_task_percent = (complete_task_count/task_count)*100;
 		}
-		double complete_task_percent = (complete_task_count/task_count)*100;
 		// 任务完成率
 		map.put("complete_task_percent", nf.format(complete_task_percent)+"%");
 		// 任务合格
@@ -150,7 +153,14 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		int certified_person_count = ((BigDecimal) report.get("certified_person_count")).intValue();
 		// 持证人员数
 		map.put("certified_person_count", certified_person_count);
-		double certified_percent =  (certified_person_count/person_count)*100;
+
+		double certified_percent;
+		if (0 == person_count) {
+			certified_percent = 0.0;
+			log.error("-----------------------------人员总数是 0，请检查同步服务！-----------------------------");
+		} else {
+			certified_percent =  (certified_person_count/person_count)*100;
+		}
 		// 持证率
 		map.put("certified_percent", nf.format(certified_percent)+"%");
 		// 人员合格

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -397,6 +397,15 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             if (!StringUtil.isNotEmpty(x.getUrl())) {
                 throw new RuntimeException("错误行" + rowNum + "：视频地址不能为空");
             }
+            if (ValidationUtil.isEmpty(x.getType())) {
+                throw new RuntimeException("机构/部门编码不能为空，请修改后上传！");
+            }
+            if (ValidationUtil.isEmpty(x.getBizOrgCode())) {
+                throw new RuntimeException("机构/部门名称不能为空，请修改后上传！");
+            }
+            if (ValidationUtil.isEmpty(x.getBizOrgName())) {
+                throw new RuntimeException("视频类型为必填字段，请修改后上传！");
+            }
 //            if (!urlPattern.matcher(x.getUrl().trim()).matches()) {
 //                throw new RuntimeException("错误行" + rowNum + "：视频地址格式有误，仅支持协议+ip+端口的格式");
 //            }