From d0473678cc0a9b38bba3f3db724e221bcb3c117a Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Fri, 7 Apr 2023 18:06:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B1=9F=E4=B8=9A=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E5=8F=B0=E6=9B=B4=E6=96=B0/=E5=88=A0=E9=99=A4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UploadFileController.java | 16 +++++++- .../basicdata/entity/vo/UploadImageVo.java | 14 +++++++ .../basicdata/service/UploadFileService.java | 4 ++ .../service/impl/UploadFileServiceImpl.java | 15 +++++++ .../project/controller/ProjectController.java | 36 ++++++++++++++++- .../project/entity/dto/SjProjectDto.java | 39 +++++++++++++++++-- .../service/impl/ProjectServiceImpl.java | 2 +- .../QualityInspectionRecordServiceImpl.java | 7 ++++ .../resources/application-sjjt-gsx.properties | 5 ++- 9 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/entity/vo/UploadImageVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java index 89e5efed6..df175adb4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java @@ -1,8 +1,11 @@ package com.zhgd.xmgl.modules.basicdata.controller; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.basicdata.entity.vo.UploadImageVo; import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -40,7 +43,7 @@ public class UploadFileController { @ResponseBody @PostMapping(value = "/uploadBase64") - public Map uploadBase64(@RequestParam("base64Image") String base64Image){ + public Map uploadBase64(@RequestParam("base64Image") String base64Image) { Map resultMap = new HashMap<>(); try { resultMap = uploadFileService.uploadBase64Image(base64Image); @@ -50,6 +53,17 @@ public class UploadFileController { return resultMap; } + /** + * 三江业务中台上传图片返回url + * + * @param file + * @return + */ + @PostMapping(value = "/sj/image") + @ApiOperation(value = "三江业务中台上传图片", notes = "三江业务中台上传图片", httpMethod = "POST") + public Result uploadSjImage(@RequestParam("file") MultipartFile file) { + return uploadFileService.uploadSjImage(file); + } /*@ApiOperation(value = "企业上传资料", notes = "企业上传资料" , httpMethod="POST") @ApiImplicitParams({ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/vo/UploadImageVo.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/vo/UploadImageVo.java new file mode 100644 index 000000000..16fb0cead --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/vo/UploadImageVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.basicdata.entity.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "上传图片结果Vo") +public class UploadImageVo { + @ApiModelProperty(value = "图片名称") + private String imgName; + @ApiModelProperty(value = "图片访问url") + private String imgUrl; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/UploadFileService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/UploadFileService.java index cd30ea49d..f0c612b0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/UploadFileService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/UploadFileService.java @@ -10,6 +10,8 @@ package com.zhgd.xmgl.modules.basicdata.service; import cn.xuyanwu.spring.file.storage.FileInfo; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.basicdata.entity.vo.UploadImageVo; import org.springframework.web.multipart.MultipartFile; import java.awt.image.BufferedImage; @@ -52,4 +54,6 @@ public interface UploadFileService { * @param file */ void uploadAsync(MultipartFile file); + + Result uploadSjImage(MultipartFile file); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/UploadFileServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/UploadFileServiceImpl.java index 2a42cfa71..8f4d5cbd3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/UploadFileServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/UploadFileServiceImpl.java @@ -4,6 +4,8 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; import cn.xuyanwu.spring.file.storage.FileInfo; import cn.xuyanwu.spring.file.storage.FileStorageService; import com.zhgd.file.FileUtil; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.basicdata.entity.vo.UploadImageVo; import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.basicdata.utils.UrlUtil; import com.zhgd.xmgl.util.MessageUtil; @@ -30,6 +32,9 @@ public class UploadFileServiceImpl implements UploadFileService { @Value("${basePath}") private String basePath; + @Value("${sj.upload.image.url:}") + private String sjUploadUrl; + @Autowired private FileStorageService fileStorageService; @@ -271,5 +276,15 @@ public class UploadFileServiceImpl implements UploadFileService { FileInfo fileInfo = fileStorageService.of(file).upload(); log.info("异步上传文件，当前文件信息：{}", fileInfo); } + + @Override + public Result uploadSjImage(MultipartFile file) { + FileInfo fileInfo = fileStorageService.of(file).upload(); + UploadImageVo uploadImageVo = new UploadImageVo(); + String filename = fileInfo.getFilename(); + uploadImageVo.setImgName(filename); + uploadImageVo.setImgUrl(sjUploadUrl + filename); + return Result.success(uploadImageVo); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java index ea1d25c3e..4d4784928 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.project.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; @@ -117,18 +118,49 @@ public class ProjectController { * @param dto * @return */ - //@OperLog(operModul = "项目管理", operType = "添加项目", operDesc = "添加项目") @ApiOperation(value = " 三江业务中台添加项目", notes = "三江业务中台添加项目", httpMethod = "POST") @PostMapping(value = "/sj/business/add") public Result addSjProject(@RequestBody @Validate SjProjectDto dto) { Project project = new Project(); BeanUtils.copyProperties(dto, project); project.setCompanySn("B386480F85E84592B8E102224D090794"); - projectService.setProjectCode(project); + projectService.setProjectAreaCode(project); projectService.saveProject(project); return Result.ok(); } + /** + * 三江业务中台更新项目（根据项目编号projectNumber更新） + * + * @param dto + * @return + */ + @ApiOperation(value = " 三江业务中台更新项目（根据项目编号projectNumber更新）", notes = "三江业务中台更新项目（根据项目编号projectNumber更新）", httpMethod = "POST") + @PostMapping(value = "/sj/business/update") + public Result updateSjProject(@RequestBody @Validate SjProjectDto dto) { + Project project = new Project(); + BeanUtils.copyProperties(dto, project); + project.setCompanySn("B386480F85E84592B8E102224D090794"); + projectService.setProjectAreaCode(project); + projectService.update(project, new LambdaQueryWrapper().eq(Project::getProjectNumber, dto.getProjectNumber())); + return Result.ok(); + } + + /** + * 三江业务中台删除项目（根据项目编号projectNumber删除） + */ + @ApiOperation(value = "三江业务中台删除项目（根据项目编号projectNumber删除）", notes = "三江业务中台删除项目（根据项目编号projectNumber删除）", httpMethod = "POST") + @PostMapping(value = "/sj/business/delete") + public Result deleteSjProject(@RequestParam String projectNumber) { + Project one = projectService.getOne(new LambdaQueryWrapper().eq(Project::getProjectNumber, projectNumber)); + if (one != null) { + projectService.removeProject(String.valueOf(one.getProjectId())); + redisRepository.del("projectInfoBySn:" + one.getProjectSn()); + } + return Result.ok(); + } + + /** * 添加 * diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/SjProjectDto.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/SjProjectDto.java index 534b1bc78..61d9412f6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/SjProjectDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/SjProjectDto.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.project.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; import javax.validation.constraints.NotBlank; @@ -24,6 +25,7 @@ public class SjProjectDto { private java.lang.String longitude; @ApiModelProperty(value = "项目编号") + @NotBlank private java.lang.String projectNumber; @ApiModelProperty(value = "工程类别，1房建，2市政，5公路") @@ -50,10 +52,41 @@ public class SjProjectDto { @ApiModelProperty(value = "项目联系电话") private java.lang.String projectTel; - @ApiModelProperty(value = "是否是重点工程 0否，2省重，3市重，4区重") - private java.lang.Integer majorProjectType; - @ApiModelProperty(value = "项目进度") private Integer projectProgress; + @ApiModelProperty(value = "'三江重点工程类型多选'") + private String keyProjectType; + + /** + * 施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成 + */ + @Excel(name = "施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成", width = 15) + @ApiModelProperty(value = "施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成") + private java.lang.Integer constructionStage; + /** + * 可售面积 + */ + @Excel(name = "可售面积", width = 15) + @ApiModelProperty(value = "可售面积") + private java.lang.String saleAcreage; + /** + * 户数 + */ + @Excel(name = "户数", width = 15) + @ApiModelProperty(value = "户数") + private java.lang.Integer households; + /** + * 楼栋数 + */ + @Excel(name = "楼栋数", width = 15) + @ApiModelProperty(value = "楼栋数") + private java.lang.Integer buildingNum; + /** + * 现场布置图路径 + */ + @Excel(name = "现场布置图路径", width = 15) + @ApiModelProperty(value = "现场布置图路径") + private java.lang.String layoutImage; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java index 384d96a8b..ceb4ebb9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java @@ -215,7 +215,7 @@ public class ProjectServiceImpl extends ServiceImpl impl * * @param project */ - public void setProjectCode(Project project) { + public void setProjectAreaCode(Project project) { String address = project.getProjectAddress(); WSSsdrAddress wsSsdrAddress = AddressUtil.resolveAddress(address); String province = wsSsdrAddress.getProvince(); 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 a47e1af12..8855e6e13 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 @@ -66,6 +66,13 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl selectQualityStatistics(Map map) { + /* + xmgl/qualityInspectionRecord/selectQualityStatistics + totalNum: '',问题总数 + jyUrgentLevelNum: '',紧要问题 + ybUrgentLevelNum: '',一般问题 + yzUrgentLevelNum: ''严重问题 + */ Map data = new HashMap<>(); map.put("recordType", "1"); Map total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); diff --git a/src/main/resources/application-sjjt-gsx.properties b/src/main/resources/application-sjjt-gsx.properties index f549da788..15451a79b 100644 --- a/src/main/resources/application-sjjt-gsx.properties +++ b/src/main/resources/application-sjjt-gsx.properties @@ -87,4 +87,7 @@ sj.unifiedAuthentication.login.url=http://116.169.63.183:30913 #\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u8DF3\u8F6C\u540E\u63A5\u6536code\u7684\u5730\u5740 sj.unifiedAuthentication.login.code.url=http://wbtqry.natappfree.cc/xmgl/sj/unifiedAuthentication/getTokenByCode #\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl -sj.unifiedAuthentication.success.redirect=http://192.168.34.150:8080/index.html#/login?UID= \ No newline at end of file +sj.unifiedAuthentication.success.redirect=http://192.168.34.150:8080/index.html#/login?UID= + + +sj.upload.image.url=http://192.168.34.221/image/ \ No newline at end of file