Skip to content

A
amos-boot-biz
Commit 9ff15d2d authored by lisong's avatar lisong
Browse files
Options

修改光伏用户导出

parent 352525ff
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 13 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvExport.java
View file @ 9ff15d2d
...@@ -31,6 +31,7 @@ public class HouseholdPvExport { ...@@ -31,6 +31,7 @@ public class HouseholdPvExport {
private String contactNumber; private String contactNumber;
private String period; private String period;
private String description; private String description;
private String generationNumber;
/** /**
* 设备信息 * 设备信息
*/ */
...@@ -46,6 +47,7 @@ public class HouseholdPvExport { ...@@ -46,6 +47,7 @@ public class HouseholdPvExport {
private String actualCapacity; private String actualCapacity;
private String stationType; private String stationType;
private String moduleType; private String moduleType;
private String inverterSerialNumber;
/** /**
* 安装信息 * 安装信息
*/ */
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvLeaseDto.java
View file @ 9ff15d2d
...@@ -34,7 +34,7 @@ public class HouseholdPvLeaseDto extends BaseDto { ...@@ -34,7 +34,7 @@ public class HouseholdPvLeaseDto extends BaseDto {
private Date installDate; private Date installDate;
@ApiModelProperty(value = "预计功率(w)") @ApiModelProperty(value = "预计功率(w)")
private Integer estimatedPower; private String estimatedPower;
@ApiModelProperty(value = "组件单片功率(w)") @ApiModelProperty(value = "组件单片功率(w)")
private Integer monolithicPower; private Integer monolithicPower;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/HouseholdPvLease.java
View file @ 9ff15d2d
...@@ -44,7 +44,7 @@ public class HouseholdPvLease extends BaseEntity { ...@@ -44,7 +44,7 @@ public class HouseholdPvLease extends BaseEntity {
* 预计功率(w) * 预计功率(w)
*/ */
@TableField("estimated_power") @TableField("estimated_power")
private Integer estimatedPower; private String estimatedPower;
/** /**
* 组件单片功率(w) * 组件单片功率(w)
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/HouseholdPvMapper.xml
View file @ 9ff15d2d
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
hpc.number AS contactNumber, hpc.number AS contactNumber,
hpc.period, hpc.period,
hpc.description , hpc.description ,
hpc.generation_number as generationNumber ,
hpl.install_address as installAddress, hpl.install_address as installAddress,
hpl.install_date as installDate, hpl.install_date as installDate,
hpl.estimated_power as estimatedPower, hpl.estimated_power as estimatedPower,
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
hpl.station_type as stationType, hpl.station_type as stationType,
hpl.module_type as moduleType, hpl.module_type as moduleType,
hpl.install_count as installCount, hpl.install_count as installCount,
hpl.inverter_serial_number as inverterSerialNumber,
hpi.description as installDescription, hpi.description as installDescription,
hpi.platform_company_id AS installStation hpi.platform_company_id AS installStation
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/HouseholdPvController.java
View file @ 9ff15d2d
...@@ -206,17 +206,19 @@ public class HouseholdPvController extends BaseController { ...@@ -206,17 +206,19 @@ public class HouseholdPvController extends BaseController {
row.createCell(13).setCellValue(ObjectUtils.isEmpty(item.getContactNumber()) ? "" : item.getContactNumber()); row.createCell(13).setCellValue(ObjectUtils.isEmpty(item.getContactNumber()) ? "" : item.getContactNumber());
row.createCell(14).setCellValue(ObjectUtils.isEmpty(item.getPeriod()) ? "" : item.getPeriod()); row.createCell(14).setCellValue(ObjectUtils.isEmpty(item.getPeriod()) ? "" : item.getPeriod());
row.createCell(15).setCellValue(ObjectUtils.isEmpty(item.getDescription()) ? "" : item.getDescription()); row.createCell(15).setCellValue(ObjectUtils.isEmpty(item.getDescription()) ? "" : item.getDescription());
row.createCell(16).setCellValue(ObjectUtils.isEmpty(item.getEquipmentMessage()) ? "" : item.getEquipmentMessage()); row.createCell(16).setCellValue(ObjectUtils.isEmpty(item.getGenerationNumber()) ? "" : item.getGenerationNumber());
row.createCell(17).setCellValue(ObjectUtils.isEmpty(item.getInstallAddress()) ? "" : item.getInstallAddress()); row.createCell(17).setCellValue(ObjectUtils.isEmpty(item.getEquipmentMessage()) ? "" : item.getEquipmentMessage());
row.createCell(18).setCellValue(ObjectUtils.isEmpty(item.getInstallDate()) ? "" : item.getInstallDate()); row.createCell(18).setCellValue(ObjectUtils.isEmpty(item.getInstallAddress()) ? "" : item.getInstallAddress());
row.createCell(19).setCellValue(ObjectUtils.isEmpty(item.getEstimatedPower()) ? "" : item.getEstimatedPower()); row.createCell(19).setCellValue(ObjectUtils.isEmpty(item.getInstallDate()) ? "" : item.getInstallDate());
row.createCell(20).setCellValue(ObjectUtils.isEmpty(item.getMonolithicPower()) ? "" : item.getMonolithicPower()); row.createCell(20).setCellValue(ObjectUtils.isEmpty(item.getEstimatedPower()) ? "" : item.getEstimatedPower());
row.createCell(21).setCellValue(ObjectUtils.isEmpty(item.getInstallCount()) ? "" : item.getInstallCount()); row.createCell(21).setCellValue(ObjectUtils.isEmpty(item.getMonolithicPower()) ? "" : item.getMonolithicPower());
row.createCell(22).setCellValue(ObjectUtils.isEmpty(item.getActualCapacity()) ? "" : item.getActualCapacity()); row.createCell(22).setCellValue(ObjectUtils.isEmpty(item.getInstallCount()) ? "" : item.getInstallCount());
row.createCell(23).setCellValue(ObjectUtils.isEmpty(item.getStationType()) ? "" : item.getStationType()); row.createCell(23).setCellValue(ObjectUtils.isEmpty(item.getActualCapacity()) ? "" : item.getActualCapacity());
row.createCell(24).setCellValue(ObjectUtils.isEmpty(item.getModuleType()) ? "" : item.getModuleType()); row.createCell(24).setCellValue(ObjectUtils.isEmpty(item.getStationType()) ? "" : item.getStationType());
row.createCell(25).setCellValue(ObjectUtils.isEmpty(item.getInstallStation()) ? "" : item.getInstallStation()); row.createCell(25).setCellValue(ObjectUtils.isEmpty(item.getModuleType()) ? "" : item.getModuleType());
row.createCell(26).setCellValue(ObjectUtils.isEmpty(item.getInstallDescription()) ? "" : item.getInstallDescription()); row.createCell(26).setCellValue(ObjectUtils.isEmpty(item.getInverterSerialNumber()) ? "" : item.getInverterSerialNumber());
row.createCell(27).setCellValue(ObjectUtils.isEmpty(item.getInstallStation()) ? "" : item.getInstallStation());
row.createCell(28).setCellValue(ObjectUtils.isEmpty(item.getInstallDescription()) ? "" : item.getInstallDescription());
}); });
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/HouseholdPvLeaseController.java
View file @ 9ff15d2d
...@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiOperation; ...@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.HashMap;
import java.util.List; import java.util.List;
import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvLeaseServiceImpl; import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvLeaseServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
...@@ -113,4 +115,15 @@ public class HouseholdPvLeaseController extends BaseController { ...@@ -113,4 +115,15 @@ public class HouseholdPvLeaseController extends BaseController {
public ResponseModel<List<HouseholdPvLeaseDto>> selectForList() { public ResponseModel<List<HouseholdPvLeaseDto>> selectForList() {
return ResponseHelper.buildResponse(householdPvLeaseServiceImpl.queryForHouseholdPvLeaseList()); return ResponseHelper.buildResponse(householdPvLeaseServiceImpl.queryForHouseholdPvLeaseList());
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "租赁物信息表单预计功率实时计算", notes = "租赁物信息表单预计功率实时计算")
@GetMapping(value = "/getInstallCount")
public ResponseModel<Object> getInstallCount(@RequestParam Long number,
@RequestParam Long power) {
HashMap<String, Object> map = new HashMap<>();
map.put("estimatedPower", Math.multiplyExact(number, power));
return ResponseHelper.buildResponse(map);
}
} }
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