From dbba9c3fc5187432c34329a2a18e07feca729de5 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 24 六月 2025 11:25:11 +0800
Subject: [PATCH] 2.5.1蓄电池对比分析同一时间同一品牌
---
src/main/java/com/whyc/dto/Statistic/BattCompareStic.java | 8 +
src/main/java/com/whyc/service/BatttestdataInfService.java | 116 ++++++++++++++++++----------
src/main/java/com/whyc/util/ActionUtil.java | 2
src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java | 4
src/main/java/com/whyc/service/BattresdataInfService.java | 42 ++++++++++
src/main/java/com/whyc/service/SubTablePageInfoService.java | 24 +++++
src/main/java/com/whyc/controller/StatisticController.java | 4
src/main/java/com/whyc/controller/BattCompareController.java | 10 ++
src/main/java/com/whyc/dto/Statistic/ComPareChart.java | 11 ++
src/main/resources/mapper/BattInfMapper.xml | 5 +
10 files changed, 171 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattCompareController.java b/src/main/java/com/whyc/controller/BattCompareController.java
index f8ea218..5fc0086 100644
--- a/src/main/java/com/whyc/controller/BattCompareController.java
+++ b/src/main/java/com/whyc/controller/BattCompareController.java
@@ -13,6 +13,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
+import java.util.Map;
+
@RestController
@Api(tags = "钃勭數姹犲姣斿垎鏋愮鐞�")
@RequestMapping("compare")
@@ -24,9 +27,14 @@
@ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�(1.2.15)")
@PostMapping("getBattCompare15Statistic")
- public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic){
+ public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic) throws ParseException {
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
+ if(stic.getInuserYear()!=null){
+ int year=ActionUtil.getNowYear();
+ stic.setInuseStartTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year+1-stic.getInuserYear(),0,1,5)));
+ stic.setInuseEndTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year,11,31,5)));
+ }
return battTinfService.getBattCompare15Statistic(stic);
}
diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index 11f662e..4d22234 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -128,7 +128,7 @@
stic.setUid(uinf.getId());
return battTinfService.getBattTinfStatistic(stic);
}
- @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�(1.2.15)")
+ /* @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�(1.2.15)")
@PostMapping("getBattCompare15Statistic")
public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic){
User uinf= ActionUtil.getUser();
@@ -150,7 +150,7 @@
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
return battTinfService.getBattCompare17Statistic(stic);
- }
+ }*/
@ApiOperation(value = "璁惧宸ヤ綔鐘舵�佺粺璁�(1.2.21)")
@PostMapping("getDeviceStateStatistic")
diff --git a/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java b/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java
index 34814c2..947ed61 100644
--- a/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java
+++ b/src/main/java/com/whyc/dto/Statistic/BattCompareStic.java
@@ -15,15 +15,17 @@
private Integer pageNum;
private Integer pageSize;
private Integer performance;//鐢垫睜鎬ц兘锛�1浼樼锛�2鍔ｅ寲锛�3鎹熷潖 4鏈斁鐢� 涓嶄紶鍏ㄩ儴
- private String product;
+ private String product; //鍝佺墝
private Float moncapstd;//鏍囩О瀹归噺
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date testStartTime;//寮�濮嬫椂闂�
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date testEndTime;//缁撴潫鏃堕棿
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date inuseStartTime;//寮�濮嬫椂闂�
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date inuseEndTime;//缁撴潫鏃堕棿
+
+ private Integer inuserYear;//鎶曡繍鏃堕棿1~15骞�
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Statistic/ComPareChart.java b/src/main/java/com/whyc/dto/Statistic/ComPareChart.java
new file mode 100644
index 0000000..74e89a4
--- /dev/null
+++ b/src/main/java/com/whyc/dto/Statistic/ComPareChart.java
@@ -0,0 +1,11 @@
+package com.whyc.dto.Statistic;
+
+import lombok.Data;
+
+@Data
+public class ComPareChart {
+ private Integer battgroupId;
+ private String battgroupName;
+ private Float value;
+ private Integer monNum;//鏈�楂樺崟浣撳唴闃绘湁鐢�
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java b/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java
index 7a5ccd6..d231bf1 100644
--- a/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java
+++ b/src/main/java/com/whyc/dto/Statistic/SticCompare15Res.java
@@ -19,7 +19,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date inuseTime;
private Float monvolstd;
- private List<Integer> monNums; //鎹熷潖鍗曚綋缂栧彿
+ //private List<Integer> monNums; //鎹熷潖鍗曚綋缂栧彿
private Float realCap; //瀹為檯瀹归噺
private String precentCap; //瀹归噺鐧惧垎姣�
private String capperformance; //鎬ц兘
@@ -27,4 +27,6 @@
private Integer powerId;
private Integer devId;
private Integer battgroupId;
+ private String stopReason;//鍋滄鍘熷洜
+ private Float floatGroupVol;//娴厖鐢靛帇锛堟斁鐢靛紑濮嬪墠鐨勭粍绔數鍘嬶級--鐢垫簮娴厖鐢靛帇
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattresdataInfService.java b/src/main/java/com/whyc/service/BattresdataInfService.java
index 0e089fe..f9fc71b 100644
--- a/src/main/java/com/whyc/service/BattresdataInfService.java
+++ b/src/main/java/com/whyc/service/BattresdataInfService.java
@@ -2,15 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Real.QuarterDto;
+import com.whyc.dto.Statistic.ComPareChart;
import com.whyc.mapper.BattresdataInfMapper;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_batt_testdata.BattresdataId;
import com.whyc.pojo.db_batt_testdata.BattresdataInf;
+import com.whyc.pojo.db_station.BattInf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
@Service
public class BattresdataInfService {
@@ -40,7 +42,6 @@
wrapper.last(" ORDER BY test_record_count asc ");
BattresdataInf rinf = mapper.selectOne(wrapper);
if(rinf!=null){
- String tableName ="db_batt_testdata.tb_battresdata_"+battgroupId;
String existTableName = commonMapper.existTable("db_batt_testdata", "tb_battresdata_"+battgroupId);
if(existTableName != null){
List<QuarterDto> list=subTablePageInfoService.getBattResInfData(battgroupId,rinf.getTestRecordCount());
@@ -49,4 +50,41 @@
}
return null;
}
+
+ //钃勭數姹犲姣斿垎鏋愬彸渚ф渶楂樺崟浣撳唴闃绘暟鎹�(鏈�鏂颁竴娆″唴闃绘祴璇�)
+ public ComPareChart getMaxResData(BattInf binf) {
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.eq("battgroup_id", binf.getBattgroupId());
+ wrapper.last(" limit 1");
+ wrapper.last(" ORDER BY test_starttime desc ");
+ BattresdataInf rinf = mapper.selectOne(wrapper);
+ ComPareChart chart=new ComPareChart();
+ chart.setBattgroupName(binf.getBattgroupName());
+ chart.setBattgroupId(binf.getBattgroupId());
+ chart.setValue(0f);
+ chart.setMonNum(1);
+ if(rinf!=null){
+ String existTableName = commonMapper.existTable("db_batt_testdata", "tb_battresdata_"+binf.getBattgroupId());
+ if(existTableName != null){
+ //鍙栧唴闃绘祴璇曠殑鏈�澶у唴闃诲拰鍗曚綋缂栧彿
+ List<QuarterDto> list=subTablePageInfoService.getMaxResInInfData(binf.getBattgroupId(),rinf.getTestRecordCount());
+ if(list!=null&&list.size()>0){
+ Map<String, Object> map =list.stream()
+ .max(Comparator.comparing(QuarterDto::getNumValue))
+ .map(dto -> {
+ Map<String, Object> result = new HashMap<>();
+ result.put("maxNumValue", dto.getNumValue());
+ result.put("monNum", dto.getMonNum());
+ return result;
+ })
+ .orElse(Collections.emptyMap());
+ chart.setBattgroupId(binf.getBattgroupId());
+ chart.setBattgroupName(binf.getBattgroupName());
+ chart.setValue(Float.parseFloat(map.get("maxNumValue").toString()));
+ chart.setMonNum(Integer.parseInt(map.get("monNum").toString()));
+ }
+ }
+ }
+ return chart;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index b462679..2ba3085 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -57,6 +57,9 @@
@Autowired(required = false)
private PwrdevHistorydataIdService pwrHisdataIdService;
+ @Autowired(required = false)
+ private BattresdataInfService battResdataInfService;
+
@@ -260,8 +263,8 @@
}
}
/*钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�
- *1.鏌ヨ鍑虹鍚堟潯浠剁殑鐢垫睜缁勪俊鎭�
- * 2.璁＄畻鐢垫睜缁勭殑棰勪及鍓╀綑瀹归噺
+ *1.鏌ヨ鍑虹鍚堟潯浠剁殑鐢垫睜缁勪俊鎭紙鍚屼竴鍝佺墝鍚屼竴鎶曡繍鏃堕棿锛�
+ * 2.璁＄畻鐢垫睜缁勭殑鏈�杩戜竴娆℃爣鍑嗘牳瀹规斁鐢电殑棰勪及瀹归噺
*3.鍒ゆ柇鎬ц兘鍜岀櫨鍒嗘瘮
* 4.鍒嗛〉
*/
@@ -280,12 +283,24 @@
}
}
}
+ Map<String,Object> map=new HashMap<>();//鍙充晶鍥捐〃
+ map.put("avgCap",0f);
+ map.put("standCapDiff",0f);
+ Float sumCap=0f;
+ Float maxCap=0f;
+ Float standCapDiff=0f;
+ List<ComPareChart> capList=new ArrayList<>();
+ List<ComPareChart> resList=new ArrayList<>();
+ List<ComPareChart> flotVolList=new ArrayList<>();
+ map.put("capList",capList);
+ map.put("resList",resList);
+ map.put("flotVolList",flotVolList);
//1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
List<BattInf> binfList=battInfService.getBattCompare15Statistic(stic);
if(binfList==null||binfList.size()==0){
return new Response().set(1,false,"褰撳墠鐢ㄦ埛鏈鐞嗘弧瓒虫潯浠剁殑鐢垫睜缁�");
}
- List<SticCompare15Res> reslist=new ArrayList<>();
+ List<SticCompare15Res> comparelist=new ArrayList<>();
for (BattInf binf:binfList) {
SticCompare15Res res=new SticCompare15Res();
res.setProvice(binf.getProvice());
@@ -305,54 +320,71 @@
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
if(tinf==null){
res.setRealCap(0f);
- res.setPrecentCap("0");
+ res.setPrecentCap("0.00000");
res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
- continue;
- }
- //鎵捐繖娆℃斁鐢电殑鏈�鍚庝竴绗旀暟鎹�
- List<BatttestdataId> idDataList=battTestdataIdService.getLastDataByBattgroupId(tinf.getBattgroupId(),tinf.getTestRecordCount(),tinf.getRecordNum());
- if(idDataList==null||idDataList.size()==0){
- res.setRealCap(0f);
- res.setPrecentCap("0");
- res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
- continue;
- }
- Float moncapStd=binf.getMoncapstd();
- int hourRate = BattCapFactory.GetHourRate(tinf.getTestCap(), tinf.getTestCurr());
- Float grouprealCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
- //Float restCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
- res.setRealCap(grouprealCap);
- if(grouprealCap>=moncapStd*badValue){
- res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
- }
- if(grouprealCap<=moncapStd*damageValue){
- res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
- }
- if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
- }
- //淇濈暀5浣嶅皬鏁�
- String precentCap = String.format("%.5f",(grouprealCap/binf.getMoncapstd()*100));
- res.setPrecentCap(precentCap);
- List<Integer> monNums=new ArrayList<>();
- for (BatttestdataId data:idDataList) {//姹傚崟浣撶殑 瀹為檯瀹归噺锛屾渶灏忓�煎氨鏄崟浣撶殑鍗曚綋鐢靛帇
- Float monrealCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), data.getMonVol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
- if (monrealCap <= moncapStd * damageValue) {//鎹熷潖鐨�
- monNums.add(data.getMonNum());
+ res.setStopReason("--");
+ res.setFloatGroupVol(0f);
+ }else{
+ res.setStopReason(StopReasonEnum.getValue(tinf.getTestStoptype()));
+ res.setFloatGroupVol(tinf.getFloatGroupVol());
+ //鎵捐繖娆℃斁鐢电殑鏈�鍚庝竴绗旀暟鎹�
+ List<BatttestdataId> idDataList=battTestdataIdService.getLastDataByBattgroupId(tinf.getBattgroupId(),tinf.getTestRecordCount(),tinf.getRecordNum());
+ if(idDataList==null||idDataList.size()==0){
+ res.setRealCap(0f);
+ res.setPrecentCap("0.00000");
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_4.getStateId()));
+ res.setFloatGroupVol(0f);
+ }else{
+ Float moncapStd=binf.getMoncapstd();
+ int hourRate = BattCapFactory.GetHourRate(tinf.getTestCap(), tinf.getTestCurr());
+ Float grouprealCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
+ //Float restCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
+ res.setRealCap(grouprealCap);
+ if(grouprealCap>=moncapStd*badValue){
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_1.getStateId()));
+ }
+ if(grouprealCap<=moncapStd*damageValue){
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_3.getStateId()));
+ }
+ if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
+ res.setCapperformance(BattCapperformanceEnum.getValue(BattCapperformanceEnum.BATTSTATE_2.getStateId()));
+ }
+ //淇濈暀5浣嶅皬鏁�
+ String precentCap = String.format("%.5f",(grouprealCap/binf.getMoncapstd()*100));
+ res.setPrecentCap(precentCap);
+ sumCap+=grouprealCap;
+ standCapDiff=grouprealCap-maxCap;
+ if(grouprealCap>=maxCap){
+ maxCap=grouprealCap;
+ }
}
}
- res.setMonNums(monNums);
if(stic.getPerformance()==null){
- reslist.add(res);
+ comparelist.add(res);
}else{
if(res.getCapperformance().equals(BattCapperformanceEnum.getValue(stic.getPerformance()))){
- reslist.add(res);
+ comparelist.add(res);
}
}
-
+ ComPareChart capChart=new ComPareChart();
+ capChart.setBattgroupId(binf.getBattgroupId());
+ capChart.setBattgroupName(binf.getBattgroupName());
+ capChart.setValue(res.getRealCap());
+ capList.add(capChart);
+ ComPareChart floatVolChart=new ComPareChart();
+ floatVolChart.setBattgroupId(binf.getBattgroupId());
+ floatVolChart.setBattgroupName(binf.getBattgroupName());
+ floatVolChart.setValue(res.getFloatGroupVol());
+ flotVolList.add(floatVolChart);
+ //缁熻鍐呴樆娴嬭瘯
+ ComPareChart resChart=battResdataInfService.getMaxResData(binf);
+ resList.add(resChart);
}
- PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
- return new Response().setII(1,reslist.size()>0,pageInfo,"钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�");
+ map.put("avgCap",sumCap/binfList.size());
+ map.put("standCapDiff",standCapDiff);
+
+ PageInfo pageInfo=PageInfoUtils.list2PageInfo(comparelist, stic.getPageNum(), stic.getPageSize());
+ return new Response().setIII(1,comparelist.size()>0,pageInfo,map,"钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�");
}
//钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堜笉鍚屽搧鐗屽悓涓�鏃堕棿锛�(1.2.16)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index ff2d302..f814cf7 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -5,6 +5,7 @@
import com.whyc.dto.AlmHis.PwrAlmPar;
import com.whyc.dto.AnalysisAlm.ResAnalysis;
import com.whyc.dto.Real.*;
+import com.whyc.dto.Statistic.ComPareChart;
import com.whyc.dto.Statistic.QuarterPwr7Res;
import com.whyc.mapper.CallBack;
import com.whyc.pojo.db_alarm.BattalarmDataHistory;
@@ -518,7 +519,7 @@
}
//鑾峰彇鍐呴樆鏁版嵁
public List<QuarterDto> getBattResInfData(Integer battgroupId,Integer testRecordCount) {
- String sql="select distinct mon_num,test_starttime,mon_res, from db_batt_testdata.tb_battresdata_"+battgroupId
+ String sql="select distinct mon_num,test_starttime,mon_res from db_batt_testdata.tb_battresdata_"+battgroupId
+" where test_record_count="+testRecordCount+" order by mon_num asc";
List<QuarterDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
@@ -535,6 +536,26 @@
}
});
return list;
+ }
+ //鍙栧唴闃绘祴璇曠殑鏈�澶у唴闃诲拰鍗曚綋缂栧彿
+ public List<QuarterDto> getMaxResInInfData(Integer battgroupId, Integer testRecordCount) {
+ String sql="select distinct mon_num,test_starttime,mon_res from db_batt_testdata.tb_battresdata_"+battgroupId
+ +" where test_record_count="+testRecordCount+" order by mon_num asc";
+ List<QuarterDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<QuarterDto> list=new ArrayList<>();
+ while (rs.next()){
+ QuarterDto data=new QuarterDto();
+ data.setMonNum(rs.getInt("mon_num"));
+ data.setNumValue(rs.getFloat("mon_res"));
+ data.setRecordTime(rs.getTimestamp("test_starttime"));
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
}
//鎵捐繖娆℃斁鐢电殑鎸囧畾涓�绗旀暟鎹�
public List<BatttestdataId> getLastDataByBattgroupId(Integer battgroupId, Integer testRecordCount, Integer recordNum) {
@@ -1083,5 +1104,4 @@
});
return list;
}
-
}
diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index 13cab65..fd4edb8 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -18,6 +18,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.regex.Matcher;
@@ -340,7 +341,6 @@
cal.set(Calendar.DAY_OF_MONTH,day);
if(type==1){
return new SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime())+"00:00:00";
-
} else if(type==2){
return new SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime())+"09:00:00";
}else if(type==3){
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index 71b8776..d799e9a 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -231,11 +231,14 @@
<if test="stic.product!=null">
and tb_batt_inf.product=#{stic.product}
</if>
+ <if test="stic.moncapstd!=null">
+ and tb_batt_inf.moncapstd=#{stic.moncapstd}
+ </if>
<if test="stic.inuseStartTime!=null">
and tb_batt_inf.inuse_time>=#{stic.inuseStartTime}
</if>
<if test="stic.inuseEndTime!=null">
- and tb_batt_inf.inuse_time<=#{stic.inuseEndTimee}
+ and tb_batt_inf.inuse_time<=#{stic.inuseEndTime}
</if>
<if test="stic.uid>100">
and tb_batt_inf.station_id in(
--
Gitblit v1.9.1