Skip to content

A
amos-boot-biz
Commit db5af22f authored by chenzhao's avatar chenzhao
Browse files
Options

修改代码

parent b459c59c
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 31 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInverterDtoNew.java
View file @ db5af22f
......@@ -98,4 +98,10 @@ public class JpInverterDtoNew extends BaseDto {
@ApiModelProperty(value = "筛选用 最大值")
private Double maxValue;
@ApiModelProperty(value = "所属区域公司名称")
private String companyName;
@ApiModelProperty(value = "电站类型")
private String stationType;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java
View file @ db5af22f
......@@ -160,22 +160,22 @@ public class TdHYGFInverterDayGenerate implements Serializable {
private Double igbtTemp;
/**
* 直流电流1
* 直流功率1
*/
@ExcelIgnore
private Double pv1;
/**
* 直流电流2
* 直流功率2
*/
@ExcelIgnore
private Double pv2;
/**
* 直流电流3
* 直流功率3
*/
@ExcelIgnore
private Double pv3;
/**
* 直流电流4
* 直流功率4
*/
@ExcelIgnore
private Double pv4;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ db5af22f
......@@ -50,9 +50,9 @@
hjc.collector_sn_code,
hjc.update_time,
hjc.current_power,
ROUND(hjc.day_power_generation/1000,4) as dayPowerGeneration,
ROUND(hjc.month_power_generation/1000,4) as monthPowerGeneration,
ROUND(hjc.year_power_generation/1000,4) as yearPowerGeneration,
ROUND(hjc.day_power_generation/1000,3) as dayPowerGeneration,
ROUND(hjc.month_power_generation/1000,3) as monthPowerGeneration,
ROUND(hjc.year_power_generation/1000,3) as yearPowerGeneration,
hjc.brand,
hjc.model,
hjc.national_standard,
......@@ -64,12 +64,14 @@
hjc.AFCI_version,
hjc.ID,
hjc.capacity,
ROUND(hjc.total_power_generation/1000,4) as totalPowerGeneration,
ROUND(hjc.total_power_generation/1000,3) as totalPowerGeneration,
hjc.third_station_id,
hjc.is_delete,
hjc.third_code,
hjc.station_name,
hjc.addr
hjc.addr,
sta.type as stationType,
(select COMPANY_NAME from privilege_company where ORG_CODE = sta.regional_companies_code ) as companyName
from
hygf_jp_inverter hjc
left join hygf_jp_station sta on sta.third_station_id = hjc.third_station_id
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpCollectorController.java
View file @ db5af22f
......@@ -112,10 +112,10 @@ public class JpCollectorController extends BaseController {
List<JpInverter> list = jpInverterServiceImpl.list(queryWrapper);
List<JpInverter> listData =new ArrayList<>();
for (JpInverter jpInverter : list) {
jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration()!=null?Double.valueOf(String.format("%.4f",jpInverter.getDayPowerGeneration()/1000)):0);
jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?Double.valueOf(String.format("%.4f",jpInverter.getMonthPowerGeneration()/1000)):0);
jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration()!=null?Double.valueOf(String.format("%.4f",jpInverter.getYearPowerGeneration()/1000)):0);
jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration()!=null?Double.valueOf(String.format("%.4f",jpInverter.getTotalPowerGeneration()/1000)):0);
jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getDayPowerGeneration()/1000)):0);
jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getMonthPowerGeneration()/1000)):0);
jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getYearPowerGeneration()/1000)):0);
jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration()!=null?Double.valueOf(String.format("%.3f",jpInverter.getTotalPowerGeneration()/1000)):0);
listData.add(jpInverter);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ db5af22f
......@@ -238,8 +238,11 @@ public class JpInverterController extends BaseController {
} catch (ParseException e) {
e.printStackTrace();
}
List<JSONObject> treeParams1 = parseArray(JSONObject.toJSONString(treeParams.get("treeParams")), JSONObject.class);
if (CollectionUtils.isEmpty(treeParams1)){
Map<String,Object> obj = new HashMap<>();
return ResponseHelper.buildResponse(obj);
}
return ResponseHelper.buildResponse(jpInverterServiceImpl.selectDayTrend(treeParams1, time, snCode, thirdStationId));
}else if (treeParams.get("date").equals("month")){
return ResponseHelper.buildResponse(jpInverterServiceImpl.selectMonthTrend(time, snCode, thirdStationId));
......@@ -400,7 +403,8 @@ public class JpInverterController extends BaseController {
public ResponseModel<JpInverterDto> selectOneBySnCode(@PathVariable String snCode) {
LambdaQueryWrapper<JpInverter> query = new LambdaQueryWrapper<>();
query.eq(JpInverter::getSnCode,snCode);
JpInverter jpInverter = jpInverterServiceImpl.getBaseMapper().selectOne(query);
query.orderByDesc(JpInverter::getUpdateTime);
JpInverter jpInverter = jpInverterServiceImpl.getBaseMapper().selectList(query).get(0);
jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration()!=null?jpInverter.getDayPowerGeneration()/1000:0);
jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?jpInverter.getMonthPowerGeneration()/1000:0);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ db5af22f
......@@ -177,6 +177,7 @@ public class JpStationController extends BaseController {
String name = jpInverter.stream().map(JpInverter::getSnCode).collect(Collectors.joining(","));
jpStationDto.setNbsn(name);
jpStationDto.setCjsn(names);
jpStationDto.setCapacity(jpStationDto.getCapacity() ==null?0:Double.valueOf( String.format("%.2f", jpStationDto.getCapacity() / 1000)));
jpStationDto.setRegionalCompaniesName(personnelBusiness.getRegionalCompaniesName());
return ResponseHelper.buildResponse(jpStationDto);
}
......
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 @ db5af22f
......@@ -104,7 +104,14 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
}
public Map<String,Object> selectDayTrend(List<JSONObject>treeParams, String time, String snCode, String thirdStationId) {
List<String> key = treeParams.stream().map(e -> e.get("key").toString().replace("_","")).collect(Collectors.toList());
List<String> key = new ArrayList<>();
treeParams.forEach(a->{
if (a.get("key").toString().startsWith("acc")||a.get("key").toString().startsWith("acv")||a.get("key").toString().startsWith("pv")){
key.add(a.get("key").toString().replace("_",""));
}else {
key.add(a.get("key").toString());
}
});
List<Map<String,Object>> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectDayTrend(key, time, snCode, thirdStationId);
List<String> zData = new ArrayList<>();
tdHYGFInverterDayGenerates.forEach(e->zData.add(e.get("workstatus").toString()) );
......@@ -113,8 +120,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
List<String> value = new ArrayList<>();
for (Map<String, Object> obj : tdHYGFInverterDayGenerates) {
xData.add(obj.get("time").toString().substring(0,obj.get("time").toString().length()-4));
String key1 = treeParam.get("key").toString().replace("_","");
value.add(obj.get(key1).toString());
String key1 = treeParam.get("key").toString();
if (treeParam.get("key").toString().startsWith("acc")||treeParam.get("key").toString().startsWith("acv")||treeParam.get("key").toString().startsWith("pv")){
key1 =treeParam.get("key").toString().replace("_","");
} value.add(obj.get(key1).toString());
}
treeParam.put("data",value);
}
......@@ -128,8 +137,12 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
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";
Date timeStart = DateUtils.dateAddHours(date, -8);
Date tiemEnd = DateUtils.dateAddHours(date, 16);
String startTime = DateUtil.format(timeStart, "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(tiemEnd, "yyyy-MM-dd HH:mm:ss");
//String startTime = DateUtil.format(date, "yyyy-MM-dd") + "00:00:00";
//String endTime = DateUtil.format(date, "yyyy-MM-dd") + "23:59:59";
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterDayGenerate>()
.ge("created_time", startTime)
.le("created_time", endTime)
......@@ -274,7 +287,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map<String,Object> map = new HashMap<>();
Map<String,Object> map1 = new HashMap<>();
map1.put("name","发电量");
map1.put("unit","kw");
map1.put("unit","kW");
map1.put("data",value1);
yData.add(map1);
Map<String,Object> map2 = new HashMap<>();
......@@ -301,7 +314,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map<String,Object> map = new HashMap<>();
Map<String,Object> map1 = new HashMap<>();
map1.put("name","发电量");
map1.put("unit","kw");
map1.put("unit","kW");
map1.put("data",value1);
yData.add(map1);
Map<String,Object> map2 = new HashMap<>();
......@@ -328,7 +341,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map<String,Object> map = new HashMap<>();
Map<String,Object> map1 = new HashMap<>();
map1.put("name","发电量");
map1.put("unit","kw");
map1.put("unit","kW");
map1.put("data",value1);
yData.add(map1);
Map<String,Object> map2 = new HashMap<>();
......
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 @ db5af22f
......@@ -457,7 +457,6 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
hd.setThirdStationId(jpStation.getThirdStationId());
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?jpStation.getAccumulatedPower()*FD:null);
hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()*FD/jpStation.getRatedPower())));
hd.setAccumulatedPower(jpStation.getAccumulatedPower());
hd.setCumulativeIncome(jpStation.getCumulativeIncome());
ld.add(hd);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/paramsTree.json
View file @ db5af22f
......@@ -42,44 +42,64 @@
"unit": "A"
}
]
},
}, {
"name": "直流功率",
"key": "pv",
"children": [
{"name":"直流功率PV1",
"key": "pv_1",
"unit": "kW"
},
{"name":"直流功率PV2",
"key": "pv_2",
"unit": "kW"
},
{"name":"直流功率PV3",
"key": "pv_3",
"unit": "kW"
},
{"name":"直流功率PV4",
"key": "pv_4",
"unit": "kW"
}
]},
{
"name": "U_交流电压",
"key": "acv1",
"key": "dcv1",
"unit": "V",
"children": [
]
},
{
"name": "V_交流电压",
"key": "acv2",
"key": "dcv2",
"unit": "V",
"children": [
]
}, {
"name": "W_交流电压",
"key": "acv3",
"key": "dcv3",
"unit": "V",
"children": [
]
},
{
"name": "U_交流电流",
"key": "acc1",
"key": "dcc1",
"unit": "A",
"children": [
]
},
{
"name": "W_交流电流",
"key": "acc3",
"key": "dcc3",
"unit": "A",
"children": [
]
},
{
"name": "V_交流电流",
"key": "acc2",
"key": "dcc2",
"unit": "A",
"children": [
]
......@@ -94,24 +114,46 @@
{
"name": "总功率",
"key": "total_power",
"unit": "kWh",
"children": [
]
},
{
"name": "当日电量",
"key": "day_gen",
"unit": "kWh",
"children": [
]
},
{
"name": "累计电量",
"key": "total_gen",
"unit": "kWh",
"children": [
]
},
{
"name": "IGBT温度",
"key": "igbt_temp",
"unit": "℃",
"children": [
]
},
{
"name": "直流母线电压",
"key": "zlmxdy",
"children": [
]
},
{
"name": "直流母线半电压",
"key": "zlmxbdy",
"children": [
]
},
{
"name": "绝缘阻抗实时值",
"key": "jyzkssz",
"children": [
]
}
......
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