Skip to content

A
amos-boot-zx-biz
Commit 48a1dc5b authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

补全swagger注解

parent 8ca23553
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 98 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommercialDto.java
View file @ 48a1dc5b
......@@ -64,67 +64,67 @@ public class CommercialDto extends BaseDto {
@ApiModelProperty(value = "紧急联系人",example = "13022982292")
private String legalEmergentTelephone;
@ApiModelProperty(value = "结婚证文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "结婚证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> marriageCredit;
@ApiModelProperty(value = "房产证文件标识",example = "[{url: \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房产证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateCredit;
@ApiModelProperty(value = "身份证正反面文件标识",example = "[{url: \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "身份证正反面文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardCredit;
@ApiModelProperty(value = "户口本文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "户口本文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> householdBookCredit;
@ApiModelProperty(value = "手持身份证文件标识",example = "[{url: \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "手持身份证文件标识",example = "[{\"url\": \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardCredit;
@ApiModelProperty(value = "踏勘照片文件标识",example = "[{uid: \"0.qcyinzogdcd\", url: \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]")
@ApiModelProperty(value = "踏勘照片文件标识",example = "[{\"uid\": \"0.qcyinzogdcd\", \"url\": \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> surveyPhotosWeb;
@ApiModelProperty(value = "组件平面图与组串连线图文件标识",example = "[{url: \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "组件平面图与组串连线图文件标识",example = "[{\"url\": \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> formationWeb;
@ApiModelProperty(value = "房屋所有权继承说明文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房屋所有权继承说明文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> inheritWeb;
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识",example = "[{url: \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识",example = "[{\"url\": \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agreementWeb;
@ApiModelProperty(value = "用户手持身份证照片文件标识",example = "[{url: \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "用户手持身份证照片文件标识",example = "[{\"url\": \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardLegal;
@ApiModelProperty(value = "法人营业执照文件标识",example = "[{url: \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "法人营业执照文件标识",example = "[{\"url\": \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> licenseLegal;
@ApiModelProperty(value = "法定代理人身份证文件标识",example = "[{url: \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]")
@ApiModelProperty(value = "法定代理人身份证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agentLegal;
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识",example = "[{url: \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识",example = "[{\"url\": \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateLegal;
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识",example = "[{url: \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识",example = "[{\"url\": \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseAgreementLegal;
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识",example = "[{url: \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> creditReportLegal;
@ApiModelProperty(value = "项目备案证文件标识",example = "[{url: \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "项目备案证文件标识",example = "[{\"url\": \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> filingsLegal;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DesignInformationDto.java
View file @ 48a1dc5b
......@@ -24,30 +24,30 @@ public class DesignInformationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "典型设计图信息",example = "[{uid: \"0.2fcslywd2ry\", name: \"11.dws\", url: \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]")
@ApiModelProperty(value = "典型设计图信息",example = "[{\"uid\": \"0.2fcslywd2ry\", name: \"11.dws\", \"url\": \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> typicalDiagram;
/**
* 典型设计图信息
*/
@ApiModelProperty(value = "典型设计图信息",example = "[{uid: \"0.qbiq6dutwl\", name: \"11.dwg\", url: \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]")
@ApiModelProperty(value = "典型设计图信息",example = "[{\"uid\": \"0.qbiq6dutwl\", name: \"11.dwg\", \"url\": \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> engineering;
@ApiModelProperty(value = "组件排布图",example = "[{uid: \"0.9bn4t1r35hf\", name: \"11.dwg\", url: \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]")
@ApiModelProperty(value = "组件排布图",example = "[{\"uid\": \"0.9bn4t1r35hf\", name: \"11.dwg\", \"url\": \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentLayout;
@ApiModelProperty(value = "组件支架图",example = "[{uid: \"0.26j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]")
@ApiModelProperty(value = "组件支架图",example = "[{\"uid\": \"0.26j7x3whyx8\", name: \"11.dws\", \"url\": \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentBracket;
@ApiModelProperty(value = "组串接线图",example = "[{uid: \"0.36j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]")
@ApiModelProperty(value = "组串接线图",example = "[{\"uid\": \"0.36j7x3whyx8\", name: \"11.dws\", \"url\": \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> connectionLine;
@ApiModelProperty(value = "一次接线图",example = "[{uid: \"0.46j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]")
@ApiModelProperty(value = "一次接线图",example = "[{\"uid\": \"0.46j7x3whyx8\", name: \"11.dws\", \"url\": \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> onceLine;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/InformationDto.java
View file @ 48a1dc5b
......@@ -30,11 +30,11 @@ public class InformationDto extends BaseDto {
@ApiModelProperty(value = "档案编号",example = "DA002JXSRYG202411073242")
private String archivesNumber;
@ApiModelProperty(value = "身份证文件标识",example = "[{url: \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]")
@ApiModelProperty(value = "身份证文件标识",example = "[{\"url\": \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> cardFile;
@ApiModelProperty(value = " 房产证文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = " 房产证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseProve;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java
View file @ 48a1dc5b
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
......@@ -15,64 +16,79 @@ public class PowerStationEngineeringInfoAllDto {
//并网验收审核记录
@ApiModelProperty(value = "并网验收审核记录")
LoggerDto loggerDto;
//验收审核记录
@ApiModelProperty(value = "验收审核记录")
LoggerDto loggerYsDto;
//自审信息
@ApiModelProperty(value = "自审信息")
ConstructionRecords constructionRecords;
@ApiModelProperty(value = "并网操作日志")
ConstructionGirdRecords constructionGirdRecords;
@ApiModelProperty(value = "验收操作日志")
ConstructionAcceptanceRecords acceptanceRecords;
// 基本信息
@ApiModelProperty(value = "基本信息")
SurveyInformationDto surveyInformation;
@ApiModelProperty(value = "施工派工单Id",example = "1813102468939149314")
Long workOrderPowerStationId;
// 资料归档
@ApiModelProperty(value = "资料归档")
InformationDto information;
// 勘察信息详情
@ApiModelProperty(value = "勘察信息详情")
SurveyDetailsDto surveyDetails;
// 扩展信息
@ApiModelProperty(value = "扩展信息")
ExtendedInformationDto extendedInformation;
// 商务信息
@ApiModelProperty(value = "商务信息")
CommercialDto commercial;
//设计信息
@ApiModelProperty(value = "订单跟踪")
DesignInformationDto designInformation;
//订单跟踪
@ApiModelProperty(value = "订单跟踪")
LoggerDto orderTracking;
//工程信息
@ApiModelProperty(value = "工程信息")
PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息
@ApiModelProperty(value = "施工信息")
PowerStationConstructionData powerStationConstructionData;
//并网信息
@ApiModelProperty(value = "并网信息")
HygfOnGrid hygfOnGrid;
//派工单信息
@ApiModelProperty(value = "派工单信息")
WorkOrder workOrder;
//验收信息
@ApiModelProperty(value = "验收信息")
AcceptanceCheck acceptanceCheck;
@ApiModelProperty(value = "保存标识",example = "0")
//保存标识 0 保存 1保存并提交
Integer commitFlag;
@ApiModelProperty(value = "流程类型",example = "0")
//流程类型 0 并网 1是验收
Integer flowType;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyDetailsDto.java
View file @ 48a1dc5b
......@@ -55,7 +55,7 @@ public class SurveyDetailsDto extends BaseDto {
private String houseBias;
@ApiModelProperty(value = "手机指南正截图",example = "[{uid: \"0.pe5rtqf7ape\", url: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@ApiModelProperty(value = "手机指南正截图",example = "[{\"uid\": \"0.pe5rtqf7ape\", \"url\": \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> compass;
......@@ -157,35 +157,35 @@ public class SurveyDetailsDto extends BaseDto {
@ApiModelProperty(value = "关于邻居采光遮挡",example = "32")
private String daylightingObstruction;
@ApiModelProperty(value = "房屋整体文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "房屋整体文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> overallHousingSurvey;
@ApiModelProperty(value = "房屋周边文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "房屋周边文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> surroundingHouseSurvey;
@ApiModelProperty(value = "房屋内部整体照片文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "房屋内部整体照片文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> insideHouseSurvey;
@ApiModelProperty(value = "电表参数文件标识",example = "[{uid: \"0.pe5rtqf7ape\", url: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@ApiModelProperty(value = "电表参数文件标识",example = "[{\"uid\": \"0.pe5rtqf7ape\", \"url\": \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> electricitySurvey;
@ApiModelProperty(value = "屋顶全貌文件标识",example = "[{uid: \"0.kc339n1txcb\", url: \"/upload/common/19F868769E539D6ABA4A954530CD62E.png\"}]")
@ApiModelProperty(value = "屋顶全貌文件标识",example = "[{\"uid\": \"0.kc339n1txcb\", \"url\": \"/upload/common/19F868769E539D6ABA4A954530CD62E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> panoramaSurvey;
@ApiModelProperty(value = "屋顶平面草图文件标识",example = "[{uid: \"0.tgglnu260c\", url: \"/upload/common/719434819AB11D29A18253655579D1E.png\"}]")
@ApiModelProperty(value = "屋顶平面草图文件标识",example = "[{\"uid\": \"0.tgglnu260c\", \"url\": \"/upload/common/719434819AB11D29A18253655579D1E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> planSketchSurvey;
@ApiModelProperty(value = "房屋方位角文件标识",example = "[{uid: \"0.pe5rtqf7ape\", url: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@ApiModelProperty(value = "房屋方位角文件标识",example = "[{\"uid\": \"0.pe5rtqf7ape\", \"url\": \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> azimuthSurvey;
@ApiModelProperty(value = "其他附件文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "其他附件文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> otherAccessorySurvey;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
View file @ 48a1dc5b
......@@ -116,11 +116,11 @@ public class SurveyInformationDto extends BaseDto {
@ApiModelProperty(value = "农户id",example = "1854346995112611841")
private Long peasantHouseholdId;
@ApiModelProperty(value = "身份证正面",example = "[{url: \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]")
@ApiModelProperty(value = "身份证正面",example = "[{\"url\": \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardFront;
@ApiModelProperty(value = "身份证反面",example = "[{url: \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]")
@ApiModelProperty(value = "身份证反面",example = "[{\"url\": \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardOpposite;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessageDto.java
View file @ 48a1dc5b
......@@ -22,22 +22,22 @@ public class UserMessageDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务类型")
@ApiModelProperty(value = "任务类型",example = "经销商审核")
private String type;
@ApiModelProperty(value = "业务id")
@ApiModelProperty(value = "业务id",example = "1706869110685569025")
private Long businessId;
@ApiModelProperty(value = "用户id")
@ApiModelProperty(value = "用户id",example = "5214012")
private String amosUserId;
@ApiModelProperty(value = " 消息创建时间")
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
private Date creationTime;
@ApiModelProperty(value = "消息内容")
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
private String taskName;
@ApiModelProperty(value = "经销商orgCode")
@ApiModelProperty(value = "经销商orgCode",example = "86*355*443*479")
private String amosOrgCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessagePageDto.java
View file @ 48a1dc5b
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -13,6 +15,7 @@ import java.util.Date;
* @createDate: 2023/8/21
*/
@Data
@ApiModel(value = "UserMessagePageDto",description = "人员消息分页")
public class UserMessagePageDto extends Page<UserMessage> {
......@@ -20,22 +23,26 @@ public class UserMessagePageDto extends Page<UserMessage> {
/**
* 任务类型
*/
@ApiModelProperty(value = "任务类型",example = "经销商审核")
private String type;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id",example = "5214012")
private String amosUserId;
/**
* 消息创建时间
*/
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
private Date creationTime;
/**
* 消息内容
*/
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
private String taskName;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionAcceptanceRecords.java
View file @ 48a1dc5b
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -10,7 +12,7 @@ import java.util.Date;
import java.util.List;
/**
* 并网操作日志
* 验收操作日志
*
* @author system_generator
* @date 2024-09-02
......@@ -19,6 +21,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_construction_acceptance_records")
@ApiModel(value = "ConstructionAcceptanceRecords",description = "验收操作日志")
public class ConstructionAcceptanceRecords extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,48 +29,56 @@ public class ConstructionAcceptanceRecords extends BaseEntity {
/**
* 操作人
*/
@ApiModelProperty(value = "操作人",example = "admin")
@TableField("operator")
private String operator;
/**
* 操作内容
*/
@ApiModelProperty(value = "操作内容",example = "提交验收审核")
@TableField("operation_content")
private String operationContent;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间",example = "2024-09-02 14:36:20")
@TableField("operation_time")
private Date operationTime;
/**
* 操作结果
*/
@ApiModelProperty(value = "操作结果",example = "通过")
@TableField("operation_results")
private String operationResults;
/**
* 施工单id
*/
@ApiModelProperty(value = "施工单id",example = "1830494459985399809")
@TableField("acceptance_id")
private Long acceptanceId;
/**
* 施工电站
*/
@ApiModelProperty(value = "施工电站",example = "1813102468939149314")
@TableField("work_order_power_station_id")
private Long workOrderPowerStationId;
/**
* 农户id
*/
@ApiModelProperty(value = "农户id",example = "1801072960862187521")
@TableField("peasant_household_id")
private Long peasantHouseholdId;
/**
* 备注
*/
@ApiModelProperty(value = "备注",example = "经销商管理员审核通过")
@TableField("notes")
private String notes;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionGirdRecords.java
View file @ 48a1dc5b
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -19,6 +21,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_construction_gird_records")
@ApiModel(value = "ConstructionGirdRecords",description = "并网操作日志")
public class ConstructionGirdRecords extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,42 +29,49 @@ public class ConstructionGirdRecords extends BaseEntity {
/**
* 操作人
*/
@ApiModelProperty(value = "操作人",example = "admin")
@TableField("operator")
private String operator;
/**
* 操作内容
*/
@ApiModelProperty(value = "操作内容",example = "提交并网资料")
@TableField("operation_content")
private String operationContent;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间",example = "2024-09-02 10:57:18")
@TableField("operation_time")
private Date operationTime;
/**
* 操作结果
*/
@ApiModelProperty(value = "操作结果",example = "通过")
@TableField("operation_results")
private String operationResults;
/**
* 施工单id
*/
@ApiModelProperty(value = "施工单id",example = "1829346281735065601")
@TableField("grid_id")
private Long gridId;
/**
* 施工电站
*/
@ApiModelProperty(value = "施工电站",example = "1808655906133536770")
@TableField("work_order_power_station_id")
private Long workOrderPowerStationId;
/**
* 农户id
*/
@ApiModelProperty(value = "农户id",example = "1767379423369129985")
@TableField("peasant_household_id")
private Long peasantHouseholdId;
......@@ -69,6 +79,7 @@ public class ConstructionGirdRecords extends BaseEntity {
/**
* 备注
*/
@ApiModelProperty(value = "备注",example = "通过")
@TableField("notes")
private String notes;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java
View file @ 48a1dc5b
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -19,6 +21,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_user_message")
@ApiModel(value = "UserMessage",description = "人员消息")
public class UserMessage extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,36 +29,42 @@ public class UserMessage extends BaseEntity {
/**
* 任务类型
*/
@ApiModelProperty(value = "任务类型",example = "经销商审核")
@TableField("type")
private String type;
/**
* 业务id
*/
@ApiModelProperty(value = "业务id",example = "1706869110685569025")
@TableField("business_id")
private Long businessId;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id",example = "5214012")
@TableField("amos_user_id")
private String amosUserId;
/**
* 消息创建时间
*/
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
@TableField("creation_time")
private Date creationTime;
/**
* 消息内容
*/
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
@TableField("task_name")
private String taskName;
/**
* 经销商orgCode
*/
@ApiModelProperty(value = "经销商orgCode",example = "86*355*443*479")
@TableField("amos_org_code")
private String amosOrgCode;
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 48a1dc5b
......@@ -113,7 +113,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新经销商人员信息", notes = "根据sequenceNbr更新经销商人员信息")
public ResponseModel<UnitInfoDto> updateBySequenceNbrUnitInfo(@RequestBody UnitInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<UnitInfoDto> updateBySequenceNbrUnitInfo(@RequestBody UnitInfoDto model,@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(unitInfoServiceImpl.updateWithModel(model));
}
......@@ -127,7 +127,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除经销商人员信息", notes = "根据sequenceNbr删除经销商人员信息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(unitInfoServiceImpl.removeById(sequenceNbr));
}
......@@ -140,7 +140,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息")
public ResponseModel<UnitInfoDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<UnitInfoDto> selectOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.queryBySeq(sequenceNbr));
}
......@@ -148,7 +148,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getOne/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息")
public ResponseModel<UnitInfoData> getOne(@PathVariable String sequenceNbr) {
public ResponseModel<UnitInfoData> getOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable String sequenceNbr) {
UnitInfo unitInfo= unitInfoServiceImpl.getById(sequenceNbr);
unitInfo.setHeadCardPhotoBackList(toCommonFile(unitInfo.getHeadCardPhotoBack()));
......@@ -171,7 +171,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询")
public ResponseModel<Page<UnitInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
public ResponseModel<Page<UnitInfoDto>> queryForPage(@ApiParam(value = "页码", example = "1")@RequestParam(value = "current") int current,@ApiParam(value = "页数大小", example = "20")@RequestParam
(value = "size") int size) {
Page<UnitInfoDto> page = new Page<UnitInfoDto>();
page.setCurrent(current);
......@@ -183,7 +183,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryForDealerReviewPage")
@ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询")
public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@ApiParam(value = "页码", example = "1")@RequestParam(value = "current") int current, @ApiParam(value = "页数大小", example = "20")@RequestParam
(value = "size") int size, ReviewDto reviewDto) {
Page<ReviewDto> page=dealerReviewServiceImpl.queryForDealerReviewPage(current,size,reviewDto);
return ResponseHelper.buildResponse(page);
......@@ -248,7 +248,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/management-unit/tree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection<CompanyModel>> managementUnitTree(@RequestParam(required = false)String orgCode) {
public ResponseModel<Collection<CompanyModel>> managementUnitTree(@ApiParam(value = "区域Code", example = "86*355*443*479")@RequestParam(required = false)String orgCode) {
RequestContext.setAppKey("AMOS_STUDIO");
RequestContext.setProduct("AMOS_STUDIO_WEB");
RequestContext.setToken(requestContext.getToken());
......@@ -342,7 +342,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistUserName/{userName}")
@ApiOperation(httpMethod = "GET", value = "判断用户名是否存在", notes = "判断用户名是否存在")
public ResponseModel hasExistUserName( @PathVariable(value = "userName") String userName) {
public ResponseModel hasExistUserName( @ApiParam(value = "用户名", example = "admin")@PathVariable(value = "userName") String userName) {
try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(null, userName));
} catch (Exception e) {
......@@ -360,7 +360,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistPhone/{phone}")
@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
public ResponseModel hasExistPhone( @PathVariable(value = "phone") String phone) {
public ResponseModel hasExistPhone(@ApiParam(value = "手机号", example = "15895233587") @PathVariable(value = "phone") String phone) {
try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(phone, null));
} catch (Exception e) {
......@@ -376,8 +376,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/sendTelCode/{tel}")
@ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel,
@RequestParam(value = "type", required = false) String type) {
public ResponseModel<Boolean> sendTelCode(@ApiParam(value = "手机号", example = "15895233587")@PathVariable(value = "tel") String tel,
@ApiParam(value = "类型", example = "1") @RequestParam(value = "type", required = false) String type) {
if (ValidationUtil.isEmpty(tel)) {
throw new BadRequest("参数校验失败.");
......@@ -408,7 +408,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/verifyTelCode/{tel}/{code}")
@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String adminTel, @PathVariable(value = "code") String code) {
public ResponseModel<Boolean> verifyTelCode(@ApiParam(value = "手机号", example = "15895233587")@PathVariable(value = "tel") String adminTel,
@ApiParam(value = "验证码", example = "258546")@PathVariable(value = "code") String code) {
Boolean flag = false;
if (ValidationUtil.isEmpty(adminTel) || ValidationUtil.isEmpty(code)) {
throw new BadRequest("参数校验失败.");
......@@ -447,11 +448,11 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "经销商审核", notes = "经销商审核")
@PostMapping(value = "/powerStationExamine")
public ResponseModel<String> powerStationExamine(@RequestParam(value = "pageId") long pageId,
@RequestParam(value = "nodeCode") String nodeCode,
@RequestParam(value = "stationId") String stationId,
@RequestParam(value = "taskId") String taskId,
@RequestParam(value = "planInstanceId") String planInstanceId,
public ResponseModel<String> powerStationExamine(@ApiParam(value = "分页Id", example = "1706974721737756674")@RequestParam(value = "pageId") long pageId,
@ApiParam(value = "节点Code", example = "1") @RequestParam(value = "nodeCode") String nodeCode,
@ApiParam(value = "场站Id", example = "1711627029541031938") @RequestParam(value = "stationId") String stationId,
@ApiParam(value = "任务Id", example = "1712383951215005697") @RequestParam(value = "taskId") String taskId,
@ApiParam(value = "计划实例Id", example = "64ddb490-7261-11ef-b7e1-02420a1c0012") @RequestParam(value = "planInstanceId") String planInstanceId,
@RequestBody Map<String, Object> kv) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.powerStationExamine(pageId, nodeCode, stationId, taskId, planInstanceId, kv));
}
......@@ -462,7 +463,9 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单")
@GetMapping(value = "/updateUser")
public ResponseModel<Object> updateUser(String adminUserId ,String sequenceNbr ,String type) {
public ResponseModel<Object> updateUser(@ApiParam(value = "管理员用户Id", example = "8121589")String adminUserId ,
@ApiParam(value = "主键", example = "1813102468876234754")String sequenceNbr ,
@ApiParam(value = "类型", example = "1")String type) {
FeignClientResult<List<String>> userResult =null;
UnitInfo unitInfo= unitInfoServiceImpl.getById(sequenceNbr);
......@@ -480,7 +483,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "获取经销商单位", notes = "获取经销商单位")
@GetMapping(value = "/getUnit")
public ResponseModel< List<UnitInfo>> getUnit( @RequestParam(required = false)String amosCompanySeq) {
public ResponseModel< List<UnitInfo>> getUnit(@ApiParam(value = "经销商公司", example = "1702216914824097794") @RequestParam(required = false)String amosCompanySeq) {
LambdaQueryWrapper<UnitInfo> unitInfoque=new LambdaQueryWrapper<>();
......@@ -719,7 +722,7 @@ public class UnitInfoController extends BaseController {
@GetMapping(value = "/getRegionalCompanie")
@UserLimits
public ResponseModel< List<RegionalCompanies> > getRegionalCompanie(
@RequestParam(required=false) Long sequenceNbr
@ApiParam(value = "主键", example = "1702216914824097794") @RequestParam(required=false) Long sequenceNbr
) {
// LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
// qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
......@@ -734,8 +737,8 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieById")
public ResponseModel< RegionalCompanies > getRegionalCompanieById(
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(required=false) Long unitInfoId
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq,
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId
) {
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
qu.eq(RegionalCompanies::getRegionalCompaniesSeq,regionalCompaniesSeq);
......@@ -749,8 +752,8 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieUnitInfo")
public ResponseModel< List<RegionalCompanies> > getRegionalCompanieUnitInfo(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq
) {
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
qu.eq(RegionalCompanies::getRegionalCompaniesSeq,regionalCompaniesSeq);
......@@ -771,8 +774,8 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getUnitInfoListData")
public ResponseModel< List<Map<String,Object>> > getUnitInfoListData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq
) {
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null,null);
......@@ -794,13 +797,13 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdData")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(value = "current") int current,
@RequestParam (value = "size") int size,
@RequestParam (required=false) String peasantHouseholdNo,
@RequestParam (required=false) String ownersName,
@RequestParam (required=false) String ids
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq,
@ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam (value = "size") int size,
@ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam (required=false) String peasantHouseholdNo,
@ApiParam(value = "电站名称", example = "admin") @RequestParam (required=false) String ownersName,
@ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam (required=false) String ids
) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData( unitInfoId,regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName,ids));
......@@ -810,13 +813,13 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdDataNew")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdDataNew(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(value = "current") int current,
@RequestParam (value = "size") int size,
@RequestParam (required=false) String peasantHouseholdNo,
@RequestParam (required=false) String ownersName,
@RequestParam (required=false) String ids
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq,
@ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam (value = "size") int size,
@ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam (required=false) String peasantHouseholdNo,
@ApiParam(value = "电站名称", example = "admin") @RequestParam (required=false) String ownersName,
@ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam (required=false) String ids
) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdDataNew(unitInfoId, regionalCompaniesSeq, current, size, peasantHouseholdNo, ownersName, ids));
......@@ -850,8 +853,8 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserList")
public ResponseModel< List<Map<String,Object>> > getuserList( @RequestParam(required=false) Long role,
@RequestParam(required=false) Long regionalCompaniesSeq
public ResponseModel< List<Map<String,Object>> > getuserList( @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required=false) Long role,
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required=false) Long regionalCompaniesSeq
) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
......@@ -866,8 +869,8 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserListAll")
public ResponseModel< List<Map<String,Object>> > getuserListAll( @RequestParam(required=false) Long role,
@RequestParam(required=false) Long regionalCompaniesSeq
public ResponseModel< List<Map<String,Object>> > getuserListAll( @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required=false) Long role,
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required=false) Long regionalCompaniesSeq
) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
......@@ -878,7 +881,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserTelephone")
public ResponseModel< Map<String,Object> > getuserTelephone( @RequestParam(required=false) String userName
public ResponseModel< Map<String,Object> > getuserTelephone(@ApiParam(value = "用户名称", example = "admin") @RequestParam(required=false) String userName
) { Map<String,Object> data=null;
if(StringUtils.isNotEmpty(userName)){
List<Map<String,Object>> date= unitInfoMapper.getuserListtelephone(userName,null,null,null);
......@@ -894,7 +897,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据userId查询手机号", notes = "根据userId查询手机号")
@GetMapping(value = "/getUserTelephoneByUserId")
public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @RequestParam(required=false) String userId
public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @ApiParam(value = "用户Id", example = "8542741")@RequestParam(required=false) String userId
) { Map<String,Object> data=null;
if(StringUtils.isNotEmpty(userId)){
List<Map<String,Object>> date= unitInfoMapper.getUserTelephoneByUserId(userId);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UserMessageController.java
View file @ 48a1dc5b
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.UserMessageServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -54,7 +55,8 @@ public class UserMessageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新人员消息", notes = "根据sequenceNbr更新人员消息")
public ResponseModel<UserMessageDto> updateBySequenceNbrUserMessage(@RequestBody UserMessageDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<UserMessageDto> updateBySequenceNbrUserMessage(@RequestBody UserMessageDto model,
@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(userMessageServiceImpl.updateWithModel(model));
}
......@@ -68,7 +70,8 @@ public class UserMessageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除人员消息", notes = "根据sequenceNbr删除人员消息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(userMessageServiceImpl.removeById(sequenceNbr));
}
......@@ -81,7 +84,7 @@ public class UserMessageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员消息", notes = "根据sequenceNbr查询单个人员消息")
public ResponseModel<UserMessageDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<UserMessageDto> selectOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(userMessageServiceImpl.queryBySeq(sequenceNbr));
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java
View file @ 48a1dc5b
......@@ -340,7 +340,8 @@ public class WorkOrderController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "完工登记详情", notes = "完工登记详情")
@GetMapping(value = "/getPowerStationEngineeringInfoHistory")
public ResponseModel<PowerStationEngineeringInfoAllDto> getPowerStationEngineeringInfoHistory( @ApiParam(name = "peasantHouseholdId",value = "农户ID",example = "1712383951215005697") @RequestParam(value = "peasantHouseholdId")Long peasantHouseholdId , @RequestParam(value = "processInstanceId",required = false)String processInstanceId) {
public ResponseModel<PowerStationEngineeringInfoAllDto> getPowerStationEngineeringInfoHistory( @ApiParam(name = "peasantHouseholdId",value = "农户ID",example = "1712383951215005697") @RequestParam(value = "peasantHouseholdId")Long peasantHouseholdId ,
@ApiParam(value = "流程实例Id",example = "f2d8aa89-7594-11ef-b7e1-02420a1c0012") @RequestParam(value = "processInstanceId",required = false)String processInstanceId) {
PowerStationEngineeringInfoAllDto returnDto = workOrderServiceImpl.getPowerStationEngineeringInfoHistory(peasantHouseholdId,processInstanceId);
return ResponseHelper.buildResponse(returnDto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment