Skip to content

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

补全swagger注解

parent c6cc699e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 417 additions and 238 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java
View file @ 8b15ab0b
package com.yeejoin.amos.boot.biz.common.dto; package com.yeejoin.amos.boot.biz.common.dto;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -13,6 +14,7 @@ import java.util.Date; ...@@ -13,6 +14,7 @@ import java.util.Date;
* *
*/ */
@Data @Data
@ApiModel(value = "BaseDto",description = "实体类")
public class BaseDto implements Serializable{ public class BaseDto implements Serializable{
/** /**
* *
...@@ -21,23 +23,23 @@ public class BaseDto implements Serializable{ ...@@ -21,23 +23,23 @@ public class BaseDto implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "主键ID",example = "1779438242769170434")
protected Long sequenceNbr; protected Long sequenceNbr;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间",example = "2024-05-06 09:54:29")
protected Date recDate; protected Date recDate;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "更新人id") @ApiModelProperty(value = "更新人id",example = "6790510")
protected String recUserId; protected String recUserId;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人",example = "admin")
protected String recUserName; protected String recUserName;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "是否删除") @ApiModelProperty(value = "是否删除",example = "false")
private Boolean isDelete=false; private Boolean isDelete=false;
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java
View file @ 8b15ab0b
...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler; import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.BigDecimalTypeHandler; import org.apache.ibatis.type.BigDecimalTypeHandler;
import org.apache.ibatis.type.BigIntegerTypeHandler; import org.apache.ibatis.type.BigIntegerTypeHandler;
...@@ -18,25 +20,27 @@ import java.util.Date; ...@@ -18,25 +20,27 @@ import java.util.Date;
* @author DELL * @author DELL
*/ */
@Data @Data
@ApiModel(value = "BaseEntity",description = "基础实体类")
public class BaseEntity implements Serializable{ public class BaseEntity implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键",example = "1712049025391267842")
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER) @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr; protected Long sequenceNbr;
@ApiModelProperty(value = "创建日期",example = "2023-10-11 18:20:51")
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE) @TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate; protected Date recDate;
@ApiModelProperty(value = "创建人ID",example = "5606165")
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE) @TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId; protected String recUserId;
@ApiModelProperty(value = "创建人",example = "admin")
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE) @TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName; protected String recUserName;
/** /**
* 是否删除 * 是否删除
*/ */
@ApiModelProperty(value = "是否删除",example = "false")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class) @TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
public Boolean isDelete=false; public Boolean isDelete=false;
......
amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-kingbase8.properties
View file @ 8b15ab0b
## DB properties hygf ## DB properties hygf
## db1-production database ## db1-production database
spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root spring.db1.datasource.url=jdbc:kingbase8://192.168.0.68:54321/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
spring.db1.datasource.username=root spring.db1.datasource.username=root
spring.db1.datasource.password=Yeejoin@2020 spring.db1.datasource.password=Yeejoin@2020
spring.db1.datasource.driver-class-name=com.kingbase8.Driver spring.db1.datasource.driver-class-name=com.kingbase8.Driver
## db2-sync_data ## db2-sync_data
spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root spring.db2.datasource.url=jdbc:kingbase8://192.168.0.68:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
spring.db2.datasource.username=root spring.db2.datasource.username=root
spring.db2.datasource.password=Yeejoin@2020 spring.db2.datasource.password=Yeejoin@2020
spring.db2.datasource.driver-class-name=com.kingbase8.Driver spring.db2.datasource.driver-class-name=com.kingbase8.Driver
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommercialDto.java
View file @ 8b15ab0b
...@@ -24,113 +24,113 @@ public class CommercialDto extends BaseDto { ...@@ -24,113 +24,113 @@ public class CommercialDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "商务类型") @ApiModelProperty(value = "商务类型",example = "zrr")
private String type; private String type;
@ApiModelProperty(value = "申请人") @ApiModelProperty(value = "申请人",example = "admin")
private String applicant; private String applicant;
@ApiModelProperty(value = "身份证号") @ApiModelProperty(value = "身份证号",example = "610481199402245014")
private String idCard; private String idCard;
@ApiModelProperty(value = "申请人联系电话") @ApiModelProperty(value = "申请人联系电话",example = "13022982292")
private String telephone; private String telephone;
@ApiModelProperty(value = "省市区") @ApiModelProperty(value = "省市区",example = "[110000, 110100, 110101]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> projectAddress; private List<Integer> projectAddress;
@ApiModelProperty(value = "省市区名称") @ApiModelProperty(value = "省市区名称",example = "北京市/北京城区/东城区")
private String projectAddressName; private String projectAddressName;
@ApiModelProperty(value = "省市区文字集合") @ApiModelProperty(value = "省市区文字集合",example = "[\"北京市\", \"北京城区\", \"东城区\"]")
private List<String> projectAddressText; private List<String> projectAddressText;
@ApiModelProperty(value = "设备信息") @ApiModelProperty(value = "设备信息",example = "设备信息")
private String device; private String device;
@ApiModelProperty(value = "电子系统造价") @ApiModelProperty(value = "电子系统造价",example = "12.55")
private Float cost; private Float cost;
@ApiModelProperty(value = "安装规模") @ApiModelProperty(value = "安装规模",example = "23.52")
private String scale; private String scale;
@ApiModelProperty(value = "法务类型") @ApiModelProperty(value = "法务类型",example = "zjdnhw")
private String legalType; private String legalType;
@ApiModelProperty(value = "有效联系电话") @ApiModelProperty(value = "有效联系电话",example = "13022982292")
private String legalContactTelephone; private String legalContactTelephone;
@ApiModelProperty(value = "紧急联系人") @ApiModelProperty(value = "紧急联系人",example = "13022982292")
private String legalEmergentTelephone; private String legalEmergentTelephone;
@ApiModelProperty(value = "结婚证文件标识") @ApiModelProperty(value = "结婚证文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> marriageCredit; private List<Object> marriageCredit;
@ApiModelProperty(value = "房产证文件标识") @ApiModelProperty(value = "房产证文件标识",example = "[{url: \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateCredit; private List<Object> realEstateCredit;
@ApiModelProperty(value = "身份证正反面文件标识") @ApiModelProperty(value = "身份证正反面文件标识",example = "[{url: \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardCredit; private List<Object> idCardCredit;
@ApiModelProperty(value = "户口本文件标识") @ApiModelProperty(value = "户口本文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> householdBookCredit; private List<Object> householdBookCredit;
@ApiModelProperty(value = "手持身份证文件标识") @ApiModelProperty(value = "手持身份证文件标识",example = "[{url: \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardCredit; private List<Object> handIdCardCredit;
@ApiModelProperty(value = "踏勘照片文件标识") @ApiModelProperty(value = "踏勘照片文件标识",example = "[{uid: \"0.qcyinzogdcd\", url: \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> surveyPhotosWeb; private List<Object> surveyPhotosWeb;
@ApiModelProperty(value = "组件平面图与组串连线图文件标识") @ApiModelProperty(value = "组件平面图与组串连线图文件标识",example = "[{url: \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> formationWeb; private List<Object> formationWeb;
@ApiModelProperty(value = "房屋所有权继承说明文件标识") @ApiModelProperty(value = "房屋所有权继承说明文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> inheritWeb; private List<Object> inheritWeb;
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识") @ApiModelProperty(value = "户用光伏电站项目合作协议文件标识",example = "[{url: \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agreementWeb; private List<Object> agreementWeb;
@ApiModelProperty(value = "用户手持身份证照片文件标识") @ApiModelProperty(value = "用户手持身份证照片文件标识",example = "[{url: \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardLegal; private List<Object> handIdCardLegal;
@ApiModelProperty(value = "法人营业执照文件标识") @ApiModelProperty(value = "法人营业执照文件标识",example = "[{url: \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> licenseLegal; private List<Object> licenseLegal;
@ApiModelProperty(value = "法定代理人身份证文件标识") @ApiModelProperty(value = "法定代理人身份证文件标识",example = "[{url: \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agentLegal; private List<Object> agentLegal;
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识") @ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识",example = "[{url: \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateLegal; private List<Object> realEstateLegal;
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识") @ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识",example = "[{url: \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseAgreementLegal; private List<Object> houseAgreementLegal;
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识") @ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识",example = "[{url: \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> creditReportLegal; private List<Object> creditReportLegal;
@ApiModelProperty(value = "项目备案证文件标识") @ApiModelProperty(value = "项目备案证文件标识",example = "[{url: \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> filingsLegal; private List<Object> filingsLegal;
@ApiModelProperty(value = " 省市区详细地址") @ApiModelProperty(value = " 省市区详细地址",example = "北京市/北京城区/东城区")
private String projectAddressDetail; private String projectAddressDetail;
@ApiModelProperty(value = "勘察表id") @ApiModelProperty(value = "勘察表id",example = "1854346995112611841")
private Long surveyInformationId; private Long surveyInformationId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DesignInformationDto.java
View file @ 8b15ab0b
...@@ -24,102 +24,102 @@ public class DesignInformationDto extends BaseDto { ...@@ -24,102 +24,102 @@ public class DesignInformationDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "典型设计图信息") @ApiModelProperty(value = "典型设计图信息",example = "[{uid: \"0.2fcslywd2ry\", name: \"11.dws\", url: \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> typicalDiagram; private List<Object> typicalDiagram;
/** /**
* 典型设计图信息 * 典型设计图信息
*/ */
@ApiModelProperty(value = "典型设计图信息") @ApiModelProperty(value = "典型设计图信息",example = "[{uid: \"0.qbiq6dutwl\", name: \"11.dwg\", url: \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> engineering; private List<Object> engineering;
@ApiModelProperty(value = "组件排布图") @ApiModelProperty(value = "组件排布图",example = "[{uid: \"0.9bn4t1r35hf\", name: \"11.dwg\", url: \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentLayout; private List<Object> componentLayout;
@ApiModelProperty(value = "组件支架图") @ApiModelProperty(value = "组件支架图",example = "[{uid: \"0.26j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentBracket; private List<Object> componentBracket;
@ApiModelProperty(value = "组串接线图") @ApiModelProperty(value = "组串接线图",example = "[{uid: \"0.36j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> connectionLine; private List<Object> connectionLine;
@ApiModelProperty(value = "一次接线图") @ApiModelProperty(value = "一次接线图",example = "[{uid: \"0.46j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> onceLine; private List<Object> onceLine;
@ApiModelProperty(value = "组件") @ApiModelProperty(value = "组件",example = "[{\"gl\":\"245W\",\"wlbm\":\"1\",\"pzsl\":\"1\",\"bk\":\"30b\",\"Symbol_key\":\"11750F96-B831-4D1F-87F0-5EB18A0C0301\",\"wlmc\":\"1\",\"lx\":\"danjing\",\"dcpgg\":\"1\",\"zgl\":1,\"dsm\":\"dm\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> assembly; private List<Object> assembly;
@ApiModelProperty(value = "逆变器") @ApiModelProperty(value = "逆变器",example = "[{\"xl\":\"bx\",\"gl\":1,\"wlbm\":\"1\",\"pzsl\":\"1\",\"Symbol_key\":\"0665F5B8-19E6-470B-BADC-C94A5C4081E0\",\"wlmc\":\"1\",\"xw\":\"dx\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> inverter; private List<Object> inverter;
@ApiModelProperty(value = "电表箱") @ApiModelProperty(value = "电表箱",example = "[{\"wlbm\":\"1\",\"cz\":\"smc\",\"gn\":\"dz\",\"pzsl\":\"1\",\"Symbol_key\":\"49CE32B8-F22B-4007-B4A3-315A55BE7AEA\",\"wlmc\":\"1\",\"swms\":\"qesw\",\"xw\":\"dx\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> electricityMeter; private List<Object> electricityMeter;
@ApiModelProperty(value = "电缆") @ApiModelProperty(value = "电缆",example = "[{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"BD49C438-C85F-4A88-B105-2757F0EC454A\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"ED62C48A-0E32-459C-B02C-ED4C7475E508\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"14EF658D-446A-4D80-AE99-AF62898A43D2\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"6E8A3BEE-9D6B-489C-9339-0362B8892660\",\"wlmc\":\"554545\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> cable; private List<Object> cable;
@ApiModelProperty(value = "支架") @ApiModelProperty(value = "支架",example = "[{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"BD49C438-C85F-4A88-B105-2757F0EC454A\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"ED62C48A-0E32-459C-B02C-ED4C7475E508\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"14EF658D-446A-4D80-AE99-AF62898A43D2\",\"wlmc\":\"554545\"},{\"xh\":\"ZR-YJV22\",\"gg\":\"3×50+1×25\",\"wlbm\":\"的非官方的功夫格斗\",\"pzsl\":55,\"Symbol_key\":\"6E8A3BEE-9D6B-489C-9339-0362B8892660\",\"wlmc\":\"554545\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> support; private List<Object> support;
@ApiModelProperty(value = " 防滑雪措施") @ApiModelProperty(value = " 防滑雪措施",example = "wxfhxcs")
private String antiSkiing; private String antiSkiing;
@ApiModelProperty(value = " 防滑雪措施备注") @ApiModelProperty(value = " 防滑雪措施备注",example = "防滑雪措施备注")
private String antiSkiingNotes; private String antiSkiingNotes;
@ApiModelProperty(value = " 抽检") @ApiModelProperty(value = " 抽检",example = "f")
private String spotCheck; private String spotCheck;
@ApiModelProperty(value = " 抽检意见") @ApiModelProperty(value = " 抽检意见",example = "抽检意见")
private String spotCheckOpinion; private String spotCheckOpinion;
@ApiModelProperty(value = "是否定制") @ApiModelProperty(value = "是否定制",example = "f")
private String isokCustomized; private String isokCustomized;
@ApiModelProperty(value = "是否加固") @ApiModelProperty(value = "是否加固",example = "f")
private String windResistant; private String windResistant;
@ApiModelProperty(value = "试点方案") @ApiModelProperty(value = "试点方案",example = "bsd")
private String pilotProgram; private String pilotProgram;
@ApiModelProperty(value = " s试点物料") @ApiModelProperty(value = " 试点物料",example = "bsd")
private String pilotMaterials; private String pilotMaterials;
@ApiModelProperty(value = "方位角") @ApiModelProperty(value = "方位角",example = "1")
private String azimuth; private String azimuth;
@ApiModelProperty(value = "倾角") @ApiModelProperty(value = "倾角",example = "1")
private String dipAngle; private String dipAngle;
@ApiModelProperty(value = " 应用场景") @ApiModelProperty(value = " 应用场景",example = "应用场景")
private String applicationScenario; private String applicationScenario;
@ApiModelProperty(value = "应用场景数量") @ApiModelProperty(value = "应用场景数量",example = "11")
private Integer applicationScenarioNum; private Integer applicationScenarioNum;
@ApiModelProperty(value = "支架方案") @ApiModelProperty(value = "支架方案",example = "支架方案")
private String supportScheme; private String supportScheme;
@ApiModelProperty(value = "支架方案数量") @ApiModelProperty(value = "支架方案数量",example = "11")
private Integer supportSchemeNum; private Integer supportSchemeNum;
@ApiModelProperty(value = "特殊方案") @ApiModelProperty(value = "特殊方案",example = "特殊方案")
private String specialPlan; private String specialPlan;
@ApiModelProperty(value = "特殊方案数量") @ApiModelProperty(value = "特殊方案数量",example = "111")
private Integer specialPlanNum; private Integer specialPlanNum;
@ApiModelProperty(value = "农户id") @ApiModelProperty(value = "农户id",example = "1854346995242635266")
private String peasantHouseholdId; private String peasantHouseholdId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ExtendedInformationDto.java
View file @ 8b15ab0b
...@@ -24,14 +24,14 @@ public class ExtendedInformationDto extends BaseDto { ...@@ -24,14 +24,14 @@ public class ExtendedInformationDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "订单说明") @ApiModelProperty(value = "订单说明",example = "订单说明")
private String orderDescription; private String orderDescription;
@ApiModelProperty(value = "联系人") @ApiModelProperty(value = "联系人",example = "[{\"qq\":\"11\",\"mailbox\":\"11\",\"wechat\":\"11\",\"telephone\":\"11\",\"userName\":\"11\",\"relation\":\"11\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> contacts; private List<Object> contacts;
@ApiModelProperty(value = "勘察表id") @ApiModelProperty(value = "勘察表id",example = "1854346995112611841")
private Long surveyInformationId; private Long surveyInformationId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/InformationDto.java
View file @ 8b15ab0b
...@@ -24,21 +24,21 @@ public class InformationDto extends BaseDto { ...@@ -24,21 +24,21 @@ public class InformationDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "文件编号") @ApiModelProperty(value = "文件编号",example = "WJ002JXSRYG202411073299")
private String fileNumber; private String fileNumber;
@ApiModelProperty(value = "档案编号") @ApiModelProperty(value = "档案编号",example = "DA002JXSRYG202411073242")
private String archivesNumber; private String archivesNumber;
@ApiModelProperty(value = "身份证文件标识") @ApiModelProperty(value = "身份证文件标识",example = "[{url: \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> cardFile; private List<Object> cardFile;
@ApiModelProperty(value = " 房产证文件标识") @ApiModelProperty(value = " 房产证文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseProve; private List<Object> houseProve;
@ApiModelProperty(value = "勘察表id") @ApiModelProperty(value = "勘察表id",example = "1854346995112611841")
private Long surveyInformationId; private Long surveyInformationId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/LoggerDto.java
View file @ 8b15ab0b
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
...@@ -14,5 +15,6 @@ import java.util.List; ...@@ -14,5 +15,6 @@ import java.util.List;
@ApiModel(value="LoggerDto", description="审核日志") @ApiModel(value="LoggerDto", description="审核日志")
public class LoggerDto { public class LoggerDto {
//订单跟踪 //订单跟踪
@ApiModelProperty(value = "订单跟踪")
List<LinkedHashMap> logger; List<LinkedHashMap> logger;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java
View file @ 8b15ab0b
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
/** /**
...@@ -9,6 +10,7 @@ import lombok.Data; ...@@ -9,6 +10,7 @@ import lombok.Data;
* @createDate: 2024/1/12 * @createDate: 2024/1/12
*/ */
@Data @Data
@ApiModel(value = "PowerStationEngineeringInfoAllDto",description = "施工工程信息")
public class PowerStationEngineeringInfoAllDto { public class PowerStationEngineeringInfoAllDto {
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInfoAllDto.java
View file @ 8b15ab0b
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -9,47 +10,57 @@ import lombok.Data; ...@@ -9,47 +10,57 @@ import lombok.Data;
public class SurveyInfoAllDto { public class SurveyInfoAllDto {
// 资料归档 // 资料归档
@ApiModelProperty(value = "资料归档")
InformationDto information; InformationDto information;
// 勘察信息详情 // 勘察信息详情
@ApiModelProperty(value = "勘察信息详情")
SurveyDetailsDto surveyDetails; SurveyDetailsDto surveyDetails;
// 勘察信息 // 勘察信息
@ApiModelProperty(value = "勘察信息")
SurveyInformationDto surveyInformation; SurveyInformationDto surveyInformation;
// 扩展信息 // 扩展信息
@ApiModelProperty(value = "扩展信息")
ExtendedInformationDto extendedInformation; ExtendedInformationDto extendedInformation;
// 商务信息 // 商务信息
@ApiModelProperty(value = "商务信息")
CommercialDto commercial; CommercialDto commercial;
//设计信息 //设计信息
@ApiModelProperty(value = "设计信息")
DesignInformationDto designInformation; DesignInformationDto designInformation;
//订单跟踪 //订单跟踪
@ApiModelProperty(value = "订单跟踪")
LoggerDto orderTracking; LoggerDto orderTracking;
//工程信息 //工程信息
@ApiModelProperty(value = "工程信息")
PowerStationEngineeringInfo powerStationEngineeringInfo; PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息 //施工信息
@ApiModelProperty(value = "施工信息")
PowerStationConstructionData powerStationConstructionData; PowerStationConstructionData powerStationConstructionData;
//并网信息 //并网信息
@ApiModelProperty(value = "并网信息")
HygfOnGrid hygfOnGrid; HygfOnGrid hygfOnGrid;
//派工单信息 //派工单信息
@ApiModelProperty(value = "派工单信息")
WorkOrder workOrder; WorkOrder workOrder;
//自审信息 //自审信息
@ApiModelProperty(value = "自审信息")
ConstructionRecords constructionRecords; ConstructionRecords constructionRecords;
//验收信息 //验收信息
@ApiModelProperty(value = "验收信息")
AcceptanceCheck acceptanceCheck; AcceptanceCheck acceptanceCheck;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
View file @ 8b15ab0b
...@@ -29,98 +29,98 @@ public class SurveyInformationDto extends BaseDto { ...@@ -29,98 +29,98 @@ public class SurveyInformationDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "勘察编号") @ApiModelProperty(value = "勘察编号",example = "KC002JXSRYG202411071202")
private String surveyNumber; private String surveyNumber;
@ApiModelProperty(value = "电站类型") @ApiModelProperty(value = "电站类型",example = "zx")
private String powerStationType; private String powerStationType;
@ApiModelProperty(value = "开发方名称") @ApiModelProperty(value = "开发方名称",example = "MYSQL兼容经销商")
private String developerName; private String developerName;
@ApiModelProperty(value = "开发方code") @ApiModelProperty(value = "开发方code",example = "86*355*443*883")
private String developerCode; private String developerCode;
@ApiModelProperty(value = "开发方平台id") @ApiModelProperty(value = "开发方平台id",example = "1815743601213181953")
private Long developerId; private Long developerId;
@ApiModelProperty(value = " 业务员id") @ApiModelProperty(value = " 业务员id",example = "1815743601213181953")
private String salesmanId; private String salesmanId;
@ApiModelProperty(value = "业务员名称") @ApiModelProperty(value = "业务员名称",example = "admin")
private String salesman; private String salesman;
@ApiModelProperty(value = "制单人") @ApiModelProperty(value = "制单人",example = "开发")
private String creator; private String creator;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "制单时间") @ApiModelProperty(value = "制单时间",example = "2024-11-07 13:51:17")
private Date creatorTime; private Date creatorTime;
@ApiModelProperty(value = "业主类型") @ApiModelProperty(value = "业主类型",example = "jm")
private String ownerType; private String ownerType;
@ApiModelProperty(value = " 审核状态 0未审核,1审核中，2审核结束") @ApiModelProperty(value = " 审核状态 0未审核,1审核中，2审核结束",example = "0")
private Integer review; private Integer review;
@ApiModelProperty(value = "来源农户编号") @ApiModelProperty(value = "来源农户编号",example = "NH002JXSRYG20241107121128")
private String peasantHouseholdNo; private String peasantHouseholdNo;
@ApiModelProperty(value = "业主姓名") @ApiModelProperty(value = "业主姓名",example = "admin")
private String ownersName; private String ownersName;
@ApiModelProperty(value = "联系电话") @ApiModelProperty(value = "联系电话",example = "13022982292")
private String telephone; private String telephone;
@ApiModelProperty(value = "身份证号") @ApiModelProperty(value = "身份证号",example = "610481199402245014")
private String idCard; private String idCard;
@ApiModelProperty(value = "邮箱") @ApiModelProperty(value = "邮箱",example = "212da@163.com")
private String mailbox; private String mailbox;
@ApiModelProperty(value = "项目详细地址") @ApiModelProperty(value = "项目详细地址",example = "北京市/北京城区/东城区")
private String projectAddressDetail; private String projectAddressDetail;
@ApiModelProperty(value = "常住详细地址") @ApiModelProperty(value = "常住详细地址",example = "北京市/北京城区/东城区")
private String permanentAddressDetail; private String permanentAddressDetail;
@ApiModelProperty(value = "项目地址code") @ApiModelProperty(value = "项目地址code",example = "[110000, 110100, 110101]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> projectAddress; private List<Integer> projectAddress;
@ApiModelProperty(value = "项目地址文字") @ApiModelProperty(value = "项目地址文字",example = "[\"北京市\", \"北京城区\", \"东城区\"]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> projectAddressText; private List<String> projectAddressText;
@ApiModelProperty(value = "项目地址") @ApiModelProperty(value = "项目地址",example = "北京市/北京城区/东城区")
private String projectAddressName; private String projectAddressName;
@ApiModelProperty(value = "常住地址") @ApiModelProperty(value = "常住地址",example = "北京市/北京城区/东城区")
private String permanentAddressName; private String permanentAddressName;
@ApiModelProperty(value = "常住地址code") @ApiModelProperty(value = "常住地址code",example = "[110000, 110100, 110101]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Integer> permanentAddress; private List<Integer> permanentAddress;
@ApiModelProperty(value = "常住地址文字") @ApiModelProperty(value = "常住地址文字",example = "北京市/北京城区/东城区")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> permanentAddressText; private List<String> permanentAddressText;
@ApiModelProperty(value = "常住是否相同") @ApiModelProperty(value = "常住是否相同",example = "相同")
private String isPermanent; private String isPermanent;
@ApiModelProperty(value = "定金") @ApiModelProperty(value = "定金",example = "12.23")
private Float deposit; private Float deposit;
@ApiModelProperty(value = "区域公司id") @ApiModelProperty(value = "区域公司id",example = "1702215275253886977")
@NotNull(message = "区域公司id不能为空") @NotNull(message = "区域公司id不能为空")
private Long regionalCompaniesSeq; private Long regionalCompaniesSeq;
@ApiModelProperty(value = "农户id") @ApiModelProperty(value = "农户id",example = "1854346995112611841")
private Long peasantHouseholdId; private Long peasantHouseholdId;
@ApiModelProperty(value = "身份证正面") @ApiModelProperty(value = "身份证正面",example = "[{url: \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardFront; private List<Object> idCardFront;
@ApiModelProperty(value = "身份证反面") @ApiModelProperty(value = "身份证反面",example = "[{url: \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class) @TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardOpposite; private List<Object> idCardOpposite;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java
View file @ 8b15ab0b
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -14,92 +15,97 @@ import java.util.List; ...@@ -14,92 +15,97 @@ import java.util.List;
*/ */
@Data @Data
@ApiModel(value = "WorkOrderPage",description = "派工单分页")
public class WorkOrderPage { public class WorkOrderPage {
@ApiModelProperty(value = "农户id") @ApiModelProperty(value = "农户id",example = "1712049025391267842")
protected Long sequenceNbr; protected Long sequenceNbr;
@ApiModelProperty(value = "农户信息编号") @ApiModelProperty(value = "农户信息编号",example = "NH004GXZZZZYLBL202405164277")
private String peasantHouseholdNo; private String peasantHouseholdNo;
@ApiModelProperty(value = "开发商") @ApiModelProperty(value = "开发商",example = "admin")
private String developerName; private String developerName;
@ApiModelProperty(value = "区域公司") @ApiModelProperty(value = "区域公司",example = "户用光伏测试有限公司")
private String regionalCompaniesName; private String regionalCompaniesName;
@ApiModelProperty(value = "派工单编号") @ApiModelProperty(value = "派工单编号",example = "PG060HBWHXZ202404149953")
private String workOrderNum; private String workOrderNum;
@ApiModelProperty(value = "业主姓名") @ApiModelProperty(value = "业主姓名",example = "admin")
private String ownersName; private String ownersName;
@ApiModelProperty(value = "工程负责人") @ApiModelProperty(value = "工程负责人",example = "admin")
private String projectRegionManager; private String projectRegionManager;
@ApiModelProperty(value = "施工负责人") @ApiModelProperty(value = "施工负责人",example = "admin")
private String constructionRegionManager; private String constructionRegionManager;
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "完工时间") @ApiModelProperty(value = "完工时间",example = "2024-10-25")
private Date completionDate; private Date completionDate;
@ApiModelProperty(value = "项目地址") @ApiModelProperty(value = "项目地址",example = "北京市/北京城区/东城")
private String projectAddressName; private String projectAddressName;
@ApiModelProperty(value = "电站施工状态") @ApiModelProperty(value = "电站施工状态",example = "已完工")
private String powerStationConstructionStatus; private String powerStationConstructionStatus;
@ApiModelProperty(value = "派工电站id") @ApiModelProperty(value = "派工电站id",example = "1712049025391267842")
protected Long workOrderPowerStationId; protected Long workOrderPowerStationId;
@ApiModelProperty(value = "派工电站节点标识") @ApiModelProperty(value = "派工电站节点标识",example = "1712049025391267842")
protected String workOrderPowerStationNode; protected String workOrderPowerStationNode;
@ApiModelProperty(value = "派工单id") @ApiModelProperty(value = "派工单id",example = "1712049025391267842")
protected String workOrderId; protected String workOrderId;
/** /**
* 区域公司id * 区域公司id
*/ */
@ApiModelProperty(value = "区域公司id",example = "1703949560172277762")
private Long regionCompanyId; private Long regionCompanyId;
@ApiModelProperty(value = "平台经销商单位id") @ApiModelProperty(value = "平台经销商单位id",example = "1761919380884582402")
private Long amosDealerId; private Long amosDealerId;
@ApiModelProperty(value = "类型",example = "2")
private String type; private String type;
@ApiModelProperty(value = "片区审核") @ApiModelProperty(value = "片区审核",example = "通过")
private String powerStationAreaStatus ; private String powerStationAreaStatus ;
@ApiModelProperty(value = "设计审核") @ApiModelProperty(value = "设计审核",example = "通过")
private String powerStationDesignStatus ; private String powerStationDesignStatus ;
@ApiModelProperty(value = "工程审核") @ApiModelProperty(value = "工程审核",example = "通过")
private String powerStationEngineeringStatus ; private String powerStationEngineeringStatus ;
@ApiModelProperty(value = "判断是否有进行中的整改单数量") @ApiModelProperty(value = "判断是否有进行中的整改单数量",example = "33")
private Long rectificationNum ; private Long rectificationNum ;
@ApiModelProperty(value = "最后一条作废整改单id") @ApiModelProperty(value = "最后一条作废整改单id",example = "1720655712712945666")
private Long rollbackOrderId ; private Long rollbackOrderId ;
@ApiModelProperty(value = "页码",example = "1")
int current; int current;
@ApiModelProperty(value = "大小",example = "20")
int size; int size;
@ApiModelProperty(value = "数据过滤标识") @ApiModelProperty(value = "数据过滤标识",example = "[yseq,tet]")
private List<String> workOrderPowerStationNodes ; private List<String> workOrderPowerStationNodes ;
@ApiModelProperty(value = "判断是否可以审核,默认不可以") @ApiModelProperty(value = "判断是否可以审核,默认不可以",example = "不可以")
private String isAudit ; private String isAudit ;
@ApiModelProperty(value = "历史审核意见") @ApiModelProperty(value = "历史审核意见",example = "不通过")
private String auditIdea ; private String auditIdea ;
@ApiModelProperty(value = "实例id") @ApiModelProperty(value = "实例id",example = "8dbc3974-a160-11ef-aa06-02420a1c0010")
private String instanceId ; private String instanceId ;
@ApiModelProperty(value = "电站安装规模") @ApiModelProperty(value = "电站安装规模",example = "245.55")
private String scale ; private String scale ;
@ApiModelProperty(value = "电站实际规模") @ApiModelProperty(value = "电站实际规模",example = "245.75")
private String realScale ; private String realScale ;
@ApiModelProperty(value = "省份",example = "陕西省")
private String province; private String province;
@ApiModelProperty(value = "首次编辑施工资料日期") @ApiModelProperty(value = "首次编辑施工资料日期",example = "2024-10-14 10:12:31")
private String firstConstructionDate; private String firstConstructionDate;
@ApiModelProperty(value = "开始时间",example = "2024-10-14 10:12:31")
private String startTime; private String startTime;
@ApiModelProperty(value = "结束时间",example = "2024-10-15 10:12:31")
private String endTime; private String endTime;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPowerStationDto.java
View file @ 8b15ab0b
...@@ -19,15 +19,16 @@ public class WorkOrderPowerStationDto extends BaseDto { ...@@ -19,15 +19,16 @@ public class WorkOrderPowerStationDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "施工电站Id",example = "1779359620159008770")
private Long workOrderId; private Long workOrderId;
@ApiModelProperty(value = "农户ID",example = "177935963124219008770")
private Long peasantHouseholdId; private Long peasantHouseholdId;
@ApiModelProperty(value = "电站施工状态") @ApiModelProperty(value = "电站施工状态",example = "已完工")
private String powerStationConstructionStatus; private String powerStationConstructionStatus;
@ApiModelProperty(value = "完工审核意见") @ApiModelProperty(value = "完工审核意见",example = "通过")
private String completionAuditOpinion; private String completionAuditOpinion;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/YearPowerDto.java
View file @ 8b15ab0b
...@@ -17,16 +17,16 @@ public class YearPowerDto { ...@@ -17,16 +17,16 @@ public class YearPowerDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "第三方电站id") @ApiModelProperty(value = "第三方电站id",example = "158889985588")
private String thirdStationId; private String thirdStationId;
@ApiModelProperty(value = "日期") @ApiModelProperty(value = "日期",example = "2024-10-15")
private String month; private String month;
@ApiModelProperty(value = "年月") @ApiModelProperty(value = "年月",example = "2024")
private String year; private String year;
@ApiModelProperty(value = "平均功率") @ApiModelProperty(value = "平均功率",example = "2255.32")
private Double power; private Double power;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionRecords.java
View file @ 8b15ab0b
...@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity; ...@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -20,6 +22,7 @@ import java.util.List; ...@@ -20,6 +22,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("hygf_construction_records") @TableName("hygf_construction_records")
@ApiModel(value="ConstructionRecords", description="施工日志")
public class ConstructionRecords extends BaseEntity { public class ConstructionRecords extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,47 +30,55 @@ public class ConstructionRecords extends BaseEntity { ...@@ -27,47 +30,55 @@ public class ConstructionRecords extends BaseEntity {
/** /**
* 操作人 * 操作人
*/ */
@ApiModelProperty(value = "操作人",example = "余干多")
@TableField("operator") @TableField("operator")
private String operator; private String operator;
/** /**
* 操作内容 * 操作内容
*/ */
@ApiModelProperty(value = "操作内容",example = "提交并网资料")
@TableField("operation_content") @TableField("operation_content")
private String operationContent; private String operationContent;
/** /**
* 操作时间 * 操作时间
*/ */
@ApiModelProperty(value = "操作时间",example = "2024-11-07 15:02:42")
@TableField("operation_time") @TableField("operation_time")
private Date operationTime; private Date operationTime;
/** /**
* 操作结果 * 操作结果
*/ */
@ApiModelProperty(value = "操作结果",example = "通过")
@TableField("operation_results") @TableField("operation_results")
private String operationResults; private String operationResults;
/** /**
* 施工单id * 施工单id
*/ */
@ApiModelProperty(value = "施工单id",example = "1854418822019158018")
@TableField("work_order_id") @TableField("work_order_id")
private Long workOrderId; private Long workOrderId;
/** /**
* 施工电站 * 施工电站
*/ */
@ApiModelProperty(value = "施工电站",example = "1854411671791996929")
@TableField("work_order_power_station_id") @TableField("work_order_power_station_id")
private Long workOrderPowerStationId; private Long workOrderPowerStationId;
/** /**
* 农户id * 农户id
*/ */
@ApiModelProperty(value = "农户id",example = "1854346995242635266")
@TableField("peasant_household_id") @TableField("peasant_household_id")
private Long peasantHouseholdId; private Long peasantHouseholdId;
@TableField("notes") @TableField("notes")
@ApiModelProperty(value = "备注",example = "备注")
private String notes; private String notes;
...@@ -86,6 +97,7 @@ public class ConstructionRecords extends BaseEntity { ...@@ -86,6 +97,7 @@ public class ConstructionRecords extends BaseEntity {
} }
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "施工日志")
List<ConstructionRecords> constructionRecordsList; List<ConstructionRecords> constructionRecordsList;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfOnGrid.java
View file @ 8b15ab0b
...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; ...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -22,81 +24,92 @@ import java.util.List; ...@@ -22,81 +24,92 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value ="hygf_on_grid_and_acceptance",autoResultMap = true) @TableName(value ="hygf_on_grid_and_acceptance",autoResultMap = true)
@ApiModel(value = "HygfOnGrid",description ="并网信息")
public class HygfOnGrid extends BaseEntity { public class HygfOnGrid extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 并网申请 * 并网申请
并网申请
*/ */
@ApiModelProperty(value = "并网申请",example = "[{\"uid\":\"amos-upload-1718704468706-45\",\"name\":\"c697beac6170e3aa7b300a44fef9751.png\",\"url\":\"/upload/jxiop/amos_studio/6702951/E0B1EC278112E95474A272E8E3478C94.png\",\"status\":\"done\"}]")
@TableField(value ="grid_connection_application",typeHandler = FastjsonTypeHandler.class) @TableField(value ="grid_connection_application",typeHandler = FastjsonTypeHandler.class)
private List<Object> gridConnectionApplication; private List<Object> gridConnectionApplication;
/** /**
* 并网回执 * 并网回执
*/ */
@ApiModelProperty(value = "并网回执",example = "[{\"uid\":\"amos-upload-1718704468706-47\",\"name\":\"ff3bb95792ad9aab2a7562640f56387.png\",\"url\":\"/upload/jxiop/amos_studio/6702951/62179B20ABBBCF1FFFBEF328E36828.png\",\"status\":\"done\"}]")
@TableField(value ="grid_connection_receipt",typeHandler = FastjsonTypeHandler.class) @TableField(value ="grid_connection_receipt",typeHandler = FastjsonTypeHandler.class)
private List<Object> gridConnectionReceipt; private List<Object> gridConnectionReceipt;
/** /**
* 并网方案 * 并网方案
*/ */
@ApiModelProperty(value = "并网方案",example = "[{\"uid\":\"amos-upload-1718704468706-49\",\"name\":\"01d5189960473e76aae9cea2e7c3c6b.png\",\"url\":\"/upload/jxiop/amos_studio/6702951/E64563083D0FF1FF375BDEA13E9CD11.png\",\"status\":\"done\"},{\"uid\":\"amos-upload-1718704468706-50\",\"name\":\"ef69465d929b216519f3cb42ee5da8b.png\",\"url\":\"/upload/jxiop/amos_studio/6702951/7FECCAE05CF8C678DB02869C9478FED.png\",\"status\":\"done\"}]")
@TableField(value ="grid_connection_scheme",typeHandler = FastjsonTypeHandler.class) @TableField(value ="grid_connection_scheme",typeHandler = FastjsonTypeHandler.class)
private List<Object> gridConnectionScheme; private List<Object> gridConnectionScheme;
/** /**
* 供电合同 * 供电合同
*/ */
@ApiModelProperty(value = "供电合同",example = "[{\"uid\":\"0.optumczxo5r\",\"name\":\"4921.jpg\",\"url\":\"/upload/common/7AF1F7FF6D20B3A0DFB919DD2C0CE87.jpg\"}]")
@TableField(value ="power_supply_contract",typeHandler = FastjsonTypeHandler.class) @TableField(value ="power_supply_contract",typeHandler = FastjsonTypeHandler.class)
private List<Object> powerSupplyContract; private List<Object> powerSupplyContract;
/** /**
* 购售合同 * 购售合同
*/ */
@ApiModelProperty(value = "购售合同",example = "[{\"uid\":\"amos-upload-1718276542534-12\",\"name\":\"发用电合同.pdf\",\"url\":\"/upload/jxiop/amos_studio/6406664/E0FA7C856A991C6FEA89B2F6A2A968.pdf\",\"status\":\"done\"}]")
@TableField(value ="purchase_sale_contract",typeHandler = FastjsonTypeHandler.class) @TableField(value ="purchase_sale_contract",typeHandler = FastjsonTypeHandler.class)
private List<Object> purchaseSaleContract; private List<Object> purchaseSaleContract;
/** /**
* 并网协议 * 并网协议
*/ */
@ApiModelProperty(value = "并网协议",example = "[{\"uid\":\"amos-upload-1718276542534-14\",\"name\":\"发用电合同.pdf\",\"url\":\"/upload/jxiop/amos_studio/6406664/F2730C3413BD5E97EAA8A637A1D83F2.pdf\",\"status\":\"done\"}]")
@TableField(value ="grid_connection_protocol",typeHandler = FastjsonTypeHandler.class) @TableField(value ="grid_connection_protocol",typeHandler = FastjsonTypeHandler.class)
private List<Object> gridConnectionProtocol; private List<Object> gridConnectionProtocol;
/** /**
* 并网合同 * 并网合同
*/ */
@ApiModelProperty(value = "并网合同",example = "[{\"uid\":\"amos-upload-1718722141999-38\",\"name\":\"发用电合同.pdf\",\"url\":\"/upload/jxiop/amos_studio/6406664/6F27B3267D1B7190253832B4C2BCBD3.pdf\",\"status\":\"done\"}]")
@TableField(value ="grid_connection_contract",typeHandler = FastjsonTypeHandler.class) @TableField(value ="grid_connection_contract",typeHandler = FastjsonTypeHandler.class)
private List<Object> gridConnectionContract; private List<Object> gridConnectionContract;
/** /**
* 光e宝 * 光e宝
*/ */
@ApiModelProperty(value = "光e宝",example = "[{\"uid\":\"amos-upload-1719462431414-41\",\"name\":\"发用电.pdf\",\"url\":\"/upload/jxiop/amos_studio/6406664/4F46FA9F2E4A19378CEB7AA546AFB.pdf\",\"status\":\"done\"}]")
@TableField(value ="guang_e_bao",typeHandler = FastjsonTypeHandler.class) @TableField(value ="guang_e_bao",typeHandler = FastjsonTypeHandler.class)
private List<Object> guangEBao; private List<Object> guangEBao;
/** /**
* 开户行 * 开户行
*/ */
@ApiModelProperty(value = "开户行",example = "海口农商银行石山支行")
@TableField("bank") @TableField("bank")
private String bank; private String bank;
/** /**
* 户名 * 户名
*/ */
@ApiModelProperty(value = "户名",example = "钟保才")
@TableField("account_name") @TableField("account_name")
private String accountName; private String accountName;
/** /**
* 账号 * 账号
*/ */
@ApiModelProperty(value = "账号",example = "3436248200000740")
@TableField("account_number") @TableField("account_number")
private String accountNumber; private String accountNumber;
/** /**
* 合同到期时间 * 合同到期时间
*/ */
@ApiModelProperty(value = "合同到期时间",example = "2049-06-06")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("contract_expiration_date") @TableField("contract_expiration_date")
private Date contractExpirationDate; private Date contractExpirationDate;
...@@ -104,6 +117,7 @@ public class HygfOnGrid extends BaseEntity { ...@@ -104,6 +117,7 @@ public class HygfOnGrid extends BaseEntity {
/** /**
* 有效发电开始日 * 有效发电开始日
*/ */
@ApiModelProperty(value = "有效发电开始日",example = "2024-06-11")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("effective_power_generation_start_date") @TableField("effective_power_generation_start_date")
private Date effectivePowerGenerationStartDate; private Date effectivePowerGenerationStartDate;
...@@ -111,42 +125,50 @@ public class HygfOnGrid extends BaseEntity { ...@@ -111,42 +125,50 @@ public class HygfOnGrid extends BaseEntity {
/** /**
* 并网箱整体照片 * 并网箱整体照片
*/ */
@ApiModelProperty(value = "并网箱整体照片",example = "[{\"uid\":\"amos-upload-1719408990562-61\",\"name\":\"电箱.jpg\",\"url\":\"/upload/jxiop/amos_studio/6406664/FA626C261EE18B852C520A2D172ACE2.jpg\",\"status\":\"done\"}]")
@TableField(value ="overall_photo_grid_cage",typeHandler = FastjsonTypeHandler.class) @TableField(value ="overall_photo_grid_cage",typeHandler = FastjsonTypeHandler.class)
private List<Object> overallPhotoGridCage; private List<Object> overallPhotoGridCage;
/** /**
* 表箱整体照片 * 表箱整体照片
*/ */
@ApiModelProperty(value = "表箱整体照片",example = "[{\"uid\":\"amos-upload-1719408990562-63\",\"name\":\"电箱.jpg\",\"url\":\"/upload/jxiop/amos_studio/6406664/9281CC7CC55DCC6488B5193F3B6081.jpg\",\"status\":\"done\"}]")
@TableField(value ="electric_meter_box",typeHandler = FastjsonTypeHandler.class) @TableField(value ="electric_meter_box",typeHandler = FastjsonTypeHandler.class)
private List<Object> electricMeterBox; private List<Object> electricMeterBox;
/** /**
* 电表照片或视频 * 电表照片或视频
*/ */
@ApiModelProperty(value = "电表照片或视频",example = "[{\"uid\":\"amos-upload-1719408990562-99\",\"name\":\"电表.jpg\",\"url\":\"/upload/jxiop/amos_studio/6406664/B399377A21604009B9F6697F438A9B7.jpg\",\"status\":\"done\"}]")
@TableField(value ="electricity_meter",typeHandler = FastjsonTypeHandler.class) @TableField(value ="electricity_meter",typeHandler = FastjsonTypeHandler.class)
private List<Object> electricityMeter; private List<Object> electricityMeter;
/** /**
* 施工单id * 施工单id
*/ */
@ApiModelProperty(value = "施工单id",example = "1804051827063287810")
@TableField("work_order_id") @TableField("work_order_id")
private Long workOrderId; private Long workOrderId;
/** /**
* 施工电站id * 施工电站id
*/ */
@ApiModelProperty(value = "施工电站id",example = "1804051827105230850")
@TableField("work_order_power_station_id") @TableField("work_order_power_station_id")
private Long workOrderPowerStationId; private Long workOrderPowerStationId;
/** /**
* 农户id * 农户id
*/ */
@ApiModelProperty(value = "农户id",example = "1784414465702260737")
@TableField("peasant_household_id") @TableField("peasant_household_id")
private Long peasantHouseholdId; private Long peasantHouseholdId;
@ApiModelProperty(value = "并网时间",example = "2024-07-05 19:16:28")
@TableField("grid_connection_time") @TableField("grid_connection_time")
private Date gridConnectionTime; private Date gridConnectionTime;
@ApiModelProperty(value = "类型",example = "zx")
@TableField(exist = false) @TableField(exist = false)
private String type; private String type;
...@@ -154,16 +176,19 @@ public class HygfOnGrid extends BaseEntity { ...@@ -154,16 +176,19 @@ public class HygfOnGrid extends BaseEntity {
/** /**
* 片区整改单 * 片区整改单
*/ */
@ApiModelProperty(value = "片区整改单")
@TableField(exist = false) @TableField(exist = false)
private List<HygfRectificationOrder> areaOrders; private List<HygfRectificationOrder> areaOrders;
/** /**
* 工程整改单 * 工程整改单
*/ */
@ApiModelProperty(value = "工程整改单")
@TableField(exist = false) @TableField(exist = false)
private List<HygfRectificationOrder> engineeringOrders; private List<HygfRectificationOrder> engineeringOrders;
/** /**
* 设计整改单 * 设计整改单
*/ */
@ApiModelProperty(value = "设计整改单")
@TableField(exist = false) @TableField(exist = false)
private List<HygfRectificationOrder> designOrders; private List<HygfRectificationOrder> designOrders;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfRectificationOrder.java
View file @ 8b15ab0b
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -21,6 +22,7 @@ import java.util.List; ...@@ -21,6 +22,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value="hygf_rectification_order",autoResultMap = true) @TableName(value="hygf_rectification_order",autoResultMap = true)
@ApiModel(value = "HygfRectificationOrder",description ="审核单")
public class HygfRectificationOrder extends BaseEntity { public class HygfRectificationOrder extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,59 +30,69 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -28,59 +30,69 @@ public class HygfRectificationOrder extends BaseEntity {
/** /**
* 农户姓名 * 农户姓名
*/ */
@ApiModelProperty(value = "农户姓名",example = "冯宗荣")
@TableField("peasant_househole_name") @TableField("peasant_househole_name")
private String peasantHouseholeName; private String peasantHouseholeName;
/** /**
* 农户编号 * 农户编号
*/ */
@ApiModelProperty(value = "农户编号",example = "NH085SXAKZY202406274366")
@TableField("peasant_househole_code") @TableField("peasant_househole_code")
private String peasantHouseholeCode; private String peasantHouseholeCode;
/** /**
* 农户编号 * 项目地址
*/ */
@ApiModelProperty(value = "项目地址",example = "陕西省/安康市/紫阳县")
@TableField("project_address_name") @TableField("project_address_name")
private String projectAddressName; private String projectAddressName;
/** /**
* 农户场站id * 农户场站id
*/ */
@ApiModelProperty(value = "农户场站id",example = "1806275143140405250")
@TableField("peasant_househole_id") @TableField("peasant_househole_id")
private Long peasantHouseholeId; private Long peasantHouseholeId;
/** /**
* 整改项 * 整改项
*/ */
@ApiModelProperty(value = "整改项",example = "[{\"value\":\"巴登巴登棒棒哒\"},{\"value\":\"好多好多好多\"}]")
@TableField(value = "rectification_idea", typeHandler = FastjsonTypeHandler.class) @TableField(value = "rectification_idea", typeHandler = FastjsonTypeHandler.class)
private List<Object> rectificationIdea; private List<Object> rectificationIdea;
/** /**
* 整改附件 * 整改附件
*/ */
@ApiModelProperty(value = "整改附件",example = "[{\"uid\":\"0.q86dqhs5ox\",\"name\":\"测试11文档 - 副本 (2).pdf\",\"url\":\"/upload/common/2A1F49AD23EE80CE924174E57936235.pdf\"}]")
@TableField(value = "rectification_file", typeHandler = FastjsonTypeHandler.class) @TableField(value = "rectification_file", typeHandler = FastjsonTypeHandler.class)
private List<Object> rectificationFile; private List<Object> rectificationFile;
/** /**
* 整改结果附件 * 整改结果附件
*/ */
@ApiModelProperty(value = "整改结果附件",example = "[{\"uid\":\"0.mh6ka3udyu\",\"name\":\"测试11文档 - 副本 (5).pdf\",\"url\":\"/upload/common/2E7114E14DD89C11BCAA9C3803AF16B.pdf\"}]")
@TableField(value = "result_file", typeHandler = FastjsonTypeHandler.class) @TableField(value = "result_file", typeHandler = FastjsonTypeHandler.class)
private List<Object> resultFile; private List<Object> resultFile;
/** /**
* 整改结果 * 整改结果
*/ */
@ApiModelProperty(value = "整改结果",example = "[{\"value\":\"22\"}]")
@TableField(value ="rectification_result", typeHandler = FastjsonTypeHandler.class) @TableField(value ="rectification_result", typeHandler = FastjsonTypeHandler.class)
private List<Object> rectificationResult; private List<Object> rectificationResult;
/** /**
* 审核意见 * 审核意见
*/ */
@ApiModelProperty(value = "审核意见",example = "片区审核驳回")
@TableField("audit_idea") @TableField("audit_idea")
private String auditIdea; private String auditIdea;
/** /**
* 审核结果 * 审核结果
*/ */
@ApiModelProperty(value = "审核结果",example = "通过")
@TableField("audit_result") @TableField("audit_result")
private String auditResult; private String auditResult;
...@@ -88,6 +100,7 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -88,6 +100,7 @@ public class HygfRectificationOrder extends BaseEntity {
/** /**
* 整改类型 * 整改类型
*/ */
@ApiModelProperty(value = "整改类型",example = "土建类")
@TableField("rectification_type") @TableField("rectification_type")
private String rectificationType; private String rectificationType;
...@@ -95,24 +108,28 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -95,24 +108,28 @@ public class HygfRectificationOrder extends BaseEntity {
/** /**
* 整改来源 * 整改来源
*/ */
@ApiModelProperty(value = "整改来源",example = "area")
@TableField("rectification_source") @TableField("rectification_source")
private String rectificationSource; private String rectificationSource;
/** /**
* 整改来源 * 整改来源
*/ */
@ApiModelProperty(value = "整改来源",example = "area")
@TableField(exist = false) @TableField(exist = false)
private String rectificationSourceName; private String rectificationSourceName;
/** /**
* 整改历史意见 * 整改历史意见
*/ */
@ApiModelProperty(value = "整改历史意见",example = "[{\"value\":\"片区不通过\"},{\"value\":\"2024-08-16 10:20:34: 片区驳回不通过\"}]")
@TableField(value = "rectification_history", typeHandler = FastjsonTypeHandler.class) @TableField(value = "rectification_history", typeHandler = FastjsonTypeHandler.class)
private List<Object> rectificationHistory; private List<Object> rectificationHistory;
/** /**
* 整改单状态 * 整改单状态
*/ */
@ApiModelProperty(value = "整改单状态",example = "已完成")
@TableField("rectification_status") @TableField("rectification_status")
private String rectificationStatus; private String rectificationStatus;
...@@ -120,6 +137,7 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -120,6 +137,7 @@ public class HygfRectificationOrder extends BaseEntity {
/** /**
* 是否提交 0 提交 1 暂存 * 是否提交 0 提交 1 暂存
*/ */
@ApiModelProperty(value = "是否提交 0 提交 1 暂存",example = "0")
@TableField(exist = false) @TableField(exist = false)
private String addorSubmit; private String addorSubmit;
...@@ -127,6 +145,7 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -127,6 +145,7 @@ public class HygfRectificationOrder extends BaseEntity {
/** /**
* 工程负责人 * 工程负责人
*/ */
@ApiModelProperty(value = "工程负责人",example = "admin")
@TableField("project_region_manger") @TableField("project_region_manger")
private String projectRegionManager; private String projectRegionManager;
...@@ -134,13 +153,16 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -134,13 +153,16 @@ public class HygfRectificationOrder extends BaseEntity {
/** /**
* 是否提交 0 提交 1 暂存 * 是否提交 0 提交 1 暂存
*/ */
@ApiModelProperty(value = "是否提交 0 提交 1 暂存",example = "0")
@TableField(exist = false) @TableField(exist = false)
private String isAudit; private String isAudit;
@ApiModelProperty(value = "结果WEB",example = "结果WEB")
@TableField(exist = false) @TableField(exist = false)
private String rectificationResultWeb; private String rectificationResultWeb;
@ApiModelProperty(value = "历史WEB",example = "历史WEB")
@TableField(exist = false) @TableField(exist = false)
private String rectificationHistoryWeb; private String rectificationHistoryWeb;
@ApiModelProperty(value = "ideaWeb",example = "ideaWeb")
@TableField(exist = false) @TableField(exist = false)
private String rectificationIdeaWeb; private String rectificationIdeaWeb;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java
View file @ 8b15ab0b
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -21,6 +23,7 @@ import java.util.List; ...@@ -21,6 +23,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value = "hygf_peasant_household",autoResultMap = true) @TableName(value = "hygf_peasant_household",autoResultMap = true)
@ApiModel(value = "PeasantHousehold",description = "农户信息")
public class PeasantHousehold extends BaseEntity { public class PeasantHousehold extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -29,166 +32,196 @@ public class PeasantHousehold extends BaseEntity { ...@@ -29,166 +32,196 @@ public class PeasantHousehold extends BaseEntity {
/** /**
* 勘察表id * 勘察表id
*/ */
@ApiModelProperty(value = "勘察表id",example = "1712050621051310082")
@TableField("survey_information_id") @TableField("survey_information_id")
private Long surveyInformationId; private Long surveyInformationId;
/** /**
* 农户信息编号 * 农户信息编号
*/ */
@ApiModelProperty(value = "农户信息编号",example = "NH004GXZZZZYLBL202405164277")
@TableField("peasant_household_no") @TableField("peasant_household_no")
private String peasantHouseholdNo; private String peasantHouseholdNo;
/** /**
* 业主姓名 * 业主姓名
*/ */
@ApiModelProperty(value = "业主姓名",example = "admin")
@TableField("owners_name") @TableField("owners_name")
private String ownersName; private String ownersName;
/** /**
* 联系电话 * 联系电话
*/ */
@ApiModelProperty(value = "联系电话",example = "13700068571888")
@TableField("telephone") @TableField("telephone")
private String telephone; private String telephone;
/** /**
* 开发方名称 * 开发方名称
*/ */
@ApiModelProperty(value = "开发方名称",example = "系统演示专用账号")
@TableField("developer_name") @TableField("developer_name")
private String developerName; private String developerName;
/** /**
* 开发方code * 开发方code
*/ */
@ApiModelProperty(value = "开发方code",example = "86*355*443*479")
@TableField("developer_code") @TableField("developer_code")
private String developerCode; private String developerCode;
@ApiModelProperty(value = "开发方Id",example = "1711989888259223554")
@TableField("developer_id") @TableField("developer_id")
private Long developerId; private Long developerId;
/** /**
* 定金 * 定金
*/ */
@ApiModelProperty(value = "定金",example = "11.5")
@TableField("deposit") @TableField("deposit")
private Float deposit; private Float deposit;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间",example = "2023-10-11 18:20:51")
@TableField("creation_time") @TableField("creation_time")
private Date creationTime; private Date creationTime;
/** /**
* 项目地址 * 项目地址
*/ */
@ApiModelProperty(value = "项目地址",example = "[110000,110100,110101]")
@TableField(value = "project_address",typeHandler = FastjsonTypeHandler.class) @TableField(value = "project_address",typeHandler = FastjsonTypeHandler.class)
private List<Integer> projectAddress; private List<Integer> projectAddress;
/** /**
* 常住地址 * 常住地址
*/ */
@ApiModelProperty(value = "常住地址",example = "[110000,110100,110101]")
@TableField(value = "permanent_address",typeHandler = FastjsonTypeHandler.class) @TableField(value = "permanent_address",typeHandler = FastjsonTypeHandler.class)
private List<Integer> permanentAddress; private List<Integer> permanentAddress;
/** /**
* 常住地址 * 常住地址
*/ */
@ApiModelProperty(value = "常住地址",example = "北京市/北京城区/东城")
@TableField("permanent_address_name") @TableField("permanent_address_name")
private String permanentAddressName; private String permanentAddressName;
/** /**
* 项目地址 * 项目地址
*/ */
@ApiModelProperty(value = "项目地址",example = "北京市/北京城区/东城")
@TableField("project_address_name") @TableField("project_address_name")
private String projectAddressName; private String projectAddressName;
/** /**
* 是否勘察 0,1 * 是否勘察 0,1
*/ */
@ApiModelProperty(value = "是否勘察 0,1",example = "0")
@TableField("survey_or_not") @TableField("survey_or_not")
private Integer surveyOrNot; private Integer surveyOrNot;
/** /**
* 身份证号 * 身份证号
*/ */
@ApiModelProperty(value = "身份证号",example = "210702199012010611")
@TableField("id_card") @TableField("id_card")
private String idCard; private String idCard;
/** /**
* 邮箱 * 邮箱
*/ */
@ApiModelProperty(value = "邮箱",example = "22134124@163.com")
@TableField("mailbox") @TableField("mailbox")
private String mailbox; private String mailbox;
/** /**
* 审核状态 0未审核,1审核中，2审核结束 * 审核状态 0未审核,1审核中，2审核结束
*/ */
@ApiModelProperty(value = "审核状态 0未审核,1审核中，2审核结束",example = "0")
@TableField("review") @TableField("review")
private Integer review; private Integer review;
/** /**
* 项目详细地址 * 项目详细地址
*/ */
@ApiModelProperty(value = "项目详细地址",example = "汝湖镇仍中村委仍中村小组153号")
@TableField("project_address_detail") @TableField("project_address_detail")
private String projectAddressDetail; private String projectAddressDetail;
/** /**
* 常住详细地址 * 常住详细地址
*/ */
@ApiModelProperty(value = "常住详细地址",example = "汝湖镇仍中村委仍中村小组153号")
@TableField("permanent_address_detail") @TableField("permanent_address_detail")
private String permanentAddressDetail; private String permanentAddressDetail;
/* /*
* 开发人 * 开发人
* */ * */
@ApiModelProperty(value = "开发人",example = "admin")
@TableField("developer") @TableField("developer")
private String developer; private String developer;
@ApiModelProperty(value = "开发人Id",example = "1711989888259223554")
@TableField("developer_user_id") @TableField("developer_user_id")
private String developerUserId; private String developerUserId;
/* /*
* 区域公司id * 区域公司id
* */ * */
@ApiModelProperty(value = "区域公司id",example = "1703949560172277762")
@TableField("regional_companies_seq") @TableField("regional_companies_seq")
private Long regionalCompaniesSeq; private Long regionalCompaniesSeq;
/* /*
* 区域公司code * 区域公司code
* */ * */
@ApiModelProperty(value = "区域公司code",example = "86*354*344*385*464")
@TableField("regional_companies_code") @TableField("regional_companies_code")
private String regionalCompaniesCode; private String regionalCompaniesCode;
/* /*
* 区域公司名称 * 区域公司名称
* */ * */
@ApiModelProperty(value = "区域公司名称",example = "户用光伏测试有限公司")
@TableField("regional_companies_name") @TableField("regional_companies_name")
private String regionalCompaniesName; private String regionalCompaniesName;
/* /*
* 身份证正面 * 身份证正面
* */ * */
@ApiModelProperty(value = "身份证正面",example = "[{\"url\":\"/upload/common/1A1A581255340AE3E9FC42EE2E3D08F.jpg\"}]")
@TableField(value = "id_card_front", typeHandler = FastjsonTypeHandler.class) @TableField(value = "id_card_front", typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardFront; private List<Object> idCardFront;
/* /*
* 身份证反面 * 身份证反面
* */ * */
@ApiModelProperty(value = "身份证反面",example = "[{\"url\":\"/upload/common/1A1A581255340AE3E9FC42EE2E3D08F.jpg\"}]")
@TableField(value = "id_card_opposite", typeHandler = FastjsonTypeHandler.class) @TableField(value = "id_card_opposite", typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardOpposite; private List<Object> idCardOpposite;
/* /*
* 微信唯一id * 微信唯一id
* */ * */
@ApiModelProperty(value = "微信唯一id",example = "asdfwe212414")
@TableField("open_id") @TableField("open_id")
private String openId; private String openId;
/* /*
* 是否已认证（0-未认证，1-已认证） * 是否已认证（0-未认证，1-已认证）
* */ * */
@ApiModelProperty(value = "是否已认证（0-未认证，1-已认证）",example = "0")
@TableField("is_certified") @TableField("is_certified")
private Integer isCertified; private Integer isCertified;
/* /*
* 平台userId * 平台userId
* */ * */
@ApiModelProperty(value = "平台userId",example = "5606165")
@TableField("amos_user_id") @TableField("amos_user_id")
private String amosUserId; private String amosUserId;
/* /*
* 是否历史电站 * 是否历史电站
* */ * */
@ApiModelProperty(value = "是否历史电站",example = "0")
@TableField("is_history") @TableField("is_history")
private String isHistory; private String isHistory;
@ApiModelProperty(value = "场站ID",example = "1706869086106972161")
@TableField(exist = false) @TableField(exist = false)
protected Long stationId; protected Long stationId;
...@@ -197,47 +230,56 @@ public class PeasantHousehold extends BaseEntity { ...@@ -197,47 +230,56 @@ public class PeasantHousehold extends BaseEntity {
/** /**
* 已发货，已收货， * 已发货，已收货，
*/ */
@ApiModelProperty(value = "施工状态 已发货，已收货",example = "已发货")
@TableField("preparation_money_state") @TableField("preparation_money_state")
private String preparationMoneyState; private String preparationMoneyState;
/** /**
* 备货状态 * 备货状态
*/ */
@ApiModelProperty(value = "备货状态",example = "备货中")
@TableField("construction_state") @TableField("construction_state")
private String constructionState; private String constructionState;
@ApiModelProperty(value = "勘察或下个节点",example = "勘察")
@TableField(exist = false) @TableField(exist = false)
private String surveyOrNotText; private String surveyOrNotText;
@ApiModelProperty(value = "常住地址",example = "北京市/北京城区/东城")
@TableField(exist = false,typeHandler = FastjsonTypeHandler.class) @TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
private List<String> permanentAddressText; private List<String> permanentAddressText;
@ApiModelProperty(value = "项目地址",example = "北京市/北京城区/东城")
@TableField(exist = false,typeHandler = FastjsonTypeHandler.class) @TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
private List<String> projectAddressText; private List<String> projectAddressText;
/** /**
* 当前农户下所有的合同是否已废弃, 1(全部已废弃), 0(未全部废弃) * 当前农户下所有的合同是否已废弃, 1(全部已废弃), 0(未全部废弃)
*/ */
@ApiModelProperty(value = "当前农户下所有的合同是否已废弃, 1(全部已废弃), 0(未全部废弃)",example = "0")
@TableField(exist = false) @TableField(exist = false)
private Integer isAllRevoke; private Integer isAllRevoke;
/** /**
* 电站规模 * 电站规模
*/ */
@ApiModelProperty(value = "电站规模",example = "25.50")
@TableField(exist = false) @TableField(exist = false)
private String scale; private String scale;
/** /**
* 电站规模 * 电站规模
*/ */
@ApiModelProperty(value = "电站实际规模",example = "23.50")
@TableField(exist = false) @TableField(exist = false)
private String realScale; private String realScale;
/** /**
放款金额 放款金额
*/ */
@ApiModelProperty(value = "放款金额",example = "23.77")
@TableField(exist = false) @TableField(exist = false)
private Double disbursementMoney; private Double disbursementMoney;
@ApiModelProperty(value = "省份",example = "北京市")
@TableField(exist = false) @TableField(exist = false)
private String province; private String province;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationEngineeringInfo.java
View file @ 8b15ab0b
...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -22,6 +24,7 @@ import java.util.List; ...@@ -22,6 +24,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value = "hygf_power_station_engineering_info",autoResultMap = true) @TableName(value = "hygf_power_station_engineering_info",autoResultMap = true)
@ApiModel(value = "PowerStationEngineeringInfo",description = "施工电站工程信息")
public class PowerStationEngineeringInfo extends BaseEntity { public class PowerStationEngineeringInfo extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -29,88 +32,102 @@ public class PowerStationEngineeringInfo extends BaseEntity { ...@@ -29,88 +32,102 @@ public class PowerStationEngineeringInfo extends BaseEntity {
/** /**
* 组件规格 * 组件规格
*/ */
@ApiModelProperty(value = "组件规格",example = "540")
@TableField("component_specification") @TableField("component_specification")
private String componentSpecification; private String componentSpecification;
/** /**
* 上网类型 * 上网类型
*/ */
@ApiModelProperty(value = "上网类型",example = "全额上网")
@TableField("grid_connection_type") @TableField("grid_connection_type")
private String gridConnectionType; private String gridConnectionType;
/** /**
* 组件数量 * 组件数量
*/ */
@ApiModelProperty(value = "组件数量",example = "43")
@TableField("component_quantity") @TableField("component_quantity")
private Integer componentQuantity; private Integer componentQuantity;
/** /**
* 组件数量 * 实际电量
*/ */
@ApiModelProperty(value = "实际电量",example = "23.22")
@TableField("real_scale") @TableField("real_scale")
private Double realScale; private Double realScale;
/** /**
* 逆变器数量 * 逆变器数量
*/ */
@ApiModelProperty(value = "逆变器数量",example = "43")
@TableField("inverter_quantity") @TableField("inverter_quantity")
private Integer inverterQuantity; private Integer inverterQuantity;
/** /**
* 并网箱数量 * 并网箱数量
*/ */
@ApiModelProperty(value = "并网箱数量",example = "21")
@TableField("grid_box_quantity") @TableField("grid_box_quantity")
private Integer gridBoxQuantity; private Integer gridBoxQuantity;
/** /**
* 电缆规格 * 电缆规格
*/ */
@ApiModelProperty(value = "电缆规格",example = "4x6")
@TableField("cable_specification") @TableField("cable_specification")
private String cableSpecification; private String cableSpecification;
/** /**
* 电站设计方案 * 电站设计方案
*/ */
@ApiModelProperty(value = "电站设计方案",example = "43")
@TableField("power_station_design_plan") @TableField("power_station_design_plan")
private String powerStationDesignPlan; private String powerStationDesignPlan;
/** /**
* 屋顶类型 * 屋顶类型
*/ */
@ApiModelProperty(value = "屋顶类型",example = "平屋顶")
@TableField("roof_type") @TableField("roof_type")
private String roofType; private String roofType;
/** /**
* 组件类型 * 组件类型
*/ */
@ApiModelProperty(value = "组件类型",example = "单晶")
@TableField("component_type") @TableField("component_type")
private String componentType; private String componentType;
/** /**
* 并网箱类型 * 并网箱类型
*/ */
@ApiModelProperty(value = "并网箱类型",example = "带计量表位")
@TableField("grid_box_type") @TableField("grid_box_type")
private String gridBoxType; private String gridBoxType;
/** /**
* 并网箱功能 * 并网箱功能
*/ */
@ApiModelProperty(value = "并网箱功能",example = "一进一出")
@TableField("grid_box_function") @TableField("grid_box_function")
private String gridBoxFunction; private String gridBoxFunction;
/** /**
* *
*/ */
@ApiModelProperty(value = "派工单Id",example = "1854410994177019905")
@TableField("work_order_id") @TableField("work_order_id")
private Long workOrderId; private Long workOrderId;
/** /**
* *
*/ */
@ApiModelProperty(value = "施工电站ID",example = "1854411671791996929")
@TableField("work_order_power_station_id") @TableField("work_order_power_station_id")
private Long workOrderPowerStationId; private Long workOrderPowerStationId;
@ApiModelProperty(value = "完成时间",example = "2024-11-19")
@TableField(value = "completion_date",updateStrategy = FieldStrategy.IGNORED) @TableField(value = "completion_date",updateStrategy = FieldStrategy.IGNORED)
@JsonFormat(pattern="yyyy-MM-dd") @JsonFormat(pattern="yyyy-MM-dd")
private Date completionDate; private Date completionDate;
...@@ -122,23 +139,27 @@ public class PowerStationEngineeringInfo extends BaseEntity { ...@@ -122,23 +139,27 @@ public class PowerStationEngineeringInfo extends BaseEntity {
* 施工组件信息 * 施工组件信息
*/ */
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "施工组件信息",example = "[{\"gl\":\"540W\",\"xlh\":\"*323\",\"wlbm\":\"\",\"bk\":\"\",\"id\":\"amos-timeuuid-1730961702464-5\",\"wlmc\":\"\",\"lx\":\"\",\"dcpgg\":\"\",\"dsm\":\"单面\"}]")
private List<Object> constructionComponentInfo; private List<Object> constructionComponentInfo;
/** /**
* 施工逆变器信息 * 施工逆变器信息
*/ */
@ApiModelProperty(value = "施工逆变器信息",example = "[{\"xl\":\"\",\"gl\":\"10kW\",\"xlh\":\"3232\",\"wlbm\":\"\",\"id\":\"amos-timeuuid-1730961702464-2\",\"wlmc\":\"\",\"yzm\":\"\",\"xw\":\"\"}]")
@TableField(exist = false) @TableField(exist = false)
private List<Object> constructionInverterInfo; private List<Object> constructionInverterInfo;
/** /**
* 施工采集器信息 * 施工采集器信息
*/ */
@ApiModelProperty(value = "施工采集器信息",example = "[{\"xlh\":\"3232\",\"id\":\"amos-timeuuid-1730961702464-3\"}]")
@TableField(exist = false) @TableField(exist = false)
private List<Object> constructionCollectorBoxInfo; private List<Object> constructionCollectorBoxInfo;
/** /**
* 施工并网箱信息 * 施工并网箱信息
*/ */
@ApiModelProperty(value = "施工并网箱信息",example = "[{\"gl\":\"63A一进一出\",\"xlh\":\"*32323\",\"wlbm\":\"\",\"cz\":\"\",\"gn\":\"一进一出\",\"id\":\"amos-timeuuid-1730961702464-4\",\"wlmc\":\"\",\"lx\":\"带计量表位\",\"swms\":\"\",\"xw\":\"\"}]")
@TableField(exist = false) @TableField(exist = false)
private List<Object> constructionGridBoxInfo; private List<Object> constructionGridBoxInfo;
...@@ -147,24 +168,28 @@ public class PowerStationEngineeringInfo extends BaseEntity { ...@@ -147,24 +168,28 @@ public class PowerStationEngineeringInfo extends BaseEntity {
/** /**
* 工程负责人 * 工程负责人
*/ */
@ApiModelProperty(value = "工程负责人",example = "admin")
@TableField(exist = false) @TableField(exist = false)
private String projectRegionManager; private String projectRegionManager;
/** /**
* 工程负责人电话 * 工程负责人电话
*/ */
@ApiModelProperty(value = "工程负责人电话",example = "13342224434")
@TableField(exist = false) @TableField(exist = false)
private String projectRegionManagerPhone; private String projectRegionManagerPhone;
/** /**
* 施工负责人 * 施工负责人
*/ */
@ApiModelProperty(value = "施工负责人",example = "admin")
@TableField(exist = false) @TableField(exist = false)
private String constructionRegionManager; private String constructionRegionManager;
/** /**
* 施工负责人电话 * 施工负责人电话
*/ */
@ApiModelProperty(value = "施工负责人电话",example = "13342224434")
@TableField(exist = false) @TableField(exist = false)
private String constructionRegionManagerPhone; private String constructionRegionManagerPhone;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrder.java
View file @ 8b15ab0b
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -23,6 +24,7 @@ import java.util.List; ...@@ -23,6 +24,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("hygf_work_order") @TableName("hygf_work_order")
@ApiModel(value="WorkOrder", description="派工单实体类")
public class WorkOrder extends BaseEntity { public class WorkOrder extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -30,18 +32,21 @@ public class WorkOrder extends BaseEntity { ...@@ -30,18 +32,21 @@ public class WorkOrder extends BaseEntity {
/** /**
* 派工单编号 * 派工单编号
*/ */
@ApiModelProperty(value = "派工单编号",example = "PG002JXSRYG202403226123")
@TableField("work_order_num") @TableField("work_order_num")
private String workOrderNum; private String workOrderNum;
/** /**
* 制单人 * 制单人
*/ */
@ApiModelProperty(value = "制单人",example = "admin")
@TableField("preparer") @TableField("preparer")
private String preparer; private String preparer;
/** /**
* 制单日期 * 制单日期
*/ */
@ApiModelProperty(value = "制单日期",example = "2024-03-22")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("issue_date") @TableField("issue_date")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
...@@ -50,6 +55,7 @@ public class WorkOrder extends BaseEntity { ...@@ -50,6 +55,7 @@ public class WorkOrder extends BaseEntity {
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@ApiModelProperty(value = "计划开工日期",example = "2025-03-22")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField("planned_start_date") @TableField("planned_start_date")
...@@ -58,6 +64,7 @@ public class WorkOrder extends BaseEntity { ...@@ -58,6 +64,7 @@ public class WorkOrder extends BaseEntity {
/** /**
* 计划完工日期 * 计划完工日期
*/ */
@ApiModelProperty(value = "计划完工日期",example = "2025-03-22")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField("planned_end_date") @TableField("planned_end_date")
...@@ -66,18 +73,21 @@ public class WorkOrder extends BaseEntity { ...@@ -66,18 +73,21 @@ public class WorkOrder extends BaseEntity {
/** /**
* 区域公司id * 区域公司id
*/ */
@ApiModelProperty(value = "区域公司id",example = "1702215275253886977")
@TableField("region_company_id") @TableField("region_company_id")
private Long regionCompanyId; private Long regionCompanyId;
/** /**
* 区域公司名称 * 区域公司名称
*/ */
@ApiModelProperty(value = "区域公司名称",example = "余干县赣德新能源科技有限公司")
@TableField("region_company_name") @TableField("region_company_name")
private String regionCompanyName; private String regionCompanyName;
/** /**
* 区域公司orgcode * 区域公司orgcode
*/ */
@ApiModelProperty(value = "区域公司orgcode",example = "86*354*344*385*446")
@TableField("region_code") @TableField("region_code")
private String regionCode; private String regionCode;
...@@ -85,6 +95,7 @@ public class WorkOrder extends BaseEntity { ...@@ -85,6 +95,7 @@ public class WorkOrder extends BaseEntity {
/** /**
* 区域公司省市区 * 区域公司省市区
*/ */
@ApiModelProperty(value = "区域公司省市区",example = "江西省,上饶市,余干县")
@TableField("region_address") @TableField("region_address")
private String regionAddress; private String regionAddress;
...@@ -92,76 +103,86 @@ public class WorkOrder extends BaseEntity { ...@@ -92,76 +103,86 @@ public class WorkOrder extends BaseEntity {
/** /**
* 工程负责人 * 工程负责人
*/ */
@ApiModelProperty(value = "工程负责人",example = "admin")
@TableField("project_region_manager") @TableField("project_region_manager")
private String projectRegionManager; private String projectRegionManager;
/** /**
* 工程负责人电话 * 工程负责人电话
*/ */
@ApiModelProperty(value = "工程负责人电话",example = "133222244122")
@TableField("project_region_manager_phone") @TableField("project_region_manager_phone")
private String projectRegionManagerPhone; private String projectRegionManagerPhone;
/** /**
* 施工负责人 * 施工负责人
*/ */
@ApiModelProperty(value = "施工负责人",example = "admin")
@TableField("construction_region_manager") @TableField("construction_region_manager")
private String constructionRegionManager; private String constructionRegionManager;
/** /**
* 施工负责人电话 * 施工负责人电话
*/ */
@ApiModelProperty(value = "施工负责人电话",example = "133222244122")
@TableField("construction_region_manager_phone") @TableField("construction_region_manager_phone")
private String constructionRegionManagerPhone; private String constructionRegionManagerPhone;
/** /**
* 派工单状态 * 派工单状态
*/ */
@ApiModelProperty(value = "派工单状态",example = "已完工")
@TableField("work_order_status") @TableField("work_order_status")
private String workOrderStatus; private String workOrderStatus;
@ApiModelProperty(value = "平台经销商单位id") @ApiModelProperty(value = "平台经销商单位id",example = "1706869086106972161")
@TableField("amos_dealer_id") @TableField("amos_dealer_id")
private Long amosDealerId; private Long amosDealerId;
@ApiModelProperty(value = "平台经销商单位名称") @ApiModelProperty(value = "平台经销商单位名称",example = "四川锦绣天地建筑工程有限公司南昌分公司")
@TableField("amos_dealer_name") @TableField("amos_dealer_name")
private String amosDealerName; private String amosDealerName;
@ApiModelProperty(value = "平台经销商单位orgcode") @ApiModelProperty(value = "平台经销商单位orgcode",example = "86*355*443*472")
@TableField("amos_dealer_org_code") @TableField("amos_dealer_org_code")
private String amosDealerOrgCode; private String amosDealerOrgCode;
@ApiModelProperty(value = "工程负责人userId") @ApiModelProperty(value = "工程负责人userId",example = "213213")
@TableField("project_region_manager_user_id") @TableField("project_region_manager_user_id")
private String projectRegionManagerUserId; private String projectRegionManagerUserId;
@ApiModelProperty(value = "工程负责人userId") @ApiModelProperty(value = "工程注册人userId",example = "213213")
@TableField("construction_region_manager_user_id") @TableField("construction_region_manager_user_id")
private String constructionRegionManagerUserId; private String constructionRegionManagerUserId;
@ApiModelProperty(value = "农户信息")
@TableField(exist = false) @TableField(exist = false)
List<PeasantHousehold> peasantHouseholdId; List<PeasantHousehold> peasantHouseholdId;
@ApiModelProperty(value = "施工电站数",example = "12")
@TableField(exist = false) @TableField(exist = false)
int peasantHouseholdNum;//施工电站数 int peasantHouseholdNum;//施工电站数
@ApiModelProperty(value = "已施工电站数",example = "10")
@TableField(exist = false) @TableField(exist = false)
int peasantHouseholdSgNum;//已施工电站数 int peasantHouseholdSgNum;//已施工电站数
/** /**
* 经销商单位 * 经销商单位
* */ * */
@ApiModelProperty(value = "经销商单位",example = "1706869086106972161")
@TableField(exist = false) @TableField(exist = false)
private Long developerId; private Long developerId;
@ApiModelProperty(value = "页码",example = "1")
@TableField(exist = false) @TableField(exist = false)
int current; int current;
@ApiModelProperty(value = "页数大小",example = "20")
@TableField(exist = false) @TableField(exist = false)
int size; int size;
@ApiModelProperty(value = "电站名称",example = "admin")
@TableField(exist = false) @TableField(exist = false)
private String ownersName; private String ownersName;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderPowerStationController.java
View file @ 8b15ab0b
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPowerStationDto; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPowerStationDto;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkOrderPowerStationServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkOrderPowerStationServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
...@@ -52,7 +53,7 @@ public class WorkOrderPowerStationController extends BaseController { ...@@ -52,7 +53,7 @@ public class WorkOrderPowerStationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新施工派工单电站", notes = "根据sequenceNbr更新施工派工单电站") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新施工派工单电站", notes = "根据sequenceNbr更新施工派工单电站")
public ResponseModel<WorkOrderPowerStationDto> updateBySequenceNbrWorkOrderPowerStation(@RequestBody WorkOrderPowerStationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<WorkOrderPowerStationDto> updateBySequenceNbrWorkOrderPowerStation(@RequestBody WorkOrderPowerStationDto model,@ApiParam(name = "sequenceNbr",value = "主键", example = "158888889425888")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(workOrderPowerStationServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(workOrderPowerStationServiceImpl.updateWithModel(model));
} }
...@@ -66,7 +67,7 @@ public class WorkOrderPowerStationController extends BaseController { ...@@ -66,7 +67,7 @@ public class WorkOrderPowerStationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除施工派工单电站", notes = "根据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(name = "sequenceNbr",value = "主键", example = "158888889425888") @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(workOrderPowerStationServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(workOrderPowerStationServiceImpl.removeById(sequenceNbr));
} }
...@@ -79,7 +80,7 @@ public class WorkOrderPowerStationController extends BaseController { ...@@ -79,7 +80,7 @@ public class WorkOrderPowerStationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工单电站", notes = "根据sequenceNbr查询单个施工派工单电站") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工派工单电站", notes = "根据sequenceNbr查询单个施工派工单电站")
public ResponseModel<WorkOrderPowerStationDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<WorkOrderPowerStationDto> selectOne(@ApiParam(name = "sequenceNbr",value = "主键", example = "158888889425888")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(workOrderPowerStationServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(workOrderPowerStationServiceImpl.queryBySeq(sequenceNbr));
} }
...@@ -93,8 +94,8 @@ public class WorkOrderPowerStationController extends BaseController { ...@@ -93,8 +94,8 @@ public class WorkOrderPowerStationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "施工派工单电站分页查询", notes = "施工派工单电站分页查询") @ApiOperation(httpMethod = "GET",value = "施工派工单电站分页查询", notes = "施工派工单电站分页查询")
public ResponseModel<Page<WorkOrderPowerStationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<WorkOrderPowerStationDto>> queryForPage(@RequestParam(value = "current")@ApiParam(name = "current",example = "1") int current,@RequestParam
(value = "size") int size) { (value = "size")@ApiParam(name = "size",example = "10") int size) {
Page<WorkOrderPowerStationDto> page = new Page<WorkOrderPowerStationDto>(); Page<WorkOrderPowerStationDto> page = new Page<WorkOrderPowerStationDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/YearPowerController.java
View file @ 8b15ab0b
...@@ -5,7 +5,9 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController; ...@@ -5,7 +5,9 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.dto.YearPowerDto; import com.yeejoin.amos.boot.module.hygf.api.dto.YearPowerDto;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.YearPowerServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.YearPowerServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
...@@ -52,7 +54,7 @@ public class YearPowerController extends BaseController { ...@@ -52,7 +54,7 @@ public class YearPowerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新按年统计", notes = "根据sequenceNbr更新按年统计") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新按年统计", notes = "根据sequenceNbr更新按年统计")
public ResponseModel<YearPowerDto> updateBySequenceNbrYearPower(@RequestBody YearPowerDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<YearPowerDto> updateBySequenceNbrYearPower(@RequestBody YearPowerDto model,@ApiParam(name = "sequenceNbr",value = "主键", example = "158888889425888") @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(yearPowerServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(yearPowerServiceImpl.updateWithModel(model));
} }
...@@ -65,7 +67,7 @@ public class YearPowerController extends BaseController { ...@@ -65,7 +67,7 @@ public class YearPowerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除按年统计", notes = "根据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(name = "sequenceNbr",value = "主键", example = "158888889425888")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(yearPowerServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(yearPowerServiceImpl.removeById(sequenceNbr));
} }
...@@ -78,7 +80,7 @@ public class YearPowerController extends BaseController { ...@@ -78,7 +80,7 @@ public class YearPowerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个按年统计", notes = "根据sequenceNbr查询单个按年统计") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个按年统计", notes = "根据sequenceNbr查询单个按年统计")
public ResponseModel<YearPowerDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<YearPowerDto> selectOne(@ApiParam(name = "sequenceNbr",value = "主键", example = "158888889425888")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(yearPowerServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(yearPowerServiceImpl.queryBySeq(sequenceNbr));
} }
...@@ -92,8 +94,8 @@ public class YearPowerController extends BaseController { ...@@ -92,8 +94,8 @@ public class YearPowerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "按年统计分页查询", notes = "按年统计分页查询") @ApiOperation(httpMethod = "GET",value = "按年统计分页查询", notes = "按年统计分页查询")
public ResponseModel<Page<YearPowerDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<YearPowerDto>> queryForPage(@RequestParam(value = "current")@ApiParam(name = "current",example = "1") int current, @RequestParam
(value = "size") int size) { (value = "size") @ApiParam(name = "size",example = "20")int size) {
Page<YearPowerDto> page = new Page<YearPowerDto>(); Page<YearPowerDto> page = new Page<YearPowerDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
......
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