From 60df60b520f5099b80433b03b7052e4362a639a6 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Tue, 4 Jul 2023 17:59:00 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FiletransferServiceImpl.java | 49 +++++++----- .../DeepExcavationEngineeringController.java | 14 +--- .../entity/DeepExcavationEngineering.java | 33 ++++---- .../IDeepExcavationEngineeringService.java | 2 + .../DeepExcavationEngineeringServiceImpl.java | 37 +++++++++ .../controller/ProjectFileController.java | 8 ++ .../service/impl/ProgressTaskServiceImpl.java | 4 + .../worker/mapper/xml/WorkerInfoMapper.xml | 4 + .../resources/application-gsx-prod.properties | 74 ----------------- ...ication-jxj-wisdom-template-gsx.properties | 80 ------------------- 10 files changed, 105 insertions(+), 200 deletions(-) delete mode 100644 src/main/resources/application-gsx-prod.properties delete mode 100644 src/main/resources/application-jxj-wisdom-template-gsx.properties diff --git a/src/main/java/com/zhgd/xmgl/modules/file/service/impl/FiletransferServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/file/service/impl/FiletransferServiceImpl.java index 350fc95ca..93f3c849c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/file/service/impl/FiletransferServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/file/service/impl/FiletransferServiceImpl.java @@ -1,10 +1,7 @@ package com.zhgd.xmgl.modules.file.service.impl; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.upload.Uploader; import com.zhgd.jeecg.upload.domain.UploadFile; import com.zhgd.jeecg.upload.factory.ChunkUploaderFactory; @@ -13,10 +10,14 @@ import com.zhgd.xmgl.base.UploadFileDTO; import com.zhgd.xmgl.modules.file.entity.ProjectFile; import com.zhgd.xmgl.modules.file.mapper.ProjectFileMapper; import com.zhgd.xmgl.modules.file.service.IFiletransferService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + @Service public class FiletransferServiceImpl implements IFiletransferService { @@ -27,31 +28,43 @@ public class FiletransferServiceImpl implements IFiletransferService { @Override - public void uploadFile(HttpServletRequest request, UploadFileDTO UploadFileDto) { + public void uploadFile(HttpServletRequest request, UploadFileDTO uploadFileDTO) { UploadFile uploadFile = new UploadFile(); - uploadFile.setChunkNumber(UploadFileDto.getChunkNumber()); - uploadFile.setChunkSize(UploadFileDto.getChunkSize()); - uploadFile.setTotalChunks(UploadFileDto.getTotalChunks()); - uploadFile.setIdentifier(UploadFileDto.getIdentifier()); - uploadFile.setTotalSize(UploadFileDto.getTotalSize()); - uploadFile.setCurrentChunkSize(UploadFileDto.getCurrentChunkSize()); + uploadFile.setChunkNumber(uploadFileDTO.getChunkNumber()); + uploadFile.setChunkSize(uploadFileDTO.getChunkSize()); + uploadFile.setTotalChunks(uploadFileDTO.getTotalChunks()); + uploadFile.setIdentifier(uploadFileDTO.getIdentifier()); + uploadFile.setTotalSize(uploadFileDTO.getTotalSize()); + uploadFile.setCurrentChunkSize(uploadFileDTO.getCurrentChunkSize()); Uploader uploader = new ChunkUploaderFactory().getUploader(uploadFile); - List uploadFileList = uploader.upload(request,basePath); - for (int i = 0; i < uploadFileList.size(); i++){ + List uploadFileList = uploader.upload(request, basePath); + checkParams(uploadFileDTO, uploadFile); + for (int i = 0; i < uploadFileList.size(); i++) { uploadFile = uploadFileList.get(i); - if (uploadFile.getSuccess() == 1){ + if (uploadFile.getSuccess() == 1) { ProjectFile userFile = new ProjectFile(); userFile.setExtendName(uploadFile.getFileType()); userFile.setFileName(uploadFile.getFileName()); - userFile.setFilePath(UploadFileDto.getFilePath()); - userFile.setProjectSn(UploadFileDto.getProjectSn()); + userFile.setFilePath(uploadFileDTO.getFilePath()); + userFile.setProjectSn(uploadFileDTO.getProjectSn()); userFile.setIsDir(0); userFile.setFileUrl(uploadFile.getUrl()); - userFile.setFileSize(uploadFile.getFileSize()+""); + userFile.setFileSize(uploadFile.getFileSize() + ""); userFile.setUploadTime(DateUtil.getCurrentTime()); projectFileMapper.insert(userFile); } } } + private void checkParams(UploadFileDTO uploadFileDTO, UploadFile uploadFile) { + List projectFiles = projectFileMapper.selectList(new LambdaQueryWrapper() + .eq(ProjectFile::getProjectSn, uploadFileDTO.getProjectSn()) + .eq(ProjectFile::getFileName, uploadFile.getFileName()) + .eq(ProjectFile::getExtendName, uploadFile.getFileType()) + .eq(ProjectFile::getIsDir, 0)); + if (CollectionUtils.isNotEmpty(projectFiles)) { + throw new OpenAlertException("该文件已存在"); + } + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationEngineeringController.java index c12956414..83f1c4ecf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationEngineeringController.java @@ -81,19 +81,7 @@ public class DeepExcavationEngineeringController { @ApiOperation(value = "编辑深基坑-工程信息", notes = "编辑深基坑-工程信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody DeepExcavationEngineering deepExcavationEngineering) { - Result result = new Result(); - DeepExcavationEngineering deepExcavationEngineeringEntity = deepExcavationEngineeringService.getById(deepExcavationEngineering.getId()); - if (deepExcavationEngineeringEntity == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - boolean ok = deepExcavationEngineeringService.updateById(deepExcavationEngineering); - //TODO 返回false说明什么？ - if (ok) { - result.successMsg(MessageUtil.get("editSucess")); - } - } - - return result; + return Result.success(deepExcavationEngineeringService.edit(deepExcavationEngineering)); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/entity/DeepExcavationEngineering.java b/src/main/java/com/zhgd/xmgl/modules/foundation/entity/DeepExcavationEngineering.java index 0e8ec3bda..d9c7bb400 100644 --- a/src/main/java/com/zhgd/xmgl/modules/foundation/entity/DeepExcavationEngineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/foundation/entity/DeepExcavationEngineering.java @@ -94,23 +94,26 @@ public class DeepExcavationEngineering implements Serializable { private String surveyScheme ; /**地勘报告*/ @Excel(name = "地勘报告", width = 15) - @ApiModelProperty(value="地勘报告") - private String prospectingReport ; - /**设计图纸*/ + @ApiModelProperty(value = "地勘报告") + private String prospectingReport; + /** + * 设计图纸 + */ @Excel(name = "设计图纸", width = 15) - @ApiModelProperty(value="设计图纸") - private String deviseDrawing ; - /**图片*/ + @ApiModelProperty(value = "设计图纸") + private String deviseDrawing; + /** + * 图片 + */ @Excel(name = "图片", width = 15) - @ApiModelProperty(value="图片") - private String imageUrl ; - /**状态，1进行中，2已完成*/ - @Excel(name = "状态，1进行中，2已完成", width = 15) - @ApiModelProperty(value="状态，1进行中，2已完成") - private Integer status ; + @ApiModelProperty(value = "图片") + private String imageUrl; + @Excel(name = "状态，0，未开工，1进行中，2已完成", width = 15) + @ApiModelProperty(value = "状态，0，未开工，1进行中，2已完成") + private Integer status; - @ApiModelProperty(value="默认监测内容ID") - @TableField(exist = false) - private java.lang.String monitorTypeIds; + @ApiModelProperty(value = "默认监测内容ID") + @TableField(exist = false) + private java.lang.String monitorTypeIds; } diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java index e311ec0a4..9d88c6a25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java +++ b/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java @@ -22,4 +22,6 @@ public interface IDeepExcavationEngineeringService extends IService selectDeepExcavationEngineeringPage(Map map); List selectDeepExcavationList(Map map); + + DeepExcavationEngineering edit(DeepExcavationEngineering deepExcavationEngineering); } diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java index 712a0097d..ee5adaa9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java @@ -2,17 +2,20 @@ package com.zhgd.xmgl.modules.foundation.service.impl; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering; import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationMonitorTypeRela; import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationEngineeringMapper; import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMeasurePointMapper; import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMonitorTypeMapper; import com.zhgd.xmgl.modules.foundation.service.*; +import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,6 +60,8 @@ public class DeepExcavationEngineeringServiceImpl extends ServiceImpl selectDeepExcavationList(Map map) { return deepExcavationEngineeringMapper.selectDeepExcavationList(map); } + + @Override + public DeepExcavationEngineering edit(DeepExcavationEngineering deepExcavationEngineering) { + DeepExcavationEngineering deepExcavationEngineeringEntity = getById(deepExcavationEngineering.getId()); + if (deepExcavationEngineeringEntity == null) { + throw new OpenAlertException(MessageUtil.get("notFindErr")); + } + checkParams(deepExcavationEngineering); + setStatus(deepExcavationEngineering); + updateById(deepExcavationEngineering); + return deepExcavationEngineering; + } + + private void checkParams(DeepExcavationEngineering deepExcavationEngineering) { + if (DateUtil.parse(deepExcavationEngineering.getStartTime()).compareTo(DateUtil.parse(deepExcavationEngineering.getEndTime())) > 0) { + throw new OpenAlertException("开工时间不能大于完工时间"); + } + } + + private void setStatus(DeepExcavationEngineering deepExcavationEngineering) { + DateTime start = DateUtil.parse(deepExcavationEngineering.getStartTime()); + DateTime end = DateUtil.parse(deepExcavationEngineering.getEndTime()); + DateTime now = DateTime.now(); + if (now.compareTo(start) < 0) { + deepExcavationEngineering.setStatus(0); + } else if (now.compareTo(start) >= 0 && now.compareTo(end) < 0) { + deepExcavationEngineering.setStatus(1); + } else { + deepExcavationEngineering.setStatus(2); + } + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFileController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFileController.java index 6555f6a71..88dc63e66 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFileController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectFileController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.*; +import java.util.stream.Collectors; /** @@ -146,6 +147,13 @@ public class ProjectFileController { } + //筛选掉不存在的文件夹 + Map fileDirPathMap = filePathList.stream().map(e -> { + e.setFilePath(e.getFilePath() + e.getFileName() + "/"); + return e; + }).collect(Collectors.toMap(e -> e.getFilePath(), e -> e, (t, t2) -> t)); + List treeNodes = resultTreeNode.getChildren().stream().filter(e -> fileDirPathMap.containsKey(e.getAttributes().get("filePath"))).collect(Collectors.toList()); + resultTreeNode.setChildren(treeNodes); result.setSuccess(true); result.setResult(resultTreeNode); return result; diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java index a41398d2e..2ae933161 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.ExistException; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.call.SanjiangDataCall; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; @@ -27,6 +28,7 @@ import com.zhgd.xmgl.modules.project.mapper.ProgressTaskMapper; import com.zhgd.xmgl.modules.project.service.ProgressTaskService; import com.zhgd.xmgl.util.ProfileJudgeUtil; import lombok.extern.slf4j.Slf4j; +import net.sf.mpxj.MPXJException; import net.sf.mpxj.ProjectFile; import net.sf.mpxj.Relation; import net.sf.mpxj.Task; @@ -237,6 +239,8 @@ public class ProgressTaskServiceImpl extends ServiceImpl + and wt.project_sn = #{projectSn} + and wt.project_sn in