Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -246,7 +246,6 @@ public class OrgPersonController extends BaseController {
 
 
 
-    @PersonIdentify
     @TycloudOperation( ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/listAllByCurrentUserALL", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询(表单用)", notes = "列表分页查询（表单用）")

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

 package com.yeejoin.equipmanage.service.impl;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -434,6 +435,41 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             if (ValidationUtil.isEmpty(x.getBizOrgName())) {
                 throw new RuntimeException("机构/部门名称不能为空，请修改后上传！");
             }
+
+
+
+            //字段长度效验
+            if (ValidationUtil.isEmpty(x.getName())&&x.getName().length()>100) {
+                throw new RuntimeException("错误行" + rowNum + "：名字过长");
+            }
+            if (ValidationUtil.isEmpty(x.getCode())&&x.getCode().length()>100) {
+                throw new RuntimeException("错误行" + rowNum + "：编号过长");
+            }
+            if (ValidationUtil.isEmpty(x.getUrl())&&x.getUrl().length()>255) {
+                throw new RuntimeException("错误行" + rowNum + "：视频地址过长");
+            }
+            if (ValidationUtil.isEmpty(x.getToken())&&x.getToken().length()>255) {
+                throw new RuntimeException("错误行" + rowNum + "：token过长");
+            }
+            if (ValidationUtil.isEmpty(x.getBizOrgCode())&&x.getBizOrgCode().length()>64) {
+                throw new RuntimeException("错误行" + rowNum + "：机构编码过长");
+            }
+            if (ValidationUtil.isEmpty(x.getBizOrgName())&&x.getBizOrgName().length()>128) {
+                throw new RuntimeException("错误行" + rowNum + "：机构名称过长");
+            }
+
+            if (ValidationUtil.isEmpty(x.getAddress())&&x.getAddress().length()>2000) {
+                throw new RuntimeException("错误行" + rowNum + "：地址过长");
+            }
+
+            if (ValidationUtil.isEmpty(x.getRemark())&&x.getRemark().length()>255) {
+                throw new RuntimeException("错误行" + rowNum + "：备注过长");
+            }
+
+            if (ValidationUtil.isEmpty(x.getImg())&&x.getImg().length()>100) {
+                throw new RuntimeException("错误行" + rowNum + "：备注过长");
+            }
+
 //            if (!urlPattern.matcher(x.getUrl().trim()).matches()) {
 //                throw new RuntimeException("错误行" + rowNum + "：视频地址格式有误，仅支持协议+ip+端口的格式");
 //            }

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportSummaryMapper.xml

@@ -14,18 +14,18 @@
         select
         s.id,
         CONCAT(s.name,',',#{beginDate},' - ',#{endDate} ,':',CHAR(10),
-        CONCAT('正常设备',IFNULL(f1.totalNormalEquipNum,0),'台,','正常率:',concat(TRUNCATE(IFNULL(f1.normalEquipNumPercent,0)*100, 2),'%'),'，',
+        CONCAT('正常设备',IFNULL(f1.totalNormalEquipNum,0),'台,','正常率:',concat(TRUNCATE(ABS(IFNULL(f1.normalEquipNumPercent,0)*100), 2),'%'),'，',
         '同比上月',IF(IFNULL(f1.totalNormalEquipNum,0)- IFNULL(f1.lastMonthTotalNormalEquipNum,0) >0 ,'增加','减少'),
-        if(IFNULL(f1.lastMonthTotalNormalEquipNum,0) = 0 ,'---',CONCAT(TRUNCATE(IFNULL(f1.totalNormalEquipNum,0)/f1.lastMonthTotalNormalEquipNum -1,2)* 100,'%')),'，',CHAR(10)),
-        CONCAT('故障设备',IFNULL(f1.totalFaultEquipNum,0),'台,','故障率:',concat(TRUNCATE(IFNULL(f1.faultEquipPercent,0),2)*100,'%'),'，',
+        if(IFNULL(f1.lastMonthTotalNormalEquipNum,0) = 0 ,'---',CONCAT(TRUNCATE(ABS(IFNULL(f1.totalNormalEquipNum,0)/f1.lastMonthTotalNormalEquipNum -1),2)* 100,'%')),'，',CHAR(10)),
+        CONCAT('故障设备',IFNULL(f1.totalFaultEquipNum,0),'台,','故障率:',concat(TRUNCATE(ABS(IFNULL(f1.faultEquipPercent,0)),2)*100,'%'),'，',
         '同比上月',IF(IFNULL(f1.totalFaultEquipNum,0)- IFNULL(f1.lastMonthTotalFaultEquipNum,0) >0 ,'增加','减少'),
-        if(IFNULL(f1.lastMonthTotalFaultEquipNum,0) = 0 ,'---',CONCAT(TRUNCATE(IFNULL(f1.totalFaultEquipNum,0)/f1.lastMonthTotalFaultEquipNum -1,2)* 100,'%')),'，',CHAR(10)),
+        if(IFNULL(f1.lastMonthTotalFaultEquipNum,0) = 0 ,'---',CONCAT(TRUNCATE(ABS(IFNULL(f1.totalFaultEquipNum,0)/f1.lastMonthTotalFaultEquipNum -1),2)* 100,'%')),'，',CHAR(10)),
         CONCAT('告警设备',IFNULL(f1.totalAlarmEquipNum,0),'台,',
         '同比上月',IF(IFNULL(f1.totalAlarmEquipNum,0)- IFNULL(f1.lastMonthTotalAlarmEquipNum,0) >0 ,'增加','减少'),
-        if(IFNULL(f1.lastMonthTotalAlarmEquipNum,0) = 0 ,'---',CONCAT(TRUNCATE(IFNULL(f1.totalAlarmEquipNum,0)/f1.lastMonthTotalAlarmEquipNum  -1,2)* 100,'%')),'，',CHAR(10)),
+        if(IFNULL(f1.lastMonthTotalAlarmEquipNum,0) = 0 ,'---',CONCAT(TRUNCATE(ABS(IFNULL(f1.totalAlarmEquipNum,0)/f1.lastMonthTotalAlarmEquipNum  -1),2)* 100,'%')),'，',CHAR(10)),
         CONCAT('告警总数',IFNULL(f1.totalAlarmInfoNum,0),'条,',
         '同比上月',IF(IFNULL(f1.totalAlarmInfoNum,0)- IFNULL(f1.lastMonthTotalAlarmInfoNum,0) >0 ,'增加','减少'),
-        if(IFNULL(f1.lastMonthTotalAlarmInfoNum,0) = 0 ,'---', CONCAT(TRUNCATE(IFNULL(f1.totalAlarmInfoNum,0)/f1.lastMonthTotalAlarmInfoNum -1,2)* 100,'%'))
+        if(IFNULL(f1.lastMonthTotalAlarmInfoNum,0) = 0 ,'---', CONCAT(TRUNCATE(ABS(IFNULL(f1.totalAlarmInfoNum,0)/f1.lastMonthTotalAlarmInfoNum -1),2)* 100,'%'))
         ,'。')) as content,
         s.`name`,
         3 as report_type,