ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
@@ -78,6 +78,8 @@ screenUserVo.setCommentType(param.getCommentType()); screenUserVo.setSafetyId(param.getSafetyId()); screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId()); screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger()); screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger()); } }else if(type==2){ Project project = projectService.getById(id); @@ -90,6 +92,8 @@ screenUserVo.setCommentType(param.getCommentType()); screenUserVo.setSafetyId(param.getSafetyId()); screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId()); screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger()); screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger()); } screenUserVo.setName(project.getName()); screenUserVo.setPermissionProject(project.getPermission()); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkPresentationController.java
@@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.config.FileUploadConfig; import com.ruoyi.common.core.controller.FileController; import com.ruoyi.common.core.domain.R; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.model.*; @@ -15,6 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; /** * 数据统计面板 前端控制器 @@ -31,8 +40,63 @@ @Autowired private WorkPresentationService workPresentationService; @Autowired private TokenService tokenService; private FileUploadConfig fileUploadConfig; @ApiOperation(value = "单文件上传", notes = "单文件上传，rename 默认不重命名") @PostMapping(value = "upload", headers = "content-type=multipart/form-data") public R<?> uploadImageMany(@RequestParam(value = "file") MultipartFile mf) throws IOException { if (mf.isEmpty()) { return R.fail("请传入文件！"); } String TimeDir =new SimpleDateFormat("yyyy-MM-dd").format(new Date()); // String realPath = fileUploadConfig.getLocation() + TimeDir; String realPath = "F:\\file\\estate\\files"; File file = new File(realPath); // 没有目录就创建 if (!file.exists()) { file.mkdirs(); } // 获取文件名称 String filename = mf.getOriginalFilename(); String originalFilename=filename; // 获取文件后缀 String ext = filename.substring(filename.lastIndexOf("."), filename.length()); // 检查文件类型 if (!fileUploadConfig.getAllowExt().contains(ext)) { return R.fail("上传文件格式不正确，仅支持" + fileUploadConfig.getAllowExt()); } filename = UUID.randomUUID()+ ext; File targetFile = new File(realPath, filename);//目标文件 // 获取文件的大小size long size = mf.getSize(); System.out.println(size); //开始从源文件拷贝到目标文件 //传图片一步到位 mf.transferTo(targetFile); //拼接数据 // String imgstr = fileUploadConfig.getAccessPath() + TimeDir +"\\"+ filename; filename = filename.substring(0, filename.lastIndexOf(".")); UserFile userFile = new UserFile(); userFile.setName(filename); userFile.setContentType(mf.getContentType()); String s = ext.replaceAll("\\.", ""); userFile.setExtension(s); userFile.setSize(size); userFile.setOriginFileName(originalFilename); userFile.setCreateTime(new Date()); userFile.setDeleted(false); userFile.setUpdateTime(userFile.getCreateTime()); userFile.insert(); return R.ok(filename); } @ApiOperation(value = "获取工作展示列表",response = WorkPresentation.class) @@ -42,7 +106,9 @@ LambdaQueryWrapper<WorkPresentation> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(WorkPresentation::getClientId,query.getClientId()); wrapper.eq(WorkPresentation::getState, 1); if(query.getState()!=null){ wrapper.eq(WorkPresentation::getState, query.getState()); } if(query.getType()!=null){ wrapper.eq(WorkPresentation::getType, query.getType()); } ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java
@@ -42,6 +42,7 @@ // String realPath = fileUploadConfig.getLocation() + TimeDir; String realPath = "F:\\file\\estate\\files"; File file = new File(realPath); // 没有目录就创建 if (!file.exists()) { file.mkdirs(); @@ -56,12 +57,18 @@ } filename = UUID.randomUUID() + ext; File targetFile = new File(realPath, filename);//目标文件 // 获取文件的大小size long size = mf.getSize(); System.out.println(size); //开始从源文件拷贝到目标文件 //传图片一步到位 mf.transferTo(targetFile); //拼接数据 // String imgstr = fileUploadConfig.getAccessPath() + TimeDir +"\\"+ filename; String imgstr = filename; return R.ok(imgstr); }
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,12 +36,14 @@ private Integer id; @TableField("create_time") @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; private Boolean deleted; @ApiModelProperty(value = "名称") private String name; @TableField("update_time") @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; @ApiModelProperty(value = "复核内容") private String content; ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
@@ -558,10 +558,10 @@ break; } } if (!matchesRule) { break; } //短路与开关 // if (!matchesRule) { // break; // } } if (matchesRule) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
@@ -109,6 +109,8 @@ // 1. 先查询符合条件的 Task LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>(); taskWrapper.in(Task::getProjectId, projectIds) .ge(Task::getDate, monthStart.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()) .le(Task::getDate, monthEnd.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()) .eq(Task::getDeleted, false); List<Task> tasks = taskMapper.selectList(taskWrapper);
@@ -28,4 +28,10 @@ @ApiModelProperty(value = "设备模板id") private Integer deviceTemplateId; @ApiModelProperty(value = "1开启 2关闭 重大隐患") private Integer bigHiddenDanger; @ApiModelProperty(value = "1开启 2关闭 一般隐患") private Integer generalHiddenDanger; }
