代码提交
This commit is contained in:
wr
@@ -141,7 +141,7 @@ public class DataImportController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 登录获取token
|
||||
* 变电站母线测
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@@ -150,7 +150,7 @@ public class DataImportController {
|
||||
return iPmsMidLedgerService.insertMidLedger();
|
||||
}
|
||||
/**
|
||||
* 登录获取token
|
||||
* 变电站母线总条数
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.njcn.syncdata.controller;
|
||||
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryC;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryP;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryV;
|
||||
import com.njcn.syncdata.service.HarmonicHistory;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
* @description
|
||||
* @date 2024/1/22 16:40
|
||||
*/
|
||||
@RestController
|
||||
@Slf4j
|
||||
@RequestMapping("/History")
|
||||
@RequiredArgsConstructor
|
||||
public class HarmonicHistoryController {
|
||||
|
||||
private final HarmonicHistory harmonicHistory;
|
||||
|
||||
|
||||
@GetMapping("/getDataV")
|
||||
public List<HarmonicHistoryV> getDataV(String id,String startTime,String endTime) {
|
||||
return harmonicHistory.listHarmonicHistoryV(id, startTime, endTime);
|
||||
}
|
||||
@GetMapping("/getDataP")
|
||||
public List<HarmonicHistoryP> getDataP(String id, String startTime, String endTime) {
|
||||
return harmonicHistory.listHarmonicHistoryP(id, startTime, endTime);
|
||||
}
|
||||
@GetMapping("/getDataC")
|
||||
public List<HarmonicHistoryC> getDataC(String id, String startTime, String endTime) {
|
||||
return harmonicHistory.listHarmonicHistoryC(id, startTime, endTime);
|
||||
}
|
||||
}
|
||||
@@ -32,4 +32,9 @@ public class BusbarPSR {
|
||||
* 运行状态
|
||||
*/
|
||||
private String RUN_STATUS;
|
||||
/**
|
||||
* 电压等级
|
||||
*/
|
||||
private String VOLTAGELEVEL_ID;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
package com.njcn.syncdata.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import static com.baomidou.mybatisplus.annotation.IdType.ASSIGN_ID;
|
||||
import static com.baomidou.mybatisplus.annotation.IdType.ASSIGN_UUID;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -94,6 +90,11 @@ public class PmsMidLedger {
|
||||
@TableField("Run_Status")
|
||||
private String runStatus;
|
||||
|
||||
/**
|
||||
* 电压等级
|
||||
*/
|
||||
@TableField("voltage_Level")
|
||||
private String voltageLevel;
|
||||
/**
|
||||
* 创建用户
|
||||
*/
|
||||
|
||||
212
src/main/java/com/njcn/syncdata/pojo/zt/HarmonicHistoryC.java
Normal file
212
src/main/java/com/njcn/syncdata/pojo/zt/HarmonicHistoryC.java
Normal file
@@ -0,0 +1,212 @@
|
||||
package com.njcn.syncdata.pojo.zt;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
* @description 华云远程访问返回功率因数实体
|
||||
* @date 2024/1/22 14:59
|
||||
*/
|
||||
@Data
|
||||
public class HarmonicHistoryC {
|
||||
//台区编号
|
||||
private String tg_id;
|
||||
//数据id
|
||||
private String id;
|
||||
//相位标识
|
||||
private Integer phase_flag;
|
||||
//时间
|
||||
private String ds;
|
||||
//功率因数第1个点
|
||||
private Float c1;
|
||||
//功率因数第2个点
|
||||
private Float c2;
|
||||
//功率因数第3个点
|
||||
private Float c3;
|
||||
//功率因数第4个点
|
||||
private Float c4;
|
||||
//功率因数第5个点
|
||||
private Float c5;
|
||||
//功率因数第6个点
|
||||
private Float c6;
|
||||
//功率因数第7个点
|
||||
private Float c7;
|
||||
//功率因数第8个点
|
||||
private Float c8;
|
||||
//功率因数第9个点
|
||||
private Float c9;
|
||||
//功率因数第10个点
|
||||
private Float c10;
|
||||
//功率因数第11个点
|
||||
private Float c11;
|
||||
//功率因数第12个点
|
||||
private Float c12;
|
||||
//功率因数第13个点
|
||||
private Float c13;
|
||||
//功率因数第14个点
|
||||
private Float c14;
|
||||
//功率因数第15个点
|
||||
private Float c15;
|
||||
//功率因数第16个点
|
||||
private Float c16;
|
||||
//功率因数第17个点
|
||||
private Float c17;
|
||||
//功率因数第18个点
|
||||
private Float c18;
|
||||
//功率因数第19个点
|
||||
private Float c19;
|
||||
//功率因数第20个点
|
||||
private Float c20;
|
||||
//功率因数第21个点
|
||||
private Float c21;
|
||||
//功率因数第22个点
|
||||
private Float c22;
|
||||
//功率因数第23个点
|
||||
private Float c23;
|
||||
//功率因数第24个点
|
||||
private Float c24;
|
||||
//功率因数第25个点
|
||||
private Float c25;
|
||||
//功率因数第26个点
|
||||
private Float c26;
|
||||
//功率因数第27个点
|
||||
private Float c27;
|
||||
//功率因数第28个点
|
||||
private Float c28;
|
||||
//功率因数第29个点
|
||||
private Float c29;
|
||||
//功率因数第30个点
|
||||
private Float c30;
|
||||
//功率因数第31个点
|
||||
private Float c31;
|
||||
//功率因数第32个点
|
||||
private Float c32;
|
||||
//功率因数第33个点
|
||||
private Float c33;
|
||||
//功率因数第34个点
|
||||
private Float c34;
|
||||
//功率因数第35个点
|
||||
private Float c35;
|
||||
//功率因数第36个点
|
||||
private Float c36;
|
||||
//功率因数第37个点
|
||||
private Float c37;
|
||||
//功率因数第38个点
|
||||
private Float c38;
|
||||
//功率因数第39个点
|
||||
private Float c39;
|
||||
//功率因数第40个点
|
||||
private Float c40;
|
||||
//功率因数第41个点
|
||||
private Float c41;
|
||||
//功率因数第42个点
|
||||
private Float c42;
|
||||
//功率因数第43个点
|
||||
private Float c43;
|
||||
//功率因数第44个点
|
||||
private Float c44;
|
||||
//功率因数第45个点
|
||||
private Float c45;
|
||||
//功率因数第46个点
|
||||
private Float c46;
|
||||
//功率因数第47个点
|
||||
private Float c47;
|
||||
//功率因数第48个点
|
||||
private Float c48;
|
||||
//功率因数第49个点
|
||||
private Float c49;
|
||||
//功率因数第50个点
|
||||
private Float c50;
|
||||
//功率因数第51个点
|
||||
private Float c51;
|
||||
//功率因数第52个点
|
||||
private Float c52;
|
||||
//功率因数第53个点
|
||||
private Float c53;
|
||||
//功率因数第54个点
|
||||
private Float c54;
|
||||
//功率因数第55个点
|
||||
private Float c55;
|
||||
//功率因数第56个点
|
||||
private Float c56;
|
||||
//功率因数第57个点
|
||||
private Float c57;
|
||||
//功率因数第58个点
|
||||
private Float c58;
|
||||
//功率因数第59个点
|
||||
private Float c59;
|
||||
//功率因数第60个点
|
||||
private Float c60;
|
||||
//功率因数第61个点
|
||||
private Float c61;
|
||||
//功率因数第62个点
|
||||
private Float c62;
|
||||
//功率因数第63个点
|
||||
private Float c63;
|
||||
//功率因数第64个点
|
||||
private Float c64;
|
||||
//功率因数第65个点
|
||||
private Float c65;
|
||||
//功率因数第66个点
|
||||
private Float c66;
|
||||
//功率因数第67个点
|
||||
private Float c67;
|
||||
//功率因数第68个点
|
||||
private Float c68;
|
||||
//功率因数第69个点
|
||||
private Float c69;
|
||||
//功率因数第70个点
|
||||
private Float c70;
|
||||
//功率因数第71个点
|
||||
private Float c71;
|
||||
//功率因数第72个点
|
||||
private Float c72;
|
||||
//功率因数第73个点
|
||||
private Float c73;
|
||||
//功率因数第74个点
|
||||
private Float c74;
|
||||
//功率因数第75个点
|
||||
private Float c75;
|
||||
//功率因数第76个点
|
||||
private Float c76;
|
||||
//功率因数第77个点
|
||||
private Float c77;
|
||||
//功率因数第78个点
|
||||
private Float c78;
|
||||
//功率因数第79个点
|
||||
private Float c79;
|
||||
//功率因数第80个点
|
||||
private Float c80;
|
||||
//功率因数第81个点
|
||||
private Float c81;
|
||||
//功率因数第82个点
|
||||
private Float c82;
|
||||
//功率因数第83个点
|
||||
private Float c83;
|
||||
//功率因数第84个点
|
||||
private Float c84;
|
||||
//功率因数第85个点
|
||||
private Float c85;
|
||||
//功率因数第86个点
|
||||
private Float c86;
|
||||
//功率因数第87个点
|
||||
private Float c87;
|
||||
//功率因数第88个点
|
||||
private Float c88;
|
||||
//功率因数第89个点
|
||||
private Float c89;
|
||||
//功率因数第90个点
|
||||
private Float c90;
|
||||
//功率因数第91个点
|
||||
private Float c91;
|
||||
//功率因数第92个点
|
||||
private Float c92;
|
||||
//功率因数第93个点
|
||||
private Float c93;
|
||||
//功率因数第94个点
|
||||
private Float c94;
|
||||
//功率因数第95个点
|
||||
private Float c95;
|
||||
//功率因数第96个点
|
||||
private Float c96;
|
||||
}
|
||||
213
src/main/java/com/njcn/syncdata/pojo/zt/HarmonicHistoryP.java
Normal file
213
src/main/java/com/njcn/syncdata/pojo/zt/HarmonicHistoryP.java
Normal file
@@ -0,0 +1,213 @@
|
||||
package com.njcn.syncdata.pojo.zt;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
* @description 华云远程访问返回功率实体
|
||||
* @date 2024/1/22 14:59
|
||||
*/
|
||||
@Data
|
||||
public class HarmonicHistoryP {
|
||||
//台区编号
|
||||
private String tg_id;
|
||||
//数据id
|
||||
private String id;
|
||||
//相位标识 功率类型 1-有功 2-A相有功 3-B相有功 4-C相有功 5-无功 6-A相无功 7-B相无功 8-C相无功
|
||||
private Integer data_type;
|
||||
//时间
|
||||
private String ds;
|
||||
//功率第1个点
|
||||
private Float p1;
|
||||
//功率第2个点
|
||||
private Float p2;
|
||||
//功率第3个点
|
||||
private Float p3;
|
||||
//功率第4个点
|
||||
private Float p4;
|
||||
//功率第5个点
|
||||
private Float p5;
|
||||
//功率第6个点
|
||||
private Float p6;
|
||||
//功率第7个点
|
||||
private Float p7;
|
||||
//功率第8个点
|
||||
private Float p8;
|
||||
//功率第9个点
|
||||
private Float p9;
|
||||
//功率第10个点
|
||||
private Float p10;
|
||||
//功率第11个点
|
||||
private Float p11;
|
||||
//功率第12个点
|
||||
private Float p12;
|
||||
//功率第13个点
|
||||
private Float p13;
|
||||
//功率第14个点
|
||||
private Float p14;
|
||||
//功率第15个点
|
||||
private Float p15;
|
||||
//功率第16个点
|
||||
private Float p16;
|
||||
//功率第17个点
|
||||
private Float p17;
|
||||
//功率第18个点
|
||||
private Float p18;
|
||||
//功率第19个点
|
||||
private Float p19;
|
||||
//功率第20个点
|
||||
private Float p20;
|
||||
//功率第21个点
|
||||
private Float p21;
|
||||
//功率第22个点
|
||||
private Float p22;
|
||||
//功率第23个点
|
||||
private Float p23;
|
||||
//功率第24个点
|
||||
private Float p24;
|
||||
//功率第25个点
|
||||
private Float p25;
|
||||
//功率第26个点
|
||||
private Float p26;
|
||||
//功率第27个点
|
||||
private Float p27;
|
||||
//功率第28个点
|
||||
private Float p28;
|
||||
//功率第29个点
|
||||
private Float p29;
|
||||
//功率第30个点
|
||||
private Float p30;
|
||||
//功率第31个点
|
||||
private Float p31;
|
||||
//功率第32个点
|
||||
private Float p32;
|
||||
//功率第33个点
|
||||
private Float p33;
|
||||
//功率第34个点
|
||||
private Float p34;
|
||||
//功率第35个点
|
||||
private Float p35;
|
||||
//功率第36个点
|
||||
private Float p36;
|
||||
//功率第37个点
|
||||
private Float p37;
|
||||
//功率第38个点
|
||||
private Float p38;
|
||||
//功率第39个点
|
||||
private Float p39;
|
||||
//功率第40个点
|
||||
private Float p40;
|
||||
//功率第41个点
|
||||
private Float p41;
|
||||
//功率第42个点
|
||||
private Float p42;
|
||||
//功率第43个点
|
||||
private Float p43;
|
||||
//功率第44个点
|
||||
private Float p44;
|
||||
//功率第45个点
|
||||
private Float p45;
|
||||
//功率第46个点
|
||||
private Float p46;
|
||||
//功率第47个点
|
||||
private Float p47;
|
||||
//功率第48个点
|
||||
private Float p48;
|
||||
//功率第49个点
|
||||
private Float p49;
|
||||
//功率第50个点
|
||||
private Float p50;
|
||||
//功率第51个点
|
||||
private Float p51;
|
||||
//功率第52个点
|
||||
private Float p52;
|
||||
//功率第53个点
|
||||
private Float p53;
|
||||
//功率第54个点
|
||||
private Float p54;
|
||||
//功率第55个点
|
||||
private Float p55;
|
||||
//功率第56个点
|
||||
private Float p56;
|
||||
//功率第57个点
|
||||
private Float p57;
|
||||
//功率第58个点
|
||||
private Float p58;
|
||||
//功率第59个点
|
||||
private Float p59;
|
||||
//功率第60个点
|
||||
private Float p60;
|
||||
//功率第61个点
|
||||
private Float p61;
|
||||
//功率第62个点
|
||||
private Float p62;
|
||||
//功率第63个点
|
||||
private Float p63;
|
||||
//功率第64个点
|
||||
private Float p64;
|
||||
//功率第65个点
|
||||
private Float p65;
|
||||
//功率第66个点
|
||||
private Float p66;
|
||||
//功率第67个点
|
||||
private Float p67;
|
||||
//功率第68个点
|
||||
private Float p68;
|
||||
//功率第69个点
|
||||
private Float p69;
|
||||
//功率第70个点
|
||||
private Float p70;
|
||||
//功率第71个点
|
||||
private Float p71;
|
||||
//功率第72个点
|
||||
private Float p72;
|
||||
//功率第73个点
|
||||
private Float p73;
|
||||
//功率第74个点
|
||||
private Float p74;
|
||||
//功率第75个点
|
||||
private Float p75;
|
||||
//功率第76个点
|
||||
private Float p76;
|
||||
//功率第77个点
|
||||
private Float p77;
|
||||
//功率第78个点
|
||||
private Float p78;
|
||||
//功率第79个点
|
||||
private Float p79;
|
||||
//功率第80个点
|
||||
private Float p80;
|
||||
//功率第81个点
|
||||
private Float p81;
|
||||
//功率第82个点
|
||||
private Float p82;
|
||||
//功率第83个点
|
||||
private Float p83;
|
||||
//功率第84个点
|
||||
private Float p84;
|
||||
//功率第85个点
|
||||
private Float p85;
|
||||
//功率第86个点
|
||||
private Float p86;
|
||||
//功率第87个点
|
||||
private Float p87;
|
||||
//功率第88个点
|
||||
private Float p88;
|
||||
//功率第89个点
|
||||
private Float p89;
|
||||
//功率第90个点
|
||||
private Float p90;
|
||||
//功率第91个点
|
||||
private Float p91;
|
||||
//功率第92个点
|
||||
private Float p92;
|
||||
//功率第93个点
|
||||
private Float p93;
|
||||
//功率第94个点
|
||||
private Float p94;
|
||||
//功率第95个点
|
||||
private Float p95;
|
||||
//功率第96个点
|
||||
private Float p96;
|
||||
|
||||
}
|
||||
212
src/main/java/com/njcn/syncdata/pojo/zt/HarmonicHistoryV.java
Normal file
212
src/main/java/com/njcn/syncdata/pojo/zt/HarmonicHistoryV.java
Normal file
@@ -0,0 +1,212 @@
|
||||
package com.njcn.syncdata.pojo.zt;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
* @description 华云远程访问返回电压实体
|
||||
* @date 2024/1/15 10:18
|
||||
*/
|
||||
@Data
|
||||
public class HarmonicHistoryV {
|
||||
//台区编号
|
||||
private String tg_id;
|
||||
//数据id
|
||||
private String id;
|
||||
//相位标识
|
||||
private Integer phase_flag;
|
||||
//时间
|
||||
private String ds;
|
||||
//电压第1个点
|
||||
private Float u1;
|
||||
//电压第2个点
|
||||
private Float u2;
|
||||
//电压第3个点
|
||||
private Float u3;
|
||||
//电压第4个点
|
||||
private Float u4;
|
||||
//电压第5个点
|
||||
private Float u5;
|
||||
//电压第6个点
|
||||
private Float u6;
|
||||
//电压第7个点
|
||||
private Float u7;
|
||||
//电压第8个点
|
||||
private Float u8;
|
||||
//电压第9个点
|
||||
private Float u9;
|
||||
//电压第10个点
|
||||
private Float u10;
|
||||
//电压第11个点
|
||||
private Float u11;
|
||||
//电压第12个点
|
||||
private Float u12;
|
||||
//电压第13个点
|
||||
private Float u13;
|
||||
//电压第14个点
|
||||
private Float u14;
|
||||
//电压第15个点
|
||||
private Float u15;
|
||||
//电压第16个点
|
||||
private Float u16;
|
||||
//电压第17个点
|
||||
private Float u17;
|
||||
//电压第18个点
|
||||
private Float u18;
|
||||
//电压第19个点
|
||||
private Float u19;
|
||||
//电压第20个点
|
||||
private Float u20;
|
||||
//电压第21个点
|
||||
private Float u21;
|
||||
//电压第22个点
|
||||
private Float u22;
|
||||
//电压第23个点
|
||||
private Float u23;
|
||||
//电压第24个点
|
||||
private Float u24;
|
||||
//电压第25个点
|
||||
private Float u25;
|
||||
//电压第26个点
|
||||
private Float u26;
|
||||
//电压第27个点
|
||||
private Float u27;
|
||||
//电压第28个点
|
||||
private Float u28;
|
||||
//电压第29个点
|
||||
private Float u29;
|
||||
//电压第30个点
|
||||
private Float u30;
|
||||
//电压第31个点
|
||||
private Float u31;
|
||||
//电压第32个点
|
||||
private Float u32;
|
||||
//电压第33个点
|
||||
private Float u33;
|
||||
//电压第34个点
|
||||
private Float u34;
|
||||
//电压第35个点
|
||||
private Float u35;
|
||||
//电压第36个点
|
||||
private Float u36;
|
||||
//电压第37个点
|
||||
private Float u37;
|
||||
//电压第38个点
|
||||
private Float u38;
|
||||
//电压第39个点
|
||||
private Float u39;
|
||||
//电压第40个点
|
||||
private Float u40;
|
||||
//电压第41个点
|
||||
private Float u41;
|
||||
//电压第42个点
|
||||
private Float u42;
|
||||
//电压第43个点
|
||||
private Float u43;
|
||||
//电压第44个点
|
||||
private Float u44;
|
||||
//电压第45个点
|
||||
private Float u45;
|
||||
//电压第46个点
|
||||
private Float u46;
|
||||
//电压第47个点
|
||||
private Float u47;
|
||||
//电压第48个点
|
||||
private Float u48;
|
||||
//电压第49个点
|
||||
private Float u49;
|
||||
//电压第50个点
|
||||
private Float u50;
|
||||
//电压第51个点
|
||||
private Float u51;
|
||||
//电压第52个点
|
||||
private Float u52;
|
||||
//电压第53个点
|
||||
private Float u53;
|
||||
//电压第54个点
|
||||
private Float u54;
|
||||
//电压第55个点
|
||||
private Float u55;
|
||||
//电压第56个点
|
||||
private Float u56;
|
||||
//电压第57个点
|
||||
private Float u57;
|
||||
//电压第58个点
|
||||
private Float u58;
|
||||
//电压第59个点
|
||||
private Float u59;
|
||||
//电压第60个点
|
||||
private Float u60;
|
||||
//电压第61个点
|
||||
private Float u61;
|
||||
//电压第62个点
|
||||
private Float u62;
|
||||
//电压第63个点
|
||||
private Float u63;
|
||||
//电压第64个点
|
||||
private Float u64;
|
||||
//电压第65个点
|
||||
private Float u65;
|
||||
//电压第66个点
|
||||
private Float u66;
|
||||
//电压第67个点
|
||||
private Float u67;
|
||||
//电压第68个点
|
||||
private Float u68;
|
||||
//电压第69个点
|
||||
private Float u69;
|
||||
//电压第70个点
|
||||
private Float u70;
|
||||
//电压第71个点
|
||||
private Float u71;
|
||||
//电压第72个点
|
||||
private Float u72;
|
||||
//电压第73个点
|
||||
private Float u73;
|
||||
//电压第74个点
|
||||
private Float u74;
|
||||
//电压第75个点
|
||||
private Float u75;
|
||||
//电压第76个点
|
||||
private Float u76;
|
||||
//电压第77个点
|
||||
private Float u77;
|
||||
//电压第78个点
|
||||
private Float u78;
|
||||
//电压第79个点
|
||||
private Float u79;
|
||||
//电压第80个点
|
||||
private Float u80;
|
||||
//电压第81个点
|
||||
private Float u81;
|
||||
//电压第82个点
|
||||
private Float u82;
|
||||
//电压第83个点
|
||||
private Float u83;
|
||||
//电压第84个点
|
||||
private Float u84;
|
||||
//电压第85个点
|
||||
private Float u85;
|
||||
//电压第86个点
|
||||
private Float u86;
|
||||
//电压第87个点
|
||||
private Float u87;
|
||||
//电压第88个点
|
||||
private Float u88;
|
||||
//电压第89个点
|
||||
private Float u89;
|
||||
//电压第90个点
|
||||
private Float u90;
|
||||
//电压第91个点
|
||||
private Float u91;
|
||||
//电压第92个点
|
||||
private Float u92;
|
||||
//电压第93个点
|
||||
private Float u93;
|
||||
//电压第94个点
|
||||
private Float u94;
|
||||
//电压第95个点
|
||||
private Float u95;
|
||||
//电压第96个点
|
||||
private Float u96;
|
||||
}
|
||||
13
src/main/java/com/njcn/syncdata/service/HarmonicHistory.java
Normal file
13
src/main/java/com/njcn/syncdata/service/HarmonicHistory.java
Normal file
@@ -0,0 +1,13 @@
|
||||
package com.njcn.syncdata.service;
|
||||
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryC;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryP;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryV;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface HarmonicHistory {
|
||||
List<HarmonicHistoryV> listHarmonicHistoryV(String id, String starTime, String endTime);
|
||||
List<HarmonicHistoryP> listHarmonicHistoryP(String id, String starTime, String endTime);
|
||||
List<HarmonicHistoryC> listHarmonicHistoryC(String id, String starTime, String endTime);
|
||||
}
|
||||
@@ -2,6 +2,9 @@ package com.njcn.syncdata.service;
|
||||
|
||||
import com.njcn.db.service.IReplenishMybatisService;
|
||||
import com.njcn.syncdata.pojo.po.PmsMidLedger;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryV;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
package com.njcn.syncdata.service.impl;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.cloud.apigateway.sdk.utils.Client;
|
||||
import com.cloud.apigateway.sdk.utils.Request;
|
||||
import com.njcn.syncdata.pojo.po.AdsAstXbjcptGetFctgValueDi;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryC;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryP;
|
||||
import com.njcn.syncdata.pojo.zt.HarmonicHistoryV;
|
||||
import com.njcn.syncdata.service.HarmonicHistory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.client.methods.HttpRequestBase;
|
||||
import org.apache.http.impl.client.CloseableHttpClient;
|
||||
import org.apache.http.impl.client.HttpClients;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author wr
|
||||
* @description
|
||||
* @date 2024/1/22 16:29
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class HarmonicHistoryImpl implements HarmonicHistory {
|
||||
|
||||
@Override
|
||||
public List<HarmonicHistoryV> listHarmonicHistoryV(String id, String starTime, String endTime) {
|
||||
String key = "0e3bac160fd246f181ad4fd47da6929a";
|
||||
String secret = "383b4b2536234d84ac909cd605762061";
|
||||
String url = "http://8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn/ast/ydxxcjxt/dws/get_e_mp_TGvol_zl_ds";
|
||||
String apiId = "46e61646481c0146e26ba79bb5c8fa05";
|
||||
String apiName = "get_电能质量谐波监测系统_分布式光伏台区日数据_e_mp_TGvol_zl_时间";
|
||||
return adsDiList(HarmonicHistoryV.class,id,starTime,endTime,key,secret,url,apiId,apiName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HarmonicHistoryP> listHarmonicHistoryP(String id, String starTime, String endTime) {
|
||||
String key = "0e3bac160fd246f181ad4fd47da6929a";
|
||||
String secret = "383b4b2536234d84ac909cd605762061";
|
||||
String url = "http://8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn/ast/ydxxcjxt/dws/get_e_mp_TGpower_zl_ds";
|
||||
String apiId = "9db49fdc30dbc3bf6fa4f5cce141416c";
|
||||
String apiName = "get_电能质量谐波监测系统_分布式光伏台区日数据_e_mp_TGpower_zl_时间";
|
||||
return adsDiList(HarmonicHistoryP.class,id,starTime,endTime,key,secret,url,apiId,apiName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HarmonicHistoryC> listHarmonicHistoryC(String id, String starTime, String endTime) {
|
||||
String key = "0e3bac160fd246f181ad4fd47da6929a";
|
||||
String secret = "383b4b2536234d84ac909cd605762061";
|
||||
String url = "http://8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn/ast/ydxxcjxt/dws/get_e_mp_TGfactor_zl_ds";
|
||||
String apiId = "9c3ebd9c19dc0eb8e24385e40bd50a53";
|
||||
String apiName = "get_电能质量谐波监测系统_分布式光伏台区日数据_e_mp_TGfactor_zl_时间";
|
||||
return adsDiList(HarmonicHistoryC.class,id,starTime,endTime,key,secret,url,apiId,apiName);
|
||||
}
|
||||
|
||||
|
||||
public <T> List<T> adsDiList(Class<T> t,String id, String starTime, String endTime,String key,String secret, String url,String apiId,String apiName) {
|
||||
List<T> aas = new ArrayList<>();
|
||||
Request request = new Request();
|
||||
CloseableHttpClient client = null;
|
||||
try {
|
||||
request.setKey(key);
|
||||
request.setSecret(secret);
|
||||
//接口访问类型
|
||||
request.setMethod("GET");
|
||||
//接口访问url
|
||||
request.setUrl(url);
|
||||
//API中 header头传输的参数
|
||||
request.addHeader("x-api-id", apiId);
|
||||
//API中 Query传输的参数
|
||||
request.addQueryStringParam("tg_id", id);
|
||||
request.addQueryStringParam("startTime", starTime);
|
||||
request.addQueryStringParam("endTime",endTime);
|
||||
//API中 Body体参数
|
||||
//request.setBody("demo");
|
||||
} catch (Exception e) {
|
||||
log.error(Thread.currentThread().getName() + "链接" + apiName + "失败");
|
||||
e.printStackTrace();
|
||||
}
|
||||
try {
|
||||
HttpRequestBase signedRequest = Client.sign(request);
|
||||
Header[] authorization = signedRequest.getHeaders("Authorization");
|
||||
signedRequest.addHeader("x-Authorization", authorization[0].getValue());
|
||||
|
||||
//Send the request.
|
||||
client = HttpClients.custom().build();
|
||||
HttpResponse response = client.execute(signedRequest);
|
||||
|
||||
//Print the status line of the response.
|
||||
log.info(response.getStatusLine().toString());
|
||||
|
||||
//Print the header fields of the response.
|
||||
Header[] resHeaders = response.getAllHeaders();
|
||||
for (Header h : resHeaders) {
|
||||
log.info(h.getName() + ":" + h.getValue());
|
||||
}
|
||||
|
||||
//Print the body of the response.
|
||||
HttpEntity resEntity = response.getEntity();
|
||||
if (resEntity != null) {
|
||||
String s = EntityUtils.toString(resEntity, "UTF-8");
|
||||
log.info(System.getProperty("line.separator") + s);
|
||||
JSONObject jsonObject = JSON.parseObject(s);
|
||||
String errCode = jsonObject.getString("errCode");
|
||||
if(StrUtil.isBlank(errCode)){
|
||||
Map data = jsonObject.getObject("data", Map.class);
|
||||
aas = JSONArray.parseArray(data.get("data").toString(), t);
|
||||
log.info(Thread.currentThread().getName() + "获取日报表数据多少条 adsDiList：" + aas.size() + "结束----！");
|
||||
}else if("DLM.4094".equals(errCode)){
|
||||
log.info(Thread.currentThread().getName() + "数据链接超时" + s + "结束----！");
|
||||
}
|
||||
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(Thread.currentThread().getName() + "链接" + apiName + "失败");
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
if (client != null) {
|
||||
client.close();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return aas;
|
||||
}
|
||||
}
|
||||
@@ -49,6 +49,9 @@ public class PmsMidLedgerServiceImpl extends ReplenishMybatisServiceImpl<PmsMidL
|
||||
List<Dept> depts = dictDataMapper.selectUserList();
|
||||
//2运行状态
|
||||
List<DictData> state = dictDataMapper.selectList(DicDataTypeEnum.LINE_STATE.getCode());
|
||||
//2.1.1获取电压字典
|
||||
List<DictData> devVoltage = dictDataMapper.selectList(DicDataTypeEnum.DEV_VOLTAGE.getCode());
|
||||
|
||||
Integer numPum = 1;
|
||||
//定义每页返回数据条数
|
||||
Integer size = 20000;
|
||||
@@ -76,6 +79,7 @@ public class PmsMidLedgerServiceImpl extends ReplenishMybatisServiceImpl<PmsMidL
|
||||
mid.setLevel(0);
|
||||
mid.setSort(0);
|
||||
mid.setState(1);
|
||||
mid.setVoltageLevel(getAlgoDescribe(sub.getVOLTAGELEVEL_ID(), devVoltage));
|
||||
mid.setRunStatus(getValue(sub.getRUN_STATUS(),state));
|
||||
mid.setCreateTime(LocalDateTime.now());
|
||||
mid.setUpdateTime(LocalDateTime.now());
|
||||
@@ -115,6 +119,7 @@ public class PmsMidLedgerServiceImpl extends ReplenishMybatisServiceImpl<PmsMidL
|
||||
mid.setSort(0);
|
||||
mid.setState(1);
|
||||
mid.setRunStatus(getValue(bar.getRUN_STATUS(),state));
|
||||
mid.setVoltageLevel(getAlgoDescribe(bar.getVOLTAGELEVEL_ID(),devVoltage));
|
||||
mid.setCreateTime(LocalDateTime.now());
|
||||
mid.setUpdateTime(LocalDateTime.now());
|
||||
info.add(mid);
|
||||
@@ -180,6 +185,7 @@ public class PmsMidLedgerServiceImpl extends ReplenishMybatisServiceImpl<PmsMidL
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
public String getValue(String name, List<DictData> voltageLevel) {
|
||||
Map<String, String> voltageMap = voltageLevel.stream().filter(x -> x.getValue() != null).collect(Collectors.toMap(DictData::getValue, DictData::getId, (key1, key2) -> key1));
|
||||
if (voltageMap.containsKey(name)) {
|
||||
@@ -187,4 +193,11 @@ public class PmsMidLedgerServiceImpl extends ReplenishMybatisServiceImpl<PmsMidL
|
||||
}
|
||||
return name;
|
||||
}
|
||||
public String getAlgoDescribe(String name, List<DictData> voltageLevel) {
|
||||
Map<Integer, String> voltageMap = voltageLevel.stream().filter(x -> x.getAlgoDescribe() != null).collect(Collectors.toMap(DictData::getAlgoDescribe, DictData::getId, (key1, key2) -> key1));
|
||||
if (voltageMap.containsKey(Integer.valueOf(name))) {
|
||||
return voltageMap.get(Integer.valueOf(name));
|
||||
}
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,7 +141,6 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
|
||||
HttpEntity resEntity = response.getEntity();
|
||||
if (resEntity != null) {
|
||||
String s = EntityUtils.toString(resEntity, "UTF-8");
|
||||
log.info(System.getProperty("line.separator") + s);
|
||||
JSONObject jsonObject = JSON.parseObject(s);
|
||||
String errCode = jsonObject.getString("errCode");
|
||||
if(StrUtil.isBlank(errCode)){
|
||||
@@ -219,7 +218,6 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
|
||||
HttpEntity resEntity = response.getEntity();
|
||||
if (resEntity != null) {
|
||||
String s = EntityUtils.toString(resEntity, "UTF-8");
|
||||
log.info(System.getProperty("line.separator") + s);
|
||||
JSONObject jsonObject = JSON.parseObject(s);
|
||||
String errCode = jsonObject.getString("errCode");
|
||||
if(StrUtil.isBlank(errCode)){
|
||||
@@ -503,8 +501,6 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
|
||||
}
|
||||
|
||||
log.info(Thread.currentThread().getName() + "2.数据添加 adsDis：" + adsDis.size() + "结束----！");
|
||||
JSONArray objects = new JSONArray(Collections.singletonList(adsDis));
|
||||
log.info(Thread.currentThread().getName() + "2.数据添加信息 adsDis：" + objects + "结束----！");
|
||||
DateTime parse = DateUtil.parse(ds, "yyyyMMdd");
|
||||
LocalDateTime localDateTime = LocalDateTime.ofInstant(parse.toInstant(), ZoneId.systemDefault());
|
||||
|
||||
@@ -553,7 +549,7 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
|
||||
divide = add.divide(new BigDecimal(2), 4, BigDecimal.ROUND_UP);
|
||||
reportD.setPhaseVoltageEffective95(divide.floatValue());
|
||||
}else{
|
||||
reportD.setSpActivePower_95(0.0f);
|
||||
reportD.setPhaseVoltageEffective95(0.0f);
|
||||
}
|
||||
reportD.setPhaseVoltageEffectiveMax((float) max.getAsDouble());
|
||||
reportD.setPhaseVoltageEffectiveMin((float) min.getAsDouble());
|
||||
|
||||
Reference in New Issue
Block a user