Skip to content

A
amos-boot-zx-biz
Commit 6053d3b2 authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

# Conflicts: # amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java
parents 270c3f61 ea3ec96e
Show whitespace changes
Inline Side-by-side
Showing with 755 additions and 549 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AllPowerDto.java
View file @ 6053d3b2
......@@ -17,13 +17,13 @@ public class AllPowerDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "第三方电站id")
@ApiModelProperty(value = "第三方电站id",example = "1299184320438816565")
private String thirdStationId;
@ApiModelProperty(value = "年")
@ApiModelProperty(value = "年",example = "2024")
private String year;
@ApiModelProperty(value = "平均功率")
@ApiModelProperty(value = "平均功率",example = "5.55")
private Double power;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommerceInfoDto.java
View file @ 6053d3b2
......@@ -20,28 +20,28 @@ public class CommerceInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "统一信用代码")
@ApiModelProperty(value = "统一信用代码",example = "91340100MA2NF88491")
private String creditCode;
@ApiModelProperty(value = "营业执照")
@ApiModelProperty(value = "营业执照",example = "/upload/jxiop/amos_studio/487908BEACF744B7F32D2594A33169.jpg")
private String businessLicensePhoto;
@ApiModelProperty(value = "法人名字")
@ApiModelProperty(value = "法人名字",example = "范友湖")
private String legalPersonName;
@ApiModelProperty(value = "法人身份证号")
@ApiModelProperty(value = "法人身份证号",example = "360121199401064612")
private String legalPersonIdNumber;
@ApiModelProperty(value = "法人身份证照片正面")
@ApiModelProperty(value = "法人身份证照片正面",example = "/upload/jxiop/amos_studio/3F5E55BFAD13E3DFE6B0CA2666A7F66.png")
private String legalPersonCardPhotoFront;
@ApiModelProperty(value = "法人身份证照片反面")
@ApiModelProperty(value = "法人身份证照片反面",example = "/upload/jxiop/amos_studio/3F5E55BFAD13E3DFE6B0CA2666A7F66.png")
private String legalPersonCardPhotoBack;
@ApiModelProperty(value = "法人联系方式")
@ApiModelProperty(value = "法人联系方式",example = "15115722666")
private String legalPersonPhone;
@ApiModelProperty(value = "单位id")
@ApiModelProperty(value = "单位id",example = "1724369413567680513")
private Long unitSeq;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommercialDto.java
View file @ 6053d3b2
......@@ -64,67 +64,67 @@ public class CommercialDto extends BaseDto {
@ApiModelProperty(value = "紧急联系人",example = "13022982292")
private String legalEmergentTelephone;
@ApiModelProperty(value = "结婚证文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "结婚证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> marriageCredit;
@ApiModelProperty(value = "房产证文件标识",example = "[{url: \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房产证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A125CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateCredit;
@ApiModelProperty(value = "身份证正反面文件标识",example = "[{url: \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "身份证正反面文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4213CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardCredit;
@ApiModelProperty(value = "户口本文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "户口本文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF53213AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> householdBookCredit;
@ApiModelProperty(value = "手持身份证文件标识",example = "[{url: \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "手持身份证文件标识",example = "[{\"url\": \"/upload/common/BABC7F9321356B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardCredit;
@ApiModelProperty(value = "踏勘照片文件标识",example = "[{uid: \"0.qcyinzogdcd\", url: \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]")
@ApiModelProperty(value = "踏勘照片文件标识",example = "[{\"uid\": \"0.qcyinzogdcd\", \"url\": \"/upload/common/4CE66E78D6367C67CB4B71C03C7F30.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> surveyPhotosWeb;
@ApiModelProperty(value = "组件平面图与组串连线图文件标识",example = "[{url: \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "组件平面图与组串连线图文件标识",example = "[{\"url\": \"/upload/common/B234234FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> formationWeb;
@ApiModelProperty(value = "房屋所有权继承说明文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房屋所有权继承说明文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF32423D9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> inheritWeb;
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识",example = "[{url: \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "户用光伏电站项目合作协议文件标识",example = "[{\"url\": \"/upload/common/BAB423423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agreementWeb;
@ApiModelProperty(value = "用户手持身份证照片文件标识",example = "[{url: \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "用户手持身份证照片文件标识",example = "[{\"url\": \"/upload/common/BABC42342FD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> handIdCardLegal;
@ApiModelProperty(value = "法人营业执照文件标识",example = "[{url: \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "法人营业执照文件标识",example = "[{\"url\": \"/upload/common/BABC7F9382423AFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> licenseLegal;
@ApiModelProperty(value = "法定代理人身份证文件标识",example = "[{url: \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]")
@ApiModelProperty(value = "法定代理人身份证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4423423B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> agentLegal;
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识",example = "[{url: \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识",example = "[{\"url\": \"/upload/common/BABC7F938Aads5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> realEstateLegal;
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识",example = "[{url: \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识",example = "[{\"url\": \"/upload/common/BABrwerF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseAgreementLegal;
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识",example = "[{url: \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4Fwqeqw9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> creditReportLegal;
@ApiModelProperty(value = "项目备案证文件标识",example = "[{url: \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]")
@ApiModelProperty(value = "项目备案证文件标识",example = "[{\"url\": \"/upload/common/BABdDsdadasdwrfAFSDSArf9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> filingsLegal;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DataDto.java
View file @ 6053d3b2
......@@ -13,4 +13,5 @@ import java.util.List;
public class DataDto {
String time;
List<String> snCodes;
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DayGenerateEX.java
View file @ 6053d3b2
......@@ -17,12 +17,15 @@ public class DayGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -32,28 +35,28 @@ public class DayGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
@ExcelProperty(value = "日发电量(kWh)", index = 6)
@ExcelProperty(value = "日发电量(kWh)", index = 7)
// 日发电量
private Double dayGenerate;
@ExcelProperty(value = "日收益(元)", index = 7)
@ExcelProperty(value = "日收益(元)", index = 8)
// 日收益
private Double dayIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
/**
* 状态
*/
@ExcelProperty(value = "状态", index = 9)
@ExcelProperty(value = "状态", index = 10)
private String state;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DesignInformationDto.java
View file @ 6053d3b2
......@@ -24,30 +24,30 @@ public class DesignInformationDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "典型设计图信息",example = "[{uid: \"0.2fcslywd2ry\", name: \"11.dws\", url: \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]")
@ApiModelProperty(value = "典型设计图信息",example = "[{\"uid\": \"0.2fcslywd2ry\", \"name\": \"11.dws\", \"url\": \"/upload/common/74FD9327D410951E60319A3215641DDE.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> typicalDiagram;
/**
* 典型设计图信息
*/
@ApiModelProperty(value = "典型设计图信息",example = "[{uid: \"0.qbiq6dutwl\", name: \"11.dwg\", url: \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]")
@ApiModelProperty(value = "典型设计图信息",example = "[{\"uid\": \"0.qbiq6dutwl\", \"name\": \"11.dwg\", \"url\": \"/upload/common/4B4C1D996B21A1F4CBBD9B72A92AFBA0.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> engineering;
@ApiModelProperty(value = "组件排布图",example = "[{uid: \"0.9bn4t1r35hf\", name: \"11.dwg\", url: \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]")
@ApiModelProperty(value = "组件排布图",example = "[{\"uid\": \"0.9bn4t1r35hf\", \"name\": \"11.dwg\", \"url\": \"/upload/common/E42849CBDE341C85870262917024A.dwg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentLayout;
@ApiModelProperty(value = "组件支架图",example = "[{uid: \"0.26j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]")
@ApiModelProperty(value = "组件支架图",example = "[{\"uid\": \"0.26j7x3whyx8\", \"name\": \"11.dws\", \"url\": \"/upload/common/D9B23BWADAWDAWD931251F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> componentBracket;
@ApiModelProperty(value = "组串接线图",example = "[{uid: \"0.36j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]")
@ApiModelProperty(value = "组串接线图",example = "[{\"uid\": \"0.36j7x3whyx8\", \"name\": \"11.dws\", \"url\": \"/upload/common/D9B23B3407AWADAWF9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> connectionLine;
@ApiModelProperty(value = "一次接线图",example = "[{uid: \"0.46j7x3whyx8\", name: \"11.dws\", url: \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]")
@ApiModelProperty(value = "一次接线图",example = "[{\"uid\": \"0.46j7x3whyx8\", \"name\": \"11.dws\", \"url\": \"/upload/common/D9B23B3DWAD51F9C1A257.dws\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> onceLine;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/InformationDto.java
View file @ 6053d3b2
......@@ -30,11 +30,11 @@ public class InformationDto extends BaseDto {
@ApiModelProperty(value = "档案编号",example = "DA002JXSRYG202411073242")
private String archivesNumber;
@ApiModelProperty(value = "身份证文件标识",example = "[{url: \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]")
@ApiModelProperty(value = "身份证文件标识",example = "[{\"url\": \"/upload/common/B1893353D7C528EE4F68EE2245959D8.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> cardFile;
@ApiModelProperty(value = " 房产证文件标识",example = "[{url: \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@ApiModelProperty(value = " 房产证文件标识",example = "[{\"url\": \"/upload/common/BABC7F938A4FF56B5CAFD9B55F5E50CD.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> houseProve;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
View file @ 6053d3b2
......@@ -167,7 +167,7 @@ public class JpStationDto extends BaseDto {
private Double ratedPower;
@ExcelIgnore
private String regionalCompaniesCode;
@ExcelIgnore
@ExcelProperty(value = "项目公司名称", index = 8)
private String regionalCompaniesName;
@ExcelIgnore
......@@ -185,7 +185,6 @@ public class JpStationDto extends BaseDto {
@ExcelProperty(value = "满发小时数（h）", index = 5)
private Double fullhour;
/**
*
* 实时功率比/
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthGenerateEX.java
View file @ 6053d3b2
......@@ -20,12 +20,15 @@ public class MonthGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -35,7 +38,7 @@ public class MonthGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
......@@ -43,15 +46,15 @@ public class MonthGenerateEX {
// 月发电量
@ExcelProperty(value = "月发电量(kWh)", index = 6)
@ExcelProperty(value = "月发电量(kWh)", index = 7)
private Double monthGenerate;
// 月收益
@ExcelProperty(value = "月收益(元)", index = 7)
@ExcelProperty(value = "月收益(元)", index = 8)
private Double monthIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java
View file @ 6053d3b2
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
......@@ -15,64 +16,79 @@ public class PowerStationEngineeringInfoAllDto {
//并网验收审核记录
@ApiModelProperty(value = "并网验收审核记录")
LoggerDto loggerDto;
//验收审核记录
@ApiModelProperty(value = "验收审核记录")
LoggerDto loggerYsDto;
//自审信息
@ApiModelProperty(value = "自审信息")
ConstructionRecords constructionRecords;
@ApiModelProperty(value = "并网操作日志")
ConstructionGirdRecords constructionGirdRecords;
@ApiModelProperty(value = "验收操作日志")
ConstructionAcceptanceRecords acceptanceRecords;
// 基本信息
@ApiModelProperty(value = "基本信息")
SurveyInformationDto surveyInformation;
@ApiModelProperty(value = "施工派工单Id",example = "1813102468939149314")
Long workOrderPowerStationId;
// 资料归档
@ApiModelProperty(value = "资料归档")
InformationDto information;
// 勘察信息详情
@ApiModelProperty(value = "勘察信息详情")
SurveyDetailsDto surveyDetails;
// 扩展信息
@ApiModelProperty(value = "扩展信息")
ExtendedInformationDto extendedInformation;
// 商务信息
@ApiModelProperty(value = "商务信息")
CommercialDto commercial;
//设计信息
@ApiModelProperty(value = "订单跟踪")
DesignInformationDto designInformation;
//订单跟踪
@ApiModelProperty(value = "订单跟踪")
LoggerDto orderTracking;
//工程信息
@ApiModelProperty(value = "工程信息")
PowerStationEngineeringInfo powerStationEngineeringInfo;
//施工信息
@ApiModelProperty(value = "施工信息")
PowerStationConstructionData powerStationConstructionData;
//并网信息
@ApiModelProperty(value = "并网信息")
HygfOnGrid hygfOnGrid;
//派工单信息
@ApiModelProperty(value = "派工单信息")
WorkOrder workOrder;
//验收信息
@ApiModelProperty(value = "验收信息")
AcceptanceCheck acceptanceCheck;
@ApiModelProperty(value = "保存标识",example = "0")
//保存标识 0 保存 1保存并提交
Integer commitFlag;
@ApiModelProperty(value = "流程类型",example = "0")
//流程类型 0 并网 1是验收
Integer flowType;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyDetailsDto.java
View file @ 6053d3b2
......@@ -55,7 +55,7 @@ public class SurveyDetailsDto extends BaseDto {
private String houseBias;
@ApiModelProperty(value = "手机指南正截图",example = "[{uid: \"0.pe5rtqf7ape\", url: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@ApiModelProperty(value = "手机指南正截图",example = "[{\"uid\": \"0.pe5rtqf7ape\", \"url\": \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> compass;
......@@ -157,35 +157,35 @@ public class SurveyDetailsDto extends BaseDto {
@ApiModelProperty(value = "关于邻居采光遮挡",example = "32")
private String daylightingObstruction;
@ApiModelProperty(value = "房屋整体文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "房屋整体文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> overallHousingSurvey;
@ApiModelProperty(value = "房屋周边文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "房屋周边文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> surroundingHouseSurvey;
@ApiModelProperty(value = "房屋内部整体照片文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "房屋内部整体照片文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> insideHouseSurvey;
@ApiModelProperty(value = "电表参数文件标识",example = "[{uid: \"0.pe5rtqf7ape\", url: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@ApiModelProperty(value = "电表参数文件标识",example = "[{\"uid\": \"0.pe5rtqf7ape\", \"url\": \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> electricitySurvey;
@ApiModelProperty(value = "屋顶全貌文件标识",example = "[{uid: \"0.kc339n1txcb\", url: \"/upload/common/19F868769E539D6ABA4A954530CD62E.png\"}]")
@ApiModelProperty(value = "屋顶全貌文件标识",example = "[{\"uid\": \"0.kc339n1txcb\", \"url\": \"/upload/common/19F868769E539D6ABA4A954530CD62E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> panoramaSurvey;
@ApiModelProperty(value = "屋顶平面草图文件标识",example = "[{uid: \"0.tgglnu260c\", url: \"/upload/common/719434819AB11D29A18253655579D1E.png\"}]")
@ApiModelProperty(value = "屋顶平面草图文件标识",example = "[{\"uid\": \"0.tgglnu260c\", \"url\": \"/upload/common/719434819AB11D29A18253655579D1E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> planSketchSurvey;
@ApiModelProperty(value = "房屋方位角文件标识",example = "[{uid: \"0.pe5rtqf7ape\", url: \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@ApiModelProperty(value = "房屋方位角文件标识",example = "[{\"uid\": \"0.pe5rtqf7ape\", \"url\": \"/upload/common/A6FFBD14C06F7643B4FDD63E50FE19F2.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> azimuthSurvey;
@ApiModelProperty(value = "其他附件文件标识",example = "[{uid: \"0.9zkn4xwv7yd\", url: \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@ApiModelProperty(value = "其他附件文件标识",example = "[{\"uid\": \"0.9zkn4xwv7yd\", \"url\": \"/upload/common/2248466CA72D1563C439816C64179F6E.png\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> otherAccessorySurvey;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java
View file @ 6053d3b2
......@@ -116,11 +116,11 @@ public class SurveyInformationDto extends BaseDto {
@ApiModelProperty(value = "农户id",example = "1854346995112611841")
private Long peasantHouseholdId;
@ApiModelProperty(value = "身份证正面",example = "[{url: \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]")
@ApiModelProperty(value = "身份证正面",example = "[{\"url\": \"/upload/common/F0DC9029F692D5D88F18CDAF8E45561.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardFront;
@ApiModelProperty(value = "身份证反面",example = "[{url: \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]")
@ApiModelProperty(value = "身份证反面",example = "[{\"url\": \"/upload/common/2F7BD22F5A557469FC484C5E3E62B56D.jpg\"}]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<Object> idCardOpposite;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessageDto.java
View file @ 6053d3b2
......@@ -22,22 +22,22 @@ public class UserMessageDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务类型")
@ApiModelProperty(value = "任务类型",example = "经销商审核")
private String type;
@ApiModelProperty(value = "业务id")
@ApiModelProperty(value = "业务id",example = "1706869110685569025")
private Long businessId;
@ApiModelProperty(value = "用户id")
@ApiModelProperty(value = "用户id",example = "5214012")
private String amosUserId;
@ApiModelProperty(value = " 消息创建时间")
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
private Date creationTime;
@ApiModelProperty(value = "消息内容")
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
private String taskName;
@ApiModelProperty(value = "经销商orgCode")
@ApiModelProperty(value = "经销商orgCode",example = "86*355*443*479")
private String amosOrgCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessagePageDto.java
View file @ 6053d3b2
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -13,6 +15,7 @@ import java.util.Date;
* @createDate: 2023/8/21
*/
@Data
@ApiModel(value = "UserMessagePageDto",description = "人员消息分页")
public class UserMessagePageDto extends Page<UserMessage> {
......@@ -20,22 +23,26 @@ public class UserMessagePageDto extends Page<UserMessage> {
/**
* 任务类型
*/
@ApiModelProperty(value = "任务类型",example = "经销商审核")
private String type;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id",example = "5214012")
private String amosUserId;
/**
* 消息创建时间
*/
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
private Date creationTime;
/**
* 消息内容
*/
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
private String taskName;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java
View file @ 6053d3b2
......@@ -85,7 +85,7 @@ public class WorkOrderPage {
int current;
@ApiModelProperty(value = "大小",example = "20")
int size;
@ApiModelProperty(value = "数据过滤标识",example = "[yseq,tet]")
@ApiModelProperty(value = "数据过滤标识",example = "[\"yseq\",\"tet\"]")
private List<String> workOrderPowerStationNodes ;
@ApiModelProperty(value = "判断是否可以审核,默认不可以",example = "不可以")
private String isAudit ;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/YearGenerateEX.java
View file @ 6053d3b2
......@@ -17,12 +17,15 @@ public class YearGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -30,22 +33,22 @@ public class YearGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
// 年发电量
@ExcelProperty(value = "年发电量(kWh)", index = 6)
@ExcelProperty(value = "年发电量(kWh)", index = 7)
private Double yearGenerate;
// 年收益
@ExcelProperty(value = "年收益（元）", index = 7)
@ExcelProperty(value = "年收益（元）", index = 8)
private Double yearIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionAcceptanceRecords.java
View file @ 6053d3b2
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -10,7 +12,7 @@ import java.util.Date;
import java.util.List;
/**
* 并网操作日志
* 验收操作日志
*
* @author system_generator
* @date 2024-09-02
......@@ -19,6 +21,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_construction_acceptance_records")
@ApiModel(value = "ConstructionAcceptanceRecords",description = "验收操作日志")
public class ConstructionAcceptanceRecords extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,48 +29,56 @@ public class ConstructionAcceptanceRecords extends BaseEntity {
/**
* 操作人
*/
@ApiModelProperty(value = "操作人",example = "admin")
@TableField("operator")
private String operator;
/**
* 操作内容
*/
@ApiModelProperty(value = "操作内容",example = "提交验收审核")
@TableField("operation_content")
private String operationContent;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间",example = "2024-09-02 14:36:20")
@TableField("operation_time")
private Date operationTime;
/**
* 操作结果
*/
@ApiModelProperty(value = "操作结果",example = "通过")
@TableField("operation_results")
private String operationResults;
/**
* 施工单id
*/
@ApiModelProperty(value = "施工单id",example = "1830494459985399809")
@TableField("acceptance_id")
private Long acceptanceId;
/**
* 施工电站
*/
@ApiModelProperty(value = "施工电站",example = "1813102468939149314")
@TableField("work_order_power_station_id")
private Long workOrderPowerStationId;
/**
* 农户id
*/
@ApiModelProperty(value = "农户id",example = "1801072960862187521")
@TableField("peasant_household_id")
private Long peasantHouseholdId;
/**
* 备注
*/
@ApiModelProperty(value = "备注",example = "经销商管理员审核通过")
@TableField("notes")
private String notes;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionGirdRecords.java
View file @ 6053d3b2
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -19,6 +21,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_construction_gird_records")
@ApiModel(value = "ConstructionGirdRecords",description = "并网操作日志")
public class ConstructionGirdRecords extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,42 +29,49 @@ public class ConstructionGirdRecords extends BaseEntity {
/**
* 操作人
*/
@ApiModelProperty(value = "操作人",example = "admin")
@TableField("operator")
private String operator;
/**
* 操作内容
*/
@ApiModelProperty(value = "操作内容",example = "提交并网资料")
@TableField("operation_content")
private String operationContent;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间",example = "2024-09-02 10:57:18")
@TableField("operation_time")
private Date operationTime;
/**
* 操作结果
*/
@ApiModelProperty(value = "操作结果",example = "通过")
@TableField("operation_results")
private String operationResults;
/**
* 施工单id
*/
@ApiModelProperty(value = "施工单id",example = "1829346281735065601")
@TableField("grid_id")
private Long gridId;
/**
* 施工电站
*/
@ApiModelProperty(value = "施工电站",example = "1808655906133536770")
@TableField("work_order_power_station_id")
private Long workOrderPowerStationId;
/**
* 农户id
*/
@ApiModelProperty(value = "农户id",example = "1767379423369129985")
@TableField("peasant_household_id")
private Long peasantHouseholdId;
......@@ -69,6 +79,7 @@ public class ConstructionGirdRecords extends BaseEntity {
/**
* 备注
*/
@ApiModelProperty(value = "备注",example = "通过")
@TableField("notes")
private String notes;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java
View file @ 6053d3b2
......@@ -186,6 +186,13 @@ public class TdHYGFInverterDayGenerate implements Serializable {
private Double income;
@ExcelIgnore
private Double fullhour;
@ExcelIgnore
private String name;
@ExcelProperty("项目公司名称")
String regionalCompaniesName;
@ExcelIgnore
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterMonthGenerate.java
View file @ 6053d3b2
......@@ -53,5 +53,10 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
private Double fullhour;
@ExcelIgnore
private Double income;
@ExcelProperty("项目公司名称")
String regionalCompaniesName;
@ExcelIgnore
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterYearGenerate.java
View file @ 6053d3b2
......@@ -53,5 +53,9 @@ public class TdHYGFInverterYearGenerate implements Serializable {
private Double fullhour;
@ExcelIgnore
private Double income;
@ExcelProperty("项目公司名称")
String regionalCompaniesName;
@ExcelIgnore
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java
View file @ 6053d3b2
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -19,6 +21,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_user_message")
@ApiModel(value = "UserMessage",description = "人员消息")
public class UserMessage extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,36 +29,42 @@ public class UserMessage extends BaseEntity {
/**
* 任务类型
*/
@ApiModelProperty(value = "任务类型",example = "经销商审核")
@TableField("type")
private String type;
/**
* 业务id
*/
@ApiModelProperty(value = "业务id",example = "1706869110685569025")
@TableField("business_id")
private Long businessId;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id",example = "5214012")
@TableField("amos_user_id")
private String amosUserId;
/**
* 消息创建时间
*/
@ApiModelProperty(value = " 消息创建时间",example = "2023-09-27 11:11:23")
@TableField("creation_time")
private Date creationTime;
/**
* 消息内容
*/
@ApiModelProperty(value = "消息内容",example = "经销商四川锦绣天地建筑工程有限公司南昌分公司待经销商审核待完成")
@TableField("task_name")
private String taskName;
/**
* 经销商orgCode
*/
@ApiModelProperty(value = "经销商orgCode",example = "86*355*443*479")
@TableField("amos_org_code")
private String amosOrgCode;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/DayGenerateMapper.java
View file @ 6053d3b2
......@@ -43,7 +43,8 @@ public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
@Param("size") int size,@Param("dto")
List<String> statioId,
@Param("dateTime")String dateTime,
@Param("stationState")String stationState);
@Param("stationState")String stationState,
@Param("regionalCompaniesCode")String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
Integer selectCount(@Param(Constants.WRAPPER) Wrapper<DayGenerate> queryWrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthGenerateMapper.java
View file @ 6053d3b2
......@@ -15,7 +15,8 @@ public interface MonthGenerateMapper extends BaseMapper<MonthGenerate> {
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<MonthGenerate> selectPagenewMonthGenerate(@Param("current") int current,@Param("size") int size,@Param("dto") List<String> statioId,
@Param("dateTime")String dateTime,
@Param("stationState")String stationState );
@Param("stationState")String stationState,
@Param("regionalCompaniesCode")String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<MonthGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<MonthGenerate> queryWrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHYGFInverterDayGenerateMapper.java
View file @ 6053d3b2
......@@ -20,5 +20,5 @@ public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInvert
List<Map<String,Object>> selectSnCodeList(String startTime, String endTime, List<String> sncodes);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList, String startTime, String endTime);
List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList, String startTime, String endTime,@Param("regionalCompaniesCode")String regionalCompaniesCode);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/YearGenerateMapper.java
View file @ 6053d3b2
......@@ -20,7 +20,8 @@ public interface YearGenerateMapper extends BaseMapper<YearGenerate> {
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<YearGenerate> selectPagenewYearGenerate(@Param("current") int current,@Param("size") int size,@Param("dto") List<String> statioId,
@Param("dateTime")String dateTime,
@Param("stationState")String stationState );
@Param("stationState")String stationState,
@Param("regionalCompaniesCode")String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<YearGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<YearGenerate> queryWrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml
View file @ 6053d3b2
......@@ -67,7 +67,16 @@
<if test="dto.state != null and dto.state !=''">
hjc.state = #{dto.state}
</if>
<if test="dto.stationName != null and dto.stationName !=''">
AND hjc.station_name like concat('%',#{dto.stationName},'%')
</if>
</where>
ORDER BY CASE
WHEN hjc.state = '报警' THEN 1
WHEN hjc.state = '离线' THEN 2
WHEN hjc.state = '在线' THEN 3
ELSE 4
END
limit #{current},#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ 6053d3b2
......@@ -50,9 +50,9 @@
hjc.collector_sn_code,
hjc.update_time,
hjc.current_power,
ROUND(hjc.day_power_generation,3) as dayPowerGeneration,
ROUND(hjc.month_power_generation,3) as monthPowerGeneration,
ROUND(hjc.year_power_generation,3) as yearPowerGeneration,
CAST(hjc.day_power_generation AS DECIMAL(20, 3)) as dayPowerGeneration,
CAST(hjc.month_power_generation AS DECIMAL(20, 3)) as monthPowerGeneration,
CAST(hjc.year_power_generation AS DECIMAL(20, 3)) as yearPowerGeneration,
hjc.brand,
hjc.model,
hjc.national_standard,
......@@ -64,7 +64,7 @@
hjc.AFCI_version,
hjc.ID,
hjc.capacity,
ROUND(hjc.total_power_generation/1000,3) as totalPowerGeneration,
CAST(hjc.total_power_generation/1000 AS DECIMAL(20, 3)) as totalPowerGeneration,
hjc.third_station_id,
hjc.is_delete,
hjc.third_code,
......@@ -89,7 +89,16 @@
<if test="dto.maxValue != null and dto.maxValue !=''">
AND hjc.capacity <![CDATA[<=]]> #{dto.maxValue}
</if>
<if test="dto.stationName != null and dto.stationName !=''">
AND hjc.station_name like concat('%',#{dto.stationName},'%')
</if>
</where>
ORDER BY CASE
WHEN hjc.state = '报警' THEN 1
WHEN hjc.state = '离线' THEN 2
WHEN hjc.state = '在线' THEN 3
ELSE 4
END
limit #{current},#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 6053d3b2
......@@ -33,13 +33,13 @@
`day_power_use` dayPowerUse,
`month_power_use` monthPowerUse,
`year_power_use` yearPowerUse,
ROUND(`real_time_power`,3) realTimePower,
ROUND(`accumulated_power`/1000,3) accumulatedPower,
CAST(`real_time_power` AS DECIMAL(20, 3)) realTimePower,
CAST(`accumulated_power`/1000 AS DECIMAL(20, 3)) accumulatedPower,
`state` ,
`type`,
`organizational_code` organizationalCode,
`is_delete` isDelete,
ROUND(`day_generate`,3) dayGenerate,
CAST(`day_generate` AS DECIMAL(20, 3)) dayGenerate,
`month_generate` monthGenerate,
`year_generate` yearGenerate,
`day_income` dayIncome,
......@@ -48,7 +48,8 @@
`area` ,
`cumulative_income` cumulativeIncome,
`email`,
rated_power ratedPower
rated_power ratedPower,
regional_companies_code
from hygf_jp_station
......@@ -80,6 +81,9 @@
<if test="dto.thirdStationId!=null">
and hygf_jp_station.third_station_id =#{dto.thirdStationId}
</if>
<if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode != ''">
and hygf_jp_station.regional_companies_code = #{dto.regionalCompaniesCode}
</if>
</where>
</select>
......@@ -89,20 +93,20 @@
select
ROUND(sum(real_time_power),3) realTimePower,
ROUND(sum(capacity)/1000,3) capacity,
ROUND(sum(day_generate)/1000,3) dayGenerate,
ROUND(sum(month_generate)/1000,3) monthGenerate,
ROUND(sum(year_generate)/1000,3) yearGenerate,
ROUND(sum(accumulated_power)/1000,3) accumulatedPower,
ROUND( sum(day_income),3) dayIncome,
ROUND(sum(month_income)/10000,3) monthIncome,
ROUND(sum(year_income)/10000,3) yearIncome,
ROUND(sum(cumulative_income)/10000,3) cumulativeIncome,
ROUND(sum(day_power_use)/1000,3) dayPowerUse,
ROUND(sum(month_power_use)/1000,3) monthPowerUse,
ROUND(sum(year_power_use)/1000,3) yearPowerUse,
ROUND(sum(rated_power),3) ratedPower,
CAST(sum(real_time_power) AS DECIMAL(20, 3)) realTimePower,
CAST(sum(capacity)/1000 AS DECIMAL(20, 3)) capacity,
CAST(sum(day_generate)/1000 AS DECIMAL(20, 3)) dayGenerate,
CAST(sum(month_generate)/1000 AS DECIMAL(20, 3)) monthGenerate,
CAST(sum(year_generate)/1000 AS DECIMAL(20, 3)) yearGenerate,
CAST(sum(accumulated_power)/1000 AS DECIMAL(20, 3)) accumulatedPower,
CAST( sum(day_income) AS DECIMAL(20, 3)) dayIncome,
CAST(sum(month_income)/10000 AS DECIMAL(20, 3)) monthIncome,
CAST(sum(year_income)/10000 AS DECIMAL(20, 3)) yearIncome,
CAST(sum(cumulative_income)/10000 AS DECIMAL(20, 3)) cumulativeIncome,
CAST(sum(day_power_use)/1000 AS DECIMAL(20, 3)) dayPowerUse,
CAST(sum(month_power_use)/1000 AS DECIMAL(20, 3)) monthPowerUse,
CAST(sum(year_power_use)/1000 AS DECIMAL(20, 3)) yearPowerUse,
CAST(sum(rated_power) AS DECIMAL(20, 3)) ratedPower,
count(*) countBuiltNum
from hygf_jp_station
<where>
......@@ -362,20 +366,20 @@
<select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select
ROUND(sum(real_time_power),3) realTimePower,
ROUND(sum(capacity)/1000,3) capacity,
ROUND(sum(day_generate)/1000,3) dayGenerate,
ROUND(sum(month_generate)/1000,3) monthGenerate,
ROUND(sum(year_generate)/1000,3) yearGenerate,
ROUND(sum(accumulated_power)/1000,3) accumulatedPower,
ROUND( sum(day_income),3) dayIncome,
ROUND(sum(month_income)/10000,3) monthIncome,
ROUND(sum(year_income)/10000,3) yearIncome,
ROUND(sum(cumulative_income)/10000,3) cumulativeIncome,
ROUND(sum(day_power_use)/1000,3) dayPowerUse,
ROUND(sum(month_power_use)/1000,3) monthPowerUse,
ROUND(sum(year_power_use)/1000,3) yearPowerUse,
ROUND(sum(rated_power),3) ratedPower,
CAST(sum(real_time_power) AS DECIMAL(20, 3)) realTimePower,
CAST(sum(capacity)/1000 AS DECIMAL(20, 3)) capacity,
CAST(sum(day_generate)/1000 AS DECIMAL(20, 3)) dayGenerate,
CAST(sum(month_generate)/1000 AS DECIMAL(20, 3)) monthGenerate,
CAST(sum(year_generate)/1000 AS DECIMAL(20, 3)) yearGenerate,
CAST(sum(accumulated_power)/1000 AS DECIMAL(20, 3)) accumulatedPower,
CAST( sum(day_income) AS DECIMAL(20, 3)) dayIncome,
CAST(sum(month_income)/10000 AS DECIMAL(20, 3)) monthIncome,
CAST(sum(year_income)/10000 AS DECIMAL(20, 3)) yearIncome,
CAST(sum(cumulative_income)/10000 AS DECIMAL(20, 3)) cumulativeIncome,
CAST(sum(day_power_use)/1000 AS DECIMAL(20, 3)) dayPowerUse,
CAST(sum(month_power_use)/1000 AS DECIMAL(20, 3)) monthPowerUse,
CAST(sum(year_power_use)/1000 AS DECIMAL(20, 3)) yearPowerUse,
CAST(sum(rated_power) AS DECIMAL(20, 3)) ratedPower,
count(*) countBuiltNum
from hygf_jp_station
<where>
......@@ -626,7 +630,7 @@
`rec_user_id` recUserId,
`rec_user_name` recUserName,
`sn_code` snCode,
ROUND(`capacity`,3) capacity,
CAST(`capacity` AS DECIMAL(20, 3)) capacity,
`name` ,
`code` ,
`system_code` systemCode,
......@@ -648,15 +652,15 @@
`day_power_use` dayPowerUse,
`month_power_use` monthPowerUse,
`year_power_use` yearPowerUse,
ROUND(`real_time_power`,3) realTimePower,
ROUND(`accumulated_power`/1000,3) accumulatedPower,
CAST(`real_time_power` AS DECIMAL(20, 3)) realTimePower,
CAST(`accumulated_power`/1000 AS DECIMAL(20, 3)) accumulatedPower,
`state` ,
`type`,
`organizational_code` organizationalCode,
`is_delete` isDelete,
ROUND(`day_generate`,3) dayGenerate,
ROUND(`month_generate`,3) monthGenerate,
ROUND(`year_generate`,3) yearGenerate,
CAST(`day_generate` AS DECIMAL(20, 3)) dayGenerate,
CAST(`month_generate` AS DECIMAL(20, 3)) monthGenerate,
CAST(`year_generate` AS DECIMAL(20, 3)) yearGenerate,
`day_income` dayIncome,
`month_income` monthIncome,
`year_income` yearIncome,
......@@ -664,7 +668,7 @@
`cumulative_income` cumulativeIncome,
`email`,
rated_power ratedPower,
ROUND(`day_generate`/capacity,3) fullhour,
CAST(`day_generate`/capacity AS DECIMAL(20, 3)) fullhour,
(select privilege_company.COMPANY_NAME from privilege_company where
privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName
from hygf_jp_station
......@@ -703,7 +707,12 @@
and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
</if>
</where>
ORDER BY CASE
WHEN state = '报警' THEN 1
WHEN state = '离线' THEN 2
WHEN state = '在线' THEN 3
ELSE 4
END
</select>
......@@ -724,11 +733,11 @@
<!-- code参数为区域公司orgCode或经销商orgCode-->
<!-- <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">-->
<!-- SELECT COUNT(*) AS powerStationNumber,-->
<!-- ROUND(SUM(capacity)/1000, 3) AS totalCapacity,-->
<!-- ROUND(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
<!-- ROUND(SUM(rated_power), 3) AS totalRatedPower,-->
<!-- ROUND(SUM(real_time_power), 3) AS totalRealTimePower,-->
<!-- ROUND(SUM(day_income), 3) AS totalDayIncome-->
<!-- CAST(SUM(capacity)/1000, 3) AS totalCapacity,-->
<!-- CAST(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
<!-- CAST(SUM(rated_power), 3) AS totalRatedPower,-->
<!-- CAST(SUM(real_time_power), 3) AS totalRealTimePower,-->
<!-- CAST(SUM(day_income), 3) AS totalDayIncome-->
<!-- FROM hygf_jp_station hjs-->
<!-- <where>-->
<!-- <if test="regionCode != null and regionCode !=''">-->
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/DayGenerateMapper.xml
View file @ 6053d3b2
......@@ -148,10 +148,19 @@
<if test="dateTime!=null and dateTime != ''">
and day_time = #{dateTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="stationState!=null and stationState != ''">
and station_state = #{stationState}
</if>
</where>
ORDER BY CASE
WHEN station_state = '报警' THEN 1
WHEN station_state = '离线' THEN 2
WHEN station_state = '在线' THEN 3
ELSE 4
END
LIMIT #{current} ,#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthGenerateMapper.xml
View file @ 6053d3b2
......@@ -15,6 +15,9 @@
<if test="dateTime!=null and dateTime != ''">
and month_time = #{dateTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="stationState!=null and stationState != ''">
and station_state = #{stationState}
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHYGFInverterDayGenerateMapper.xml
View file @ 6053d3b2
......@@ -80,6 +80,9 @@
<if test="endTime != null">
and created_time &lt;= #{endTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
</where>
order by created_time desc
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @ 6053d3b2
......@@ -132,7 +132,13 @@
AND station_name like #{stationName}
</if>
</where>
ORDER BY start_time desc
ORDER BY CASE
WHEN `state` = '未处理' THEN 1
WHEN `state` = '未恢复' THEN 2
WHEN `state` = '已处理' THEN 3
WHEN `state` = '已恢复' THEN 4
ELSE 5
END,start_time desc
limit #{current},#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/YearGenerateMapper.xml
View file @ 6053d3b2
......@@ -15,6 +15,9 @@
<if test="dateTime!=null and dateTime != ''">
and year = #{dateTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="stationState!=null and stationState != ''">
and station_state = #{stationState}
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceController.java
View file @ 6053d3b2
//package com.yeejoin.amos.boot.module.hygf.biz.controller;
//
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.github.pagehelper.PageHelper;
//import com.yeejoin.amos.boot.biz.common.controller.BaseController;
//import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
//import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
//import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
//import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
//import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
//import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//import org.typroject.tyboot.core.foundation.enumeration.UserType;
//import org.typroject.tyboot.core.restful.doc.TycloudOperation;
//import org.typroject.tyboot.core.restful.utils.ResponseHelper;
//import org.typroject.tyboot.core.restful.utils.ResponseModel;
//
//import java.util.Map;
//
//@RestController
//@Api(tags = "验收管理")
//@RequestMapping(value = "/acceptance")
//public class AcceptanceController extends BaseController {
//
// @Autowired
// PersonnelBusinessMapper personnelBusinessMapper;
// @Autowired
// private IAcceptanceService acceptanceService;
//
// @PostMapping(value = "/page")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
// @UserLimits
// public ResponseModel<Page<AcceptanceDto>> page(
// @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
// @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
// @RequestBody AcceptanceDto param
// ) {
//// UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
//// if(userUnitInformationDto!=null){
//// param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
//// param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
//// }
//
//
// return ResponseHelper.buildResponse( acceptanceService.page(current, size, param));
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Map;
@RestController
@Api(tags = "验收管理")
@RequestMapping(value = "/acceptance")
public class AcceptanceController extends BaseController {
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
private IAcceptanceService acceptanceService;
@PostMapping(value = "/page")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
@UserLimits
public ResponseModel<Page<AcceptanceDto>> page(
@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
@RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
@RequestBody AcceptanceDto param
) {
// UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
// if(userUnitInformationDto!=null){
// param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
// param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
// }
//
// @GetMapping("/acceptance-details")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
// public ResponseModel<Map<String, Object>> offlineAcceptanceDetails(@RequestParam("sequenceNbr") Long sequenceNbr) {
// return ResponseHelper.buildResponse(acceptanceService.acceptanceDetails(sequenceNbr));
// }
//
//
//
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PostMapping(value = "/save")
// @ApiOperation(httpMethod = "POST", value = "检查项新增", notes = "检查项新增")
// public ResponseModel save(@RequestBody AcceptanceCheckItem model, @RequestParam("sequenceNbr") Long sequenceNbr) {
// return ResponseHelper.buildResponse(acceptanceService.saveEntity(model, sequenceNbr));
// }
//
//
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PostMapping(value = "/checkAccept")
// @ApiOperation(httpMethod = "POST", value = "提交验收", notes = "提交验收")
// public ResponseModel checkAccept(@RequestParam Long basicGridAcceptanceId) {
// acceptanceService.checkAccept(basicGridAcceptanceId,getUserId());
// return ResponseHelper.buildResponse(null);
// }
//}
return ResponseHelper.buildResponse( acceptanceService.page(current, size, param));
}
@GetMapping("/acceptance-details")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
public ResponseModel<Map<String, Object>> offlineAcceptanceDetails(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(acceptanceService.acceptanceDetails(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "检查项新增", notes = "检查项新增")
public ResponseModel save(@RequestBody AcceptanceCheckItem model, @RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(acceptanceService.saveEntity(model, sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/checkAccept")
@ApiOperation(httpMethod = "POST", value = "提交验收", notes = "提交验收")
public ResponseModel checkAccept(@RequestParam Long basicGridAcceptanceId) {
acceptanceService.checkAccept(basicGridAcceptanceId,getUserId());
return ResponseHelper.buildResponse(null);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceRectificationOrderController.java
View file @ 6053d3b2
......@@ -33,89 +33,89 @@ public class AcceptanceRectificationOrderController extends BaseController {
@Autowired
AcceptanceRectificationOrderServiceImpl acceptanceRectificationOrderServiceImpl;
/**
* 新增验收整改单
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增验收整改单", notes = "新增验收整改单")
public ResponseModel<AcceptanceRectificationOrderDto> save(@RequestBody AcceptanceRectificationOrderDto model) {
model = acceptanceRectificationOrderServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新验收整改单", notes = "根据sequenceNbr更新验收整改单")
public ResponseModel<AcceptanceRectificationOrderDto> updateBySequenceNbrAcceptanceRectificationOrder(@PathVariable(value = "sequenceNbr") Long sequenceNbr, @RequestBody AcceptanceRectificationOrderDto model) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.updateAndDriveWorkflow(model,getUserId()));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除验收整改单", notes = "根据sequenceNbr删除验收整改单")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@GetMapping
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个验收整改单", notes = "根据sequenceNbr查询单个验收整改单")
public ResponseModel<AcceptanceRectificationOrderDto> selectOne(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryBySequenceNbr(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "验收整改单分页查询", notes = "验收整改单分页查询")
public ResponseModel<Page<AcceptanceRectificationOrderDto>> queryForPage(
@RequestParam(value = "acceptanceSeqNbr") Long acceptanceSeqNbr,
@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
@RequestParam(value = "size", required = false, defaultValue = "20") Integer size
) {
Page<AcceptanceRectificationOrderDto> page = new Page<>(current, size);
return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderPage(page, acceptanceSeqNbr));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "验收整改单列表全部数据查询", notes = "验收整改单列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<AcceptanceRectificationOrderDto>> selectForList() {
return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderList());
}
// /**
// * 新增验收整改单
// *
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PostMapping(value = "/save")
// @ApiOperation(httpMethod = "POST", value = "新增验收整改单", notes = "新增验收整改单")
// public ResponseModel<AcceptanceRectificationOrderDto> save(@RequestBody AcceptanceRectificationOrderDto model) {
// model = acceptanceRectificationOrderServiceImpl.createWithModel(model);
// return ResponseHelper.buildResponse(model);
// }
//
// /**
// * 根据sequenceNbr更新
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PutMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新验收整改单", notes = "根据sequenceNbr更新验收整改单")
// public ResponseModel<AcceptanceRectificationOrderDto> updateBySequenceNbrAcceptanceRectificationOrder(@PathVariable(value = "sequenceNbr") Long sequenceNbr, @RequestBody AcceptanceRectificationOrderDto model) {
// model.setSequenceNbr(sequenceNbr);
// return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.updateAndDriveWorkflow(model,getUserId()));
// }
//
// /**
// * 根据sequenceNbr删除
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @DeleteMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除验收整改单", notes = "根据sequenceNbr删除验收整改单")
// public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
// return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.removeById(sequenceNbr));
// }
//
// /**
// * 根据sequenceNbr查询
// *
// * @param sequenceNbr 主键
// * @return
// */
// @GetMapping
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个验收整改单", notes = "根据sequenceNbr查询单个验收整改单")
// public ResponseModel<AcceptanceRectificationOrderDto> selectOne(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
// return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryBySequenceNbr(sequenceNbr));
// }
//
// /**
// * 列表分页查询
// *
// * @param current 当前页
// * @param current 每页大小
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @GetMapping(value = "/page")
// @ApiOperation(httpMethod = "GET",value = "验收整改单分页查询", notes = "验收整改单分页查询")
// public ResponseModel<Page<AcceptanceRectificationOrderDto>> queryForPage(
// @RequestParam(value = "acceptanceSeqNbr") Long acceptanceSeqNbr,
// @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
// @RequestParam(value = "size", required = false, defaultValue = "20") Integer size
// ) {
// Page<AcceptanceRectificationOrderDto> page = new Page<>(current, size);
// return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderPage(page, acceptanceSeqNbr));
// }
//
// /**
// * 列表全部数据查询
// *
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "GET",value = "验收整改单列表全部数据查询", notes = "验收整改单列表全部数据查询")
// @GetMapping(value = "/list")
// public ResponseModel<List<AcceptanceRectificationOrderDto>> selectForList() {
// return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderList());
// }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "获取整改单负责人列表", notes = "获取整改单负责人列表")
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AllPowerController.java
View file @ 6053d3b2
//package com.yeejoin.amos.boot.module.hygf.biz.controller;
//
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.yeejoin.amos.boot.biz.common.controller.BaseController;
//import com.yeejoin.amos.boot.module.hygf.api.dto.AllPowerDto;
//import com.yeejoin.amos.boot.module.hygf.biz.service.impl.AllPowerServiceImpl;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//import org.typroject.tyboot.core.foundation.enumeration.UserType;
//import org.typroject.tyboot.core.restful.doc.TycloudOperation;
//import org.typroject.tyboot.core.restful.utils.ResponseHelper;
//import org.typroject.tyboot.core.restful.utils.ResponseModel;
//
//import javax.servlet.http.HttpServletRequest;
//import java.util.List;
//
///**
// * 统计所有功率
// *
// * @author system_generator
// * @date 2023-09-20
// */
//@RestController
//@Api(tags = "统计所有功率Api")
//@RequestMapping(value = "/all-power")
//public class AllPowerController extends BaseController {
//
// @Autowired
// AllPowerServiceImpl allPowerServiceImpl;
//
// /**
// * 新增统计所有功率
// *
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PostMapping(value = "/save")
// @ApiOperation(httpMethod = "POST", value = "新增统计所有功率", notes = "新增统计所有功率")
// public ResponseModel<AllPowerDto> save(@RequestBody AllPowerDto model) {
// model = allPowerServiceImpl.createWithModel(model);
// return ResponseHelper.buildResponse(model);
// }
//
// /**
// * 根据sequenceNbr更新
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PutMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新统计所有功率", notes = "根据sequenceNbr更新统计所有功率")
// public ResponseModel<AllPowerDto> updateBySequenceNbrAllPower(@RequestBody AllPowerDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
// return ResponseHelper.buildResponse(allPowerServiceImpl.updateWithModel(model));
// }
//
// /**
// * 根据sequenceNbr删除
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @DeleteMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除统计所有功率", notes = "根据sequenceNbr删除统计所有功率")
// public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
// return ResponseHelper.buildResponse(allPowerServiceImpl.removeById(sequenceNbr));
// }
//
// /**
// * 根据sequenceNbr查询
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @GetMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个统计所有功率", notes = "根据sequenceNbr查询单个统计所有功率")
// public ResponseModel<AllPowerDto> selectOne(@PathVariable Long sequenceNbr) {
// return ResponseHelper.buildResponse(allPowerServiceImpl.queryBySeq(sequenceNbr));
// }
//
// /**
// * 列表分页查询
// *
// * @param current 当前页
// * @param current 每页大小
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @GetMapping(value = "/page")
// @ApiOperation(httpMethod = "GET",value = "统计所有功率分页查询", notes = "统计所有功率分页查询")
// public ResponseModel<Page<AllPowerDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
// (value = "size") int size) {
// Page<AllPowerDto> page = new Page<AllPowerDto>();
// page.setCurrent(current);
// page.setSize(size);
// return ResponseHelper.buildResponse(allPowerServiceImpl.queryForAllPowerPage(page));
// }
//
// /**
// * 列表全部数据查询
// *
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "GET",value = "统计所有功率列表全部数据查询", notes = "统计所有功率列表全部数据查询")
// @GetMapping(value = "/list")
// public ResponseModel<List<AllPowerDto>> selectForList() {
// return ResponseHelper.buildResponse(allPowerServiceImpl.queryForAllPowerList());
// }
//}
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.dto.AllPowerDto;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.AllPowerServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 统计所有功率
*
* @author system_generator
* @date 2023-09-20
*/
@RestController
@Api(tags = "统计所有功率Api")
@RequestMapping(value = "/all-power")
public class AllPowerController extends BaseController {
@Autowired
AllPowerServiceImpl allPowerServiceImpl;
/**
* 新增统计所有功率
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增统计所有功率", notes = "新增统计所有功率")
public ResponseModel<AllPowerDto> save(@RequestBody AllPowerDto model) {
model = allPowerServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新统计所有功率", notes = "根据sequenceNbr更新统计所有功率")
public ResponseModel<AllPowerDto> updateBySequenceNbrAllPower(@RequestBody AllPowerDto model,@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(allPowerServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除统计所有功率", notes = "根据sequenceNbr删除统计所有功率")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(allPowerServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个统计所有功率", notes = "根据sequenceNbr查询单个统计所有功率")
public ResponseModel<AllPowerDto> selectOne(@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(allPowerServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "统计所有功率分页查询", notes = "统计所有功率分页查询")
public ResponseModel<Page<AllPowerDto>> queryForPage(@ApiParam(value = "当前页码",example = "1")@RequestParam(value = "current") int current,
@ApiParam(value = "分页条数",example = "20")@RequestParam(value = "size") int size) {
Page<AllPowerDto> page = new Page<AllPowerDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(allPowerServiceImpl.queryForAllPowerPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "统计所有功率列表全部数据查询", notes = "统计所有功率列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<AllPowerDto>> selectForList() {
return ResponseHelper.buildResponse(allPowerServiceImpl.queryForAllPowerList());
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommerceInfoController.java
View file @ 6053d3b2
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommerceInfoServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -52,7 +53,7 @@ public class CommerceInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新经销商单位信息", notes = "根据sequenceNbr更新经销商单位信息")
public ResponseModel<CommerceInfoDto> updateBySequenceNbrCommerceInfo(@RequestBody CommerceInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<CommerceInfoDto> updateBySequenceNbrCommerceInfo(@RequestBody CommerceInfoDto model,@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(commerceInfoServiceImpl.updateWithModel(model));
}
......@@ -66,7 +67,7 @@ public class CommerceInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除经销商单位信息", notes = "根据sequenceNbr删除经销商单位信息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(commerceInfoServiceImpl.removeById(sequenceNbr));
}
......@@ -79,7 +80,7 @@ public class CommerceInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商单位信息", notes = "根据sequenceNbr查询单个经销商单位信息")
public ResponseModel<CommerceInfoDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<CommerceInfoDto> selectOne(@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(commerceInfoServiceImpl.queryBySeq(sequenceNbr));
}
......@@ -93,7 +94,7 @@ public class CommerceInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "经销商单位信息分页查询", notes = "经销商单位信息分页查询")
public ResponseModel<Page<CommerceInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
public ResponseModel<Page<CommerceInfoDto>> queryForPage(@ApiParam(value = "当前页码",example = "1")@RequestParam(value = "current") int current,@ApiParam(value = "分页条数",example = "20")@RequestParam
(value = "size") int size) {
Page<CommerceInfoDto> page = new Page<CommerceInfoDto>();
page.setCurrent(current);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommercialController.java
View file @ 6053d3b2
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.CommercialDto;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommercialServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -52,7 +53,7 @@ public class CommercialController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新商务信息", notes = "根据sequenceNbr更新商务信息")
public ResponseModel<CommercialDto> updateBySequenceNbrCommercial(@RequestBody CommercialDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<CommercialDto> updateBySequenceNbrCommercial(@RequestBody CommercialDto model,@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(commercialServiceImpl.updateWithModel(model));
}
......@@ -66,7 +67,7 @@ public class CommercialController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除商务信息", notes = "根据sequenceNbr删除商务信息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(commercialServiceImpl.removeById(sequenceNbr));
}
......@@ -79,7 +80,7 @@ public class CommercialController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个商务信息", notes = "根据sequenceNbr查询单个商务信息")
public ResponseModel<CommercialDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<CommercialDto> selectOne(@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(commercialServiceImpl.queryBySeq(sequenceNbr));
}
......@@ -93,7 +94,7 @@ public class CommercialController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "商务信息分页查询", notes = "商务信息分页查询")
public ResponseModel<Page<CommercialDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
public ResponseModel<Page<CommercialDto>> queryForPage(@ApiParam(value = "当前页码",example = "1")@RequestParam(value = "current") int current,@ApiParam(value = "分页条数",example = "20")@RequestParam
(value = "size") int size) {
Page<CommercialDto> page = new Page<CommercialDto>();
page.setCurrent(current);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java
View file @ 6053d3b2
......@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceIm
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.StatisticsHomepageServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -43,8 +44,8 @@ public class CommonController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectRegionByParentCode")
@ApiOperation(httpMethod = "GET", value = "查询省市区", notes = "查询省市区")
public ResponseModel<List<Map<String,Object>>> selectRegionByParentCode(@RequestParam(value = "parentCode", defaultValue = "0") String parentCode,
@RequestParam(value = "level", defaultValue = "1") String level) {
public ResponseModel<List<Map<String,Object>>> selectRegionByParentCode(@ApiParam(value = "父id",example = "0")@RequestParam(value = "parentCode", defaultValue = "0") String parentCode,
@ApiParam(value = "等级",example = "1")@RequestParam(value = "level", defaultValue = "1") String level) {
return ResponseHelper.buildResponse(financingInfoService.selectRegionByParentCode(parentCode, level));
}
......@@ -56,34 +57,19 @@ public class CommonController {
@GetMapping(value = "/downInformation")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "资料下载", notes = "资料下载")
public void downList(HttpServletResponse response, @RequestParam(required = false) String surveyInformationId,
@RequestParam(required = false)List<String> peasantHouseholdIds,
@RequestParam(required = false)String processInstanceId) throws IOException {
public void downList(HttpServletResponse response,
@ApiParam(value = "场站id",example = "[1721720979853414401,1721720979853414401]")@RequestParam(required = false)List<String> peasantHouseholdIds) throws IOException {
// 设置响应头
response.setContentType("application/zip");
commonService.downZiliao(surveyInformationId,peasantHouseholdIds,processInstanceId,response);
commonService.downZiliao("",peasantHouseholdIds,"",response);
System.out.println("zip下载成功");
}
/**
* 设备信息下载
*
* @return
*/
@GetMapping(value = "/test")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "资料下载", notes = "资料下载")
public void test(HttpServletResponse response) throws IOException {
// 设置响应头
response.setContentType("application/zip");
commonService.test(response);
System.out.println("zip下载成功");
}
/**
* 设备信息下载
......@@ -93,7 +79,7 @@ public class CommonController {
@GetMapping(value = "/getSchedule")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "资料下载进度获取", notes = "资料下载进度获取")
public ResponseModel<Object> getSchedule(String peasantHouseholdId) {
public ResponseModel<Object> getSchedule(@ApiParam(value = "场站id",example = "1721720979853414401")String peasantHouseholdId) {
return ResponseHelper.buildResponse(commonService.getSchedule(peasantHouseholdId));
......@@ -110,11 +96,11 @@ public class CommonController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "首页统计环形图及统计表", notes = "首页统计环形图及统计表")
@UserLimits
public ResponseModel<Map<String, Object>> statisticsHomepage(@RequestParam(required = false) String developerCode,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String province,
@RequestParam(required = false) String city,
@RequestParam(required = false) String district) {
public ResponseModel<Map<String, Object>> statisticsHomepage(@ApiParam(value = "经销商公司code",example = "87*253*775") @RequestParam(required = false) String developerCode,
@ApiParam(value = "区域公司code",example = "87*253*652") @RequestParam(required = false) String regionalCompaniesCode,
@ApiParam(value = "省份",example = "610000") @RequestParam(required = false) String province,
@ApiParam(value = "市",example = "610700") @RequestParam(required = false) String city,
@ApiParam(value = "区",example = "610116") @RequestParam(required = false) String district) {
return ResponseHelper.buildResponse(statisticsHomepageService.statisticsHomepage(developerCode,regionalCompaniesCode,province,city,district));
......@@ -129,12 +115,12 @@ public class CommonController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表上方统计表", notes = "列表上方统计表")
@UserLimits
public ResponseModel<Map<String, Object>> statisticsTop(@RequestParam(required = false) String developerCode,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String province,
@RequestParam(required = false) String city,
@RequestParam(required = true) String type,
@RequestParam(required = false) String district) {
public ResponseModel<Map<String, Object>> statisticsTop(@ApiParam(value = "经销商公司code",example = "87*253*775")@RequestParam(required = false) String developerCode,
@ApiParam(value = "区域公司code",example = "87*253*652") @RequestParam(required = false) String regionalCompaniesCode,
@ApiParam(value = "省份",example = "610000") @RequestParam(required = false) String province,
@ApiParam(value = "市",example = "610700") @RequestParam(required = false) String city,
@ApiParam(value = "页面统计类型",example = "survey") @RequestParam(required = true) String type,
@ApiParam(value = "区",example = "610116") @RequestParam(required = false) String district) {
return ResponseHelper.buildResponse(statisticsHomepageService.statisticsTop(type,developerCode,regionalCompaniesCode,province,city,district));
......@@ -147,13 +133,13 @@ public class CommonController {
*/
@GetMapping(value = "/homePageExport")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "资料下载进度获取", notes = "资料下载进度获取")
@ApiOperation(httpMethod = "GET", value = "列表首页统计导出", notes = "列表首页统计导出")
@UserLimits
public void homePageExport(@RequestParam(required = false) String developerCode,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String province,
@RequestParam(required = false) String city,
@RequestParam(required = false) String district,
public void homePageExport(@ApiParam(value = "经销商公司code",example = "87*253*775")@RequestParam(required = false) String developerCode,
@ApiParam(value = "区域公司code",example = "87*253*652") @RequestParam(required = false) String regionalCompaniesCode,
@ApiParam(value = "省份",example = "610000") @RequestParam(required = false) String province,
@ApiParam(value = "市",example = "610700") @RequestParam(required = false) String city,
@ApiParam(value = "区",example = "610116") @RequestParam(required = false) String district,
HttpServletResponse response) throws IOException {
statisticsHomepageService.homePageExport(developerCode,regionalCompaniesCode,province,city,district,response);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/ContractTemplateController.java
View file @ 6053d3b2
......@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ContractTemplateServic
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -60,7 +61,7 @@ public class ContractTemplateController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<ContractTemplateDto> updateBySequenceNbrContractTemplate(@RequestBody ContractTemplateDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<ContractTemplateDto> updateBySequenceNbrContractTemplate(@RequestBody ContractTemplateDto model,@ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(contractTemplateServiceImpl.updateWithModel(model));
}
......@@ -88,7 +89,7 @@ public class ContractTemplateController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @ApiParam(value = "主键",example = "1805040753609568257")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(contractTemplateServiceImpl.removeById(sequenceNbr));
}
......@@ -115,7 +116,7 @@ public class ContractTemplateController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<ContractTemplateDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
public ResponseModel<Page<ContractTemplateDto>> queryForPage(@ApiParam(value = "当前页码",example = "1")@RequestParam(value = "current") int current,@ApiParam(value = "分页条数",example = "20")@RequestParam
(value = "size") int size) {
Page<ContractTemplateDto> page = new Page<ContractTemplateDto>();
page.setCurrent(current);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ 6053d3b2
......@@ -275,7 +275,7 @@ public class JpInverterController extends BaseController {
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null));
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -288,7 +288,7 @@ public class JpInverterController extends BaseController {
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
}
//List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates =jpInverterServiceImpl.jpInverterDayReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates =jpInverterServiceImpl.jpInverterDayReportExport(dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode());
try {
setResponseHeadForDowload(response,"逆变器日报表.xls");
EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterDayGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器日报表").doWrite(tdHYGFInverterDayGenerates);
......@@ -309,7 +309,7 @@ public class JpInverterController extends BaseController {
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null));
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -322,7 +322,7 @@ public class JpInverterController extends BaseController {
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode());
try {
setResponseHeadForDowload(response,"逆变器月报表.xls");
EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterMonthGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器月报表").doWrite(tdHYGFInverterMonthGenerates);
......@@ -344,7 +344,7 @@ public class JpInverterController extends BaseController {
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null));
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -357,7 +357,7 @@ public class JpInverterController extends BaseController {
dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode());
try {
setResponseHeadForDowload(response,"逆变器年报表.xls");
EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterYearGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器年报表").doWrite(tdHYGFInverterYearGenerates);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 6053d3b2
......@@ -113,7 +113,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新经销商人员信息", notes = "根据sequenceNbr更新经销商人员信息")
public ResponseModel<UnitInfoDto> updateBySequenceNbrUnitInfo(@RequestBody UnitInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<UnitInfoDto> updateBySequenceNbrUnitInfo(@RequestBody UnitInfoDto model,@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(unitInfoServiceImpl.updateWithModel(model));
}
......@@ -127,7 +127,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除经销商人员信息", notes = "根据sequenceNbr删除经销商人员信息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@ApiParam(value = "主键", example = "1706869110685569025") @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(unitInfoServiceImpl.removeById(sequenceNbr));
}
......@@ -140,7 +140,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息")
public ResponseModel<UnitInfoDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<UnitInfoDto> selectOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.queryBySeq(sequenceNbr));
}
......@@ -148,7 +148,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getOne/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个经销商人员信息", notes = "根据sequenceNbr查询单个经销商人员信息")
public ResponseModel<UnitInfoData> getOne(@PathVariable String sequenceNbr) {
public ResponseModel<UnitInfoData> getOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable String sequenceNbr) {
UnitInfo unitInfo= unitInfoServiceImpl.getById(sequenceNbr);
unitInfo.setHeadCardPhotoBackList(toCommonFile(unitInfo.getHeadCardPhotoBack()));
......@@ -171,7 +171,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询")
public ResponseModel<Page<UnitInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
public ResponseModel<Page<UnitInfoDto>> queryForPage(@ApiParam(value = "页码", example = "1")@RequestParam(value = "current") int current,@ApiParam(value = "页数大小", example = "20")@RequestParam
(value = "size") int size) {
Page<UnitInfoDto> page = new Page<UnitInfoDto>();
page.setCurrent(current);
......@@ -183,7 +183,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryForDealerReviewPage")
@ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询", notes = "经销商人员信息分页查询")
public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@ApiParam(value = "页码", example = "1")@RequestParam(value = "current") int current, @ApiParam(value = "页数大小", example = "20")@RequestParam
(value = "size") int size, ReviewDto reviewDto) {
Page<ReviewDto> page=dealerReviewServiceImpl.queryForDealerReviewPage(current,size,reviewDto);
return ResponseHelper.buildResponse(page);
......@@ -248,7 +248,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/management-unit/tree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection<CompanyModel>> managementUnitTree(@RequestParam(required = false)String orgCode) {
public ResponseModel<Collection<CompanyModel>> managementUnitTree(@ApiParam(value = "区域Code", example = "86*355*443*479")@RequestParam(required = false)String orgCode) {
RequestContext.setAppKey("AMOS_STUDIO");
RequestContext.setProduct("AMOS_STUDIO_WEB");
RequestContext.setToken(requestContext.getToken());
......@@ -342,7 +342,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistUserName/{userName}")
@ApiOperation(httpMethod = "GET", value = "判断用户名是否存在", notes = "判断用户名是否存在")
public ResponseModel hasExistUserName( @PathVariable(value = "userName") String userName) {
public ResponseModel hasExistUserName( @ApiParam(value = "用户名", example = "admin")@PathVariable(value = "userName") String userName) {
try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(null, userName));
} catch (Exception e) {
......@@ -360,7 +360,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/hasExistPhone/{phone}")
@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
public ResponseModel hasExistPhone( @PathVariable(value = "phone") String phone) {
public ResponseModel hasExistPhone(@ApiParam(value = "手机号", example = "15895233587") @PathVariable(value = "phone") String phone) {
try {
return CommonResponseNewUtil.success(unitInfoServiceImpl.hasExistPhoneOrUserName(phone, null));
} catch (Exception e) {
......@@ -376,8 +376,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/sendTelCode/{tel}")
@ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel,
@RequestParam(value = "type", required = false) String type) {
public ResponseModel<Boolean> sendTelCode(@ApiParam(value = "手机号", example = "15895233587")@PathVariable(value = "tel") String tel,
@ApiParam(value = "类型", example = "1") @RequestParam(value = "type", required = false) String type) {
if (ValidationUtil.isEmpty(tel)) {
throw new BadRequest("参数校验失败.");
......@@ -408,7 +408,8 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/verifyTelCode/{tel}/{code}")
@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String adminTel, @PathVariable(value = "code") String code) {
public ResponseModel<Boolean> verifyTelCode(@ApiParam(value = "手机号", example = "15895233587")@PathVariable(value = "tel") String adminTel,
@ApiParam(value = "验证码", example = "258546")@PathVariable(value = "code") String code) {
Boolean flag = false;
if (ValidationUtil.isEmpty(adminTel) || ValidationUtil.isEmpty(code)) {
throw new BadRequest("参数校验失败.");
......@@ -447,11 +448,11 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "经销商审核", notes = "经销商审核")
@PostMapping(value = "/powerStationExamine")
public ResponseModel<String> powerStationExamine(@RequestParam(value = "pageId") long pageId,
@RequestParam(value = "nodeCode") String nodeCode,
@RequestParam(value = "stationId") String stationId,
@RequestParam(value = "taskId") String taskId,
@RequestParam(value = "planInstanceId") String planInstanceId,
public ResponseModel<String> powerStationExamine(@ApiParam(value = "分页Id", example = "1706974721737756674")@RequestParam(value = "pageId") long pageId,
@ApiParam(value = "节点Code", example = "1") @RequestParam(value = "nodeCode") String nodeCode,
@ApiParam(value = "场站Id", example = "1711627029541031938") @RequestParam(value = "stationId") String stationId,
@ApiParam(value = "任务Id", example = "1712383951215005697") @RequestParam(value = "taskId") String taskId,
@ApiParam(value = "计划实例Id", example = "64ddb490-7261-11ef-b7e1-02420a1c0012") @RequestParam(value = "planInstanceId") String planInstanceId,
@RequestBody Map<String, Object> kv) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.powerStationExamine(pageId, nodeCode, stationId, taskId, planInstanceId, kv));
}
......@@ -462,7 +463,9 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单")
@GetMapping(value = "/updateUser")
public ResponseModel<Object> updateUser(String adminUserId ,String sequenceNbr ,String type) {
public ResponseModel<Object> updateUser(@ApiParam(value = "管理员用户Id", example = "8121589")String adminUserId ,
@ApiParam(value = "主键", example = "1813102468876234754")String sequenceNbr ,
@ApiParam(value = "类型", example = "1")String type) {
FeignClientResult<List<String>> userResult =null;
UnitInfo unitInfo= unitInfoServiceImpl.getById(sequenceNbr);
......@@ -480,7 +483,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "获取经销商单位", notes = "获取经销商单位")
@GetMapping(value = "/getUnit")
public ResponseModel< List<UnitInfo>> getUnit( @RequestParam(required = false)String amosCompanySeq) {
public ResponseModel< List<UnitInfo>> getUnit(@ApiParam(value = "经销商公司", example = "1702216914824097794") @RequestParam(required = false)String amosCompanySeq) {
LambdaQueryWrapper<UnitInfo> unitInfoque=new LambdaQueryWrapper<>();
......@@ -719,7 +722,7 @@ public class UnitInfoController extends BaseController {
@GetMapping(value = "/getRegionalCompanie")
@UserLimits
public ResponseModel< List<RegionalCompanies> > getRegionalCompanie(
@RequestParam(required=false) Long sequenceNbr
@ApiParam(value = "主键", example = "1702216914824097794") @RequestParam(required=false) Long sequenceNbr
) {
// LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
// qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
......@@ -734,8 +737,8 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieById")
public ResponseModel< RegionalCompanies > getRegionalCompanieById(
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(required=false) Long unitInfoId
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq,
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId
) {
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
qu.eq(RegionalCompanies::getRegionalCompaniesSeq,regionalCompaniesSeq);
......@@ -749,8 +752,8 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getRegionalCompanieUnitInfo")
public ResponseModel< List<RegionalCompanies> > getRegionalCompanieUnitInfo(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq
) {
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
qu.eq(RegionalCompanies::getRegionalCompaniesSeq,regionalCompaniesSeq);
......@@ -771,8 +774,8 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getUnitInfoListData")
public ResponseModel< List<Map<String,Object>> > getUnitInfoListData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq
) {
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null,null);
......@@ -794,13 +797,13 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdData")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(value = "current") int current,
@RequestParam (value = "size") int size,
@RequestParam (required=false) String peasantHouseholdNo,
@RequestParam (required=false) String ownersName,
@RequestParam (required=false) String ids
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq,
@ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam (value = "size") int size,
@ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam (required=false) String peasantHouseholdNo,
@ApiParam(value = "电站名称", example = "admin") @RequestParam (required=false) String ownersName,
@ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam (required=false) String ids
) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData( unitInfoId,regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName,ids));
......@@ -810,13 +813,13 @@ public class UnitInfoController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdDataNew")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdDataNew(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(value = "current") int current,
@RequestParam (value = "size") int size,
@RequestParam (required=false) String peasantHouseholdNo,
@RequestParam (required=false) String ownersName,
@RequestParam (required=false) String ids
@ApiParam(value = "人员Id", example = "1715318790759149570") @RequestParam(required=false) Long unitInfoId,
@ApiParam(value = "注册公司ID", example = "1702216914824097794") @RequestParam(required=false) Long regionalCompaniesSeq,
@ApiParam(value = "页码", example = "1") @RequestParam(value = "current") int current,
@ApiParam(value = "页数大小", example = "20") @RequestParam (value = "size") int size,
@ApiParam(value = "农户ID", example = "1710823964114186242") @RequestParam (required=false) String peasantHouseholdNo,
@ApiParam(value = "电站名称", example = "admin") @RequestParam (required=false) String ownersName,
@ApiParam(value = "id", example = "1710823964114186242,1717088938155339777") @RequestParam (required=false) String ids
) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdDataNew(unitInfoId, regionalCompaniesSeq, current, size, peasantHouseholdNo, ownersName, ids));
......@@ -850,8 +853,8 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserList")
public ResponseModel< List<Map<String,Object>> > getuserList( @RequestParam(required=false) Long role,
@RequestParam(required=false) Long regionalCompaniesSeq
public ResponseModel< List<Map<String,Object>> > getuserList( @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required=false) Long role,
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required=false) Long regionalCompaniesSeq
) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
......@@ -866,8 +869,8 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserListAll")
public ResponseModel< List<Map<String,Object>> > getuserListAll( @RequestParam(required=false) Long role,
@RequestParam(required=false) Long regionalCompaniesSeq
public ResponseModel< List<Map<String,Object>> > getuserListAll( @ApiParam(value = "角色Id", example = "6582473") @RequestParam(required=false) Long role,
@ApiParam(value = "注册区域Id", example = "1710823964114186242") @RequestParam(required=false) Long regionalCompaniesSeq
) {
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
......@@ -878,7 +881,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getuserTelephone")
public ResponseModel< Map<String,Object> > getuserTelephone( @RequestParam(required=false) String userName
public ResponseModel< Map<String,Object> > getuserTelephone(@ApiParam(value = "用户名称", example = "admin") @RequestParam(required=false) String userName
) { Map<String,Object> data=null;
if(StringUtils.isNotEmpty(userName)){
List<Map<String,Object>> date= unitInfoMapper.getuserListtelephone(userName,null,null,null);
......@@ -894,7 +897,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据userId查询手机号", notes = "根据userId查询手机号")
@GetMapping(value = "/getUserTelephoneByUserId")
public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @RequestParam(required=false) String userId
public ResponseModel< Map<String,Object> > getUserTelephoneByUserId( @ApiParam(value = "用户Id", example = "8542741")@RequestParam(required=false) String userId
) { Map<String,Object> data=null;
if(StringUtils.isNotEmpty(userId)){
List<Map<String,Object>> date= unitInfoMapper.getUserTelephoneByUserId(userId);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UserMessageController.java
View file @ 6053d3b2
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.UserMessageServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -54,7 +55,8 @@ public class UserMessageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新人员消息", notes = "根据sequenceNbr更新人员消息")
public ResponseModel<UserMessageDto> updateBySequenceNbrUserMessage(@RequestBody UserMessageDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<UserMessageDto> updateBySequenceNbrUserMessage(@RequestBody UserMessageDto model,
@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(userMessageServiceImpl.updateWithModel(model));
}
......@@ -68,7 +70,8 @@ public class UserMessageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除人员消息", notes = "根据sequenceNbr删除人员消息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(userMessageServiceImpl.removeById(sequenceNbr));
}
......@@ -81,7 +84,7 @@ public class UserMessageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员消息", notes = "根据sequenceNbr查询单个人员消息")
public ResponseModel<UserMessageDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<UserMessageDto> selectOne(@ApiParam(value = "主键", example = "1706869110685569025")@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(userMessageServiceImpl.queryBySeq(sequenceNbr));
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java
View file @ 6053d3b2
......@@ -340,7 +340,8 @@ public class WorkOrderController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "完工登记详情", notes = "完工登记详情")
@GetMapping(value = "/getPowerStationEngineeringInfoHistory")
public ResponseModel<PowerStationEngineeringInfoAllDto> getPowerStationEngineeringInfoHistory( @ApiParam(name = "peasantHouseholdId",value = "农户ID",example = "1712383951215005697") @RequestParam(value = "peasantHouseholdId")Long peasantHouseholdId , @RequestParam(value = "processInstanceId",required = false)String processInstanceId) {
public ResponseModel<PowerStationEngineeringInfoAllDto> getPowerStationEngineeringInfoHistory( @ApiParam(name = "peasantHouseholdId",value = "农户ID",example = "1712383951215005697") @RequestParam(value = "peasantHouseholdId")Long peasantHouseholdId ,
@ApiParam(value = "流程实例Id",example = "f2d8aa89-7594-11ef-b7e1-02420a1c0012") @RequestParam(value = "processInstanceId",required = false)String processInstanceId) {
PowerStationEngineeringInfoAllDto returnDto = workOrderServiceImpl.getPowerStationEngineeringInfoHistory(peasantHouseholdId,processInstanceId);
return ResponseHelper.buildResponse(returnDto);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java
View file @ 6053d3b2
......@@ -978,16 +978,7 @@ public class CommonServiceImpl {
cleanup(ziLiaoDir);
}
public void test (HttpServletResponse response) throws UnsupportedEncodingException {
String fileName = "批量资料";
Path currentWorkingDir = Paths.get("");
// 获取当前工作目录
Path rootDir = currentWorkingDir;
Path ziLiaoDir =rootDir.resolve("批量资料");
String encodedFilename = URLEncoder.encode( fileName+".zip", StandardCharsets.UTF_8.name());
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName+".zip", "UTF-8"));
createZipFile(ziLiaoDir, "批量资料",response);
}
private void autoSizeColumns(Sheet sheet) {
if (null != sheet.getRow(0) ){
for (int i = 0; i < sheet.getRow(0).getLastCellNum(); i++) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @ 6053d3b2
......@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDtoNew;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IJpInverterService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHYGFInverterDayGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHYGFInverterMonthGenerateMapper;
......@@ -50,6 +51,8 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
@Autowired
JpInverterMapper jpInverterMapper;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
/**
* 分页查询
......@@ -132,9 +135,23 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
map.put("zData",zData);
return map;
}
/**
* 获取区域公司Map
* @return
*/
private Map<String, String> getRegionalCompaniesNameMap() {
Map<String, String> map = new HashMap<>();
List<RegionalCompanies> regionalCompanies = regionalCompaniesMapper.selectList(null);
if(CollectionUtil.isNotEmpty(regionalCompanies)){
for (RegionalCompanies regionalCompany : regionalCompanies) {
map.put(regionalCompany.getRegionalCompaniesCode(),regionalCompany.getRegionalCompaniesName());
}
}
return map;
}
@UserLimits
public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
// Date date = DateUtil.parse(time, "yyyy-MM-dd");
// Date timeStart = DateUtils.dateAddHours(date, -8);
......@@ -177,14 +194,15 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
maxCreatedTimeList.add(sdf.format(item.get("max_created_time")));
}
});
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size);
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime);
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime,regionalCompaniesCode);
tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
});
PageInfo<TdHYGFInverterDayGenerate> page = new PageInfo(tdHYGFInverterDayGenerates);
......@@ -221,7 +239,8 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
// return tdHYGFInverterDayGeneratePage;
}
@UserLimits
public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes, List<String> stationIds) {
public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
Date date = DateUtil.parse(time, "yyyy-MM-dd");
String startTime = DateUtil.format(date, "yyyy-MM-dd") + "00:00:00";
String endTime = DateUtil.format(date, "yyyy-MM-dd") + "23:59:59";
......@@ -232,18 +251,19 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("created_time");
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectList(queryWrapper);
tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
});
return tdHYGFInverterDayGenerates;
}
@UserLimits
public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode ) {
Page<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGeneratePage = new Page<>();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
.eq("year_month", time);
......@@ -251,13 +271,18 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.orderByDesc("day_time");
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("day_time");
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size);
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null));
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> {
tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour() != null ? Double.valueOf(String.format("%.2f", tdHYGFInverterMonthGenerate.getFullhour())) : null);
tdHYGFInverterMonthGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterMonthGenerate.getRegionalCompaniesCode()));
});
PageInfo<TdHYGFInverterMonthGenerate> page = new PageInfo(tdHYGFInverterMonthGenerates);
Page<TdHYGFInverterMonthGenerate> pagenew = new Page<TdHYGFInverterMonthGenerate>();
......@@ -286,20 +311,25 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
//// return tdHYGFInverterMonthGeneratePage;
}
@UserLimits
public List<TdHYGFInverterMonthGenerate> jpInverterMonthReportExport( String time, List<String> sncodes, List<String> stationIds) {
public List<TdHYGFInverterMonthGenerate> jpInverterMonthReportExport( String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
.eq("year_month", time);
// .in("third_station_id", stationIds);
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("day_time");
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null));
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> {
tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null);
tdHYGFInverterMonthGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterMonthGenerate.getRegionalCompaniesCode()));
});
return tdHYGFInverterMonthGenerates;
}
@UserLimits
public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Page<TdHYGFInverterYearGenerate> tdHYGFInverterYearGeneratePage = new Page<>();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
.eq("year", time);
......@@ -307,14 +337,18 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("month_time");
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size);
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null));
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setGenerate(tdHYGFInverterYearGenerate.getGenerate()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getGenerate())):null));
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> {
tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null);
tdHYGFInverterYearGenerate.setGenerate(tdHYGFInverterYearGenerate.getGenerate()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getGenerate())):null);
tdHYGFInverterYearGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterYearGenerate.getRegionalCompaniesCode()));
});
PageInfo<TdHYGFInverterYearGenerate> page = new PageInfo(tdHYGFInverterYearGenerates);
Page<TdHYGFInverterYearGenerate> pagenew = new Page<TdHYGFInverterYearGenerate>();
......@@ -340,16 +374,21 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
// return tdHYGFInverterYearGeneratePage;
}
@UserLimits
public List<TdHYGFInverterYearGenerate> jpInverterYearReportExport(String time, List<String> sncodes, List<String> stationIds) {
public List<TdHYGFInverterYearGenerate> jpInverterYearReportExport(String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
.eq("year", time);
// .in("third_station_id", stationIds);
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("month_time");
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null));
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> {
tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null);
tdHYGFInverterYearGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterYearGenerate.getRegionalCompaniesCode()));
});
return tdHYGFInverterYearGenerates;
}
public List<Map<String, String>> getInverterSncodes(List<String> stationIds) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ 6053d3b2
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapBuilder;
import com.alibaba.excel.EasyExcel;
......@@ -15,6 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpCollectorMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IJpStationService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
......@@ -64,6 +66,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
MonthGenerateMapper monthGenerateMapper;
@Autowired
YearGenerateMapper yearGenerateMapper;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
private static double FDL = 0.001;
private static int FD = 1000;
......@@ -427,10 +431,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
wapper.eq(!StringUtils.isEmpty(reviewDto.getState()),DayGenerate::getStationState,reviewDto.getState());
wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限
count= dayGenerateMapper.selectCount(wapper);
//拦截拼接权限
List<DayGenerate> listday= dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
List<DayGenerate> listday= dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState(),reviewDto.getRegionalCompaniesCode());
list = getJpStationDtoday( dataJpStation, listday);
break;
case"month":
......@@ -440,10 +446,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限
count= monthGenerateMapper.selectCount(wapper1);
//拦截拼接权限
List<MonthGenerate> listmonth= monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
List<MonthGenerate> listmonth= monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState(),reviewDto.getRegionalCompaniesCode());
list = getJpStationDtomonth( dataJpStation, listmonth);
break;
......@@ -454,10 +461,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());
wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限
count= yearGenerateMapper.selectCount(wapper2);
//拦截拼接权限
List<YearGenerate> listyear= yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
List<YearGenerate> listyear= yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState(),reviewDto.getRegionalCompaniesCode());
list = getJpStationDtoyear(dataJpStation, listyear);
break;
......@@ -579,6 +587,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto> da){
List<JpStationDto> ld=new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (JpStationDto jpStation : da) {
JpStationDto hd=new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr());
......@@ -591,6 +600,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower())):null);
hd.setFullhour(Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower()*FD/jpStation.getCapacity())));
hd.setCumulativeIncome(jpStation.getCumulativeIncome()!=null?Double.valueOf(String.format("%.3f",jpStation.getCumulativeIncome())):null);
hd.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(jpStation.getRegionalCompaniesCode()));
ld.add(hd);
}
......@@ -600,7 +611,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoAll(List<JpStation> da) {
List<JpStationDto> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (JpStation jpStation : da) {
JpStationDto hd = new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr());
......@@ -613,6 +624,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setFullhour(Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower() / jpStation.getCapacity())));
hd.setCumulativeIncome(jpStation.getCumulativeIncome() != null ? Double.valueOf(String.format("%.3f", jpStation.getCumulativeIncome())) : null);
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(jpStation.getRegionalCompaniesCode()));
ld.add(hd);
}
......@@ -621,6 +633,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoday(List<JpStation> da, List<DayGenerate> listday) {
List<JpStationDto> ld = new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (DayGenerate dayGenerate : listday) {
JpStationDto hd = new JpStationDto();
for (JpStation jpStation : da) {
......@@ -637,6 +650,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setDayGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setTimeDate(dayGenerate.getDayTime());
hd.setDayIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setRegionalCompaniesCode(dayGenerate.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -645,8 +660,24 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
return ld;
}
/**
* 获取区域公司Map
* @return
*/
private Map<String, String> getRegionalCompaniesNameMap() {
Map<String, String> map = new HashMap<>();
List<RegionalCompanies> regionalCompanies = regionalCompaniesMapper.selectList(null);
if(CollectionUtil.isNotEmpty(regionalCompanies)){
for (RegionalCompanies regionalCompany : regionalCompanies) {
map.put(regionalCompany.getRegionalCompaniesCode(),regionalCompany.getRegionalCompaniesName());
}
}
return map;
}
public List<JpStationDto> getJpStationDtomonth(List<JpStation> da, List<MonthGenerate> listmonth) {
List<JpStationDto> ld = new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (MonthGenerate dayGenerate : listmonth) {
JpStationDto hd = new JpStationDto();
for (JpStation jpStation : da) {
......@@ -663,6 +694,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setMonthIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getMonthTime());
hd.setFullhour(dayGenerate.getFullhour() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getFullhour())) : null);
hd.setRegionalCompaniesCode(dayGenerate.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -673,6 +706,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoyear(List<JpStation> da, List<YearGenerate> listyear) {
List<JpStationDto> ld = new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (YearGenerate dayGenerate : listyear) {
JpStationDto hd = new JpStationDto();
for (JpStation jpStation : da) {
......@@ -690,6 +724,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setYearGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setYearIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getYearTime());
hd.setRegionalCompaniesCode(dayGenerate.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -719,6 +755,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate());
wapper.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), DayGenerate::getStationState, reviewDto.getState());
wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
List<DayGenerate> listday = dayGenerateMapper.selectList(wapper);
List<DayGenerateEX> listne = getJpStationDtodaynew(dataJpStation, listday);
......@@ -732,7 +769,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate());
wapper1.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), MonthGenerate::getStationState, reviewDto.getState());
wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
List<MonthGenerate> listmonth = monthGenerateMapper.selectList(wapper1);
List<MonthGenerateEX> lo = getJpStationDtomonthnew(dataJpStation, listmonth);
setResponseHeadForDowload(response, "电站月报表.xls");
......@@ -745,7 +782,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate());
wapper2.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), YearGenerate::getStationState, reviewDto.getState());
wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
List<YearGenerate> listyear = yearGenerateMapper.selectList(wapper2);
List<YearGenerateEX> listy = getJpStationDtoyearnew(dataJpStation, listyear);
setResponseHeadForDowload(response, "电站年报表.xls");
......@@ -841,6 +878,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<DayGenerateEX> getJpStationDtodaynew( List<JpStation> da, List<DayGenerate> listday){
List<DayGenerateEX> ld=new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (DayGenerate dayGenerate : listday) {
DayGenerateEX hd = new DayGenerateEX();
for (JpStation jpStation : da) {
......@@ -856,6 +894,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setDayGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setTimeDate(dayGenerate.getDayTime());
hd.setDayIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -866,6 +905,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<MonthGenerateEX> getJpStationDtomonthnew(List<JpStation> da, List<MonthGenerate> listmonth) {
List<MonthGenerateEX> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (MonthGenerate dayGenerate : listmonth) {
MonthGenerateEX hd = new MonthGenerateEX();
for (JpStation jpStation : da) {
......@@ -879,6 +919,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setMonthIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getMonthTime());
hd.setFullhour(dayGenerate.getFullhour() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getFullhour())) : null);
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -889,6 +930,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<YearGenerateEX> getJpStationDtoyearnew(List<JpStation> da, List<YearGenerate> listyear) {
List<YearGenerateEX> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (YearGenerate dayGenerate : listyear) {
YearGenerateEX hd = new YearGenerateEX();
for (JpStation jpStation : da) {
......@@ -903,6 +945,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setYearGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setYearIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getYearTime());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ 6053d3b2
......@@ -448,7 +448,10 @@ public class SurveyInformationServiceImpl
powerStation.setTechnologyStatus("");
powerStation.setDesignStatus("");
powerStation.setBusinessStatus("");
powerStation.setKcCreateTime(new Date());
SurveyInformation surveyInformation = this.baseMapper.selectById(peasantHousehold.getSurveyInformationId());
if(Objects.nonNull(surveyInformation)){
powerStation.setKcCreateTime(surveyInformation.getCreatorTime());
}
powerStationService.savePowerStation(powerStation, true, powerStation.getOwnersName(), "");
//
......
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