From 7d1feae71bfd79b9021e516916b79f918bfcbcd9 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 16:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectReportVo.java | 33 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 57 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java | 252 ++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java | 12
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProjectDangerousTrendVo.java | 22 +
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectReportListQuery.java | 16
ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectDangerousTrendQuery.java | 23 +
ruoyi-system/src/main/resources/mapper/system/ProjectInfoMapper.xml | 2
ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java | 28 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScreenAccountMapper.java | 6
ruoyi-system/src/main/resources/mapper/system/ScreenAccountMapper.xml | 6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java | 6
ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustListQuery.java | 31 +
ruoyi-system/src/main/java/com/ruoyi/system/vo/LoginNameVo.java | 12
ruoyi-system/src/main/java/com/ruoyi/system/service/ScreenAccountService.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectInfoService.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenAccountServiceImpl.java | 15
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 210 ++++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 38 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java | 26 +
ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java | 13
ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectVo.java | 51 ++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 11
ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustDeviceListQuery.java | 30 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java | 93 ++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java | 43 ++
28 files changed, 1,018 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
new file mode 100644
index 0000000..826445a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/EntrustProjectController.java
@@ -0,0 +1,252 @@
+package com.ruoyi.web.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.dto.EditHiddenDangerResponsiblePersonDto;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.model.Record;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/projectEntrust")
+@Api(tags = "委托方端")
+public class EntrustProjectController {
+
+
+ @Autowired
+ private ProjectService projectService;
+ @Autowired
+ private ClientService clientService;
+ @Autowired
+ private ClientParamService clientParamService;
+
+ @Autowired
+ private DeviceUsageService deviceUsageService;
+
+ @Autowired
+ private ReportTemplateService reportTemplateService;
+ @Autowired
+ private ProjectInfoService projectInfoService;
+ @Autowired
+ private ScreenAccountService screenAccountService;
+
+ @Autowired
+ private TaskService taskService;
+
+ @Autowired
+ private RecordService recordService;
+ @Autowired
+ private RecordImageService recordImageService;
+ @Autowired
+ private UserFileService userFileService;
+
+ @ApiOperation(value = "项目列表", response = EntrustProjectVo.class)
+ @PostMapping("/projectList")
+ public R<Page<EntrustProjectVo>> projectList(@RequestBody EntrustListQuery query) {
+ Page<EntrustProjectVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<EntrustProjectVo> list = deviceUsageService.projectList(page, query);
+ page.setRecords(list);
+ return R.ok(page);
+ }
+
+ @ApiOperation(value = "项目列表-报告模板列表", response = ReportTemplate.class)
+ @GetMapping("/projectReport")
+ public R<List<ReportTemplate>> projectReport(Integer id, Integer type) {
+ Client client = clientService.getById(id);
+ ClientParam clientParam = clientParamService.lambdaQuery().eq(ClientParam::getClientId, client.getId())
+ .last("limit 1")
+ .one();
+ List<Integer> templateIds = new ArrayList<>();
+ Integer safetyId = clientParam.getSafetyId();
+ if (safetyId != null) templateIds.add(safetyId);
+ Integer deviceTemplateId = clientParam.getDeviceTemplateId();
+ if (deviceTemplateId != null) templateIds.add(deviceTemplateId);
+
+ if (templateIds.isEmpty()) {
+ return R.ok(new ArrayList<>());
+ }
+ List<ReportTemplate> list = reportTemplateService.lambdaQuery()
+ .in(ReportTemplate::getId, templateIds).list();
+ return R.ok(list);
+ }
+
+ @ApiOperation(value = "项目列表-报告列表", response = EntrustProjectReportVo.class)
+ @PostMapping("/projectReport")
+ public R<Page<EntrustProjectReportVo>> projectReport(@RequestBody ProjectReportListQuery query) {
+ Page<EntrustProjectReportVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<EntrustProjectReportVo> list = deviceUsageService.projectReport(page, query);
+ page.setRecords(list);
+ return R.ok(page);
+ }
+
+ @ApiOperation(value = "获取设备列表", response = EntrustDeviceListVo.class)
+ @PostMapping("/deviceList")
+ public R<Page<EntrustDeviceListVo>> deviceList(@RequestBody @Valid EntrustDeviceListQuery query) {
+ Page<EntrustDeviceListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<EntrustDeviceListVo> list = deviceUsageService.deviceList(page, query);
+ page.setRecords(list);
+ return R.ok(page);
+ }
+
+ @ApiOperation(value = "获取重大隐患列表", response = DeviceListVo.class)
+ @PostMapping("/errorList")
+ public R<Page<ErrorListVo>> errorList(@RequestBody @Valid ErrorListQuery query) {
+ Page<ErrorListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<ErrorListVo> list = deviceUsageService.errorList(page, query);
+ for (ErrorListVo errorListVo : list) {
+ List<Integer> recordFileIds = recordImageService.lambdaQuery()
+ .eq(RecordImage::getRecordId, errorListVo.getId()).list()
+ .stream().map(RecordImage::getUserFileId).collect(Collectors.toList());
+ if (!recordFileIds.isEmpty()) {
+ List<UserFile> pictures = userFileService.lambdaQuery()
+ .in(UserFile::getId, recordFileIds).list();
+ errorListVo.setPictures(pictures);
+ }
+ }
+ page.setRecords(list);
+ return R.ok(page);
+ }
+ @ApiOperation(value = "获取安全隐患列表", response = ErrorListVo.class)
+ @PostMapping("/safetyErrorList")
+ public R<Page<ErrorListVo>> safetyErrorList(@RequestBody @Valid ErrorListQuery query) {
+ Page<ErrorListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<ErrorListVo> list = deviceUsageService.safetyErrorList(page, query);
+ for (ErrorListVo errorListVo : list) {
+ List<Integer> recordFileIds = recordImageService.lambdaQuery()
+ .eq(RecordImage::getRecordId, errorListVo.getId()).list()
+ .stream().map(RecordImage::getUserFileId).collect(Collectors.toList());
+ if (!recordFileIds.isEmpty()) {
+ List<UserFile> pictures = userFileService.lambdaQuery()
+ .in(UserFile::getId, recordFileIds).list();
+ errorListVo.setPictures(pictures);
+ }
+ }
+ page.setRecords(list);
+ return R.ok(page);
+ }
+ @ApiOperation(value = "获取设备隐患列表", response = ErrorListVo.class)
+ @PostMapping("/deviceErrorList")
+ public R<Page<ErrorListVo>> deviceList(@RequestBody @Valid ErrorListQuery query) {
+ Page<ErrorListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<ErrorListVo> list = deviceUsageService.deviceErrorList(page, query);
+ for (ErrorListVo errorListVo : list) {
+ List<Integer> recordFileIds = recordImageService.lambdaQuery()
+ .eq(RecordImage::getRecordId, errorListVo.getId()).list()
+ .stream().map(RecordImage::getUserFileId).collect(Collectors.toList());
+ if (!recordFileIds.isEmpty()) {
+ List<UserFile> pictures = userFileService.lambdaQuery()
+ .in(UserFile::getId, recordFileIds).list();
+ errorListVo.setPictures(pictures);
+ }
+ }
+ page.setRecords(list);
+ return R.ok(page);
+ }
+ @ApiOperation(value = "设置负责人")
+ @GetMapping("/setResponsiblePerson")
+ public R setResponsiblePerson(Integer id , String responsiblePerson) {
+ Record record = recordService.getById(id);
+ record.setResponsiblePerson(responsiblePerson);
+ recordService.updateById(record);
+ return R.ok();
+ }
+ @ApiOperation(value = "隐患详情")
+ @GetMapping("/errorDetail")
+ public R errorDetail(Integer id) {
+ Record record = recordService.getById(id);
+
+ return R.ok();
+ }
+ @ApiOperation(value = "获取项目详情", response = Project.class)
+ @GetMapping("/getProjectDetail/{id}")
+ public R<ProjectVo> getStoryDetail(@PathVariable Integer id) {
+ ProjectVo projectVo = new ProjectVo();
+ Project project = projectService.getById(id);
+ BeanUtils.copyProperties(project, projectVo);
+
+ List<String> properties = deviceUsageService.getDeviceUsageList(id);
+ projectVo.setProperties(properties);
+
+ ProjectInfo projectInfo = projectInfoService.getOne(new LambdaUpdateWrapper<ProjectInfo>().eq(ProjectInfo::getProjectId, id));
+ if (projectInfo != null) {
+ projectVo.setProgress(projectInfo.getProgress());
+ }
+ Task task = taskService.getOne(new LambdaUpdateWrapper<Task>().eq(Task::getProjectId, id).orderByDesc(Task::getUpdateTime).last("limit 1"));
+
+ if (task != null) {
+ projectVo.setCheckTime(task.getUpdateTime());
+ }
+ return R.ok(projectVo);
+ }
+
+
+ @ApiOperation(value = "获取项目隐患数量", response = Project.class)
+ @GetMapping("/getProjectHiddenDangerCount/{id}")
+ public R<HiddenDangerVo> getProjectHiddenDangerCount(@PathVariable Integer id) {
+ HiddenDangerVo hiddenDangerVo = new HiddenDangerVo();
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, id));
+ if (!list.isEmpty()) {
+ List<Integer> taskIds = list.stream().map(Task::getId).collect(Collectors.toList());
+ // 0是一级隐患
+ List<Record> records = recordService.list(new LambdaQueryWrapper<Record>().eq(Record::getLevel, 0).eq(Record::getDeleted, 0).in(Record::getCheckTaskId, taskIds));
+ hiddenDangerVo.setSerious(records.size());
+ int rectified = records.stream().filter(Record::getReformed).collect(Collectors.toList()).size();
+ hiddenDangerVo.setRectified(rectified);
+ hiddenDangerVo.setUnRectified(records.size() - rectified);
+ }
+ return R.ok(hiddenDangerVo);
+ }
+
+
+ @ApiOperation(value = "获取隐患列表", response = HiddenDangerListVo.class)
+ @PostMapping("/getHiddenDangerList")
+ public R<Page<HiddenDangerListVo>> getHiddenDangerList(@RequestBody @Valid HiddenDangerListQuery query) {
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, query.getProjectId()));
+ if (tasks.isEmpty()) {
+ return R.ok(new Page<>());
+ }
+ List<Integer> taskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
+ Page<HiddenDangerListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+ List<HiddenDangerListVo> list = recordService.getHiddenDangerList(page, query, taskIds);
+ page.setRecords(list);
+ return R.ok(page);
+
+ }
+
+
+ @ApiOperation(value = "编辑隐患责任人")
+ @PostMapping("/editHiddenDangerResponsiblePerson")
+ public R<Void> editHiddenDangerResponsiblePerson(@RequestBody @Valid EditHiddenDangerResponsiblePersonDto dto) {
+ Record record = recordService.getById(dto.getId());
+ if (record == null) {
+ return R.fail("隐患不存在");
+ }
+ record.setResponsiblePerson(dto.getResponsiblePerson());
+ recordService.updateById(record);
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "获取隐患详情")
+ @GetMapping("/getHiddenDangerDetail/{problemId}")
+ public R<?> getHiddenDangerDetail(@PathVariable Integer problemId) {
+ var record = recordService.getHiddenDangerDetail(problemId);
+ return R.ok(record);
+ }
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
index f2edc8e..5363854 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -59,9 +59,30 @@
@Autowired
private PositionService positionService;
-
@Autowired
private PlanService planService;
+
+ @Autowired
+ private ScreenAccountService screenAccountService;
+
+
+ @ApiOperation(value = "获取项目/委托方列表",response = LoginNameVo.class)
+ @GetMapping("/getLoginNameVoList")
+ public R<List<LoginNameVo>> getProjectList(@RequestParam Integer userId) {
+ ScreenAccount screenAccount = screenAccountService.getById(userId);
+ String clientProjectIds = screenAccount.getClientProjectIds();
+ if(screenAccount.getType()==1){
+ // 委托方
+ List<LoginNameVo> list = screenAccountService.getLoginClient(clientProjectIds);
+ return R.ok(list);
+ }else {
+ // 项目
+ List<LoginNameVo> list = screenAccountService.getLoginProject(clientProjectIds);
+ return R.ok(list);
+
+ }
+
+ }
@@ -274,6 +295,13 @@
return R.ok(list);
}
+ @ApiOperation(value = "获取项目重大风险源详情")
+ @GetMapping("/getProjectDangerousSourceDetail/{id}")
+ public R<?> getProjectDangerousSourceDetail(@PathVariable Integer id) {
+ ProjectInfo projectInfo = projectInfoService.getById(id);
+ return R.ok(projectInfo);
+ }
+
@ApiOperation(value = "设备类型")
@GetMapping("/deviceTypes")
public R<?> deviceTypeOptions(@RequestParam(value = "title", required = false) String title) {
@@ -310,4 +338,12 @@
return R.ok(list);
}
+
+ @ApiOperation(value = "大屏风险趋势")
+ @PostMapping("/getProjectDangerousTrend")
+ public R<List<ProjectDangerousTrendVo>> getProjectDangerousTrend(@RequestBody @Valid ProjectDangerousTrendQuery query) {
+ List<ProjectDangerousTrendVo> list = projectInfoService.getProjectDangerousTrend(query);
+ return R.ok(list);
+ }
+
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index 670e6b3..0ae0b88 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -71,6 +71,9 @@
*/
private SysUser user;
+
+
+ private Integer type;
public LoginUser()
{
}
@@ -89,6 +92,14 @@
this.permissions = permissions;
}
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
public Long getUserId()
{
return userId;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index ccdb974..4c6e46a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -99,6 +99,7 @@
sysUser.setUserName(user.getName());
sysUser.setPassword(user.getPassword());
loginUser.setUser(sysUser);
+ loginUser.setType(user.getType());
// 生成token
return loginUser;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java
index 9969bae..1754f85 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java
@@ -8,6 +8,8 @@
import com.ruoyi.system.query.DeviceListQuery;
import com.ruoyi.system.vo.DeviceCountVo;
import com.ruoyi.system.vo.DeviceListVo;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.vo.*;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
@@ -28,6 +30,16 @@
List<DeviceListVo> getDeviceList(@Param("page") Page<DeviceListVo> page, @Param("query") DeviceListQuery query);
+ List<EntrustProjectVo> projectList(@Param("page")Page<EntrustProjectVo> page,@Param("query")EntrustListQuery query);
+
+ List<EntrustProjectReportVo> projectReport(@Param("page")Page<EntrustProjectReportVo> page, @Param("query")ProjectReportListQuery query);
+
+ List<EntrustDeviceListVo> deviceList(@Param("page")Page<EntrustDeviceListVo> page, @Param("query")EntrustDeviceListQuery query);
+
+ List<ErrorListVo> errorList(@Param("page")Page<ErrorListVo> page, @Param("query")ErrorListQuery query);
List<DeviceCountVo> getProjectDeviceCount(@Param("id") Integer id);
+ List<ErrorListVo> deviceErrorList(@Param("page")Page<ErrorListVo> page, @Param("query")ErrorListQuery query);
+
+ List<ErrorListVo> safetyErrorList(@Param("page")Page<ErrorListVo> page, @Param("query")ErrorListQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScreenAccountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScreenAccountMapper.java
index be8740d..d666db5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScreenAccountMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScreenAccountMapper.java
@@ -3,10 +3,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.Contract;
import com.ruoyi.system.model.ScreenAccount;
+import com.ruoyi.system.vo.LoginNameVo;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
public interface ScreenAccountMapper extends BaseMapper<ScreenAccount> {
Long getToken(@Param("key") String key);
+ List<LoginNameVo> getLoginClient(@Param("ids") List<String> ids);
+
+ List<LoginNameVo> getLoginProject(@Param("ids") List<String> ids);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustDeviceListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustDeviceListQuery.java
new file mode 100644
index 0000000..b8ac3e6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustDeviceListQuery.java
@@ -0,0 +1,30 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("委托方端设备信息列表查询query")
+public class EntrustDeviceListQuery extends BasePage {
+
+ @ApiModelProperty("项目id")
+ @NotNull(message = "项目id不能为空")
+ private Integer projectId;
+ @ApiModelProperty("整改情况 true已整改 false未整改")
+ private Boolean reformed;
+ @ApiModelProperty("设备类型")
+ private Integer type;
+
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ private String endTime;
+
+ @ApiModelProperty("内容")
+ private String content;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustListQuery.java
new file mode 100644
index 0000000..d7e42e6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/EntrustListQuery.java
@@ -0,0 +1,31 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("委托方端项目列表查询query")
+public class EntrustListQuery extends BasePage {
+
+ @ApiModelProperty("项目id")
+ private Integer projectId;
+
+ @ApiModelProperty("项目类型：1-房建 2-市政 3-建筑工程等")
+ private Integer type;
+
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ private String endTime;
+
+ @ApiModelProperty("风险评级")
+ private String riskLevel;
+
+ @ApiModelProperty("项目名称")
+ private String name;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
new file mode 100644
index 0000000..313e6b7
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
@@ -0,0 +1,26 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("委托方端隐患列表查询query")
+public class ErrorListQuery extends BasePage {
+
+ @ApiModelProperty("项目id")
+ private Integer projectId;
+ @ApiModelProperty("整改情况 true已整改 false未整改")
+ private Boolean reformed;
+ @ApiModelProperty("隐患类型 1安全 2设备")
+ private Integer type;
+ @ApiModelProperty("开始时间")
+ private String startTime;
+ @ApiModelProperty("结束时间")
+ private String endTime;
+ @ApiModelProperty("内容")
+ private String content;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectDangerousTrendQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectDangerousTrendQuery.java
new file mode 100644
index 0000000..8db674e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectDangerousTrendQuery.java
@@ -0,0 +1,23 @@
+package com.ruoyi.system.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("项目危险趋势查询参数")
+public class ProjectDangerousTrendQuery {
+ @ApiModelProperty("项目id")
+ @NotNull(message = "项目id不能为空")
+ private Integer projectId;
+
+ @ApiModelProperty("开始时间")
+ @NotNull(message = "开始时间不能为空")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ @NotNull(message = "结束时间不能为空")
+ private String endTime;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectReportListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectReportListQuery.java
new file mode 100644
index 0000000..1202a0e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/ProjectReportListQuery.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("委托方端项目报告列表查询query")
+public class ProjectReportListQuery extends BasePage {
+
+ @ApiModelProperty("项目id")
+ private Integer projectId;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java
index aeed6e3..d6f836d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.DeviceUsage;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.vo.*;
import com.ruoyi.system.query.DeviceListQuery;
import com.ruoyi.system.vo.DeviceCountVo;
import com.ruoyi.system.vo.DeviceListVo;
@@ -25,6 +27,17 @@
List<DeviceListVo> getDeviceList(Page<DeviceListVo> page, @Valid DeviceListQuery query);
+ List<EntrustProjectVo> projectList(Page<EntrustProjectVo> page, EntrustListQuery query);
+
+ List<EntrustProjectReportVo> projectReport(Page<EntrustProjectReportVo> page, ProjectReportListQuery query);
+
+ List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query);
+
+ List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query);
+
+ List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query);
+
+ List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query);
List<DeviceCountVo> getProjectDeviceCount(Integer id);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
index 1866bcf..a594f0d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
@@ -501,7 +501,7 @@
} else if (finalScore >= thresholdA) {
return "C";
} else {
- return null; // 不满足任何类别
+ return "C"; // 不满足任何类别
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectInfoService.java
index 91ce556..75d7659 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectInfoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectInfoService.java
@@ -2,7 +2,9 @@
import com.ruoyi.system.model.ProjectInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.query.ProjectDangerousTrendQuery;
import com.ruoyi.system.query.ProjectHiddenDangerTrendListQuery;
+import com.ruoyi.system.vo.ProjectDangerousTrendVo;
import com.ruoyi.system.vo.ProjectHiddenDangerList;
import com.ruoyi.system.vo.ProjectHiddenDangerTrendVo;
@@ -23,4 +25,7 @@
List<ProjectHiddenDangerList> getProjectHiddenDangerTrendList(@Valid ProjectHiddenDangerTrendListQuery query);
+ List<ProjectDangerousTrendVo> getProjectDangerousTrend(@Valid ProjectDangerousTrendQuery query);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ScreenAccountService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ScreenAccountService.java
index 8f4aac7..025932f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ScreenAccountService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ScreenAccountService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.OnDuty;
import com.ruoyi.system.model.ScreenAccount;
+import com.ruoyi.system.vo.LoginNameVo;
+
+import java.util.List;
/**
* <p>
@@ -18,4 +21,9 @@
Long getToken(String key);
+ List<LoginNameVo> getLoginClient(String clientProjectIds);
+
+
+ List<LoginNameVo> getLoginProject(String clientProjectIds);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
index 3a5e9e0..45264b2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
@@ -581,12 +581,12 @@
Map<Integer, String> categoryMap;
if (!projects.isEmpty()) {
// 判断项目类型：在建工程 or 固定资产
- Integer usageType = projects.get(0).getUsageType();
- if (usageType != null && usageType == 0) {
+ Integer usageType = projects.get(0).getType();
+ if (usageType != null && usageType != 2) {
// 在建工程
categoryMap = projectCategoryCalculator.calculateOngoingProjectCategories(
projects, clientId, startDate, endDate);
- } else if (usageType != null && usageType == 1) {
+ } else if (usageType != null && usageType == 2) {
// 固定资产
categoryMap = projectCategoryCalculator.calculateFixedAssetCategories(
projects, clientId, startDate, endDate);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index c27f6e2..477c910 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -6,8 +6,9 @@
import com.ruoyi.system.mapper.DeviceUsageMapper;
import com.ruoyi.system.model.DeviceUsage;
import com.ruoyi.system.model.Record;
-import com.ruoyi.system.query.DeviceListQuery;
+import com.ruoyi.system.query.*;
import com.ruoyi.system.service.DeviceUsageService;
+import com.ruoyi.system.vo.*;
import com.ruoyi.system.vo.DeviceCountVo;
import com.ruoyi.system.vo.DeviceListVo;
import org.springframework.stereotype.Service;
@@ -55,5 +56,59 @@
return this.baseMapper.getProjectDeviceCount(id);
}
+ @Override
+ public List<EntrustProjectVo> projectList( Page<EntrustProjectVo> page,EntrustListQuery query) {
+ Integer pageNum = query.getPageNum();
+ Integer pageSize = query.getPageSize();
+ List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page,query);
+ for (EntrustProjectVo deviceListVo : deviceList) {
+ LocalDateTime checkTime = deviceListVo.getCheckTime();
+ // 判断checkTime是否是本月的时间
+ if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
+ deviceListVo.setCheckResult("已检查");
+ }else {
+ deviceListVo.setCheckResult("未检查");
+ }
+ }
+ return deviceList;
+ }
+
+ @Override
+ public List<EntrustProjectReportVo> projectReport(Page<EntrustProjectReportVo> page, ProjectReportListQuery query) {
+ List<EntrustProjectReportVo> entrustProjectReportVoList = this.baseMapper.projectReport(page,query);
+ return entrustProjectReportVoList;
+ }
+
+ @Override
+ public List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query) {
+ List<EntrustDeviceListVo> deviceList = this.baseMapper.deviceList(page, query);
+ for (EntrustDeviceListVo deviceListVo : deviceList) {
+ LocalDateTime checkTime = deviceListVo.getCheckTime();
+ // 判断checkTime是否是本月的时间
+ if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
+ deviceListVo.setCheckResult("已检查");
+ }else {
+ deviceListVo.setCheckResult("未检查");
+ }
+ }
+ return deviceList;
+ }
+
+ @Override
+ public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ List<ErrorListVo> errorList = this.baseMapper.errorList(page, query);
+ return errorList;
+ }
+
+ @Override
+ public List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ List<ErrorListVo> errorList = this.baseMapper.deviceErrorList(page, query);
+ return errorList; }
+
+ @Override
+ public List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ List<ErrorListVo> errorList = this.baseMapper.safetyErrorList(page, query);
+ return errorList; }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
index ae0efc4..e1db0fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProjectInfoServiceImpl.java
@@ -4,13 +4,18 @@
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.system.model.Project;
import com.ruoyi.system.model.ProjectInfo;
import com.ruoyi.system.mapper.ProjectInfoMapper;
import com.ruoyi.system.model.Record;
+import com.ruoyi.system.query.ProjectDangerousTrendQuery;
import com.ruoyi.system.query.ProjectHiddenDangerTrendListQuery;
+import com.ruoyi.system.service.ProjectCategoryCalculator;
import com.ruoyi.system.service.ProjectInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.service.ProjectService;
import com.ruoyi.system.service.RecordService;
+import com.ruoyi.system.vo.ProjectDangerousTrendVo;
import com.ruoyi.system.vo.ProjectHiddenDangerList;
import com.ruoyi.system.vo.ProjectHiddenDangerNextList;
import com.ruoyi.system.vo.ProjectHiddenDangerTrendVo;
@@ -19,13 +24,13 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.YearMonth;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static java.util.stream.Collectors.groupingBy;
@@ -41,6 +46,12 @@
public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, ProjectInfo> implements ProjectInfoService {
+ @Autowired
+ private ProjectCategoryCalculator projectCategoryCalculator;
+
+ @Autowired
+ private ProjectService projectService;
+
@Override
public List<ProjectHiddenDangerTrendVo> getProjectHiddenDangerTrend(Integer projectId) {
// 获取上月第一天的时间
@@ -49,9 +60,19 @@
for (Record record : list) {
String hierarchyNames = record.getHierarchyNames();
JSONArray jsonArray = JSONArray.parseArray(hierarchyNames);
- // 取出倒数第4个
- String name = jsonArray.getString(jsonArray.size()-4);
- record.setHierarchyName( name);
+ if(record.getDeviceId()!=null){
+ // 取出倒数第3个
+ String name = jsonArray.getString(jsonArray.size()-3);
+
+ record.setHierarchyName( name);
+ }else {
+ // 取出倒数第4个
+ String name = jsonArray.getString(jsonArray.size()-4);
+
+ record.setHierarchyName( name);
+ }
+
+
}
LocalDate thisMonth = LocalDate.now().minusMonths(0).with(TemporalAdjusters.firstDayOfMonth());
@@ -89,9 +110,18 @@
for (Record record : list) {
String hierarchyNames = record.getHierarchyNames();
JSONArray jsonArray = JSONArray.parseArray(hierarchyNames);
- // 取出倒数第4个
- String name = jsonArray.getString(jsonArray.size()-4);
- record.setHierarchyName( name);
+ if(record.getDeviceId()!=null){
+ // 取出倒数第3个
+ String name = jsonArray.getString(jsonArray.size()-3);
+
+ record.setHierarchyName( name);
+ }else {
+ // 取出倒数第4个
+ String name = jsonArray.getString(jsonArray.size()-4);
+
+ record.setHierarchyName( name);
+ }
+
}
// 算出跨度几个月
@@ -132,6 +162,51 @@
}
+ @Override
+ public List<ProjectDangerousTrendVo> getProjectDangerousTrend(ProjectDangerousTrendQuery query) {
+ List<ProjectDangerousTrendVo> list = new ArrayList<>();
+ Project project = projectService.getById(query.getProjectId());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // 算出跨度几个月
+ int months = calculateMonthsBetween(query.getStartTime(),query.getEndTime());
+ ArrayList<Project> projects = new ArrayList<>();
+ projects.add( project);
+ String temp=null;
+ try {
+ for (int i = 0; i < months; i++) {
+ ProjectDangerousTrendVo vo = new ProjectDangerousTrendVo();
+ LocalDate localDate = getMonthBoundaries(query.getStartTime(), true).plusMonths(i);
+ String dateStr = localDate.toString().substring(0, 7);
+ String start = localDate+" 00:00:00";
+ String end = getMonthBoundaries(query.getStartTime(), false).plusMonths(i)+" 23:59:59";
+ Date startDate = simpleDateFormat.parse(start);
+ Date endDate = simpleDateFormat.parse(end);
+ vo.setTime(dateStr);
+
+ if(project.getType()==2){
+ Map<Integer, String> integerStringMap = projectCategoryCalculator.calculateFixedAssetCategories(projects, Long.valueOf(project.getClientId()), startDate, endDate);
+ String s = integerStringMap.get(query.getProjectId());
+ vo.setLevel(s);
+ }else {
+ Map<Integer, String> integerStringMap = projectCategoryCalculator.calculateOngoingProjectCategories(projects, Long.valueOf(project.getClientId()), startDate, endDate);
+ String s = integerStringMap.get(query.getProjectId());
+ vo.setLevel(s);
+ }
+ // 如果没有则沿用上次的
+ if(vo.getLevel()!=null){
+ temp=vo.getLevel();
+ }else {
+ vo.setLevel(temp);
+ }
+ list.add( vo);
+ }
+ }catch (ParseException e){
+ e.printStackTrace();
+ }
+
+ return list;
+ }
+
public static LocalDate getMonthBoundaries(String yearMonthStr,boolean isInclusive) {
// 解析字符串为YearMonth
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenAccountServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenAccountServiceImpl.java
index 83569cf..f51d5c0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenAccountServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenAccountServiceImpl.java
@@ -8,7 +8,11 @@
import com.ruoyi.system.model.ScreenAccount;
import com.ruoyi.system.service.OnDutyService;
import com.ruoyi.system.service.ScreenAccountService;
+import com.ruoyi.system.vo.LoginNameVo;
import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -30,4 +34,15 @@
public Long getToken(String key) {
return this.baseMapper.getToken(key);
}
+
+ @Override
+ public List<LoginNameVo> getLoginClient(String clientProjectIds) {
+ return this.baseMapper.getLoginClient(Arrays.asList(clientProjectIds.split( ",")));
+ }
+
+ @Override
+ public List<LoginNameVo> getLoginProject(String clientProjectIds) {
+
+ return this.baseMapper.getLoginProject(Arrays.asList(clientProjectIds.split( ",")));
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
new file mode 100644
index 0000000..4818c1c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
@@ -0,0 +1,28 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("大屏设备列表信息Vo")
+public class EntrustDeviceListVo {
+
+ private Integer id;
+ @ApiModelProperty("项目名称")
+ private String projectName;
+ @ApiModelProperty("设备类型：1-塔式起重机 2-施工升降机 3-物料提升机 4-桥式起重机 5-附着式升降脚手架 6-流动式起重机 7-高处作业吊篮 8-门式起重机 9-架桥机 10-其他")
+ private Integer type;
+ @ApiModelProperty("设备编号")
+ private String name;
+ @ApiModelProperty("设备信息 例:{\"使用单位\": \"使用单位1\", \"初装高度\": \"1001\", \"备案机构\": \"备案机构1\", \"报废年限\": \"66\", \"设备型号\": \"设备型号1\", \"使用登记日期\": \"2021-01-01\", \"使用登记机构\": \"使用登记机构1\", \"最大安装高度\": \"2001\", \"最终安装高度\": \"3001\", \"设备出厂日期\": \"2023-07-20\", \"安拆人员证件号\": \"安拆证号1\", \"设备使用登记证号\": \"使用证号1\", \"设备备案登记日期\": \"2021-01-01\", \"设备备案登记有效期\": \"2021-01-01\", \"工程起重机械安拆单位\": \"安拆单位1\", \"工程起重机械生产单位\": \"生产单位1\", \"工程起重机械租赁单位\": \"租赁单位1\", \"工程起重机械维保单位\": \"维保单位1\", \"使用登记有效期截止日期\": \"2021-01-01\", \"工程起重机械设备备案登记证号\": \"备案证号1\"}")
+ private String properties;
+ @ApiModelProperty("检查情况")
+ private String checkResult;
+ @ApiModelProperty("检查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime checkTime;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectReportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectReportVo.java
new file mode 100644
index 0000000..14bb363
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectReportVo.java
@@ -0,0 +1,33 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("项目信息-报告清单")
+public class EntrustProjectReportVo {
+
+ @ApiModelProperty("计划类型：1-安全检查 2-质量检查 3-综合检查 4-设备检查 5-运营检查")
+ private Integer type;
+ @ApiModelProperty("检查计划")
+ private String name;
+ @ApiModelProperty("分数")
+ private Integer score;
+ @ApiModelProperty("风险类型")
+ private Integer riskLevel;
+ @ApiModelProperty("检查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime checkTime;
+
+ private Integer id;
+
+
+
+
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectVo.java
new file mode 100644
index 0000000..dc628c4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustProjectVo.java
@@ -0,0 +1,51 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@ApiModel("项目信息")
+public class EntrustProjectVo {
+
+ @ApiModelProperty("项目类型")
+ private Integer type;
+
+ @ApiModelProperty("项目名称")
+ private String name;
+
+ @ApiModelProperty("项目地址")
+ private String addressInfo;
+
+ @ApiModelProperty("施工单位信息")
+ private String constructionCompanyInfo;
+
+ @ApiModelProperty("监理单位信息")
+ private String supervisorCompanyInfo;
+
+ @ApiModelProperty("建设单位信息")
+ private String developmentCompanyInfo;
+
+ @ApiModelProperty("本月检查情况")
+ private String checkResult;
+ @ApiModelProperty("本月检查风险")
+ private String risk;
+// @ApiModelProperty("风险等级：0-拒绝接受风险 1-不可接受风险 2-重大风险 3-中等风险 4-可接受风险")
+// private Integer riskLevel;
+
+ @ApiModelProperty("最近检查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime checkTime;
+
+ private Integer id;
+
+
+
+
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java
new file mode 100644
index 0000000..f8af8eb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java
@@ -0,0 +1,43 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.model.UserFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@ApiModel("重大安全隐患列表信息Vo")
+public class ErrorListVo {
+
+ private Integer id;
+ @ApiModelProperty("项目名称")
+ private String projectName;
+ @ApiModelProperty("计划名称")
+ private String planName;
+ @ApiModelProperty("检查内容")
+ private String hierarchyName;
+ @ApiModelProperty("问题描述")
+ private String problemName;
+ @ApiModelProperty("问题部位")
+ private String problemPart;
+ @ApiModelProperty("问题备注")
+ private String remark;
+ @ApiModelProperty("隐患等级：1-一级隐患 2-二级隐患 3-三级隐患 4-四级隐患")
+ private Integer level;
+ @ApiModelProperty("隐患类型 1安全 2设备")
+ private Integer type;
+ @ApiModelProperty("图片")
+ private List<UserFile> pictures;
+ @ApiModelProperty("检查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime checkTime;
+ @ApiModelProperty("整改情况 true已整改 false未整改")
+ private Boolean reformed;
+ @ApiModelProperty("责任人")
+ private String responsiblePerson;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/LoginNameVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/LoginNameVo.java
new file mode 100644
index 0000000..45996d7
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/LoginNameVo.java
@@ -0,0 +1,12 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("登录查看选择账户")
+public class LoginNameVo {
+ private Integer id;
+
+ private String name;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProjectDangerousTrendVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProjectDangerousTrendVo.java
new file mode 100644
index 0000000..a93647d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProjectDangerousTrendVo.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("大屏项目危险趋势")
+public class ProjectDangerousTrendVo {
+
+
+
+ @ApiModelProperty("等级")
+ private String level;
+
+ @ApiModelProperty("结束时间")
+ private String time;
+
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index f887013..a3ea189 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -4,16 +4,16 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.DeviceUsage">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="deleted" property="deleted" />
- <result column="name" property="name" />
- <result column="update_time" property="updateTime" />
- <result column="properties" property="properties" />
- <result column="creator_id" property="creatorId" />
- <result column="device_id" property="deviceId" />
- <result column="project_id" property="projectId" />
- <result column="disabled" property="disabled" />
+ <id column="id" property="id"/>
+ <result column="create_time" property="createTime"/>
+ <result column="deleted" property="deleted"/>
+ <result column="name" property="name"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="properties" property="properties"/>
+ <result column="creator_id" property="creatorId"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="project_id" property="projectId"/>
+ <result column="disabled" property="disabled"/>
</resultMap>
<select id="getDeviceUsageList" resultType="java.lang.String">
select t2.properties from device_usage t1
@@ -22,14 +22,14 @@
</select>
<select id="getDeviceList" resultType="com.ruoyi.system.vo.DeviceListVo">
- select t1.id, t1.name, t1.create_time, t1.properties, t1.type, latest.record_time as checkTime
+ select t1.id, t1.name, t1.create_time, t1.properties, t1.type, latest.record_time as checkTime
from device t1
- left join device_usage t2 on t1.id = t2.device_id
- left join (
- select device_id, max(create_time) as record_time
- from record
- group by device_id
- ) latest on t1.id = latest.device_id
+ left join device_usage t2 on t1.id = t2.device_id
+ left join (
+ select device_id, max(create_time) as record_time
+ from record
+ group by device_id
+ ) latest on t1.id = latest.device_id
where t2.project_id = #{query.projectId} and t2.deleted = 0
<if test="query.type != null">
and t1.type = #{query.type}
@@ -41,10 +41,184 @@
and latest.record_time >= #{query.startTime}
</if>
<if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=latest.record_time
+ and #{query.endTime} >=latest.record_time
</if>
order by latest.record_time desc
</select>
+ <select id="deviceList" resultType="com.ruoyi.system.vo.EntrustDeviceListVo">
+ select t2.id, t2.name, t2.create_time, t2.properties, t2.type, latest.record_time as checkTime,t3.name as projectName
+ from device_usage t1
+ left join device t2 on t2.id = t1.device_id
+ left join (
+ select device_id, max(create_time) as record_time
+ from record
+ group by device_id
+ ) latest on t2.id = latest.device_id
+ left join project t3 on t1.project_id = t3.id
+ where t1.project_id = #{query.projectId} and t1.deleted = 0 and t1.disabled = 0
+ <if test="query.type != null">
+ and t2.type = #{query.type}
+ </if>
+ <if test="query.content!= null and query.content!=''">
+ and t2.name like CONCAT('%', #{query.content}, '%')
+ </if>
+ <if test="query.startTime != null and query.startTime != ''">
+ and latest.record_time >= #{query.startTime}
+ </if>
+ <if test="query.endTime != null and query.endTime != ''">
+ and #{query.endTime} >=latest.record_time
+ </if>
+ order by latest.record_time desc
+ </select>
+ <select id="projectList" resultType="com.ruoyi.system.vo.EntrustProjectVo">
+ select
+ t1.*, latest.record_time as checkTime,result.risk_level
+ from project t1
+ left join device_usage t2 on t1.id = t2.project_id
+ left join (
+ select device_id, max(create_time) as record_time
+ from record
+ group by device_id
+ ) latest on t2.device_id = latest.device_id
+ left join (
+ select score,project_id,risk_level
+ from eval_result
+ group by project_id
+ order by create_time desc
+ ) result on t1.id = result.project_id
+ where t1.deleted = 0 and t2.deleted = 0
+
+ <if test="query.projectId != null">
+ and t1.id = #{query.projectId}
+ </if>
+ <if test="query.type != null">
+ and t1.type = #{query.type}
+ </if>
+ <if test="query.riskLevel != null">
+ and result.risk_level = #{query.riskLevel}
+ </if>
+ <if test="query.name!= null and query.name!=''">
+ and t1.name like CONCAT('%', #{query.content}, '%')
+ </if>
+ <if test="query.startTime != null and query.startTime != ''">
+ and latest.record_time >= #{query.startTime}
+ </if>
+ <if test="query.endTime != null and query.endTime != ''">
+ and #{query.endTime} >=latest.record_time
+ </if>
+ GROUP BY t1.id
+ order by latest.record_time desc
+ </select>
+ <select id="projectReport" resultType="com.ruoyi.system.vo.EntrustProjectReportVo">
+ select t1.name,t1.type,t2.score,t2.risk_level,t3.time as checkTime
+ from plan t1
+ left join eval_result t2 on t1.id = t2.plan_id and t2.project_id = #{query.projectId}
+ left join check t3 on t1.id = t3.plan_id and t3.project_id = #{query.projectId}
+ where t1.deleted = 0 and t2.deleted = 0 and t2.deleted = 0
+
+ </select>
+ <select id="errorList" resultType="com.ruoyi.system.vo.ErrorListVo">
+ select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
+ ,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ from record t1
+ LEFT JOIN task t2 on t1.check_task_id = t2.id
+ LEFT JOIN project t3 on t2.project_id = t3.id
+ LEFT JOIN plan t4 on t2.plan_id = t4.id
+ LEFT JOIN problem t5 ON t1.problem_id = t5.id
+ where t1.deleted = 0 and t2.deleted = 0 and t1.`level` =1
+ <if test="query.projectId != null">
+ and t2.project_id = #{query.projectId}
+ </if>
+ <if test="query.reformed != null">
+ and t1.reformed = #{query.reformed}
+ </if>
+ <if test="query.type != null and query.type == 1">
+ and t1.device_id is null
+ </if>
+ <if test="query.type != null and query.type == 2">
+ and t1.device_id is not null
+ </if>
+ <if test="query.startTime != null and query.startTime != ''">
+ and t1.create_time >= #{query.startTime}
+ </if>
+ <if test="query.endTime != null and query.endTime != ''">
+ and #{query.endTime} >=t1.create_time
+ </if>
+ <if test="query.content!= null and query.content!=''">
+ and (t3.name like CONCAT('%', #{query.content}, '%')
+ or
+ t5.name like CONCAT('%', #{query.content}, '%')
+ or
+ t1.remark like CONCAT('%', #{query.content}, '%')
+ )
+ </if>
+ order by t1.create_time desc
+ </select>
+ <select id="deviceErrorList" resultType="com.ruoyi.system.vo.ErrorListVo">
+ select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
+ ,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ from record t1
+ LEFT JOIN task t2 on t1.check_task_id = t2.id
+ LEFT JOIN project t3 on t2.project_id = t3.id
+ LEFT JOIN plan t4 on t2.plan_id = t4.id
+ LEFT JOIN problem t5 ON t1.problem_id = t5.id
+ where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is not null
+ <if test="query.projectId != null">
+ and t2.project_id = #{query.projectId}
+ </if>
+ <if test="query.reformed != null">
+ and t1.reformed = #{query.reformed}
+ </if>
+
+ <if test="query.startTime != null and query.startTime != ''">
+ and t1.create_time >= #{query.startTime}
+ </if>
+ <if test="query.endTime != null and query.endTime != ''">
+ and #{query.endTime} >=t1.create_time
+ </if>
+ <if test="query.content!= null and query.content!=''">
+ and (t3.name like CONCAT('%', #{query.content}, '%')
+ or
+ t5.name like CONCAT('%', #{query.content}, '%')
+ or
+ t1.remark like CONCAT('%', #{query.content}, '%')
+ )
+ </if>
+ order by t1.create_time desc
+ </select>
+ <select id="safetyErrorList" resultType="com.ruoyi.system.vo.ErrorListVo">
+ select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
+ ,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ from record t1
+ LEFT JOIN task t2 on t1.check_task_id = t2.id
+ LEFT JOIN project t3 on t2.project_id = t3.id
+ LEFT JOIN plan t4 on t2.plan_id = t4.id
+ LEFT JOIN problem t5 ON t1.problem_id = t5.id
+ where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is null
+ <if test="query.projectId != null">
+ and t2.project_id = #{query.projectId}
+ </if>
+ <if test="query.reformed != null">
+ and t1.reformed = #{query.reformed}
+ </if>
+
+ <if test="query.startTime != null and query.startTime != ''">
+ and t1.create_time >= #{query.startTime}
+ </if>
+ <if test="query.endTime != null and query.endTime != ''">
+ and #{query.endTime} >=t1.create_time
+ </if>
+ <if test="query.content!= null and query.content!=''">
+ and (t3.name like CONCAT('%', #{query.content}, '%')
+ or
+ t5.name like CONCAT('%', #{query.content}, '%')
+ or
+ t1.remark like CONCAT('%', #{query.content}, '%')
+ )
+ </if>
+ order by t1.create_time desc
+ </select>
+
<select id="getProjectDeviceCount" resultType="com.ruoyi.system.vo.DeviceCountVo"
parameterType="java.lang.Integer">
diff --git a/ruoyi-system/src/main/resources/mapper/system/ProjectInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ProjectInfoMapper.xml
index 66b87da..d950306 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ProjectInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ProjectInfoMapper.xml
@@ -28,7 +28,7 @@
</sql>
<select id="getProjectHiddenDangerTrend" resultType="com.ruoyi.system.model.Record"
>
- select t2.id,t2.hierarchy_names,t2.create_time from task t1
+ select t2.id,t2.hierarchy_names,t2.create_time,t2.device_id from task t1
left join record t2 on t1.id=t2.check_task_id
where t1.project_id=#{projectId} and t1.deleted=0
and t2.create_time between #{startTime} and #{endTime}
diff --git a/ruoyi-system/src/main/resources/mapper/system/ScreenAccountMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ScreenAccountMapper.xml
index 37158aa..67095ee 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ScreenAccountMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ScreenAccountMapper.xml
@@ -5,4 +5,10 @@
<select id="getToken" resultType="java.lang.Long">
select id from user_session where token = #{key} and `state`="ENABLED" limit 1
</select>
+ <select id="getLoginClient" resultType="com.ruoyi.system.vo.LoginNameVo">
+ select id,name from client where id in <foreach collection="ids" separator="," item="id" close=")" open="(" >#{id}</foreach>
+ </select>
+ <select id="getLoginProject" resultType="com.ruoyi.system.vo.LoginNameVo">
+ select id,name from project where id in <foreach collection="ids" separator="," item="id" close=")" open="(" >#{id}</foreach>
+ </select>
</mapper>
--
Gitblit v1.7.1