|
|
@@ -19,6 +19,7 @@ import com.chuanghai.student_portrait.response.enums.StatusEnum;
|
|
|
import com.chuanghai.student_portrait.service.ColdWaterService;
|
|
|
import com.chuanghai.student_portrait.service.DormService;
|
|
|
import com.chuanghai.student_portrait.service.ElectricityService;
|
|
|
+import com.chuanghai.student_portrait.utils.LogUtils;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpEntity;
|
|
|
@@ -56,102 +57,7 @@ public class ElectricityServiceImpl extends ServiceImpl<ElectricityMapper, Elect
|
|
|
private Integer page = 1;
|
|
|
|
|
|
private Integer size = 8;
|
|
|
-// @Override
|
|
|
-// public BaseResponse coldWaterAndElectricityEnergy() {
|
|
|
-// ArrayList<EnergyDto> hotWaterEnergyDtos = new ArrayList<>();
|
|
|
-// for (int i = 1; i <= 5; i++) {
|
|
|
-// String dateTime = getDateTime(i);
|
|
|
-//// 女生 1栋到6栋
|
|
|
-// List<Dorm> girlDorm = dormService.list(Wrappers.<Dorm>lambdaQuery()
|
|
|
-// .eq(Dorm::getBuild, "1栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "2栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "3栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "4栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "5栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "6栋")
|
|
|
-// );
|
|
|
-// EnergyDto girlEnergyDto = new EnergyDto();
|
|
|
-//
|
|
|
-// Double girlTotalMoney = 0.0;
|
|
|
-// for (Dorm dorm : girlDorm) {
|
|
|
-// String dom = dorm.getDom();
|
|
|
-//// 电费
|
|
|
-// List<Electricity> list = this.list(Wrappers.<Electricity>lambdaQuery()
|
|
|
-// .eq(Electricity::getDateTime, dateTime)
|
|
|
-// .eq(Electricity::getDom, dom)
|
|
|
-// );
|
|
|
-// for (Electricity electricity : list) {
|
|
|
-// Double money = electricity.getTotalMoney();
|
|
|
-// girlTotalMoney = girlTotalMoney + money;
|
|
|
-// }
|
|
|
-//// 水费
|
|
|
-// List<ColdWater> list1 = coldWaterService.list(Wrappers.<ColdWater>lambdaQuery()
|
|
|
-// .eq(ColdWater::getDataTime, dateTime)
|
|
|
-// .eq(ColdWater::getDom, dom)
|
|
|
-// );
|
|
|
-// for (ColdWater coldWater : list1) {
|
|
|
-// Double money = coldWater.getTotalMoney();
|
|
|
-// girlTotalMoney = girlTotalMoney + money;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// girlEnergyDto.setGenderDrom("女生");
|
|
|
-// girlEnergyDto.setTotalMoney(girlTotalMoney);
|
|
|
-// girlEnergyDto.setDate(dateTime);
|
|
|
-// hotWaterEnergyDtos.add(girlEnergyDto);
|
|
|
-// EnergyDto boyEnergyDto = new EnergyDto();
|
|
|
-//// 男生 7栋到15栋
|
|
|
-// List<Dorm> boyDorm = dormService.list(Wrappers.<Dorm>lambdaQuery()
|
|
|
-// .eq(Dorm::getBuild, "7栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "8栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "9栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "10栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "11栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "12栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "13栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "14栋")
|
|
|
-// .or()
|
|
|
-// .eq(Dorm::getBuild, "15栋")
|
|
|
-// );
|
|
|
-// Double boyTotalMoney = 0.0;
|
|
|
-// for (Dorm dorm : boyDorm) {
|
|
|
-// String dom = dorm.getDom();
|
|
|
-// List<Electricity> list = this.list(Wrappers.<Electricity>lambdaQuery()
|
|
|
-// .eq(Electricity::getDateTime,dateTime)
|
|
|
-// .eq(Electricity::getDom, dom)
|
|
|
-// );
|
|
|
-// for (Electricity electricity : list) {
|
|
|
-// Double money = electricity.getTotalMoney();
|
|
|
-// boyTotalMoney = boyTotalMoney + money;
|
|
|
-// }
|
|
|
-//// 水费
|
|
|
-// List<ColdWater> list1 = coldWaterService.list(Wrappers.<ColdWater>lambdaQuery()
|
|
|
-// .eq(ColdWater::getDataTime, dateTime)
|
|
|
-// .eq(ColdWater::getDom, dom)
|
|
|
-// );
|
|
|
-// for (ColdWater coldWater : list1) {
|
|
|
-// Double money = coldWater.getTotalMoney();
|
|
|
-// boyTotalMoney = boyTotalMoney + money;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// boyEnergyDto.setGenderDrom("男生");
|
|
|
-// boyEnergyDto.setTotalMoney(boyTotalMoney);
|
|
|
-// boyEnergyDto.setDate(dateTime);
|
|
|
-// hotWaterEnergyDtos.add(boyEnergyDto);
|
|
|
-// }
|
|
|
-// return BaseResponse.ok(StatusEnum.SUCCESS, hotWaterEnergyDtos);
|
|
|
-// }
|
|
|
+
|
|
|
|
|
|
public static String getDateTime(int i) {
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
|
|
|
@@ -172,6 +78,7 @@ public class ElectricityServiceImpl extends ServiceImpl<ElectricityMapper, Elect
|
|
|
try {
|
|
|
this.getElectrucity(dorm.getDom());
|
|
|
} catch (Exception e) {
|
|
|
+ LogUtils.logError(e);
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|