diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java index 2d37b78fc..83980501d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java @@ -29,7 +29,9 @@ import java.util.Map; public class DictionaryItemController { @Autowired private IDictionaryItemService dictionaryItemService; +/* + */ /** * 分页列表查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml index 04d0d56c5..2bb33c7d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml @@ -225,7 +225,8 @@ group_concat( DISTINCT a.project_sn ), group_concat( DISTINCT cp.company_sn ), group_concat( DISTINCT b.company_sn ), - group_concat( DISTINCT f.company_sn )) + group_concat( DISTINCT f.company_sn ), + group_concat( DISTINCT f.headquarters_sn )) FROM project a INNER JOIN company cp ON a.company_sn = cp.company_sn diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index ccff1e929..3d1169531 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -23,6 +23,8 @@ import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.ProjectExternalSystemService; import com.zhgd.xmgl.modules.project.mapper.ProjectExternalSystemServiceMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; +import com.zhgd.xmgl.modules.quality.entity.QualityRegion; +import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper; import com.zhgd.xmgl.modules.worker.entity.UserEnterprise; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; @@ -61,6 +63,8 @@ import java.util.*; @Slf4j @Transactional(rollbackFor = Exception.class) public class SystemUserServiceImpl extends ServiceImpl implements ISystemUserService { + @Autowired + private QualityRegionMapper qualityRegionMapper; @Autowired private ICompanyService companyService; @Autowired @@ -970,6 +974,7 @@ public class SystemUserServiceImpl extends ServiceImpl().eq(BaseRoleUser::getUserId, id)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index 40f5270ee..7fa570a5e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -220,7 +220,7 @@ public class QualityInspectionRecordController { @ApiOperation(value = "通过id查询质量检查记录信息", notes = "通过id查询质量检查记录信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "质量检查记录ID", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/selectQualityInspectionRecordById") - public Result selectQualityInspectionRecordById(@RequestBody Map map) { + public Result selectQualityInspectionRecordById(@RequestBody Map map) { return Result.success(qualityInspectionRecordService.selectQualityInspectionRecordById(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java index f06730aef..ff428ce9f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java @@ -9,10 +9,12 @@ public class QualityInspectionRecordVo extends QualityInspectionRecord { private String inspectManName; private String createEnterpriseName; private String verifyManName; - private String subentryname; + @ApiModelProperty("分项名称") + private String subentryName; private String notifyPersonName; private String enterpriseName; - private String subsectionname; + @ApiModelProperty("分部名称") + private String subsectionName; private String fullName; private String routineCheckName; private String changeName; @@ -21,5 +23,7 @@ public class QualityInspectionRecordVo extends QualityInspectionRecord { private Boolean overTime; @ApiModelProperty("问题描述") private String problemDescription; + private String dangerName; + private String dangerItemName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java index 6849f0d40..2fe7d4afd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java @@ -21,7 +21,7 @@ import java.util.Map; @Mapper public interface QualityInspectionRecordMapper extends BaseMapper { - EntityMap selectQualityInspectionRecordById(Map map); + QualityInspectionRecordVo selectQualityInspectionRecordById(Map map); List selectQualityInspectionRecordPage(Page page, @Param("param") Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java index 4d4e30d4c..9c565e663 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java @@ -22,4 +22,6 @@ public interface QualityRegionMapper extends BaseMapper { List selectChildQualityRegionList(Map map); QualityRegion getPeerNewQualityRegion(Map param); + + void updateDutyNull(String id); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml index 157dfdbf1..3382c97de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml @@ -1,7 +1,8 @@ - SELECT a.*, b.enterprise_name, c.full_name, @@ -14,7 +15,9 @@ r.danger_name danger_item_name, (SELECT GROUP_CONCAT(real_name) FROM system_user - WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name + WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name, + subsection.subdivision_project_name subsectionName, + subentry.subdivision_project_name subentryName from quality_inspection_record a LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn LEFT JOIN danger_type_record c ON a.danger_type_id = c.id @@ -24,6 +27,8 @@ LEFT JOIN system_user f ON a.verify_man_id = f.user_id LEFT JOIN system_user g ON a.inspect_man_id = g.user_id LEFT JOIN routine_inspect h ON a.routine_id = h.id + LEFT join subdivision_project subsection on subsection.id = a.subsection_id + LEFT join subdivision_project subentry on subentry.id = a.subentry_id WHERE a.id = #{id} SELECT * from quality_region - WHERE parent_region=0 - AND project_sn=#{projectSn} + WHERE parent_region = 0 + AND project_sn = #{projectSn} order by region_code - \ No newline at end of file + + + update quality_region + set duty_id = null, + duty_name = null + where duty_id = #{id} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java index d9e8b9b38..2879952e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java @@ -19,7 +19,7 @@ import java.util.Map; */ public interface IQualityInspectionRecordService extends IService { - EntityMap selectQualityInspectionRecordById(Map map); + QualityInspectionRecordVo selectQualityInspectionRecordById(Map map); RecordVo selectQualityInspectionRecordPage(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java index 4c24ebfd0..f4b9ca031 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.quality.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -58,8 +57,10 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl map) { - return qualityInspectionRecordMapper.selectQualityInspectionRecordById(map); + public QualityInspectionRecordVo selectQualityInspectionRecordById(Map map) { + QualityInspectionRecordVo vo = qualityInspectionRecordMapper.selectQualityInspectionRecordById(map); + setProblemDescription(vo); + return vo; } @Override @@ -81,8 +82,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); List list = qualityInspectionRecordMapper.selectQualityInspectionRecordPage(page, map); for (QualityInspectionRecordVo vo : list) { - String problemDescription = StringUtils.substringAfterLast(vo.getDangerItemContent(), "/"); - vo.setProblemDescription(StringUtils.isNotBlank(problemDescription) ? problemDescription : vo.getDangerItemContent()); + setProblemDescription(vo); } page.setRecords(list); QualityInspectionRecordTotalVo total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); @@ -92,6 +92,11 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl getChildrenByQualityRegionId(Long regionId, List all) { ArrayList list = new ArrayList<>(); for (QualityRegion qualityRegion : all) { @@ -147,14 +152,10 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl> queryList(TaskProgressContent taskProgressContent, HttpServletRequest req) { diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressContent.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressContent.java index c162cca06..320cf7806 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressContent.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressContent.java @@ -33,10 +33,10 @@ public class TaskProgressContent implements Serializable { @ApiModelProperty(value = "id") private java.lang.Long id; /** - * taskProgressId + * 任务进度甘特图id */ - @Excel(name = "taskProgressId", width = 15) - @ApiModelProperty(value = "taskProgressId") + @Excel(name = "任务进度甘特图id", width = 15) + @ApiModelProperty(value = "任务进度甘特图id") private java.lang.Long taskProgressId; /** * 上报时间 diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java index f8e2bb173..e010a8954 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java @@ -51,10 +51,12 @@ public class TaskProgressContentServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(taskProgressContent, req.getParameterMap()); List taskProgressContents = baseMapper.queryList(taskProgressContent, queryWrapper); List ids = taskProgressContents.stream().map(TaskProgressContent::getId).collect(Collectors.toList()); - List detailList = taskProgressMaterialRelMapper.queryDetailListByContentIds(ids); - Map> contentIdMap = detailList.stream().collect(Collectors.groupingBy(TaskProgressMaterialRel::getTaskProgressContentId)); - for (TaskProgressContent progressContent : taskProgressContents) { - progressContent.setTypeDataList(contentIdMap.get(progressContent.getId())); + if (CollUtil.isNotEmpty(ids)) { + List detailList = taskProgressMaterialRelMapper.queryDetailListByContentIds(ids); + Map> contentIdMap = detailList.stream().collect(Collectors.groupingBy(TaskProgressMaterialRel::getTaskProgressContentId)); + for (TaskProgressContent progressContent : taskProgressContents) { + progressContent.setTypeDataList(contentIdMap.get(progressContent.getId())); + } } return taskProgressContents; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index a8c1e0f89..852520cc0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; +import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo; import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService; import com.zhgd.xmgl.util.MessageUtil; @@ -20,10 +22,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Date; @@ -120,7 +119,7 @@ public class AiAnalyseHardWareAlarmRecordController { return Result.success(aiAnalyseHardWareAlarmRecordService.selectAiAnalyseHardWareAlarmList(map)); } - @ApiOperation(value = "查询所有各预警类型预警数（不同天数）", notes = "查询所有各预警类型预警数（不同天数）", httpMethod = "POST") + @ApiOperation(value = "查询所有各预警类型预警数（不同天数今日、近七天、最近30天）", notes = "查询所有各预警类型预警数（不同天数今日、近七天、最近30天）", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "selectType", value = "查询类型，1近七天，2最近30天，3今日，4、24小时", paramType = "query", required = false, dataType = "String"), @@ -130,6 +129,15 @@ public class AiAnalyseHardWareAlarmRecordController { return Result.success(aiAnalyseHardWareAlarmRecordService.getAiAnalyseHardWareAlarmTotal(map)); } + @ApiOperation(value = "查询所有预警数（不同天数）", notes = "查询所有预警数（不同天数）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countAiAnalyseHardWareAlarmTotal") + public Result countAiAnalyseHardWareAlarmTotal(@RequestBody Map map) { + return Result.success(aiAnalyseHardWareAlarmRecordService.countAiAnalyseHardWareAlarmTotal(map)); + } + @ApiOperation(value = "根据ID获取预警详情信息", notes = "根据ID获取预警详情信息", httpMethod = "POST") @ApiImplicitParams(@ApiImplicitParam(name = "id", value = "预警ID", paramType = "query", dataType = "Long")) @PostMapping(value = "/getDetails") @@ -194,5 +202,4 @@ public class AiAnalyseHardWareAlarmRecordController { return Result.error("参数错误 ").data(false); } } - } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java index 8cf09f894..8cef4c577 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java @@ -56,10 +56,10 @@ public class AiAnalyseHardWareAlarmRecord implements Serializable { @ApiModelProperty(value = "图片路径") private java.lang.String imageUrl; /** - * 类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警 + * 类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测 */ - @Excel(name = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警", width = 15) - @ApiModelProperty(value = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警") + @Excel(name = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测", width = 15) + @ApiModelProperty(value = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测") private java.lang.Integer alarmType; /** * 位置 diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmTotalVo.java new file mode 100644 index 000000000..284bead76 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmTotalVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.video.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AiAnalyseHardWareAlarmTotalVo { + @ApiModelProperty("今日告警数量") + private Integer todayAlarmNum; + @ApiModelProperty("近7日告警数量") + private Integer past7AlarmNum; + @ApiModelProperty("近30日告警数量") + private Integer past30AlarmNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java index dda2ae843..a4ae4eaf9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo; import java.util.List; @@ -34,4 +35,6 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 12e94eb3c..54d9139c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -26,6 +26,7 @@ import com.zhgd.xmgl.modules.project.service.IProjectService; import com.zhgd.xmgl.modules.project.service.ProjectJqmDevService; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord; +import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo; import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper; import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareRecordMapper; @@ -129,9 +130,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl dayList; //获取时间段内所有天数 if ("1".equals(MapUtils.getString(map, "selectType"))) { - dayList = DateUtil.getNowFewDaysAgoList(7); + dayList = DateUtil.getNowFewDaysAgoList(6); } else if ("2".equals(MapUtils.getString(map, "selectType"))) { - dayList = DateUtil.getNowFewDaysAgoList(30); + dayList = DateUtil.getNowFewDaysAgoList(29); } else if ("3".equals(MapUtils.getString(map, "selectType"))) { dayList = DateUtil.getAllHourInDay(); } else { @@ -335,4 +336,16 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl map) { + AiAnalyseHardWareAlarmTotalVo vo = new AiAnalyseHardWareAlarmTotalVo(); + map.put("selectType", 3); + vo.setTodayAlarmNum(this.getAiAnalyseHardWareAlarmTotal(map).getTotalNum()); + map.put("selectType", 1); + vo.setPast7AlarmNum(this.getAiAnalyseHardWareAlarmTotal(map).getTotalNum()); + map.put("selectType", 2); + vo.setPast30AlarmNum(this.getAiAnalyseHardWareAlarmTotal(map).getTotalNum()); + return vo; + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 12497eb97..60f40eae8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -47,6 +47,8 @@ spring.servlet.multipart.file-size-threshold=0 spring.servlet.multipart.max-file-size=1024MB spring.servlet.multipart.max-request-size=1024MB spring.servlet.multipart.resolve-lazily=false +#POST上传参数限制 +server.tomcat.max-http-post-size=100MB # mqtt服务器配置 mqtt.username=admin mqtt.password=public