From d9ebd1c8863599ba777b2efc88f01e1e96aa191b Mon Sep 17 00:00:00 2001 From: whycxzp <glperry@163.com> Date: 星期五, 14 三月 2025 15:22:48 +0800 Subject: [PATCH] A200设备代码从LithiumBms迁移到本项目 --- src/main/java/com/whyc/dto/ActmPlContDto.java | 10 src/main/java/com/whyc/dto/A200ResDto.java | 311 ++++++++++++++++++++++++++++ src/main/java/com/whyc/dto/BaojiDto.java | 16 + src/main/java/com/whyc/dto/DevInfDto.java | 74 ++++++ src/main/java/com/whyc/dto/RtstateDto.java | 9 src/main/java/com/whyc/dto/ActmstopReason.java | 56 +++++ src/main/java/com/whyc/dto/ResultA200Dto.java | 11 + src/main/java/com/whyc/dto/A200stopReason.java | 36 +++ src/main/java/com/whyc/dto/ActmResDto.java | 52 ++++ src/main/java/com/whyc/dto/ResultActmDto.java | 11 + src/main/java/com/whyc/dto/DalmDto.java | 20 + 11 files changed, 606 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/whyc/dto/A200ResDto.java b/src/main/java/com/whyc/dto/A200ResDto.java new file mode 100644 index 0000000..3b091b9 --- /dev/null +++ b/src/main/java/com/whyc/dto/A200ResDto.java @@ -0,0 +1,311 @@ +package com.whyc.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.List; + +public class A200ResDto implements Serializable { + + private int devId; + + private List<Integer> devIds; + + @ApiModelProperty(value = "pack/妯$粍鍙�") + private String batteryName; + + @ApiModelProperty(value = "鏍囩О瀹归噺(AH锛�") + private Double nominalCapacity; + + @ApiModelProperty(value = "鐢垫睜绫诲瀷[0-纾烽吀閾侀攤 1-涓夊厓閿� 2-澶吀閿� 4-閿伴吀閿俔") + private Integer batteryType; + + @ApiModelProperty(value = "鐢佃姱涓叉暟") + private Integer batteryNumber; + + @ApiModelProperty(value = "鐢佃姱鍘嬪樊") + private Double diffBatteryVoltage; + + @ApiModelProperty(value = "鏀剧數鐢垫祦") + private Double dischargeCurrent; + + @ApiModelProperty(value = "鏀剧數鐩爣鐢靛帇锛圴锛�") + private Double dischargeVoltage; + + @ApiModelProperty(value = "鏀剧數鏃堕棿(绉�)") + private Integer dischargeTime; + + @ApiModelProperty(value = "棰勬斁瀹归噺锛圓H锛�") + private Double dischargeCapacity; + + @ApiModelProperty(value = "棰勬斁瀹归噺闄愬埗鏄惁寮�鍚�") + //@SerializedName("isDischargeCapacityEnable") + private boolean isDischargeCapacityEnable; + + @ApiModelProperty(value = "鍗曚覆涓嬮檺锛圴锛�") + private Double minBatteryVoltage; + + @ApiModelProperty(value = "鏀剧數妯″紡 锛堝娉�2锛�0:鎭掓祦妯″紡,1:鎭掑姛鐜囨ā寮�") + private int dischargeMode; + + @ApiModelProperty(value = "鏀剧數鍔熺巼 锛坘W锛夋亽鍔熺巼妯″紡涓嬪惎鐢�") + private Double dischargePower; + + @ApiModelProperty(value = "鍗曚覆涓嬮檺鏄惁寮�鍚�") + //@SerializedName("isMinBatteryVoltageEnable") + private boolean isMinBatteryVoltageEnable; + + @ApiModelProperty(value = "鍏呯數鐩爣鐢靛帇锛圴锛�") + private Double chargeVoltage; + + @ApiModelProperty(value = "鍏呯數淇濇姢鐢靛帇") + private Double chargeProtectVoltage; + + @ApiModelProperty(value = "鍏呯數鐢垫祦锛圓锛�") + private Double chargeCurrent; + + @ApiModelProperty(value = "鍏呯數鍋滄満鐢垫祦锛圓锛�") + private Double chargeStopCurrent; + + @ApiModelProperty(value = "鍏呯數鏃堕棿锛堢锛�") + private Integer chargeTime; + + @ApiModelProperty(value = "鍏呯數瀹归噺") + private Double chargeCapacity; + + @ApiModelProperty(value = "棰勫厖瀹归噺闄愬埗鏄惁寮�鍚�") + //@SerializedName("isChargeCapacityEnable") + private boolean isChargeCapacityEnable; + + @ApiModelProperty(value = "鍗曚覆涓婇檺") + private Double maxBatteryVoltage; + + @ApiModelProperty(value = "鍗曚覆涓婇檺闄愬埗鏄惁寮�鍚�") + //@SerializedName("isMaxBatteryVoltageEnable") + private boolean isMaxBatteryVoltageEnable; + + @ApiModelProperty(value = "鍏呯數鍔熺巼锛圞W锛�2.2KW,4.4KW") + private Double chargePower; + + @ApiModelProperty(value = "鍗曚綋娓╁害淇濇姢") + private Integer batteryTemperatureProtect; + + + public String getBatteryName() { + return batteryName; + } + + public void setBatteryName(String batteryName) { + this.batteryName = batteryName; + } + + public Double getNominalCapacity() { + return nominalCapacity; + } + + public void setNominalCapacity(Double nominalCapacity) { + this.nominalCapacity = nominalCapacity; + } + + public Integer getBatteryType() { + return batteryType; + } + + public void setBatteryType(Integer batteryType) { + this.batteryType = batteryType; + } + + public Integer getBatteryNumber() { + return batteryNumber; + } + + public void setBatteryNumber(Integer batteryNumber) { + this.batteryNumber = batteryNumber; + } + + public Double getDiffBatteryVoltage() { + return diffBatteryVoltage; + } + + public void setDiffBatteryVoltage(Double diffBatteryVoltage) { + this.diffBatteryVoltage = diffBatteryVoltage; + } + + public Double getDischargeCurrent() { + return dischargeCurrent; + } + + public void setDischargeCurrent(Double dischargeCurrent) { + this.dischargeCurrent = dischargeCurrent; + } + + public Double getDischargeVoltage() { + return dischargeVoltage; + } + + public void setDischargeVoltage(Double dischargeVoltage) { + this.dischargeVoltage = dischargeVoltage; + } + + public Integer getDischargeTime() { + return dischargeTime; + } + + public void setDischargeTime(Integer dischargeTime) { + this.dischargeTime = dischargeTime; + } + + public Double getDischargeCapacity() { + return dischargeCapacity; + } + + public void setDischargeCapacity(Double dischargeCapacity) { + this.dischargeCapacity = dischargeCapacity; + } + + @JsonProperty(value ="isDischargeCapacityEnable") + public boolean getIsDischargeCapacityEnable() { + return isDischargeCapacityEnable; + } + + public void setDischargeCapacityEnable(boolean dischargeCapacityEnable) { + isDischargeCapacityEnable = dischargeCapacityEnable; + } + + public Double getMinBatteryVoltage() { + return minBatteryVoltage; + } + + public void setMinBatteryVoltage(Double minBatteryVoltage) { + this.minBatteryVoltage = minBatteryVoltage; + } + @JsonProperty(value ="isMinBatteryVoltageEnable") + public boolean getIsMinBatteryVoltageEnable() { + return isMinBatteryVoltageEnable; + } + + public void setMinBatteryVoltageEnable(boolean minBatteryVoltageEnable) { + isMinBatteryVoltageEnable = minBatteryVoltageEnable; + } + + public Double getChargeVoltage() { + return chargeVoltage; + } + + public void setChargeVoltage(Double chargeVoltage) { + this.chargeVoltage = chargeVoltage; + } + + public Double getChargeProtectVoltage() { + return chargeProtectVoltage; + } + + public void setChargeProtectVoltage(Double chargeProtectVoltage) { + this.chargeProtectVoltage = chargeProtectVoltage; + } + + public Double getChargeCurrent() { + return chargeCurrent; + } + + public void setChargeCurrent(Double chargeCurrent) { + this.chargeCurrent = chargeCurrent; + } + + public Double getChargeStopCurrent() { + return chargeStopCurrent; + } + + public void setChargeStopCurrent(Double chargeStopCurrent) { + this.chargeStopCurrent = chargeStopCurrent; + } + + public Integer getChargeTime() { + return chargeTime; + } + + public void setChargeTime(Integer chargeTime) { + this.chargeTime = chargeTime; + } + + public Double getChargeCapacity() { + return chargeCapacity; + } + + public void setChargeCapacity(Double chargeCapacity) { + this.chargeCapacity = chargeCapacity; + } + @JsonProperty(value ="isChargeCapacityEnable") + public boolean getIsChargeCapacityEnable() { + return isChargeCapacityEnable; + } + + public void setChargeCapacityEnable(boolean chargeCapacityEnable) { + isChargeCapacityEnable = chargeCapacityEnable; + } + + public Double getMaxBatteryVoltage() { + return maxBatteryVoltage; + } + + public void setMaxBatteryVoltage(Double maxBatteryVoltage) { + this.maxBatteryVoltage = maxBatteryVoltage; + } + @JsonProperty(value ="isMaxBatteryVoltageEnable") + public boolean getIsMaxBatteryVoltageEnable() { + return isMaxBatteryVoltageEnable; + } + + public void setMaxBatteryVoltageEnable(boolean maxBatteryVoltageEnable) { + isMaxBatteryVoltageEnable = maxBatteryVoltageEnable; + } + + public Double getChargePower() { + return chargePower; + } + + public void setChargePower(Double chargePower) { + this.chargePower = chargePower; + } + + public Integer getBatteryTemperatureProtect() { + return batteryTemperatureProtect; + } + + public void setBatteryTemperatureProtect(Integer batteryTemperatureProtect) { + this.batteryTemperatureProtect = batteryTemperatureProtect; + } + + public int getDevId() { + return devId; + } + + public void setDevId(int devId) { + this.devId = devId; + } + + public List<Integer> getDevIds() { + return devIds; + } + + public void setDevIds(List<Integer> devIds) { + this.devIds = devIds; + } + + public int getDischargeMode() { + return dischargeMode; + } + + public void setDischargeMode(int dischargeMode) { + this.dischargeMode = dischargeMode; + } + + public Double getDischargePower() { + return dischargePower; + } + + public void setDischargePower(Double dischargePower) { + this.dischargePower = dischargePower; + } +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/A200stopReason.java b/src/main/java/com/whyc/dto/A200stopReason.java new file mode 100644 index 0000000..0c017ec --- /dev/null +++ b/src/main/java/com/whyc/dto/A200stopReason.java @@ -0,0 +1,36 @@ +package com.whyc.dto; + +public class A200stopReason { + + /* //a200鍋滄鍘熷洜 + public static String getStopReason(int stopType){ + String stopReason="鏈煡"; + switch (stopType){ + case 1:stopReason="鎵嬪姩鍋滄";break; + case 2:stopReason="娴嬭瘯鏃堕棿鍒�";break; + case 3:stopReason="棰勬斁瀹归噺鍒�";break; + case 4:stopReason="棰勫厖瀹归噺鍒�";break; + case 5:stopReason="鍗曚綋涓嬮檺鍒�";break; + case 6:stopReason="鍗曚綋涓婇檺鍒�";break; + case 7:stopReason="妯$粍涓嬮檺鍒�";break; + case 8:stopReason="妯$粍涓婇檺鍒�";break; + case 9:stopReason="纭欢鍛婅";break; + case 10:stopReason="閫氫俊寮傚父";break; + case 11:stopReason="鏁存祦鍣ㄧ數鍘嬭繃楂�";break; + case 12:stopReason="鏁存祦鍣ㄧ數鍘嬭繃浣�";break; + case 13:stopReason="鍗曚綋鍘嬪樊鍒拌揪璁惧畾鍊�";break; + case 14:stopReason="妯$粍鐢靛帇涓庡厖鐢电洰鏍囩數鍘嬩箣宸皬浜�0.5V 涓� 娴嬭瘯鐢垫祦鍒拌揪璁剧疆闃�鍊硷紝鍋滄鍏呯數";break; + case 15:stopReason="妯$粍鐢靛帇涓庢斁鐢电洰鏍囩數鍘嬩箣宸皬浜�0.5V 涓� 娴嬭瘯鐢垫祦鍒拌揪璁剧疆闃�鍊硷紝鍋滄鏀剧數";break; + case 16:stopReason="绱ф�ュ仠鏈�";break; + case 17:stopReason="妯$粍鐢靛帇寮傚父鎴朌C鏂矾鍣ㄥ凡鏂紑";break; + case 18:stopReason="鍗曚綋鐢靛帇閲囬泦妯″潡鏈繛鎺�";break; + case 19:stopReason="妯$粍鐢靛帇鍒拌揪淇濇姢鐢靛帇鍊�";break; + case 20:stopReason="鍗曚綋娓╁害杩囬珮";break; + case 21:stopReason="缁勫帇鎸佺画3鍒嗛挓寮傚父";break; + case 22:stopReason="娓╁害3鍒嗛挓鍐呭崌楂�5掳C";break; + case 23:stopReason="鍗曚綋娓╁害閲囬泦妯″潡鏈繛鎺�";break; + } + return stopReason; + }*/ + +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/ActmPlContDto.java b/src/main/java/com/whyc/dto/ActmPlContDto.java new file mode 100644 index 0000000..dc550bf --- /dev/null +++ b/src/main/java/com/whyc/dto/ActmPlContDto.java @@ -0,0 +1,10 @@ +package com.whyc.dto; + +import lombok.Data; + +@Data +public class ActmPlContDto { + int devId; + int type; + int index; +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/ActmResDto.java b/src/main/java/com/whyc/dto/ActmResDto.java new file mode 100644 index 0000000..d011020 --- /dev/null +++ b/src/main/java/com/whyc/dto/ActmResDto.java @@ -0,0 +1,52 @@ +package com.whyc.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class ActmResDto implements Serializable { + + private int devId; + + private List<Integer> devIds; + + @ApiModelProperty(value = "妯$粍闇�瑕侊紝浠�0寮�濮�") + private Integer batteryStorageIndex; + + @ApiModelProperty(value = "妯$粍缂栧彿") + private String moduleCode; + + @ApiModelProperty(value = "宸ヤ綔妯″紡[0-鍏呯數 1-鏀剧數 2-鍧囪 ]") + private Integer workMode; + + @ApiModelProperty(value = "鐢垫睜绫诲瀷[0-閾侀攤 1-涓夊厓閿� 2-閽涢吀閿� 3-閿伴吀閿俔") + private Integer batteryType; + + @ApiModelProperty(value = "褰撳墠閰嶇疆鐨勭數鑺暟閲�(鐢垫睜鑺傛暟 浠�1寮�濮�)") + private Integer batteryNumber; + + @ApiModelProperty(value = "褰撳墠閰嶇疆鐨勬俯搴︿紶鎰熷櫒鏁伴噺") + private Integer ntcCount; + + @ApiModelProperty(value = "娴嬭瘯鐢垫睜鍒楄〃[娴嬭瘯鐢垫睜鍒楄〃鏄皢寰呮祴鐢佃姱缂栧彿鐢ㄩ�楀彿鍒嗛殧鐨勫瓧绗︿覆銆備緥濡傦細1,2,4,6 琛ㄧず娴嬭瘯1#銆�2#銆�4#銆�6#鐢佃姱锛屽叾浣欐病鏈夊寘鍚殑鐢佃姱涓嶈繘琛屾祴璇昡") + private String testBatteryArray; + + @ApiModelProperty(value = "鐢靛帇闃堝��") + private Double voltage; + + @ApiModelProperty(value = "宸ヤ綔鐢垫祦") + private Double current; + + @ApiModelProperty(value = "鍙厤缃殑鏈�澶х數鑺暟閲廩鍙]") + private Integer maxBatteryNumber; + + @ApiModelProperty(value = "鍙厤缃殑鏈�澶ф俯搴︿紶鎰熷櫒鏁伴噺[鍙]") + private Integer maxNtcCount; + + @ApiModelProperty(value = "鐢垫睜缁勬暟锛岃寖鍥�1~4缁�") + private Integer batteryStorageNumber; + +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/ActmstopReason.java b/src/main/java/com/whyc/dto/ActmstopReason.java new file mode 100644 index 0000000..740678a --- /dev/null +++ b/src/main/java/com/whyc/dto/ActmstopReason.java @@ -0,0 +1,56 @@ +package com.whyc.dto; + +public class ActmstopReason { + /*//actm鍋滄鍘熷洜 + public static String getStopReason(int stopType){ + String stopReason="鏈煡"; + switch (stopType){ + case 1:stopReason="鎵嬪姩鍋滄";break; + case 2:stopReason="娴嬭瘯鏃堕棿鍒�";break; + case 3:stopReason="棰勬斁瀹归噺鍒�";break; + case 4:stopReason="棰勫厖瀹归噺鍒�";break; + case 5:stopReason="鍗曚綋涓嬮檺鍒�";break; + case 6:stopReason="鍗曚綋涓婇檺鍒�";break; + case 7:stopReason="妯$粍涓嬮檺鍒�";break; + case 8:stopReason="妯$粍涓婇檺鍒�";break; + case 9:stopReason="纭欢鍛婅";break; + case 10:stopReason="閫氫俊寮傚父";break; + case 11:stopReason="鏁存祦鍣ㄧ數鍘嬭繃楂�";break; + case 12:stopReason="鏁存祦鍣ㄧ數鍘嬭繃浣�";break; + case 13:stopReason="鍗曚綋鍘嬪樊鍒拌揪璁惧畾鍊�";break; + case 14:stopReason="妯$粍鐢靛帇涓庡厖鐢电洰鏍囩數鍘嬩箣宸皬浜�0.5V 涓� 娴嬭瘯鐢垫祦鍒拌揪璁剧疆闃�鍊硷紝鍋滄鍏呯數";break; + case 15:stopReason="妯$粍鐢靛帇涓庢斁鐢电洰鏍囩數鍘嬩箣宸皬浜�0.5V 涓� 娴嬭瘯鐢垫祦鍒拌揪璁剧疆闃�鍊硷紝鍋滄鏀剧數";break; + case 16:stopReason="绱ф�ュ仠鏈�";break; + case 17:stopReason="妯$粍鐢靛帇寮傚父鎴朌C鏂矾鍣ㄥ凡鏂紑";break; + case 18:stopReason="鍗曚綋鐢靛帇閲囬泦妯″潡鏈繛鎺�";break; + case 19:stopReason="妯$粍鐢靛帇鍒拌揪淇濇姢鐢靛帇鍊�";break; + case 20:stopReason="鍗曚綋娓╁害杩囬珮";break; + case 21:stopReason="缁勫帇鎸佺画3鍒嗛挓寮傚父";break; + case 22:stopReason="娓╁害3鍒嗛挓鍐呭崌楂�5掳C";break; + case 23:stopReason="鍗曚綋娓╁害閲囬泦妯″潡鏈繛鎺�";break; + } + return stopReason; + }*/ + //鐢垫睜绫诲瀷 + public static String getBattType(int battType){ + String typeName="鏈煡"; + switch (battType){ + case 0:typeName="閾侀攤";break; + case 1:typeName="涓夊厓閿�";break; + case 2:typeName="閽涢吀閿傜數";break; + case 3:typeName="閿伴吀閿�";break; + } + return typeName; + } + + //娴嬭瘯绫诲瀷 + public static String getTestType(int testType){ + String typeName="鏈煡"; + switch (testType){ + case 2:typeName="鍏呯數";break; + case 3:typeName="鏀剧數";break; + case 4:typeName="鍧囪 ";break; + } + return typeName; + } +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/BaojiDto.java b/src/main/java/com/whyc/dto/BaojiDto.java new file mode 100644 index 0000000..ac4fbe4 --- /dev/null +++ b/src/main/java/com/whyc/dto/BaojiDto.java @@ -0,0 +1,16 @@ +package com.whyc.dto; + +import com.whyc.pojo.db_user.BattgroupBaojigroup; +import com.whyc.pojo.db_user.BattgroupUsr; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class BaojiDto implements Serializable { + private List<BattgroupBaojigroup> adddevList; + private List<BattgroupBaojigroup> deldevList; + private List<BattgroupUsr> addusrList; + private List<BattgroupUsr> delusrList; +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/DalmDto.java b/src/main/java/com/whyc/dto/DalmDto.java new file mode 100644 index 0000000..2606d3d --- /dev/null +++ b/src/main/java/com/whyc/dto/DalmDto.java @@ -0,0 +1,20 @@ +package com.whyc.dto; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DalmDto { + private Integer devId; + private Integer devType; + private Integer almId; + private Date startTime; + private Date endTime; + private int pageNum; + private int pageSize; + private Integer uid; + private String tableName; + private Integer limitStart; + private Integer limitEnd; +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/DevInfDto.java b/src/main/java/com/whyc/dto/DevInfDto.java new file mode 100644 index 0000000..7f52927 --- /dev/null +++ b/src/main/java/com/whyc/dto/DevInfDto.java @@ -0,0 +1,74 @@ +package com.whyc.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +public class DevInfDto { + private int pageNum; + private int pageSize; + private int devType; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + private String devOnline; + private int uid; + + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getDevType() { + return devType; + } + + public void setDevType(int devType) { + this.devType = devType; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getDevOnline() { + return devOnline; + } + + public void setDevOnline(String devOnline) { + this.devOnline = devOnline; + } + + public int getUid() { + return uid; + } + + public void setUid(int uid) { + this.uid = uid; + } +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/ResultA200Dto.java b/src/main/java/com/whyc/dto/ResultA200Dto.java new file mode 100644 index 0000000..cdc1780 --- /dev/null +++ b/src/main/java/com/whyc/dto/ResultA200Dto.java @@ -0,0 +1,11 @@ +package com.whyc.dto; + +import lombok.Data; + +@Data +public class ResultA200Dto { + String code; + String msg; + A200ResDto data; + int count; +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/ResultActmDto.java b/src/main/java/com/whyc/dto/ResultActmDto.java new file mode 100644 index 0000000..ce8a4df --- /dev/null +++ b/src/main/java/com/whyc/dto/ResultActmDto.java @@ -0,0 +1,11 @@ +package com.whyc.dto; + +import lombok.Data; + +@Data +public class ResultActmDto { + String code; + String msg; + ActmResDto data; + int count; +} \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/RtstateDto.java b/src/main/java/com/whyc/dto/RtstateDto.java new file mode 100644 index 0000000..047fc02 --- /dev/null +++ b/src/main/java/com/whyc/dto/RtstateDto.java @@ -0,0 +1,9 @@ +package com.whyc.dto; + +import lombok.Data; + +@Data +public class RtstateDto { + private int devId; + private int devType; +} \ No newline at end of file -- Gitblit v1.9.1