From d6697982822da4f53c5a6a41a725c5bf5fc1a4ee Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sat, 16 Mar 2024 19:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/Constant.java | 7 ++++++ .../entity/system/base/vo/ProVo.java | 23 +++++++++++++++++++ .../entity/system/dto/SelectDto.java | 3 +++ .../base/controller/SelectController.java | 2 +- .../system/base/mapper/IProMapper.java | 11 +++++++++ .../base/service/impl/ProServiceImpl.java | 20 ++++++++++++++-- .../main/resources/mapper/base/ProMapper.xml | 15 +++++++++--- .../resources/mapper/base/SelectMapper.xml | 17 +++++++++++--- 8 files changed, 89 insertions(+), 9 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java index 48f530e..18c834c 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java @@ -1,5 +1,8 @@ package com.securitycontrol.common.core.constant; +import java.lang.reflect.Array; +import java.util.List; + /** * @author：cwchen * @date：2024-02-27-18:13 @@ -30,6 +33,10 @@ public class Constant { public final static String XL = "线路"; + public final static String[] buildArr = {"12A0,合肥","12B0,马鞍山","12C0,芜湖","12D0,安庆","12F0,淮南", + "12G0,宣城","12H0,阜阳","12J0,铜陵","12L0,蚌埠","12M0,滁州","12N0,六安","12P0,淮北","12Q0,宿州","12R0,池州", + "12S0,黄山","12T0,亳州","12Z0,建设分公司"}; + public final static Integer CELL_1 = 1; public final static Integer CELL_2 = 2; public final static Integer CELL_3 = 3; diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java index c3c5936..3d0226e 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProVo.java @@ -28,12 +28,18 @@ public class ProVo { private Integer userId; @ApiModelProperty(value = "标段工程编码") + @NotBlank(message = "标段工程编码不能为空", groups = {Query.class}) + @Length(max = 50, message = "标段工程编码字符长度不能超过50", groups = {Query.class}) private String bidCode; @ApiModelProperty(value = "单项工程编码") + @NotBlank(message = "单项工程编码不能为空", groups = {Query.class}) + @Length(max = 50, message = "单项工程编码字符长度不能超过50", groups = {Query.class}) private String signCode; @ApiModelProperty(value = "工程编码") + @NotBlank(message = "工程编码不能为空", groups = {Query.class}) + @Length(max = 50, message = "工程编码字符长度不能超过50", groups = {Query.class}) private String proCode; @ApiModelProperty(value = "工程名称") @@ -42,36 +48,53 @@ public class ProVo { private String proName; @ApiModelProperty(value = "工程成本") + @NotBlank(message = "工程成本不能为空", groups = {Query.class}) + @Length(max = 50, message = "工程成本字符长度不能超过50", groups = {Query.class}) private String proCost; @ApiModelProperty(value = "施工单位") + @NotBlank(message = "施工单位不能为空", groups = {Query.class}) + @Length(max = 30, message = "施工单位字符长度不能超过30", groups = {Query.class}) private String sgUnit; @ApiModelProperty(value = "监理单位") + @NotBlank(message = "监理单位不能为空", groups = {Query.class}) + @Length(max = 30, message = "监理单位字符长度不能超过30", groups = {Query.class}) private String jlUnit; @ApiModelProperty(value = "工程类型") + @NotBlank(message = "工程类型不能为空", groups = {Query.class}) + @Length(max = 10, message = "工程类型字符长度不能超过10", groups = {Query.class}) private String proType; @ApiModelProperty(value = "工程规模") + @NotBlank(message = "工程规模不能为空", groups = {Query.class}) + @Length(max = 300, message = "工程规模字符长度不能超过300", groups = {Query.class}) private String proScale; @ApiModelProperty(value = "项目经理") + @NotBlank(message = "项目经理不能为空", groups = {Query.class}) + @Length(max = 10, message = "项目经理字符长度不能超过10", groups = {Query.class}) private String manager; @ApiModelProperty(value = "工程简介") + @NotBlank(message = "工程简介不能为空", groups = {Query.class}) private String proBrief; @ApiModelProperty(value = "当前工序") private String nowGx; @ApiModelProperty(value = "工程状态") + @NotBlank(message = "工程状态不能为空", groups = {Query.class}) + @Length(max = 10, message = "工程状态字符长度不能超过10", groups = {Query.class}) private String status; @ApiModelProperty(value = "计划开始时间") + @NotBlank(message = "计划开始时间不能为空", groups = {Query.class}) private String planStartTime; @ApiModelProperty(value = "计划结束时间") + @NotBlank(message = "计划结束时间不能为空", groups = {Query.class}) private String planEndTime; @ApiModelProperty(value = "实际开始时间") diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java index f6d6bc9..a3c913c 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java @@ -14,4 +14,7 @@ public class SelectDto { @ApiModelProperty(value = "参数") private String param; + + @ApiModelProperty(value = "1.变电 2线路") + private String proType; } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index cd79bcc..0bc8eb1 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -62,7 +62,7 @@ public class SelectController extends BaseController { return service.getDictLists(dto); } - @ApiOperation(value = "杆塔下拉选") + @ApiOperation(value = "杆塔下拉选/变电工序下拉选") @GetMapping("getTowerLists") public AjaxResult getTowerLists(SelectDto dto){ return service.getTowerLists(dto); diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java index cb504e0..6e4d57b 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java @@ -177,6 +177,7 @@ public interface IProMapper { /** * 当前工序计划是否存在进度填报数据 + * * @param dto * @return int * @description @@ -184,4 +185,14 @@ public interface IProMapper { * @date 2024/3/16 15:56 */ int hasGxProgress(GxPlanDto dto); + + /** + * 工程是否存在 + * @param vo + * @return int + * @description + * @author cwchen + * @date 2024/3/16 18:20 + */ + int proIsExist(ProVo vo); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java index 249e7d2..371d4b7 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java @@ -60,12 +60,12 @@ public class ProServiceImpl implements IProService { @Override public List getProLists(ProDto dto) { List list = new ArrayList<>(); + list = mapper.getProLists(dto); list.forEach(item -> { List fileNums = mapper.getProFiles(item.getProId()); item.setProImgFileNum(fileNums.get(0)); item.setProFileNum(fileNums.get(1)); }); - list = mapper.getProLists(dto); return list; } @@ -80,6 +80,10 @@ public class ProServiceImpl implements IProService { return AjaxResult.error(validResult); } String proId = UUID.randomUUID().toString().replace("-", ""); + int result = mapper.proIsExist(vo); + if(result > 0){ + return AjaxResult.error("标段编码已存在"); + } if (StringUtils.isBlank(vo.getProId())) { if (files == null || types == null) { return AjaxResult.error("图片未上传"); @@ -278,7 +282,7 @@ public class ProServiceImpl implements IProService { public ProImportVo setProData(ProImportVo vo, JSONObject obj) { String proId = UUID.randomUUID().toString().replace("-", ""); vo.setProId(proId); - vo.setOrg(obj.getString("org")); + vo.setOrg(getBuildCode(obj.getString("org"))); vo.setBidCode(obj.getString("bidCode")); vo.setSignCode(obj.getString("signCode")); vo.setProCode(obj.getString("proCode")); @@ -334,6 +338,18 @@ public class ProServiceImpl implements IProService { return fileVo; } + public static String getBuildCode(String buildName){ + if (!StringUtils.isEmpty(buildName)) { + for (String build : Constant.buildArr) { + if (build.contains(buildName)) { + System.err.println(build); + return build.split(",")[0]; + } + } + } + return null; + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult editProStatus(ProVo vo) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml index bcb736d..0abcfff 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml @@ -206,9 +206,9 @@ @@ -284,4 +285,12 @@ + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml index 4bd423e..cea6c03 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml @@ -54,8 +54,19 @@ \ No newline at end of file