diff --git a/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java b/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java index b81c57b75..655b9e5e6 100644 --- a/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java +++ b/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java @@ -12,7 +12,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; /** - * 三江用户和机构同步mq初始化 + * sj用户和机构同步mq初始化 */ @Configuration @Slf4j diff --git a/src/main/java/com/zhgd/sjmq/service/SjMqService.java b/src/main/java/com/zhgd/sjmq/service/SjMqService.java index c3ed3be30..93c3c6d34 100644 --- a/src/main/java/com/zhgd/sjmq/service/SjMqService.java +++ b/src/main/java/com/zhgd/sjmq/service/SjMqService.java @@ -176,7 +176,7 @@ public class SjMqService { "$orgAttrs": [ { "org": { - "orgName": "宜宾三江投资集团", + "orgName": "宜宾投资集团", "orgId": "le5DuXudTHe7jjUfCEDIGQ" }, "attrs": { @@ -396,7 +396,7 @@ public class SjMqService { "$orgAttrs": [ { "org": { - "orgName": "宜宾三江投资集团", + "orgName": "宜宾投资集团", "orgId": "le5DuXudTHe7jjUfCEDIGQ" }, "attrs": { diff --git a/src/main/java/com/zhgd/sjmq/service/UopCustomMessageReceiverServiceImpl.java b/src/main/java/com/zhgd/sjmq/service/UopCustomMessageReceiverServiceImpl.java index 165e7ba20..3b7976366 100644 --- a/src/main/java/com/zhgd/sjmq/service/UopCustomMessageReceiverServiceImpl.java +++ b/src/main/java/com/zhgd/sjmq/service/UopCustomMessageReceiverServiceImpl.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; import java.util.Map; /** - * 三江统一登录的mq数据同步处理service + * sj统一登录的mq数据同步处理service */ @Slf4j @Component @@ -241,4 +241,4 @@ public class UopCustomMessageReceiverServiceImpl implements UopModifyMessageList public void onMetaAttributeDelete(MetaAttributeDeleteMessage metaAttributeDeleteMessage) { } -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java b/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java index 57a905bde..27fd1748d 100644 --- a/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java +++ b/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java @@ -57,6 +57,6 @@ public class UploadFileDTO { private String identifier; @ApiModelProperty(value = "项目SN或企业sn") private String sn; - @ApiModelProperty(value = "三江安全环保资料中心文件类型id") + @ApiModelProperty(value = "sj安全环保资料中心文件类型id") private Long sjSafeEnvironmentFileTypeId; } diff --git a/src/main/java/com/zhgd/xmgl/call/SanjiangDataCall.java b/src/main/java/com/zhgd/xmgl/call/SanjiangDataCall.java index 38f8846dc..02c738894 100644 --- a/src/main/java/com/zhgd/xmgl/call/SanjiangDataCall.java +++ b/src/main/java/com/zhgd/xmgl/call/SanjiangDataCall.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * 三江业务中台远程调用 + * sj业务中台远程调用 */ @Component @Slf4j @@ -60,7 +60,7 @@ public class SanjiangDataCall { private String apiKeyHeadName = "X-API-KEY"; /** - * 判断是三江环境 + * 判断是sj环境 */ private boolean judgeSjEnvironment() { boolean sjjt = environmentUtil.isSjjt(); @@ -531,7 +531,7 @@ public class SanjiangDataCall { } /** - * 三江发送业务中台的质量的整改/复查/核验记录 + * sj发送业务中台的质量的整改/复查/核验记录 * * @param qrr */ diff --git a/src/main/java/com/zhgd/xmgl/entity/sj/UnifiedAuthenticationHttpResponse.java b/src/main/java/com/zhgd/xmgl/entity/sj/UnifiedAuthenticationHttpResponse.java index 243a95a82..00aacf687 100644 --- a/src/main/java/com/zhgd/xmgl/entity/sj/UnifiedAuthenticationHttpResponse.java +++ b/src/main/java/com/zhgd/xmgl/entity/sj/UnifiedAuthenticationHttpResponse.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.entity.sj; import lombok.Data; /** - * 三江统一登出的错误响应 + * sj统一登出的错误响应 */ @Data public class UnifiedAuthenticationHttpResponse { @@ -13,4 +13,4 @@ public class UnifiedAuthenticationHttpResponse { private String spanId; private String traceId; -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java index 19dc9223b..7b1a91dc0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java @@ -26,7 +26,7 @@ import java.security.spec.InvalidKeySpecException; import java.util.concurrent.TimeUnit; /** - * 三江统一登录 + * sj统一登录 */ @Controller @Slf4j diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java index fb2393a14..7859e3797 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java @@ -30,13 +30,13 @@ public class SjUploadFileController { private UploadFileService uploadFileService; /** - * 三江业务中台上传图片返回url + * sj业务中台上传图片返回url * * @param file * @return */ @PostMapping(value = "/sj/image") - @ApiOperation(value = "三江业务中台上传图片", notes = "三江业务中台上传图片", httpMethod = "POST") + @ApiOperation(value = "sj业务中台上传图片", notes = "sj业务中台上传图片", httpMethod = "POST") public Result uploadSjImage(@RequestParam("file") MultipartFile file) { return uploadFileService.uploadSjImage(file); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java index ac84f364c..12cb4d26f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java @@ -110,12 +110,12 @@ public class SystemUser implements Serializable { /** - * 三江统一登录的用户id + * sj统一登录的用户id */ private String sjUnifiedAuthenticationUserId; /** - * 三江统一登录的组织ids + * sj统一登录的组织ids */ private String sjUnifiedAuthenticationOrgIds; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 66d6d9a86..7e1787dfd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -869,7 +869,7 @@ public class SystemUserServiceImpl extends ServiceImpl> getProjectProgress() { return Result.success(Arrays.asList(SanjiangProgressProjectEnum.values())); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java index 549f23af7..1da8b4f14 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java @@ -42,7 +42,7 @@ public class BIMProgressTaskRqBody { private String sign; /** * 特殊的值： - * project=1 是金融城那个（原来的中建四局） + * project=1 是金融城那个（原来的zjsj） * project=2 是坪山沙湖那个 */ private Integer projectId; diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java index 50baab943..7d9de0e43 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java @@ -242,13 +242,13 @@ public class Project implements Serializable { @ApiModelProperty(value = "项目进度") private Integer projectProgress; - @ApiModelProperty(value = "云联万物-工程所在街（乡）镇") + @ApiModelProperty(value = "ylww-工程所在街（乡）镇") private String streetTownshipTown; - @ApiModelProperty(value = "云联万物-工程所在街（乡）镇机构编码") + @ApiModelProperty(value = "ylww-工程所在街（乡）镇机构编码") private String streetTownshipTownCode; - @ApiModelProperty(value = "三江重点工程类型多选") + @ApiModelProperty(value = "sj重点工程类型多选") private String keyProjectType; @ApiModelProperty(value = "fms监控大屏username") 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 61d9412f6..a3e77e4ce 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 @@ -55,7 +55,7 @@ public class SjProjectDto { @ApiModelProperty(value = "项目进度") private Integer projectProgress; - @ApiModelProperty(value = "'三江重点工程类型多选'") + @ApiModelProperty(value = "'sj重点工程类型多选'") private String keyProjectType; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java b/src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java index 03c58b0b1..cc712256a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java @@ -3,72 +3,72 @@ package com.zhgd.xmgl.modules.project.enums; import com.fasterxml.jackson.annotation.JsonFormat; /** - * 三江项目进度枚举 + * sj项目进度枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SanjiangProgressProjectEnum { /** - * 三江项目进度：总坪施工 + * sj项目进度：总坪施工 */ GENERAL_PING_CONSTRUCTION(1, "总坪施工"), /** - * 三江项目进度：绿化 + * sj项目进度：绿化 */ GREENING(2, "绿化"), /** - * 三江项目进度：安装工程 + * sj项目进度：安装工程 */ INSTALLATION_WORKS(3, "安装工程"), /** - * 三江项目进度：交安 + * sj项目进度：交安 */ TRAFFIC_SECURITY(4, "交安"), /** - * 三江项目进度：主体封顶 + * sj项目进度：主体封顶 */ THE_MAIN_BODY_IS_CAPPED(5, "主体封顶"), /** - * 三江项目进度：路面(路沿) + * sj项目进度：路面(路沿) */ PAVEMENT_CURB(6, "路面(路沿)"), /** - * 三江项目进度：主体施工 + * sj项目进度：主体施工 */ MAIN_CONSTRUCTION(7, "主体施工"), /** - * 三江项目进度：路面(沥青) + * sj项目进度：路面(沥青) */ PAVEMENT_ASPHALT(8, "路面(沥青)"), /** - * 三江项目进度：基础工程 + * sj项目进度：基础工程 */ BASIC_ENGINEERING(9, "基础工程"), /** - * 三江项目进度：路面(水稳) + * sj项目进度：路面(水稳) */ PAVEMENT_WATER_STABILIZATION(10, "路面(水稳)"), /** - * 三江项目进度：垫层完成 + * sj项目进度：垫层完成 */ THE_CUSHION_IS_COMPLETE(11, "垫层完成"), /** - * 三江项目进度：市政管网 + * sj项目进度：市政管网 */ MUNICIPAL_PIPE_NETWORK(12, "市政管网"), /** - * 三江项目进度：桩基 + * sj项目进度：桩基 */ PILE_FOUNDATION(13, "桩基"), /** - * 三江项目进度：桥涵 + * sj项目进度：桥涵 */ BRIDGE(14, "桥涵"), /** - * 三江项目进度：土方开挖 + * sj项目进度：土方开挖 */ EARTHWORK_EXCAVATION(15, "土方开挖"), /** - * 三江项目进度：土石方 + * sj项目进度：土石方 */ EARTHWORK(16, "土石方"), ; 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 14724d301..05c46693c 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 @@ -254,7 +254,7 @@ public class ProjectServiceImpl extends ServiceImpl impl } /** - * 三江：通过判断项目地址，取出里面省、市、区，然后查找并设置编码 + * sj：通过判断项目地址，取出里面省、市、区，然后查找并设置编码 * * @param project */ diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityInspectionRecord.java index a32a5a869..9c64b9a7b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityInspectionRecord.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.quality.entity; import lombok.Data; /** - * 三江发送业务中台的质量的记录 + * sj发送业务中台的质量的记录 */ @Data public class SjSendQualityInspectionRecord { diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityRectifyRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityRectifyRecord.java index 36ac7c816..f11d612fb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityRectifyRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityRectifyRecord.java @@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.quality.entity; import lombok.Data; /** - * 三江发送业务中台的质量的整改/复查/核验记录 + * sj发送业务中台的质量的整改/复查/核验记录 */ @Data public class SjSendQualityRectifyRecord { diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjDeepFoundationEquipmentInformationController.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjDeepFoundationEquipmentInformationController.java index 8868d1775..4dd6ef024 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjDeepFoundationEquipmentInformationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjDeepFoundationEquipmentInformationController.java @@ -44,7 +44,7 @@ import com.alibaba.fastjson.JSON; /** * @Title: Controller - * @Description: 三江-深基坑设备信息 + * @Description: sj-深基坑设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 @@ -52,7 +52,7 @@ import com.alibaba.fastjson.JSON; @RestController @RequestMapping("/xmgl/sjDeepFoundationEquipmentInformation") @Slf4j -@Api(tags = "三江-深基坑设备信息") +@Api(tags = "sj-深基坑设备信息") public class SjDeepFoundationEquipmentInformationController { @Autowired private ISjDeepFoundationEquipmentInformationService sjDeepFoundationEquipmentInformationService; @@ -66,7 +66,7 @@ public class SjDeepFoundationEquipmentInformationController { * @param req * @return */ - @ApiOperation(value = " 分页列表查询三江-深基坑设备信息信息", notes = "分页列表查询三江-深基坑设备信息信息", httpMethod = "GET") + @ApiOperation(value = " 分页列表查询sj-深基坑设备信息信息", notes = "分页列表查询sj-深基坑设备信息信息", httpMethod = "GET") @GetMapping(value = "/page") public Result> queryPageList(SjDeepFoundationEquipmentInformation sjDeepFoundationEquipmentInformation, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -88,7 +88,7 @@ public class SjDeepFoundationEquipmentInformationController { * @param req * @return */ - @ApiOperation(value = " 列表查询三江-深基坑设备信息信息", notes = "列表查询三江-深基坑设备信息信息", httpMethod = "GET") + @ApiOperation(value = " 列表查询sj-深基坑设备信息信息", notes = "列表查询sj-深基坑设备信息信息", httpMethod = "GET") @GetMapping(value = "/list") public Result> queryList(SjDeepFoundationEquipmentInformation sjDeepFoundationEquipmentInformation, HttpServletRequest req) { @@ -103,7 +103,7 @@ public class SjDeepFoundationEquipmentInformationController { * @param sjDeepFoundationEquipmentInformation * @return */ - @ApiOperation(value = " 添加三江-深基坑设备信息信息", notes = "添加三江-深基坑设备信息信息", httpMethod = "POST") + @ApiOperation(value = " 添加sj-深基坑设备信息信息", notes = "添加sj-深基坑设备信息信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody SjDeepFoundationEquipmentInformation sjDeepFoundationEquipmentInformation) { Result result = new Result(); @@ -127,7 +127,7 @@ public class SjDeepFoundationEquipmentInformationController { * @param sjDeepFoundationEquipmentInformation * @return */ - @ApiOperation(value = "编辑三江-深基坑设备信息信息", notes = "编辑三江-深基坑设备信息信息", httpMethod = "POST") + @ApiOperation(value = "编辑sj-深基坑设备信息信息", notes = "编辑sj-深基坑设备信息信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody SjDeepFoundationEquipmentInformation sjDeepFoundationEquipmentInformation) { Result result = new Result(); @@ -148,7 +148,7 @@ public class SjDeepFoundationEquipmentInformationController { * @param id * @return */ - @ApiOperation(value = "删除三江-深基坑设备信息信息", notes = "删除三江-深基坑设备信息信息", httpMethod = "POST") + @ApiOperation(value = "删除sj-深基坑设备信息信息", notes = "删除sj-深基坑设备信息信息", httpMethod = "POST") @PostMapping(value = "/delete") public Result delete(@RequestBody String id) { JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); @@ -173,8 +173,8 @@ public class SjDeepFoundationEquipmentInformationController { * @param ids * @return */ - @ApiOperation(value = "批量删除三江-深基坑设备信息信息", notes = "批量删除三江-深基坑设备信息信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "三江-深基坑设备信息ID字符串", paramType = "query", required = true, dataType = "String") + @ApiOperation(value = "批量删除sj-深基坑设备信息信息", notes = "批量删除sj-深基坑设备信息信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "sj-深基坑设备信息ID字符串", paramType = "query", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { Result result = new Result(); @@ -193,8 +193,8 @@ public class SjDeepFoundationEquipmentInformationController { * @param id * @return */ - @ApiOperation(value = "通过id查询三江-深基坑设备信息信息", notes = "通过id查询三江-深基坑设备信息信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "三江-深基坑设备信息ID", paramType = "query", required = true, dataType = "Integer") + @ApiOperation(value = "通过id查询sj-深基坑设备信息信息", notes = "通过id查询sj-深基坑设备信息信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "sj-深基坑设备信息ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { Result result = new Result(); diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjHighSupportMoldEquipmentInformationController.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjHighSupportMoldEquipmentInformationController.java index 377878333..cb8a3b3da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjHighSupportMoldEquipmentInformationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjHighSupportMoldEquipmentInformationController.java @@ -43,7 +43,7 @@ import com.alibaba.fastjson.JSON; /** * @Title: Controller - * @Description: 三江-高支模设备信息 + * @Description: sj-高支模设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 @@ -51,7 +51,7 @@ import com.alibaba.fastjson.JSON; @RestController @RequestMapping("/xmgl/sjHighSupportMoldEquipmentInformation") @Slf4j -@Api(tags = "三江-高支模设备信息") +@Api(tags = "sj-高支模设备信息") public class SjHighSupportMoldEquipmentInformationController { @Autowired private ISjHighSupportMoldEquipmentInformationService sjHighSupportMoldEquipmentInformationService; @@ -65,8 +65,8 @@ public class SjHighSupportMoldEquipmentInformationController { * @param req * @return */ - @ApiOperation(value = " 分页列表查询三江-高支模设备信息信息", notes = "分页列表查询三江-高支模设备信息信息", httpMethod = "GET") - @GetMapping(value = "/page") + @ApiOperation(value = " 分页列表查询sj-高支模设备信息信息", notes = "分页列表查询sj-高支模设备信息信息", httpMethod = "GET") + @GetMapping(value = "/page") public Result> queryPageList(SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @@ -87,8 +87,8 @@ public class SjHighSupportMoldEquipmentInformationController { * @param req * @return */ - @ApiOperation(value = " 列表查询三江-高支模设备信息信息", notes = "列表查询三江-高支模设备信息信息", httpMethod = "GET") - @GetMapping(value = "/list") + @ApiOperation(value = " 列表查询sj-高支模设备信息信息", notes = "列表查询sj-高支模设备信息信息", httpMethod = "GET") + @GetMapping(value = "/list") public Result> queryList(SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation, HttpServletRequest req) { @@ -102,8 +102,8 @@ public class SjHighSupportMoldEquipmentInformationController { * @param sjHighSupportMoldEquipmentInformation * @return */ - @ApiOperation(value = " 添加三江-高支模设备信息信息", notes = "添加三江-高支模设备信息信息", httpMethod = "POST") - @PostMapping(value = "/add") + @ApiOperation(value = " 添加sj-高支模设备信息信息", notes = "添加sj-高支模设备信息信息", httpMethod = "POST") + @PostMapping(value = "/add") public Result add(@RequestBody SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation) { Result result = new Result(); try { @@ -126,8 +126,8 @@ public class SjHighSupportMoldEquipmentInformationController { * @param sjHighSupportMoldEquipmentInformation * @return */ - @ApiOperation(value = "编辑三江-高支模设备信息信息", notes = "编辑三江-高支模设备信息信息", httpMethod = "POST") - @PostMapping(value = "/edit") + @ApiOperation(value = "编辑sj-高支模设备信息信息", notes = "编辑sj-高支模设备信息信息", httpMethod = "POST") + @PostMapping(value = "/edit") public Result edit(@RequestBody SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation) { Result result = new Result(); SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformationEntity = sjHighSupportMoldEquipmentInformationService.getById(sjHighSupportMoldEquipmentInformation.getId()); @@ -147,8 +147,8 @@ public class SjHighSupportMoldEquipmentInformationController { * @param id * @return */ - @ApiOperation(value = "删除三江-高支模设备信息信息", notes = "删除三江-高支模设备信息信息", httpMethod = "POST") - @PostMapping(value = "/delete") + @ApiOperation(value = "删除sj-高支模设备信息信息", notes = "删除sj-高支模设备信息信息", httpMethod = "POST") + @PostMapping(value = "/delete") public Result delete(@RequestBody String id) { JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); id = String.valueOf(jsonObject.get("id")); @@ -166,43 +166,43 @@ public class SjHighSupportMoldEquipmentInformationController { return result; } - /** - * 批量删除 - * - * @param ids - * @return - */ - @ApiOperation(value = "批量删除三江-高支模设备信息信息", notes = "批量删除三江-高支模设备信息信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "三江-高支模设备信息ID字符串", paramType = "query", required = true, dataType = "String") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - Result result = new Result(); - if (ids == null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - } else { - this.sjHighSupportMoldEquipmentInformationService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除sj-高支模设备信息信息", notes = "批量删除sj-高支模设备信息信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "sj-高支模设备信息ID字符串", paramType = "query", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.sjHighSupportMoldEquipmentInformationService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value = "通过id查询三江-高支模设备信息信息", notes = "通过id查询三江-高支模设备信息信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "三江-高支模设备信息ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); - SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation = sjHighSupportMoldEquipmentInformationService.getById(id); - if (sjHighSupportMoldEquipmentInformation == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(sjHighSupportMoldEquipmentInformation); - result.setSuccess(true); + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询sj-高支模设备信息信息", notes = "通过id查询sj-高支模设备信息信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "sj-高支模设备信息ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation = sjHighSupportMoldEquipmentInformationService.getById(id); + if (sjHighSupportMoldEquipmentInformation == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(sjHighSupportMoldEquipmentInformation); + result.setSuccess(true); } return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjImageProgressController.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjImageProgressController.java index 2a1f7150a..50a16019f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjImageProgressController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjImageProgressController.java @@ -37,7 +37,7 @@ import java.util.Map; /** * @Title: Controller - * @Description: 三江形象进度 + * @Description: sj形象进度 * @author： pds * @date： 2023-04-12 * @version： V1.0 @@ -59,7 +59,7 @@ public class SjImageProgressController { * @param req * @return */ - @ApiOperation(value = " 分页列表查询三江形象进度信息", notes = "分页列表查询三江形象进度信息", httpMethod = "GET") + @ApiOperation(value = " 分页列表查询sj形象进度信息", notes = "分页列表查询sj形象进度信息", httpMethod = "GET") @GetMapping(value = "/page") public Result> queryPageList(SjImageProgress sjImageProgress, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -83,7 +83,7 @@ public class SjImageProgressController { * @param req * @return */ - @ApiOperation(value = " 列表查询三江形象进度信息", notes = "列表查询三江形象进度信息", httpMethod = "GET") + @ApiOperation(value = " 列表查询sj形象进度信息", notes = "列表查询sj形象进度信息", httpMethod = "GET") @GetMapping(value = "/list") public Result> queryList(SjImageProgress sjImageProgress, HttpServletRequest req) { @@ -98,7 +98,7 @@ public class SjImageProgressController { * @param sjImageProgress * @return */ - @ApiOperation(value = " 添加三江形象进度信息", notes = "添加三江形象进度信息", httpMethod = "POST") + @ApiOperation(value = " 添加sj形象进度信息", notes = "添加sj形象进度信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody SjImageProgress sjImageProgress) { return sjImageProgressService.add(sjImageProgress); @@ -110,7 +110,7 @@ public class SjImageProgressController { * @param sjImageProgress * @return */ - @ApiOperation(value = "编辑三江形象进度信息", notes = "编辑三江形象进度信息", httpMethod = "POST") + @ApiOperation(value = "编辑sj形象进度信息", notes = "编辑sj形象进度信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody SjImageProgress sjImageProgress) { return sjImageProgressService.edit(sjImageProgress); @@ -122,7 +122,7 @@ public class SjImageProgressController { * @param id * @return */ - @ApiOperation(value = "删除三江形象进度信息", notes = "删除三江形象进度信息", httpMethod = "POST") + @ApiOperation(value = "删除sj形象进度信息", notes = "删除sj形象进度信息", httpMethod = "POST") @PostMapping(value = "/delete") public Result delete(@RequestBody String id) { return sjImageProgressService.delete(id); @@ -134,8 +134,8 @@ public class SjImageProgressController { * @param ids * @return */ - @ApiOperation(value = "批量删除三江形象进度信息", notes = "批量删除三江形象进度信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "三江形象进度ID字符串", paramType = "query", required = true, dataType = "String") + @ApiOperation(value = "批量删除sj形象进度信息", notes = "批量删除sj形象进度信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "sj形象进度ID字符串", paramType = "query", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { Result result = new Result(); @@ -154,8 +154,8 @@ public class SjImageProgressController { * @param id * @return */ - @ApiOperation(value = "通过id查询三江形象进度信息", notes = "通过id查询三江形象进度信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "三江形象进度ID", paramType = "query", required = true, dataType = "Integer") + @ApiOperation(value = "通过id查询sj形象进度信息", notes = "通过id查询sj形象进度信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "sj形象进度ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { Result result = new Result(); @@ -175,7 +175,7 @@ public class SjImageProgressController { * @param request * @param response */ - @ApiOperation(value = "导出excel三江形象进度信息", notes = "导出excel三江形象进度信息", httpMethod = "POST") + @ApiOperation(value = "导出excelsj形象进度信息", notes = "导出excelsj形象进度信息", httpMethod = "POST") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { // Step.1 组装查询条件 @@ -195,9 +195,9 @@ public class SjImageProgressController { ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); List pageList = sjImageProgressService.list(queryWrapper); //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "三江形象进度列表"); + mv.addObject(NormalExcelConstants.FILE_NAME, "sj形象进度列表"); mv.addObject(NormalExcelConstants.CLASS, SjImageProgress.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("三江形象进度列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("sj形象进度列表数据", "导出人:Jeecg", "导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } @@ -209,7 +209,7 @@ public class SjImageProgressController { * @param response * @return */ - @ApiOperation(value = "通过excel导入三江形象进度信息", notes = "通过excel导入三江形象进度信息", httpMethod = "POST") + @ApiOperation(value = "通过excel导入sj形象进度信息", notes = "通过excel导入sj形象进度信息", httpMethod = "POST") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java index aadb2bf8c..b430fdde6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java @@ -23,7 +23,7 @@ import java.util.*; /** * @Title: Controller - * @Description: 三江安全环保资料中心 + * @Description: sj安全环保资料中心 * @author： pds * @date： 2021-01-11 * @version： V1.0 @@ -31,7 +31,7 @@ import java.util.*; @RestController @RequestMapping("/xmgl/sjSafeEnvironmentFile") @Slf4j -@Api(tags = "三江安全环保资料中心") +@Api(tags = "sj安全环保资料中心") public class SjSafeEnvironmentFileController { @Autowired private ISjSafeEnvironmentFileService sjSafeEnvironmentFileService; diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileTypeController.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileTypeController.java index cecbea759..4a87478cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileTypeController.java @@ -41,7 +41,7 @@ import com.alibaba.fastjson.JSON; /** * @Title: Controller - * @Description: 三江安全环保资料中心文件类型 + * @Description: sj安全环保资料中心文件类型 * @author： pds * @date： 2023-04-20 * @version： V1.0 @@ -49,7 +49,7 @@ import com.alibaba.fastjson.JSON; @RestController @RequestMapping("/xmgl/sjSafeEnvironmentFileType") @Slf4j -@Api(tags = "三江安全环保资料中心文件类型") +@Api(tags = "sj安全环保资料中心文件类型") public class SjSafeEnvironmentFileTypeController { @Autowired private ISjSafeEnvironmentFileTypeService sjSafeEnvironmentFileTypeService; @@ -63,7 +63,7 @@ public class SjSafeEnvironmentFileTypeController { * @param req * @return */ - @ApiOperation(value = " 分页列表查询三江安全环保资料中心文件类型信息", notes = "分页列表查询三江安全环保资料中心文件类型信息", httpMethod = "GET") + @ApiOperation(value = " 分页列表查询sj安全环保资料中心文件类型信息", notes = "分页列表查询sj安全环保资料中心文件类型信息", httpMethod = "GET") @GetMapping(value = "/page") public Result> queryPageList(SjSafeEnvironmentFileType sjSafeEnvironmentFileType, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -85,7 +85,7 @@ public class SjSafeEnvironmentFileTypeController { * @param req * @return */ - @ApiOperation(value = " 列表查询三江安全环保资料中心文件类型信息", notes = "列表查询三江安全环保资料中心文件类型信息", httpMethod = "GET") + @ApiOperation(value = " 列表查询sj安全环保资料中心文件类型信息", notes = "列表查询sj安全环保资料中心文件类型信息", httpMethod = "GET") @GetMapping(value = "/list") public Result> queryList(SjSafeEnvironmentFileType sjSafeEnvironmentFileType, HttpServletRequest req) { @@ -100,7 +100,7 @@ public class SjSafeEnvironmentFileTypeController { * @param sjSafeEnvironmentFileType * @return */ - @ApiOperation(value = " 添加三江安全环保资料中心文件类型信息", notes = "添加三江安全环保资料中心文件类型信息", httpMethod = "POST") + @ApiOperation(value = " 添加sj安全环保资料中心文件类型信息", notes = "添加sj安全环保资料中心文件类型信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody SjSafeEnvironmentFileType sjSafeEnvironmentFileType) { Result result = new Result(); @@ -121,7 +121,7 @@ public class SjSafeEnvironmentFileTypeController { * @param sjSafeEnvironmentFileType * @return */ - @ApiOperation(value = "编辑三江安全环保资料中心文件类型信息", notes = "编辑三江安全环保资料中心文件类型信息", httpMethod = "POST") + @ApiOperation(value = "编辑sj安全环保资料中心文件类型信息", notes = "编辑sj安全环保资料中心文件类型信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody SjSafeEnvironmentFileType sjSafeEnvironmentFileType) { Result result = new Result(); @@ -142,7 +142,7 @@ public class SjSafeEnvironmentFileTypeController { * @param id * @return */ - @ApiOperation(value = "删除三江安全环保资料中心文件类型信息", notes = "删除三江安全环保资料中心文件类型信息", httpMethod = "POST") + @ApiOperation(value = "删除sj安全环保资料中心文件类型信息", notes = "删除sj安全环保资料中心文件类型信息", httpMethod = "POST") @PostMapping(value = "/delete") public Result delete(@RequestBody String id) { JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); @@ -167,8 +167,8 @@ public class SjSafeEnvironmentFileTypeController { * @param ids * @return */ - @ApiOperation(value = "批量删除三江安全环保资料中心文件类型信息", notes = "批量删除三江安全环保资料中心文件类型信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "三江安全环保资料中心文件类型ID字符串", paramType = "query", required = true, dataType = "String") + @ApiOperation(value = "批量删除sj安全环保资料中心文件类型信息", notes = "批量删除sj安全环保资料中心文件类型信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "sj安全环保资料中心文件类型ID字符串", paramType = "query", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { Result result = new Result(); @@ -187,8 +187,8 @@ public class SjSafeEnvironmentFileTypeController { * @param id * @return */ - @ApiOperation(value = "通过id查询三江安全环保资料中心文件类型信息", notes = "通过id查询三江安全环保资料中心文件类型信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "三江安全环保资料中心文件类型ID", paramType = "query", required = true, dataType = "Integer") + @ApiOperation(value = "通过id查询sj安全环保资料中心文件类型信息", notes = "通过id查询sj安全环保资料中心文件类型信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "sj安全环保资料中心文件类型ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { Result result = new Result(); diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjDeepFoundationEquipmentInformation.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjDeepFoundationEquipmentInformation.java index 386e5d7ec..0412fb16a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjDeepFoundationEquipmentInformation.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjDeepFoundationEquipmentInformation.java @@ -14,7 +14,7 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 三江-深基坑设备信息 + * @Description: sj-深基坑设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjHighSupportMoldEquipmentInformation.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjHighSupportMoldEquipmentInformation.java index 8e8b18be0..2d1220340 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjHighSupportMoldEquipmentInformation.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjHighSupportMoldEquipmentInformation.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * @Description: 三江-高支模设备信息 + * @Description: sj-高支模设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java index 287371e82..bc4844b6a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java @@ -13,7 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** - * @Description: 三江形象进度 + * @Description: sj形象进度 * @author： pds * @date： 2023-04-12 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java index bb4ca6744..98a9eb103 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java @@ -13,7 +13,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 三江安全环保资料中心 + * @Description: sj安全环保资料中心 * @author： pds * @date： 2021-01-11 * @version： V1.0 @@ -77,7 +77,7 @@ public class SjSafeEnvironmentFile implements Serializable { @ApiModelProperty(value = "文件大小") private java.lang.String fileSize; - @ApiModelProperty(value = "三江安全环保资料中心文件类型id") + @ApiModelProperty(value = "sj安全环保资料中心文件类型id") private Long sjSafeEnvironmentFileTypeId; @ApiModelProperty(value = "项目SN或企业sn") diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFileType.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFileType.java index 06525cfa2..af9c12791 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFileType.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFileType.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * @Description: 三江安全环保资料中心文件类型 + * @Description: sj安全环保资料中心文件类型 * @author： pds * @date： 2023-04-20 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjDeepFoundationEquipmentInformationMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjDeepFoundationEquipmentInformationMapper.java index 94cfe5d39..d2e78e2e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjDeepFoundationEquipmentInformationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjDeepFoundationEquipmentInformationMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 三江-深基坑设备信息 + * @Description: sj-深基坑设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjHighSupportMoldEquipmentInformationMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjHighSupportMoldEquipmentInformationMapper.java index 6caacf6ff..f878d8a09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjHighSupportMoldEquipmentInformationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjHighSupportMoldEquipmentInformationMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 三江-高支模设备信息 + * @Description: sj-高支模设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java index 2501f3a49..214b5a0cc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java @@ -5,7 +5,7 @@ import com.zhgd.xmgl.modules.sanjiang.entity.SjImageProgress; import org.apache.ibatis.annotations.Mapper; /** - * @Description: 三江形象进度 + * @Description: sj形象进度 * @author： pds * @date： 2023-04-12 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java index 9356263bc..27a7ccfa2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 三江安全环保资料中心 + * @Description: sj安全环保资料中心 * @author： pds * @date： 2021-01-11 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileTypeMapper.java index 81d265642..30bc1857d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileTypeMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: 三江安全环保资料中心文件类型 + * @Description: sj安全环保资料中心文件类型 * @author： pds * @date： 2023-04-20 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjDeepFoundationEquipmentInformationService.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjDeepFoundationEquipmentInformationService.java index 4c6bac2fd..9b81de6f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjDeepFoundationEquipmentInformationService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjDeepFoundationEquipmentInformationService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.sanjiang.entity.SjDeepFoundationEquipmentInformation; /** - * @Description: 三江-深基坑设备信息 + * @Description: sj-深基坑设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjHighSupportMoldEquipmentInformationService.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjHighSupportMoldEquipmentInformationService.java index d548157bd..03fb4b663 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjHighSupportMoldEquipmentInformationService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjHighSupportMoldEquipmentInformationService.java @@ -4,7 +4,7 @@ import com.zhgd.xmgl.modules.sanjiang.entity.SjHighSupportMoldEquipmentInformati import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 三江-高支模设备信息 + * @Description: sj-高支模设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java index e7699d510..856f4b964 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java @@ -5,7 +5,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.sanjiang.entity.SjImageProgress; /** - * @Description: 三江形象进度 + * @Description: sj形象进度 * @author： pds * @date： 2023-04-12 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileTypeService.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileTypeService.java index b095477e1..7ef19dbe4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileTypeService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileTypeService.java @@ -4,7 +4,7 @@ import com.zhgd.xmgl.modules.sanjiang.entity.SjSafeEnvironmentFileType; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 三江安全环保资料中心文件类型 + * @Description: sj安全环保资料中心文件类型 * @author： pds * @date： 2023-04-20 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjDeepFoundationEquipmentInformationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjDeepFoundationEquipmentInformationServiceImpl.java index 3e1e0a2ee..22d0c218d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjDeepFoundationEquipmentInformationServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjDeepFoundationEquipmentInformationServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 三江-深基坑设备信息 + * @Description: sj-深基坑设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjHighSupportMoldEquipmentInformationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjHighSupportMoldEquipmentInformationServiceImpl.java index c63ed8d31..a486ac1fb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjHighSupportMoldEquipmentInformationServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjHighSupportMoldEquipmentInformationServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 三江-高支模设备信息 + * @Description: sj-高支模设备信息 * @author： pds * @date： 2023-05-17 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java index 4dbdd6ce0..3439bf946 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * @Description: 三江形象进度 + * @Description: sj形象进度 * @author： pds * @date： 2023-04-12 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java index d4dbca3df..dd03c7bff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java @@ -34,7 +34,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 三江安全环保资料中心 + * @Description: sj安全环保资料中心 * @author： pds * @date： 2021-01-11 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileTypeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileTypeServiceImpl.java index 6c80729c4..56ab9f3ec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileTypeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileTypeServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 三江安全环保资料中心文件类型 + * @Description: sj安全环保资料中心文件类型 * @author： pds * @date： 2023-04-20 * @version： V1.0 diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java index 4e84ded3f..eb5888543 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java @@ -173,10 +173,10 @@ public class VideoItem implements Serializable { @ApiModelProperty(value = "报警总数") private java.lang.Integer alarmCount; - @ApiModelProperty(value = "云联万物-监控点编号") + @ApiModelProperty(value = "ylww-监控点编号") private java.lang.String monitoringPointCode; - @ApiModelProperty(value = "云联万物-监控点位置（JKDWZ001：作业面，JKDWZ002：料场，JKDWZ003：车辆出入口，JKDWZ004：人员出入口，JKDWZ005：洗轮机，JKDWZ006：围墙，JKDWZ007：塔吊，JKDWZ008：其他）") + @ApiModelProperty(value = "ylww-监控点位置（JKDWZ001：作业面，JKDWZ002：料场，JKDWZ003：车辆出入口，JKDWZ004：人员出入口，JKDWZ005：洗轮机，JKDWZ006：围墙，JKDWZ007：塔吊，JKDWZ008：其他）") private java.lang.String monitoringPointLocation; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java index 65438da33..61cb998cb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java @@ -101,13 +101,13 @@ public class EnterpriseInfoController { } /** - * 三江业务中台添加合作单位 + * sj业务中台添加合作单位 * * @param enterpriseInfo * @return */ //@OperLog(operModul = "劳务管理",operType = "添加劳务公司",operDesc = "添加劳务公司") - @ApiOperation(value = " 三江业务中台添加合作单位", notes = "三江业务中台添加合作单位", httpMethod = "POST") + @ApiOperation(value = " sj业务中台添加合作单位", notes = "sj业务中台添加合作单位", httpMethod = "POST") @PostMapping(value = "/sj/add") public Result addSj(@RequestBody SjEnterpriseInfo enterpriseInfo) { log.info("addSj：{}", JSONArray.toJSONString(enterpriseInfo)); @@ -129,13 +129,13 @@ public class EnterpriseInfoController { } /** - * 三江业务中台编辑合作单位 + * sj业务中台编辑合作单位 * * @param enterpriseInfo * @return */ //@OperLog(operModul = "劳务管理", operType = "编辑劳务公司", operDesc = "编辑劳务公司") - @ApiOperation(value = "三江业务中台编辑合作单位", notes = "三江业务中台编辑合作单位", httpMethod = "POST") + @ApiOperation(value = "sj业务中台编辑合作单位", notes = "sj业务中台编辑合作单位", httpMethod = "POST") @PostMapping(value = "/sj/edit") public Result editSj(@RequestBody SjEnterpriseInfo enterpriseInfo) { log.info("editSj：{}", JSONArray.toJSONString(enterpriseInfo)); @@ -155,13 +155,13 @@ public class EnterpriseInfoController { } /** - * 三江业务中台通过id和projectNumber删除合作单位 + * sj业务中台通过id和projectNumber删除合作单位 * * @param * @return */ //@OperLog(operModul = "劳务管理", operType = "删除劳务公司", operDesc = "删除劳务公司") - @ApiOperation(value = "三江业务中台通过id和projectNumber删除合作单位", notes = "三江业务中台通过id和projectNumber删除合作单位", httpMethod = "POST") + @ApiOperation(value = "sj业务中台通过id和projectNumber删除合作单位", notes = "sj业务中台通过id和projectNumber删除合作单位", httpMethod = "POST") @PostMapping(value = "/sj/delete") public Result deleteSj(@RequestBody SjEnterpriseInfo enterpriseInfo) { log.info("deleteSj：{}", JSONArray.toJSONString(enterpriseInfo)); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerSafeEducationController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerSafeEducationController.java index 8d79d7edc..5b89a015c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerSafeEducationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerSafeEducationController.java @@ -185,7 +185,7 @@ public class WorkerSafeEducationController { /** - * 中建四局，获取项目下的安全教育类型为入场三级交底的对应20条数据 + * zjsj，获取项目下的安全教育类型为入场三级交底的对应20条数据 * * @return */ @@ -197,7 +197,7 @@ public class WorkerSafeEducationController { } /** - * 中建四局，获取项目下的安全教育类型为安全交底对应：特种作业、雨季交底、用电交底的所有最近20条数据 + * zjsj，获取项目下的安全教育类型为安全交底对应：特种作业、雨季交底、用电交底的所有最近20条数据 * * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java index 7b74ba1f3..61df23d01 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java @@ -49,7 +49,7 @@ public interface WorkerSafeEducationMapper extends BaseMapper selectEduTypeCountByProjectSnAndSecurity(@Param("projectSn") String projectSn, @Param("securitySet") Set securitySet); /** - * 获取中建四局安全交底所需要的最近20条数据， 12安全交底（特种作业），13安全交底（雨季交底），14安全交底（用电交底）的次数 + * 获取zjsj安全交底所需要的最近20条数据， 12安全交底（特种作业），13安全交底（雨季交底），14安全交底（用电交底）的次数 * * @param projectSn * @param securitySet diff --git a/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/MiddleController.java b/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/MiddleController.java index afdca2b53..1e557806b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/MiddleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/MiddleController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 云联万物的中间库的controller，手动调用接口同步 + * ylww的中间库的controller，手动调用接口同步 */ @RestController @RequestMapping("/xmgl/ylww/middle") diff --git a/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/task/MiddleTask.java b/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/task/MiddleTask.java index c5c1d9495..7a042116f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/task/MiddleTask.java +++ b/src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/task/MiddleTask.java @@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** - * 云联万物同步结构化数据任务 + * ylww同步结构化数据任务 */ @Component @Slf4j @@ -21,12 +21,12 @@ public class MiddleTask { private EnvironmentUtil environmentUtil; /** - * 云联万物同步结构化数据任务，每天同步一次 + * ylww同步结构化数据任务，每天同步一次 */ @SchedulerLock(name = "aysnMiddle", lockAtMostFor = 1000 * 60 * 60, lockAtLeastFor = 1000 * 60 * 5) @Scheduled(cron = "0 0 2 * * ?") public void aysnMiddle() { - log.info("云联万物同步结构化数据任务执行"); + log.info("ylww同步结构化数据任务执行"); middleService.syncProject(); middleService.syncMiddleGcjkd(); } diff --git a/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java b/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java index ec671ef55..a0f2c5560 100644 --- a/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java +++ b/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java @@ -65,7 +65,7 @@ public class JwtTokenFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { if (securityEnable) { - //三江统一认证，3.登录：过滤器判断，回调地址获取code调用获取令牌，首页根据令牌获取登录数据信息 + //sj统一认证，3.登录：过滤器判断，回调地址获取code调用获取令牌，首页根据令牌获取登录数据信息 if (environmentUtil.isSjjt()) { try { validateSjProfile(request, response, filterChain); @@ -84,7 +84,7 @@ public class JwtTokenFilter extends OncePerRequestFilter { } /** - * 三江环境统一认证 + * sj环境统一认证 * * @param request * @param response diff --git a/src/main/java/com/zhgd/xmgl/task/ProgressAlarmTask.java b/src/main/java/com/zhgd/xmgl/task/ProgressAlarmTask.java index 2e9d33511..161c9c39e 100644 --- a/src/main/java/com/zhgd/xmgl/task/ProgressAlarmTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ProgressAlarmTask.java @@ -124,7 +124,7 @@ public class ProgressAlarmTask { } /** - * 中建四局和中建四局沙湖定时推送进度状态给bim + * zjsj和zjsj沙湖定时推送进度状态给bim */ @SchedulerLock(name = "autoTaskUpdateForBim", lockAtMostFor = 1000 * 60 * 60, lockAtLeastFor = 1000 * 60 * 5) @Scheduled(cron = "0 0 1 * * ?") diff --git a/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java b/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java index 269874014..ed2083f4e 100644 --- a/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java @@ -16,7 +16,7 @@ public class EnvironmentUtil { private String activeEnvironment; /** - * 是否金林湾生产环境 + * 是否jlw生产环境 * * @return */ @@ -25,7 +25,7 @@ public class EnvironmentUtil { } /** - * 是否金林湾环境 + * 是否jlw环境 * * @return */ @@ -34,7 +34,7 @@ public class EnvironmentUtil { } /** - * 是否三江本地环境 + * 是否sj本地环境 * * @return */ @@ -43,7 +43,7 @@ public class EnvironmentUtil { } /** - * 是否三江环境（包括本地、测试、生产） + * 是否sj环境（包括本地、测试、生产） * * @return */ @@ -52,7 +52,7 @@ public class EnvironmentUtil { } /** - * 是否中建四局生产环境 + * 是否zjsj生产环境 * * @return */ @@ -61,7 +61,7 @@ public class EnvironmentUtil { } /** - * 是否中建四局环境 + * 是否zjsj环境 * * @return */ @@ -70,7 +70,7 @@ public class EnvironmentUtil { } /** - * 是否中建四局沙湖环境 + * 是否zjsj沙湖环境 * * @return */ @@ -79,7 +79,7 @@ public class EnvironmentUtil { } /** - * 是否云联万物生产环境 + * 是否ylww生产环境 * * @return */ @@ -88,7 +88,7 @@ public class EnvironmentUtil { } /** - * 是否广西联通生产环境 + * 是否gxlt生产环境 * * @return */ @@ -97,7 +97,7 @@ public class EnvironmentUtil { } /** - * 是否广西联通环境 + * 是否gxlt环境 * * @return */ diff --git a/src/main/java/com/zhgd/xmgl/util/sj/JwtRsaUtils.java b/src/main/java/com/zhgd/xmgl/util/sj/JwtRsaUtils.java index 996099ba9..76517a3e1 100644 --- a/src/main/java/com/zhgd/xmgl/util/sj/JwtRsaUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/sj/JwtRsaUtils.java @@ -226,7 +226,7 @@ public class JwtRsaUtils { } /** - * 三江统一登录，验证jwt并返回用户信息 + * sj统一登录，验证jwt并返回用户信息 * * @throws InvalidKeySpecException */ @@ -262,4 +262,4 @@ public class JwtRsaUtils { return s; } -} \ No newline at end of file +}