修改月统一

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -55,7 +55,7 @@ public class HouseholdTestController {
     @Autowired
     private TdHYGFStationDayGenerateImpl tdHYGFStationDayGenerateImpl;
     @Autowired
-    private TdHYGFStationMonthGenerateImpl tdHYGFStationMonthGenerateImpl;
+    private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl;
 
     @Autowired
     private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationYearGenerate.java

 package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
 
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
-import java.io.Serializable;
+import lombok.Data;
 
 /**
  * @author DELL
  */
 @Data
 @TableName(value = "td_hygf_station_generate_year" ,autoResultMap = true)
-public class TdHYGFStationMonthGenerate implements Serializable {
+public class TdHYGFStationYearGenerate implements Serializable {
     /**
      * 创建时间
      */

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationMonthGenerateMapper.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationYearGenerateMapper.java

 package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
 
-public interface TdHYGFStationMonthGenerateMapper extends BaseMapper<TdHYGFStationMonthGenerate> {
+public interface TdHYGFStationYearGenerateMapper extends BaseMapper<TdHYGFStationYearGenerate> {
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationAllGenerateImpl.java

@@ -25,7 +25,7 @@ public class TdHYGFStationAllGenerateImpl  implements AscriptionService {
     @Autowired
     private JpStationMapper jpStationMapper;
     @Autowired
-    private TdHYGFStationAllGenerateMapper tdHYGFStationYearGenerateMapper;
+    private TdHYGFStationAllGenerateMapper tdHYGFStationAllGenerateMapper;
     @Override
     public void updateAscription(String timeNum) {
         try {
@@ -34,7 +34,7 @@ public class TdHYGFStationAllGenerateImpl  implements AscriptionService {
 
             Date star = dft.parse(timeNum);//开始时间
             String yearMonth=   dfty.format(star);
-            List<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
+            List<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationAllGenerateMapper.selectList(
                     new QueryWrapper<TdHYGFStationAllGenerate>().
                             eq("year", yearMonth).and(wrapper -> {
                         wrapper.isNull("regional_companies_code")
@@ -56,7 +56,7 @@ public class TdHYGFStationAllGenerateImpl  implements AscriptionService {
                         dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                         dayPower.setStationName(jpStation.getName());
                         dayPower.setStationState(jpStation.getState());
-                        tdHYGFStationYearGenerateMapper.insert(dayPower);
+                        tdHYGFStationAllGenerateMapper.insert(dayPower);
                     }
                 }
             }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationMonthGenerateImpl.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationYearGenerateImpl.java

 package com.yeejoin.amos.api.householdapi.face.service.business;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterYearGenerate;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
-import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
-import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
-import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
+import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
+
 /**
  * @description:
  * @author: tw
  * @createDate: 2024/4/9
  */
 @Service
-public class TdHYGFStationMonthGenerateImpl  implements AscriptionService {
+public class TdHYGFStationYearGenerateImpl  implements AscriptionService {
     @Autowired
     private JpStationMapper jpStationMapper;
     @Autowired
-    private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+    private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
     @Override
     public void updateAscription(String timeNum) {
         try {
@@ -34,8 +34,8 @@ public class TdHYGFStationMonthGenerateImpl  implements AscriptionService {
 
             Date star = dft.parse(timeNum);//开始时间
             String yearMonth=   dfty.format(star);
-            List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList(
-                    new QueryWrapper<TdHYGFStationMonthGenerate>().
+            List<TdHYGFStationYearGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
+                    new QueryWrapper<TdHYGFStationYearGenerate>().
                             eq("month_time", yearMonth).and(wrapper -> {
                         wrapper.isNull("regional_companies_code")
                                 .or()
@@ -48,7 +48,7 @@ public class TdHYGFStationMonthGenerateImpl  implements AscriptionService {
             );
 
             if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
-                for (TdHYGFStationMonthGenerate dayPower : hygfjpDayPower) {
+                for (TdHYGFStationYearGenerate dayPower : hygfjpDayPower) {
                     JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
                             eq("third_station_id", dayPower.getThirdStationId()));
                     if(jpStation!=null){
@@ -56,7 +56,7 @@ public class TdHYGFStationMonthGenerateImpl  implements AscriptionService {
                     dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
                     dayPower.setStationName(jpStation.getName());
                     dayPower.setStationState(jpStation.getState());
-                    tdHYGFStationMonthGenerateMapper.insert(dayPower);
+                    tdHYGFStationYearGenerateMapper.insert(dayPower);
                     }
                 }
             }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -99,7 +99,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 	@Autowired
 	private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
 	@Autowired
-	private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+	private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
 	@Autowired
 	private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
 
@@ -310,30 +310,30 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 					tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
 				}
 				// 户用场站月发电量
-				TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(
-						new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", stationIds.get(i))
+				TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(
+						new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", stationIds.get(i))
 								.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 								.eq("year", DateUtil.format(today1, "yyyy")));
-				if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
-					tdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
-				}
-				tdHYGFStationMonthGenerate.setThirdStationId(stationIds.get(i));
-				tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
-				tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-				tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-				tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
-				tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
+				if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
+					TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
+				}
+				TdHYGFStationYearGenerate.setThirdStationId(stationIds.get(i));
+				TdHYGFStationYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+				TdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+				TdHYGFStationYearGenerate.setGenerate(jpStation.getMonthGenerate());
+				TdHYGFStationYearGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+				TdHYGFStationYearGenerate.setIncome(jpStation.getMonthIncome());
 				// 新加
-				tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-				tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-				tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
-				tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
-				if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
-					tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
-					tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+				TdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+				TdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+				TdHYGFStationYearGenerate.setStationName(jpStation.getName());
+				TdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+				if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate.getCreatedTime())) {
+					TdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+					TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 				} else {
-					tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+					TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 				}
 				// 户用场站年发电量
 				TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java

@@ -86,7 +86,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 	@Autowired
 	private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
 	@Autowired
-	private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+	private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
 	@Autowired
 	private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
 
@@ -255,33 +255,33 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 					tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
 				}
 				// 户用场站月发电量
-				TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper
-						.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
+				TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper
+						.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
 								.eq("third_station_id", jpStation.getThirdStationId())
 								.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 								.eq("year", DateUtil.format(today1, "yyyy")));
-				if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
-					tdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
+				if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
+					TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
 				}
-				tdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
-				tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
-				tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-				tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
+				TdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId());
+				TdHYGFStationYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+				TdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+				TdHYGFStationYearGenerate.setGenerate(jpStation.getMonthGenerate());
 				if (ObjectUtils.isNotEmpty(jpStation.getMonthGenerate())) {
-					tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+					TdHYGFStationYearGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
 				}
-				tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
+				TdHYGFStationYearGenerate.setIncome(jpStation.getMonthIncome());
 				// 新加
-				tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-				tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-				tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
-				tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
-				if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
-					tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
-					tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+				TdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+				TdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+				TdHYGFStationYearGenerate.setStationName(jpStation.getName());
+				TdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+				if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationYearGenerate.getCreatedTime())) {
+					TdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+					TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 				} else {
-					tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+					TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 				}
 				// 户用场站年发电量
 				TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -113,7 +113,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     @Autowired
     private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
     @Autowired
-    private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+    private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
     @Autowired
     private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
     @Autowired
@@ -417,30 +417,30 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
             }
             //户用场站月发电量
-            TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
+            TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
                     .eq("third_station_id", jpStation.getThirdStationId())
                     .eq("month_time", DateUtil.format(today1, "yyyy-MM"))
                     .eq("year", DateUtil.format(today1, "yyyy")));
-            if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
-                tdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
+            if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
+                TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
             }
-            tdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
-            tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
-            tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-            tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-            tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
-            tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
+            TdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId());
+            TdHYGFStationYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+            TdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+            TdHYGFStationYearGenerate.setGenerate(jpStation.getMonthGenerate());
+            TdHYGFStationYearGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+            TdHYGFStationYearGenerate.setIncome(jpStation.getMonthIncome());
             //新加
-            tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-            tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-            tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
-            tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
-            if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
-                tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
-                tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+            TdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+            TdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+            TdHYGFStationYearGenerate.setStationName(jpStation.getName());
+            TdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+            if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate.getCreatedTime())) {
+                TdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+                TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
             } else {
-                tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
             }
             //户用场站年发电量
             TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationAllGenerate>()

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -107,7 +107,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 	@Autowired
 	private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
 	@Autowired
-	private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+	private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
 	@Autowired
 	private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
 	@Autowired
@@ -340,31 +340,31 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 						tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
 					}
 					// 户用场站月发电量
-					TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper
-							.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", stationId)
+					TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper
+							.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", stationId)
 									.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 									.eq("year", DateUtil.format(today1, "yyyy")));
-					if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
-						tdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
+					if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
+						TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
 					}
-					tdHYGFStationMonthGenerate.setThirdStationId(stationId);
-					tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
-					tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-					tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-					tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
-					tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
+					TdHYGFStationYearGenerate.setThirdStationId(stationId);
+					TdHYGFStationYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+					TdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+					TdHYGFStationYearGenerate.setGenerate(jpStation.getMonthGenerate());
+					TdHYGFStationYearGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+					TdHYGFStationYearGenerate.setIncome(jpStation.getMonthIncome());
 
 					// 新加
-					tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-					tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-					tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
-					tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
-					if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
-						tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
-						tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+					TdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+					TdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+					TdHYGFStationYearGenerate.setStationName(jpStation.getName());
+					TdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+					if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate.getCreatedTime())) {
+						TdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+						TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 					} else {
-						tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+						TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 					}
 					// 户用场站年发电量
 					TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SofarDataAcquisitionServiceImpl.java

@@ -42,7 +42,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHY
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterTotalGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterYearGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate;
-import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpCollectorMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpInverterElectricityMapper;
@@ -58,7 +58,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverter
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterTotalGenerateMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterYearGenerateMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper;
-import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationAllGenerateMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdJpStationMapper;
 import com.yeejoin.amos.api.householdapi.face.service.SofarDataAcquisitionService;
@@ -86,7 +86,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 	@Autowired
 	private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
 	@Autowired
-	private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+	private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
 	@Autowired
 	private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
 	@Autowired
@@ -554,35 +554,35 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 				tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
 			}
 			// 户用场站月发电量
-			TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(
-					new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", jpStation.getThirdStationId())
+			TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(
+					new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", jpStation.getThirdStationId())
 							.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 							.eq("year", DateUtil.format(today1, "yyyy")));
-			if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
-				tdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
+			if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
+				TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
 			}
-			tdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
-			tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
-			tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-			tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-			tdHYGFStationMonthGenerate.setFullhour(
+			TdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId());
+			TdHYGFStationYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+			TdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+			TdHYGFStationYearGenerate.setGenerate(jpStation.getMonthGenerate());
+			TdHYGFStationYearGenerate.setFullhour(
 //                    jpStation.getMonthGenerate() / jpStation.getCapacity()
 					(jpStation.getMonthGenerate() == null || jpStation.getCapacity() == null) ? null
 							: (jpStation.getCapacity() <= 0.0 ? null
 									: jpStation.getMonthGenerate() / jpStation.getCapacity()));
-			tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
+			TdHYGFStationYearGenerate.setIncome(jpStation.getMonthIncome());
 
 			// 新加
-			tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-			tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-			tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
-			tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
-			if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
-				tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
-				tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+			TdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+			TdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+			TdHYGFStationYearGenerate.setStationName(jpStation.getName());
+			TdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+			if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate.getCreatedTime())) {
+				TdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+				TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 			} else {
-				tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+				TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 			}
 			// 户用场站年发电量
 			TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java

@@ -79,7 +79,7 @@ public class SunlightServiceImpl implements SunlightService {
 	@Autowired
 	private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
 	@Autowired
-	private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+	private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
 	@Autowired
 	private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
 	@Autowired
@@ -458,18 +458,18 @@ public class SunlightServiceImpl implements SunlightService {
 				tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
 			}
 			// 户用场站月发电量
-			TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(
-					new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", jpStation.getThirdStationId())
+			TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(
+					new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", jpStation.getThirdStationId())
 							.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 							.eq("year", DateUtil.format(today1, "yyyy")));
-			if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
-				tdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
+			if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
+				TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
 			}
-			tdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
-			tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
-			tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
-			tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-			tdHYGFStationMonthGenerate.setFullhour(
+			TdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId());
+			TdHYGFStationYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+			TdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+			TdHYGFStationYearGenerate.setGenerate(jpStation.getMonthGenerate());
+			TdHYGFStationYearGenerate.setFullhour(
 
 //                    jpStation.getMonthGenerate() / jpStation.getCapacity()
 
@@ -479,19 +479,19 @@ public class SunlightServiceImpl implements SunlightService {
 									: jpStation.getMonthGenerate() / jpStation.getCapacity())
 
 			);
-			tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
+			TdHYGFStationYearGenerate.setIncome(jpStation.getMonthIncome());
 
 			// 新加
-			tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-			tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-			tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
-			tdHYGFStationMonthGenerate.setStationState(jpStation.getState());
-
-			if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
-				tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
-				tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+			TdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+			TdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+			TdHYGFStationYearGenerate.setStationName(jpStation.getName());
+			TdHYGFStationYearGenerate.setStationState(jpStation.getState());
+
+			if (ObjectUtils.isEmpty(TdHYGFStationYearGenerate.getCreatedTime())) {
+				TdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+				TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 			} else {
-				tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+				TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 			}
 			// 户用场站年发电量
 			TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(