admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

更改名称

Browse Source
This commit is contained in:
guo 2023-08-08 13:44:36 +08:00
parent 3d48696eee
commit eab1e05e2d
56 changed files with 190 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java
View File

@ -12,7 +12,7 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
* 三江用户和机构同步mq初始化
* sj用户和机构同步mq初始化
*/
@Configuration
@Slf4j

4
src/main/java/com/zhgd/sjmq/service/SjMqService.java
View File

@ -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": {

4
src/main/java/com/zhgd/sjmq/service/UopCustomMessageReceiverServiceImpl.java
View File

@ -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) {
}
}
}

2
src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java
View File

@ -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;
}

6
src/main/java/com/zhgd/xmgl/call/SanjiangDataCall.java
View File

@ -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
*/

4
src/main/java/com/zhgd/xmgl/entity/sj/UnifiedAuthenticationHttpResponse.java
View File

@ -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;
}
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java
View File

@ -26,7 +26,7 @@ import java.security.spec.InvalidKeySpecException;
import java.util.concurrent.TimeUnit;
/**
* 三江统一登录
* sj统一登录
*/
@Controller
@Slf4j

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java
View File

@ -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<UploadImageVo> uploadSjImage(@RequestParam("file") MultipartFile file) {
return uploadFileService.uploadSjImage(file);
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
View File

@ -110,12 +110,12 @@ public class SystemUser implements Serializable {
/**
* 三江统一登录的用户id
* sj统一登录的用户id
*/
private String sjUnifiedAuthenticationUserId;
/**
* 三江统一登录的组织ids
* sj统一登录的组织ids
*/
private String sjUnifiedAuthenticationOrgIds;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -869,7 +869,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
}
/**
* 三江统一登录获取类似以前登录的数据
* sj统一登录获取类似以前登录的数据
*
* @param jwtPayloadUserInfo
* @return

2
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/SjSendHiddenDangerInspectionRecord.java
View File

@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.dangerous.entity;
import lombok.Data;
/**
* 三江发送业务中台的安全记录
* sj发送业务中台的安全记录
*/
@Data
public class SjSendHiddenDangerInspectionRecord {

2
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/SjSendHiddenDangerRectifyRecord.java
View File

@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.dangerous.entity;
import lombok.Data;
/**
* 三江发送业务中台的安全的整改记录
* sj发送业务中台的安全的整改记录
*/
@Data
public class SjSendHiddenDangerRectifyRecord {

2
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/SjSendHiddenDangerReviewRecord.java
View File

@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.dangerous.entity;
import lombok.Data;
/**
* 三江发送业务中台的安全的复查记录
* sj发送业务中台的安全的复查记录
*/
@Data
public class SjSendHiddenDangerReviewRecord {

2
src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationCurrentDataController.java
View File

@ -137,7 +137,7 @@ public class DeepExcavationCurrentDataController {
, currentDataListQO.getStartTime(), currentDataListQO.getEndTime(), currentDataListQO.getAlarmState());
}
@ApiOperation(value = "广西联通大屏导出", notes = "广西联通大屏导出", httpMethod = "POST")
@ApiOperation(value = "gxlt大屏导出", notes = "gxlt大屏导出", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "测点名称", paramType = "query", dataType = "string", required = true),
@ApiImplicitParam(name = "measurePointName", value = "测点名称", paramType = "query", dataType = "string"),

16
src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
View File

@ -118,12 +118,12 @@ public class ProjectController {
}
/**
* 三江业务中台添加项目
* sj业务中台添加项目
*
* @param dto
* @return
*/
@ApiOperation(value = " 三江业务中台添加项目", notes = "三江业务中台添加项目", httpMethod = "POST")
@ApiOperation(value = " sj业务中台添加项目", notes = "sj业务中台添加项目", httpMethod = "POST")
@PostMapping(value = "/sj/business/add")
public Result addSjProject(@RequestBody @Validate SjProjectDto dto) {
log.info("addSjProject：{}", JSON.toJSONString(dto));
@ -136,12 +136,12 @@ public class ProjectController {
}
/**
* 三江业务中台更新项目（根据项目编号projectNumber更新）
* sj业务中台更新项目（根据项目编号projectNumber更新）
*
* @param dto
* @return
*/
@ApiOperation(value = " 三江业务中台更新项目（根据项目编号projectNumber更新）", notes = "三江业务中台更新项目（根据项目编号projectNumber更新）", httpMethod = "POST")
@ApiOperation(value = " sj业务中台更新项目（根据项目编号projectNumber更新）", notes = "sj业务中台更新项目（根据项目编号projectNumber更新）", httpMethod = "POST")
@PostMapping(value = "/sj/business/update")
public Result updateSjProject(@RequestBody @Validate SjProjectDto dto) {
log.info("updateSjProject：{}", JSON.toJSONString(dto));
@ -154,9 +154,9 @@ public class ProjectController {
}
/**
* 三江业务中台删除项目（根据项目编号projectNumber删除）
* sj业务中台删除项目（根据项目编号projectNumber删除）
*/
@ApiOperation(value = "三江业务中台删除项目（根据项目编号projectNumber删除）", notes = "三江业务中台删除项目（根据项目编号projectNumber删除）", httpMethod = "POST")
@ApiOperation(value = "sj业务中台删除项目（根据项目编号projectNumber删除）", notes = "sj业务中台删除项目（根据项目编号projectNumber删除）", httpMethod = "POST")
@PostMapping(value = "/sj/business/delete")
public Result deleteSjProject(@RequestParam String projectNumber) {
log.info("deleteSjProject：{}", projectNumber);
@ -398,12 +398,12 @@ public class ProjectController {
}
/**
* 查询三江的所有项目进度
* 查询sj的所有项目进度
*
* @param
* @return
*/
@ApiOperation(value = "查询三江的所有项目进度", notes = "查询三江的所有项目进度", httpMethod = "GET")
@ApiOperation(value = "查询sj的所有项目进度", notes = "查询sj的所有项目进度", httpMethod = "GET")
@GetMapping(value = "/getProjectProgress")
public Result<List<SanjiangProgressProjectEnum>> getProjectProgress() {
return Result.success(Arrays.asList(SanjiangProgressProjectEnum.values()));

2
src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java
View File

@ -42,7 +42,7 @@ public class BIMProgressTaskRqBody {
private String sign;
/**
* 特殊的值：
* project=1 是金融城那个（原来的中建四局）
* project=1 是金融城那个（原来的zjsj）
* project=2 是坪山沙湖那个
*/
private Integer projectId;

6
src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
View File

@ -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")

2
src/main/java/com/zhgd/xmgl/modules/project/entity/dto/SjProjectDto.java
View File

@ -55,7 +55,7 @@ public class SjProjectDto {
@ApiModelProperty(value = "项目进度")
private Integer projectProgress;
@ApiModelProperty(value = "'三江重点工程类型多选'")
@ApiModelProperty(value = "'sj重点工程类型多选'")
private String keyProjectType;
/**

34
src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java
View File

@ -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, "土石方"),
;

2
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
View File

@ -254,7 +254,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
}
/**
* 三江：通过判断项目地址，取出里面省、市、区，然后查找并设置编码
* sj：通过判断项目地址，取出里面省、市、区，然后查找并设置编码
*
* @param project
*/

2
src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityInspectionRecord.java
View File

@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.quality.entity;
import lombok.Data;
/**
* 三江发送业务中台的质量的记录
* sj发送业务中台的质量的记录
*/
@Data
public class SjSendQualityInspectionRecord {

2
src/main/java/com/zhgd/xmgl/modules/quality/entity/SjSendQualityRectifyRecord.java
View File

@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.quality.entity;
import lombok.Data;
/**
* 三江发送业务中台的质量的整改/复查/核验记录
* sj发送业务中台的质量的整改/复查/核验记录
*/
@Data
public class SjSendQualityRectifyRecord {

22
src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjDeepFoundationEquipmentInformationController.java
View File

@ -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<IPage<SjDeepFoundationEquipmentInformation>> 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<List<SjDeepFoundationEquipmentInformation>> 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<SjDeepFoundationEquipmentInformation> add(@RequestBody SjDeepFoundationEquipmentInformation sjDeepFoundationEquipmentInformation) {
Result<SjDeepFoundationEquipmentInformation> result = new Result<SjDeepFoundationEquipmentInformation>();
@ -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<SjDeepFoundationEquipmentInformation> edit(@RequestBody SjDeepFoundationEquipmentInformation sjDeepFoundationEquipmentInformation) {
Result<SjDeepFoundationEquipmentInformation> result = new Result<SjDeepFoundationEquipmentInformation>();
@ -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<SjDeepFoundationEquipmentInformation> 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<SjDeepFoundationEquipmentInformation> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SjDeepFoundationEquipmentInformation> result = new Result<SjDeepFoundationEquipmentInformation>();
@ -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<SjDeepFoundationEquipmentInformation> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SjDeepFoundationEquipmentInformation> result = new Result<SjDeepFoundationEquipmentInformation>();

96
src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjHighSupportMoldEquipmentInformationController.java
View File

@ -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<IPage<SjHighSupportMoldEquipmentInformation>> 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<List<SjHighSupportMoldEquipmentInformation>> 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<SjHighSupportMoldEquipmentInformation> add(@RequestBody SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation) {
Result<SjHighSupportMoldEquipmentInformation> result = new Result<SjHighSupportMoldEquipmentInformation>();
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<SjHighSupportMoldEquipmentInformation> edit(@RequestBody SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation) {
Result<SjHighSupportMoldEquipmentInformation> result = new Result<SjHighSupportMoldEquipmentInformation>();
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<SjHighSupportMoldEquipmentInformation> 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<SjHighSupportMoldEquipmentInformation> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SjHighSupportMoldEquipmentInformation> result = new Result<SjHighSupportMoldEquipmentInformation>();
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<SjHighSupportMoldEquipmentInformation> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SjHighSupportMoldEquipmentInformation> result = new Result<SjHighSupportMoldEquipmentInformation>();
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<SjHighSupportMoldEquipmentInformation> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SjHighSupportMoldEquipmentInformation> result = new Result<SjHighSupportMoldEquipmentInformation>();
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<SjHighSupportMoldEquipmentInformation> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SjHighSupportMoldEquipmentInformation> result = new Result<SjHighSupportMoldEquipmentInformation>();
SjHighSupportMoldEquipmentInformation sjHighSupportMoldEquipmentInformation = sjHighSupportMoldEquipmentInformationService.getById(id);
if (sjHighSupportMoldEquipmentInformation == null) {
result.error500("未找到对应实体");
} else {
result.setResult(sjHighSupportMoldEquipmentInformation);
result.setSuccess(true);
}
return result;
}

28
src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjImageProgressController.java
View File

@ -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<IPage<SjImageProgress>> 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<List<SjImageProgress>> 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<SjImageProgress> 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<SjImageProgress> 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<SjImageProgress> 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<SjImageProgress> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SjImageProgress> result = new Result<SjImageProgress>();
@ -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<SjImageProgress> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SjImageProgress> result = new Result<SjImageProgress>();
@ -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<SjImageProgress> 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;

4
src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileController.java
View File

@ -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;

22
src/main/java/com/zhgd/xmgl/modules/sanjiang/controller/SjSafeEnvironmentFileTypeController.java
View File

@ -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<IPage<SjSafeEnvironmentFileType>> 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<List<SjSafeEnvironmentFileType>> 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<SjSafeEnvironmentFileType> add(@RequestBody SjSafeEnvironmentFileType sjSafeEnvironmentFileType) {
Result<SjSafeEnvironmentFileType> result = new Result<SjSafeEnvironmentFileType>();
@ -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<SjSafeEnvironmentFileType> edit(@RequestBody SjSafeEnvironmentFileType sjSafeEnvironmentFileType) {
Result<SjSafeEnvironmentFileType> result = new Result<SjSafeEnvironmentFileType>();
@ -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<SjSafeEnvironmentFileType> 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<SjSafeEnvironmentFileType> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SjSafeEnvironmentFileType> result = new Result<SjSafeEnvironmentFileType>();
@ -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<SjSafeEnvironmentFileType> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SjSafeEnvironmentFileType> result = new Result<SjSafeEnvironmentFileType>();

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjDeepFoundationEquipmentInformation.java
View File

@ -14,7 +14,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* @Description: 三江-深基坑设备信息
* @Description: sj-深基坑设备信息
* @author： pds
* @date： 2023-05-17
* @version： V1.0

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjHighSupportMoldEquipmentInformation.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java
View File

@ -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

4
src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java
View File

@ -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")

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFileType.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjDeepFoundationEquipmentInformationMapper.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjHighSupportMoldEquipmentInformationMapper.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
/**
* @Description: 三江安全环保资料中心
* @Description: sj安全环保资料中心
* @author： pds
* @date： 2021-01-11
* @version： V1.0

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileTypeMapper.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjDeepFoundationEquipmentInformationService.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjHighSupportMoldEquipmentInformationService.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjSafeEnvironmentFileTypeService.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjDeepFoundationEquipmentInformationServiceImpl.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjHighSupportMoldEquipmentInformationServiceImpl.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java
View File

@ -34,7 +34,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 三江安全环保资料中心
* @Description: sj安全环保资料中心
* @author： pds
* @date： 2021-01-11
* @version： V1.0

2
src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileTypeServiceImpl.java
View File

@ -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

4
src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java
View File

@ -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;
/**

12
src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java
View File

@ -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));

4
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerSafeEducationController.java
View File

@ -185,7 +185,7 @@ public class WorkerSafeEducationController {
/**
* 中建四局，获取项目下的安全教育类型为入场三级交底的对应20条数据
* zjsj，获取项目下的安全教育类型为入场三级交底的对应20条数据
*
* @return
*/
@ -197,7 +197,7 @@ public class WorkerSafeEducationController {
}
/**
* 中建四局，获取项目下的安全教育类型为安全交底对应：特种作业、雨季交底、用电交底的所有最近20条数据
* zjsj，获取项目下的安全教育类型为安全交底对应：特种作业、雨季交底、用电交底的所有最近20条数据
*
* @return
*/

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java
View File

@ -49,7 +49,7 @@ public interface WorkerSafeEducationMapper extends BaseMapper<WorkerSafeEducatio
List<EduTypeCountDTO> selectEduTypeCountByProjectSnAndSecurity(@Param("projectSn") String projectSn, @Param("securitySet") Set<Integer> securitySet);
/**
* 获取中建四局安全交底所需要的最近20条数据， 12安全交底（特种作业），13安全交底（雨季交底），14安全交底（用电交底）的次数
* 获取zjsj安全交底所需要的最近20条数据， 12安全交底（特种作业），13安全交底（雨季交底），14安全交底（用电交底）的次数
*
* @param projectSn
* @param securitySet

2
src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/MiddleController.java
View File

@ -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")

6
src/main/java/com/zhgd/xmgl/modules/yunlianwanwu/middle/task/MiddleTask.java
View File

@ -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();
}

4
src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java
View File

@ -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

2
src/main/java/com/zhgd/xmgl/task/ProgressAlarmTask.java
View File

@ -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 * * ?")

20
src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java
View File

@ -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
*/

4
src/main/java/com/zhgd/xmgl/util/sj/JwtRsaUtils.java
View File

@ -226,7 +226,7 @@ public class JwtRsaUtils {
}
/**
* 三江统一登录，验证jwt并返回用户信息
* sj统一登录，验证jwt并返回用户信息
*
* @throws InvalidKeySpecException
*/
@ -262,4 +262,4 @@ public class JwtRsaUtils {
return s;
}
}
}