修改采集问题

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/ImasterUtils.java

@@ -147,7 +147,12 @@ public class ImasterUtils {
 				} else {
 					jsonArray = handlerResponseByResultResolveruleOther(ResultResolveRule, respone);
 					if (!ObjectUtils.isEmpty(jsonArray)) {
+						try {
 							result = JSONArray.parseArray(jsonArray.toJSONString(), tClass);
+						} catch (Exception e) {
+							e.printStackTrace();
+							logger.error("华为数据解析错误(getResPonseOther):" + jsonArray.toJSONString());
+						}
 					}
 				}
 			} else {
@@ -211,6 +216,10 @@ public class ImasterUtils {
 			String[] rules = resultResovle.split(",");
 			if (rules.length > 0) {
 				for (int i = 0; i < rules.length; i++) {
+					if ("ACCESS_FREQUENCY_IS_TOO_HIGH".equals(jsonObject.get(rules[i]))) {
+						logger.error("华为数据解析错误():请求系统次数太频繁,无法获取接口数据");
+						continue;
+					}
 					try {
 						jsonObject = (JSONObject) jsonObject.get(rules[i]);
 						if (jsonObject == null) {

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/SunlightUtil.java

@@ -116,7 +116,14 @@ public class SunlightUtil {
         {
             put("1", "在线");
             put("0", "离线");
-            put("2","报警" );
+        }
+    };
+    
+    public static final HashMap<String, String> gzzt= new HashMap<String, String>() {
+        {
+            put("1", "故障");
+            put("2", "报警");
+            put("4", "正常" );
         }
     };
 

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

@@ -52,7 +52,6 @@ import java.util.stream.Collectors;
 @Service
 public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionService {
 
-
 	@Autowired
 	KsolarRequestUtil kSolarRequestUtil;
 
@@ -94,7 +93,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 	@Autowired
 	private JpInverterMapper jpInverterMapper;
-    //监盘逆变器电量mapper
+	// 监盘逆变器电量mapper
 	@Autowired
 	private JpInverterElectricityMapper jpInverterElectricityMapper;
 	@Autowired
@@ -126,12 +125,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 		logger.info("-------科士达同步场站开始" + ts + "------- " + sdf.format(new Date()));
 		HashMap<String, Object> requestInfo = new HashMap<>();
 		String requestParaminfo = JSON.toJSONString(requestInfo);
-        List<KsolarStationList> kSolarStationListList = kSolarRequestUtil.getResPonse(
-                KSolarConstant.stationListUrl,
-                KSolarConstant.requestGET,
-                requestParaminfo,
-                KSolarConstant.resovle_rows,
-                KsolarStationList.class);
+		List<KsolarStationList> kSolarStationListList = kSolarRequestUtil.getResPonse(KSolarConstant.stationListUrl,
+				KSolarConstant.requestGET, requestParaminfo, KSolarConstant.resovle_rows, KsolarStationList.class);
 		for (KsolarStationList kSolarStation : kSolarStationListList) {
 			kSolarStation.setCreatedTime(System.currentTimeMillis());
 			kSolarStationMapper.insert(kSolarStation);
@@ -165,11 +160,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 				String requestParaminfo = JSON.toJSONString(requestInfo);
 				String url = KSolarConstant.stationInfoByIdUrl + "?stationId=" + ksolarStation.getStationId();
 				// 获取电站详情
-                List<KsolarStationDetails> ksolarStationDetailsList = kSolarRequestUtil.getResPonse(
-                        url,
-                        KSolarConstant.requestPOST,
-                        requestParaminfo,
-                        KSolarConstant.resovle_data,
+				List<KsolarStationDetails> ksolarStationDetailsList = kSolarRequestUtil.getResPonse(url,
+						KSolarConstant.requestPOST, requestParaminfo, KSolarConstant.resovle_data,
 						KsolarStationDetails.class);
 				// 获取单个电站的发电量和收益
 				KsolarStationEarn stationEarn = getStationEarn(ksolarStation.getStationId());
@@ -183,9 +175,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 				for (KsolarStationDetails ksolarStationDetail : ksolarStationDetailsList) {
 
 					ksolarStationDetail.setCreatedTime(System.currentTimeMillis());
-                    JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
-                            eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()).
-                            eq("third_station_id", ksolarStation.getStationId()));
+					JpStation jpStation = jpStationMapper.selectOne(
+							new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
+									.eq("third_station_id", ksolarStation.getStationId()));
 					// 给户用光伏存储的数据赋值
 					if (ObjectUtils.isEmpty(jpStation)) {
 						jpStation = new JpStation();
@@ -196,14 +188,15 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					jpStation.setPrice(ksolarStationDetail.getElecPrice());
 					jpStation.setAddress(ksolarStationDetail.getStationAddressDetail());
 					jpStation.setLongitude(ksolarStationDetail.getLongitude());
-                    jpStation.setOnGridType("自发自用");//客户确认
-                    jpStation.setRatedPower(4360.4);//客户确认
+					jpStation.setOnGridType("自发自用");// 客户确认
+					jpStation.setRatedPower(4360.4);// 客户确认
 					jpStation.setLatitude(ksolarStationDetail.getLatitude());
 					jpStation.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
 					// 业主姓名
 					jpStation.setUserName(ksolarStation.getUserName());
 					jpStation.setState(KSolarConstant.collectStaus.get(String.valueOf(ksolarStation.getStatus())));
-                    jpStation.setRealTimePower(ksolarStation.getPowerInter() != null ? ksolarStation.getPowerInter() / 1000 : 0.0);
+					jpStation.setRealTimePower(
+							ksolarStation.getPowerInter() != null ? ksolarStation.getPowerInter() / 1000 : 0.0);
 
 					jpStation.setDayGenerate(ksolarStation.getDayGeneration());
 					jpStation.setAccumulatedPower(ksolarStation.getTotalGeneration());
@@ -243,7 +236,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					// 业主电话
 					// jpStation.setUserPhone(String.valueOf(golangStationDetail.getUsermobile()));
 					// 电站联系人
-                    //                jpStation.setStationContact(String.valueOf(golangStationDetail.getMobile()).toLowerCase().replace("null", ""));
+					// jpStation.setStationContact(String.valueOf(golangStationDetail.getMobile()).toLowerCase().replace("null",
+					// ""));
 					// 组件数量
 					// jpStation.setModuleCount(ObjectUtils.isEmpty(Math.toIntExact(golangStationDetail.getModule()))?0:Math.toIntExact(golangStationDetail.getModule()));
 					jpStation.setRecDate(new Date());
@@ -253,10 +247,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 						jpStationMapper.insert(jpStation);
 					}
 
-
-
-
-                    //增加td 电站区域公司，经销商绑定表
+					// 增加td 电站区域公司，经销商绑定表
 //                    TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
 //                            eq("third_code",PVProducerInfoEnum.KSOLAR.getCode()).
 //                            eq("third_station_id",  ksolarStation.getStationId()));
@@ -285,21 +276,16 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					hygfjpStationPowerHistory.setThirdCode(jpStation.getThirdCode());
 					hygfjpStationPowerHistory.setTime(System.currentTimeMillis());
 
-                    //新加
+					// 新加
 					hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
 					hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 					hygfjpStationPowerHistory.setStationName(jpStation.getName());
 					hygfjpStationPowerHistory.setStationState(jpStation.getState());
 
-
-
 					hygfjpStationPowerHistoryMapper.insert(hygfjpStationPowerHistory);
-                    HYGFJPDayPower hygfjpDayPower = hygfjpDayPowerMapper.selectOne(
-                            new QueryWrapper<HYGFJPDayPower>().
-                                    eq("tation_id", ksolarStation.getStationId()).
-                                    eq("year_month_day", today).
-                                    eq("hour", hour)
-                    );
+					HYGFJPDayPower hygfjpDayPower = hygfjpDayPowerMapper
+							.selectOne(new QueryWrapper<HYGFJPDayPower>().eq("tation_id", ksolarStation.getStationId())
+									.eq("year_month_day", today).eq("hour", hour));
 					if (ObjectUtils.isEmpty(hygfjpDayPower)) {
 						hygfjpDayPower = new HYGFJPDayPower();
 					}
@@ -308,7 +294,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					hygfjpDayPower.setYearMonthDay(today);
 					hygfjpDayPower.setPower(ksolarStation.getPowerInter());
 
-                    //新加
+					// 新加
 					hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
 					hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 					hygfjpDayPower.setStationName(jpStation.getName());
@@ -324,9 +310,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 					ksolarStationDetailsMapper.insert(ksolarStationDetail);
 					Date today1 = new Date();
-                    //户用场站日发电量
-                    TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>()
-                            .eq("third_station_id", stationId)
+					// 户用场站日发电量
+					TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper
+							.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>().eq("third_station_id", stationId)
 									.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
 									.eq("year_month", DateUtil.format(today1, "yyyy-MM")));
 					if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) {
@@ -339,7 +325,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
 					tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
 
-                    //新加
+					// 新加
 					tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
 					tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 					tdHYGFStationDayGenerate.setStationName(jpStation.getName());
@@ -351,9 +337,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					} else {
 						tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
 					}
-                    //户用场站月发电量
-                    TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
-                            .eq("third_station_id", stationId)
+					// 户用场站月发电量
+					TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper
+							.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", stationId)
 									.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 									.eq("year", DateUtil.format(today1, "yyyy")));
 					if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)) {
@@ -366,7 +352,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
 					tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
 
-                    //新加
+					// 新加
 					tdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
 					tdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 					tdHYGFStationMonthGenerate.setStationName(jpStation.getName());
@@ -378,9 +364,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					} else {
 						tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
 					}
-                    //户用场站年发电量
-                    TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
-                            .eq("third_station_id", stationId)
+					// 户用场站年发电量
+					TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper
+							.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", stationId)
 									.eq("year_time", DateUtil.format(today1, "yyyy"))
 									.eq("year", DateUtil.format(today1, "yyyy")));
 					if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) {
@@ -392,7 +378,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
 					tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
 					tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
-                    //新加
+					// 新加
 					tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
 					tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 					tdHYGFStationYearGenerate.setStationName(jpStation.getName());
@@ -427,12 +413,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 		HashMap<String, Object> requestInfo = new HashMap<>(1);
 		String requestParaminfo = JSON.toJSONString(requestInfo);
 		String url = KSolarConstant.stationEarnUrl + "?stationId=" + stationId;
-        List<KsolarStationEarn> ksolarStationEarns = kSolarRequestUtil.getResPonse(
-                url,
-                KSolarConstant.requestGET,
-                requestParaminfo,
-                KSolarConstant.resovle_data,
-                KsolarStationEarn.class);
+		List<KsolarStationEarn> ksolarStationEarns = kSolarRequestUtil.getResPonse(url, KSolarConstant.requestGET,
+				requestParaminfo, KSolarConstant.resovle_data, KsolarStationEarn.class);
 
 		if (!CollectionUtils.isEmpty(ksolarStationEarns)) {
 			ksolarStationEarn = ksolarStationEarns.get(0);
@@ -466,16 +448,15 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 			attribId = "202";
 			stime = year;
 		}
-        String url = KSolarConstant.stationEarnChartUrl + "?stationId=" + stationId + "&attribId=" + attribId + "&stime=" + stime;
-        List<KsolarStationEarnChart> ksolarStationEarnCharts = kSolarRequestUtil.getResPonse(
-                url,
-                KSolarConstant.requestGET,
-                requestParaminfo,
-                KSolarConstant.resovle_arr,
-                KsolarStationEarnChart.class);
+		String url = KSolarConstant.stationEarnChartUrl + "?stationId=" + stationId + "&attribId=" + attribId
+				+ "&stime=" + stime;
+		List<KsolarStationEarnChart> ksolarStationEarnCharts = kSolarRequestUtil.getResPonse(url,
+				KSolarConstant.requestGET, requestParaminfo, KSolarConstant.resovle_arr, KsolarStationEarnChart.class);
 		double earnValues = 0;
 		if (!CollectionUtils.isEmpty(ksolarStationEarnCharts)) {
-            earnValues += ksolarStationEarnCharts.stream().mapToDouble(ksolarStationEarnChart -> Double.parseDouble(ksolarStationEarnChart.getEarnValue())).sum();
+			earnValues += ksolarStationEarnCharts.stream()
+					.mapToDouble(ksolarStationEarnChart -> Double.parseDouble(ksolarStationEarnChart.getEarnValue()))
+					.sum();
 		}
 		if ("year".equals(type)) {
 			map.put("yearEarn", earnValues);
@@ -506,24 +487,20 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 				}
 				HashMap<String, Object> requestInfo = new HashMap<>(1);
 				String requestParaminfo = JSON.toJSONString(requestInfo);
-                String url = KSolarConstant.stationCollectListUrl + "?stationId=" + ksolarStationList.getStationId() + "&pageNumber=1&pageSize=200";
-                List<KsolarStationCollectList> result = kSolarRequestUtil.getResPonse(
-                        url,
-                        KSolarConstant.requestGET,
-                        requestParaminfo,
-                        KSolarConstant.resovle_rows,
-                        KsolarStationCollectList.class
-                );
+				String url = KSolarConstant.stationCollectListUrl + "?stationId=" + ksolarStationList.getStationId()
+						+ "&pageNumber=1&pageSize=200";
+				List<KsolarStationCollectList> result = kSolarRequestUtil.getResPonse(url, KSolarConstant.requestGET,
+						requestParaminfo, KSolarConstant.resovle_rows, KsolarStationCollectList.class);
 				for (KsolarStationCollectList ksolarStationCollectList : result) {
 
 					ksolarStationCollectList.setCreatedTime(System.currentTimeMillis());
 					ksolarStationCollectList.setThirdStationId(ksolarStationList.getStationId());
 					ksolarStationCollectListMapper.insert(ksolarStationCollectList);
 
-                    JpCollector jpCollector = jpCollectorMapper.selectOne(new QueryWrapper<JpCollector>().
-                            eq("third_station_id", ksolarStationCollectList.getThirdStationId()).
-                            eq("sn_code", ksolarStationCollectList.getCollectId().trim()).
-                            eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
+					JpCollector jpCollector = jpCollectorMapper.selectOne(new QueryWrapper<JpCollector>()
+							.eq("third_station_id", ksolarStationCollectList.getThirdStationId())
+							.eq("sn_code", ksolarStationCollectList.getCollectId().trim())
+							.eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
 					if (ObjectUtils.isEmpty(jpCollector)) {
 						jpCollector = new JpCollector();
 					}
@@ -546,14 +523,14 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					jpCollector.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 					// 第三方厂商标识
 					jpCollector.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                    //第三方厂商标识
+					// 第三方厂商标识
 					jpCollector.setState(KSolarConstant.collectStaus.get(ksolarStationCollectList.getStatus()));
 					jpCollector.setStationName(ksolarStationCollectList.getStationName());
 					jpCollector.setAddr(ksolarStationCollectList.getAddress());
 					jpCollector.setName(ksolarStationCollectList.getCollectName());
 					jpCollector.setVersion(ksolarStationCollectList.getCollectVersion());
 					jpCollector.setType(ksolarStationCollectList.getDeviceModel());
-                    //信号强度
+					// 信号强度
 					jpCollector.setSignalStrength(String.valueOf(ksolarStationCollectList.getSignal()));
 					jpCollector.setRecDate(new Date());
 					if (ObjectUtils.isEmpty(jpCollector.getSequenceNbr())) {
@@ -581,15 +558,16 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 	public void collectorDetail() {
 		long ts = System.currentTimeMillis();
 		logger.info("-------科士达同步采集器详情/逆变器开始" + ts + "------- " + sdf.format(new Date()));
-        List<JpCollector> jpCollectorlist = jpCollectorMapper.selectList(new QueryWrapper<JpCollector>().
-                eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
+		List<JpCollector> jpCollectorlist = jpCollectorMapper
+				.selectList(new QueryWrapper<JpCollector>().eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
 		List<String> collectIds = ksolarStationCollectListMapper.getCollectIds();
 		if (!CollectionUtils.isEmpty(collectIds)) {
 			collectIds.forEach(collectId -> {
 				LambdaQueryWrapper<KsolarStationCollectList> wrapper = new LambdaQueryWrapper<>();
 				wrapper.eq(KsolarStationCollectList::getCollectId, collectId);
 				wrapper.orderByDesc(KsolarStationCollectList::getCreatedTime);
-                List<KsolarStationCollectList> ksolarStationCollectLists = ksolarStationCollectListMapper.selectList(wrapper);
+				List<KsolarStationCollectList> ksolarStationCollectLists = ksolarStationCollectListMapper
+						.selectList(wrapper);
 				if (!CollectionUtils.isEmpty(ksolarStationCollectLists)) {
 					KsolarStationCollectList ksolarStationCollectList = ksolarStationCollectLists.get(0);
 					try {
@@ -600,31 +578,29 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					HashMap<String, Object> requestInfo = new HashMap<>(1);
 					String requestParaminfo = JSON.toJSONString(requestInfo);
 					String url = KSolarConstant.stationCollectDataUrl + "?collectId=" + collectId;
-                    List<KsolarStationCollectData> result = kSolarRequestUtil.getResPonse(
-                            url,
-                            KSolarConstant.requestGET,
-                            requestParaminfo,
-                            KSolarConstant.resovle_data,
-                            KsolarStationCollectData.class
-                    );
+					List<KsolarStationCollectData> result = kSolarRequestUtil.getResPonse(url,
+							KSolarConstant.requestGET, requestParaminfo, KSolarConstant.resovle_data,
+							KsolarStationCollectData.class);
 					if (jpCollectorlist != null && jpCollectorlist.size() > 0) {
 
 						JpCollector jpCollectorflag = null;
 						for (JpCollector jpCollector : jpCollectorlist) {
-                            if (jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim()) && KSolarConstant.collectStaus.get("1").equals(jpCollector.getState())) {
+							if (jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim())
+									&& KSolarConstant.collectStaus.get("1").equals(jpCollector.getState())) {
 								jpCollectorflag = jpCollector;
 								break;
 							}
 						}
 						if (jpCollectorflag != null) {
-                            //离线状态
-                            JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
-                                    eq("collector_sn_code", jpCollectorflag.getSnCode().trim()) );
+							// 离线状态
+							JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>()
+									.eq("collector_sn_code", jpCollectorflag.getSnCode().trim()));
 							if (ObjectUtils.isEmpty(jpInverter)) {
 								jpInverter = new JpInverter();
 							}
 
-                            jpInverter.setCapacity(KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollectorflag.getName())));
+							jpInverter.setCapacity(
+									KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollectorflag.getName())));
 							jpInverter.setSnCode(jpInverter.getSnCode());
 							jpInverter.setId(jpInverter.getId());
 							jpInverter.setState(jpCollectorflag.getState());
@@ -647,19 +623,17 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 							if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
 								jpInverterMapper.updateById(jpInverter);
 							} else {
-                                if(StringUtils.isNotEmpty(jpInverter.getSnCode())){
+								if (StringUtils.isNotEmpty(jpInverter.getSnCode())) {
 									jpInverterMapper.insert(jpInverter);
 								}
 
 							}
 
-
 							for (int k1 = 1; k1 < 13; k1++) {
-                                JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                        eq("sn_code", jpInverter.getSnCode().trim()).
-                                        eq("type", "直流").
-                                        eq("name", "PV" + k1)
-                                );
+								JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper
+										.selectOne(new QueryWrapper<JpInverterElectricity>()
+												.eq("sn_code", jpInverter.getSnCode().trim()).eq("type", "直流")
+												.eq("name", "PV" + k1));
 								if (ObjectUtils.isEmpty(jpInverterElectricity)) {
 									jpInverterElectricity = new JpInverterElectricity();
 								}
@@ -679,11 +653,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 								}
 							}
 
-                            JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                    eq("sn_code", jpInverter.getSnCode().trim()).
-                                    eq("type", "交流").
-                                    eq("name", "RS")
-                            );
+							JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper
+									.selectOne(new QueryWrapper<JpInverterElectricity>()
+											.eq("sn_code", jpInverter.getSnCode().trim()).eq("type", "交流")
+											.eq("name", "RS"));
 							if (ObjectUtils.isEmpty(jpInverterElectricityR)) {
 								jpInverterElectricityR = new JpInverterElectricity();
 							}
@@ -702,11 +675,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 								jpInverterElectricityMapper.updateById(jpInverterElectricityR);
 							}
 
-                            JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                    eq("sn_code", jpInverter.getSnCode().trim()).
-                                    eq("type", "交流").
-                                    eq("name", "ST")
-                            );
+							JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper
+									.selectOne(new QueryWrapper<JpInverterElectricity>()
+											.eq("sn_code", jpInverter.getSnCode().trim()).eq("type", "交流")
+											.eq("name", "ST"));
 							if (ObjectUtils.isEmpty(jpInverterElectricityS)) {
 								jpInverterElectricityS = new JpInverterElectricity();
 							}
@@ -724,12 +696,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 								jpInverterElectricityMapper.updateById(jpInverterElectricityS);
 							}
 
-
-                            JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                    eq("sn_code", jpInverter.getSnCode().trim()).
-                                    eq("type", "交流").
-                                    eq("name", "TR")
-                            );
+							JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper
+									.selectOne(new QueryWrapper<JpInverterElectricity>()
+											.eq("sn_code", jpInverter.getSnCode().trim()).eq("type", "交流")
+											.eq("name", "TR"));
 							if (ObjectUtils.isEmpty(jpInverterElectricityT)) {
 								jpInverterElectricityT = new JpInverterElectricity();
 							}
@@ -765,8 +735,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 							// 逆变器历史
 							String today = DateUtil.today();
-                            HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(
-                                    new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", jpInverter.getSnCode().trim()).eq("date", today));
+							HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper
+									.selectOne(new QueryWrapper<HYGFJPInverterHistory>()
+											.eq("sn_code", jpInverter.getSnCode().trim()).eq("date", today));
 							if (ObjectUtils.isEmpty(hygfjpInverterHistory)) {
 								hygfjpInverterHistory = new HYGFJPInverterHistory();
 							}
@@ -785,23 +756,20 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 							} else {
 								hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
 							}
-
-
 						} else {
-
 							if (!CollectionUtils.isEmpty(result)) {
 								result.forEach(ksolarStationCollectData -> {
-                                    List<JpInverter> jpInverterList = jpInverterMapper.selectList(new QueryWrapper<JpInverter>().
-                                            eq("third_station_id", ksolarStationCollectList.getThirdStationId()).
-                                            eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()).
-                                            like("sn_code", ksolarStationCollectData.getInverterId().trim())
-                                            .isNotNull("sn_code")
-                                            .orderByDesc("update_time"));
-                                    JpInverter jpInverter =jpInverterList.get(0);
-                                    if (ObjectUtils.isEmpty(jpInverter)) {
-                                        jpInverter = new JpInverter();
+									List<JpInverter> jpInverterList = jpInverterMapper
+											.selectList(new QueryWrapper<JpInverter>()
+													.eq("third_station_id",
+															ksolarStationCollectList.getThirdStationId())
+													.eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
+													.like("sn_code", ksolarStationCollectData.getInverterId().trim())
+													.isNotNull("sn_code").orderByDesc("update_time"));
+									JpInverter jpInverter = new JpInverter();
+									if (jpInverterList.size() > 0) {
+										 jpInverter = jpInverterList.get(0);
 									}
-
 									// 品牌
 //                        jpInverter.setBrand(inverterDetailDto.getName());
 									// 国标
@@ -812,19 +780,24 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									// jpInverter.setCapacity();
 									if (jpCollectorlist != null && jpCollectorlist.size() > 0) {
 										for (JpCollector jpCollector : jpCollectorlist) {
-                                            if (jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId().trim())) {
-                                                jpInverter.setCapacity(KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName())));
+											if (jpCollector.getSnCode()
+													.equals(ksolarStationCollectList.getCollectId().trim())) {
+												jpInverter.setCapacity(KSolarConstant.Capacity
+														.get(StringUtils.lowerCase(jpCollector.getName())));
 											}
 										}
 									}
 									jpInverter.setSnCode(ksolarStationCollectData.getInverterId().trim());
 									jpInverter.setId(ksolarStationCollectData.getInverterId().trim());
-                                    jpInverter.setState(KSolarConstant.collectStaus.get(ksolarStationCollectData.getStatus()));
+									jpInverter.setState(
+											KSolarConstant.collectStaus.get(ksolarStationCollectData.getStatus()));
 									jpInverter.setCollectorId(ksolarStationCollectList.getCollectId().trim());
 									jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId().trim());
 									jpInverter.setUpdateTime(new Date());
 
-                                    jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent() != null ? ksolarStationCollectData.getPowerApparent() / 1000 : null);
+									jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent() != null
+											? ksolarStationCollectData.getPowerApparent() / 1000
+											: null);
 									jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration());
 									jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration());
 									jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration());
@@ -839,33 +812,37 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
 										jpInverterMapper.updateById(jpInverter);
 									} else {
-                                        if(StringUtils.isNotEmpty(jpInverter.getSnCode())){
+										if (StringUtils.isNotEmpty(jpInverter.getSnCode())) {
 											jpInverterMapper.insert(jpInverter);
 										}
 									}
 
-
 									String jsonString = JSON.toJSONString(ksolarStationCollectData);
 									Map<String, Object> hanlderResult = JSON.parseObject(jsonString, Map.class);
 
 									for (int k1 = 1; k1 < 13; k1++) {
-                                        JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                                eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
-                                                eq("type", "直流").
-                                                eq("name", "PV" + k1)
-                                        );
+										JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper
+												.selectOne(new QueryWrapper<JpInverterElectricity>()
+														.eq("sn_code", ksolarStationCollectData.getInverterId().trim())
+														.eq("type", "直流").eq("name", "PV" + k1));
 										if (ObjectUtils.isEmpty(jpInverterElectricity)) {
 											jpInverterElectricity = new JpInverterElectricity();
 										}
-                                        jpInverterElectricity.setInverterId(ksolarStationCollectData.getInverterId().trim());
-                                        jpInverterElectricity.setSnCode(ksolarStationCollectData.getInverterId().trim());
+										jpInverterElectricity
+												.setInverterId(ksolarStationCollectData.getInverterId().trim());
+										jpInverterElectricity
+												.setSnCode(ksolarStationCollectData.getInverterId().trim());
 										jpInverterElectricity.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                                        jpInverterElectricity.setThirdStationId(ksolarStationCollectList.getThirdStationId());
+										jpInverterElectricity
+												.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 										jpInverterElectricity.setType("直流");
 										jpInverterElectricity.setName("PV" + k1);
-                                        jpInverterElectricity.setVoltage(Double.valueOf(hanlderResult.get("voltagePv" + k1).toString()));
-                                        jpInverterElectricity.setCurrent(Double.valueOf(hanlderResult.get("currentPv" + k1).toString()));
-                                        jpInverterElectricity.setPower(Double.valueOf(hanlderResult.get("powerPv" + k1).toString()));
+										jpInverterElectricity.setVoltage(
+												Double.valueOf(hanlderResult.get("voltagePv" + k1).toString()));
+										jpInverterElectricity.setCurrent(
+												Double.valueOf(hanlderResult.get("currentPv" + k1).toString()));
+										jpInverterElectricity
+												.setPower(Double.valueOf(hanlderResult.get("powerPv" + k1).toString()));
 										if (ObjectUtils.isEmpty(jpInverterElectricity.getSequenceNbr())) {
 											jpInverterElectricityMapper.insert(jpInverterElectricity);
 										} else {
@@ -873,18 +850,19 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 										}
 									}
 
-                                    JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
-                                            eq("type", "交流").
-                                            eq("name", "RS")
-                                    );
+									JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper
+											.selectOne(new QueryWrapper<JpInverterElectricity>()
+													.eq("sn_code", ksolarStationCollectData.getInverterId().trim())
+													.eq("type", "交流").eq("name", "RS"));
 									if (ObjectUtils.isEmpty(jpInverterElectricityR)) {
 										jpInverterElectricityR = new JpInverterElectricity();
 									}
-                                    jpInverterElectricityR.setInverterId(ksolarStationCollectData.getInverterId().trim());
+									jpInverterElectricityR
+											.setInverterId(ksolarStationCollectData.getInverterId().trim());
 									jpInverterElectricityR.setSnCode(ksolarStationCollectData.getInverterId().trim());
 									jpInverterElectricityR.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                                    jpInverterElectricityR.setThirdStationId(ksolarStationCollectList.getThirdStationId());
+									jpInverterElectricityR
+											.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 									jpInverterElectricityR.setFrequency(ksolarStationCollectData.getFrequencyRs());
 									jpInverterElectricityR.setType("交流");
 									jpInverterElectricityR.setName("RS");
@@ -896,18 +874,19 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 										jpInverterElectricityMapper.updateById(jpInverterElectricityR);
 									}
 
-                                    JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
-                                            eq("type", "交流").
-                                            eq("name", "ST")
-                                    );
+									JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper
+											.selectOne(new QueryWrapper<JpInverterElectricity>()
+													.eq("sn_code", ksolarStationCollectData.getInverterId().trim())
+													.eq("type", "交流").eq("name", "ST"));
 									if (ObjectUtils.isEmpty(jpInverterElectricityS)) {
 										jpInverterElectricityS = new JpInverterElectricity();
 									}
-                                    jpInverterElectricityS.setInverterId(ksolarStationCollectData.getInverterId().trim());
+									jpInverterElectricityS
+											.setInverterId(ksolarStationCollectData.getInverterId().trim());
 									jpInverterElectricityS.setSnCode(ksolarStationCollectData.getInverterId().trim());
 									jpInverterElectricityS.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                                    jpInverterElectricityS.setThirdStationId(ksolarStationCollectList.getThirdStationId());
+									jpInverterElectricityS
+											.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 									jpInverterElectricityS.setType("交流");
 									jpInverterElectricityS.setName("ST");
 									jpInverterElectricityS.setVoltage(ksolarStationCollectData.getVoltageSt());
@@ -918,19 +897,19 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 										jpInverterElectricityMapper.updateById(jpInverterElectricityS);
 									}
 
-
-                                    JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
-                                            eq("sn_code", ksolarStationCollectData.getInverterId().trim()).
-                                            eq("type", "交流").
-                                            eq("name", "TR")
-                                    );
+									JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper
+											.selectOne(new QueryWrapper<JpInverterElectricity>()
+													.eq("sn_code", ksolarStationCollectData.getInverterId().trim())
+													.eq("type", "交流").eq("name", "TR"));
 									if (ObjectUtils.isEmpty(jpInverterElectricityT)) {
 										jpInverterElectricityT = new JpInverterElectricity();
 									}
-                                    jpInverterElectricityT.setInverterId(ksolarStationCollectData.getInverterId().trim());
+									jpInverterElectricityT
+											.setInverterId(ksolarStationCollectData.getInverterId().trim());
 									jpInverterElectricityT.setSnCode(ksolarStationCollectData.getInverterId().trim());
 									jpInverterElectricityT.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                                    jpInverterElectricityT.setThirdStationId(ksolarStationCollectList.getThirdStationId());
+									jpInverterElectricityT
+											.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 									jpInverterElectricityT.setType("交流");
 									jpInverterElectricityT.setName("TR");
 									jpInverterElectricityT.setVoltage(ksolarStationCollectData.getVoltageTr());
@@ -943,9 +922,11 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 //
 									HYGFJPInverterElecHistory hygfjpInverterElecHistory = new HYGFJPInverterElecHistory();
-                                    hygfjpInverterElecHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
+									hygfjpInverterElecHistory
+											.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 									hygfjpInverterElecHistory.setCreatedTime(System.currentTimeMillis());
-                                    hygfjpInverterElecHistory.setSnCode(ksolarStationCollectData.getInverterId().trim());
+									hygfjpInverterElecHistory
+											.setSnCode(ksolarStationCollectData.getInverterId().trim());
 
 									hygfjpInverterElecHistory.setUAcCurrent(ksolarStationCollectData.getCurrentR());
 									hygfjpInverterElecHistory.setVAcCurrent(ksolarStationCollectData.getCurrents());
@@ -959,8 +940,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 									// 逆变器历史
 									String today = DateUtil.today();
-                                    HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(
-                                            new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", ksolarStationCollectData.getInverterId()).eq("date", today));
+									HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper
+											.selectOne(new QueryWrapper<HYGFJPInverterHistory>()
+													.eq("sn_code", ksolarStationCollectData.getInverterId())
+													.eq("date", today));
 									if (ObjectUtils.isEmpty(hygfjpInverterHistory)) {
 										hygfjpInverterHistory = new HYGFJPInverterHistory();
 									}
@@ -968,11 +951,13 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									// 满发小时数
 //                        hygfjpInverterHistory.setGenerationHours(inverterDetailDto.getFullHour());
 									hygfjpInverterHistory.setDate(today);
-                                    hygfjpInverterHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
+									hygfjpInverterHistory
+											.setThirdStationId(ksolarStationCollectList.getThirdStationId());
 									hygfjpInverterHistory.setInverterId(ksolarStationCollectData.getInverterId());
 									hygfjpInverterHistory.setSnCode(jpInverter.getSnCode().trim());
 									hygfjpInverterHistory.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
-                                    hygfjpInverterHistory.setPowerGeneration(ksolarStationCollectData.getTotalGeneration());
+									hygfjpInverterHistory
+											.setPowerGeneration(ksolarStationCollectData.getTotalGeneration());
 									if (ObjectUtils.isEmpty(hygfjpInverterHistory.getCreatedTime())) {
 										hygfjpInverterHistory.setCreatedTime(System.currentTimeMillis());
 										hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
@@ -980,74 +965,89 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 										hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
 									}
 
-                                    //-----------------------户用光伏日报表----------------------
+									// -----------------------户用光伏日报表----------------------
 									TdHYGFInverterDayGenerate tdHYGFInverterDayGenerate = new TdHYGFInverterDayGenerate();
 									tdHYGFInverterDayGenerate.setCreatedTime(System.currentTimeMillis());
 									tdHYGFInverterDayGenerate.setThirdStationId(jpInverter.getThirdStationId());
 									tdHYGFInverterDayGenerate.setSnCode(jpInverter.getSnCode());
 									tdHYGFInverterDayGenerate.setName(jpInverter.getName());
 									tdHYGFInverterDayGenerate.setWorkStatus(jpInverter.getState());
-                                    //交流电压
+									// 交流电压
 									tdHYGFInverterDayGenerate.setDcv1(jpInverterElectricityR.getVoltage());
 									tdHYGFInverterDayGenerate.setDcv2(jpInverterElectricityS.getVoltage());
 									tdHYGFInverterDayGenerate.setDcv3(jpInverterElectricityT.getVoltage());
-                                    //交流电流
+									// 交流电流
 //                tdHYGFInverterDayGenerate.setDcv4(inverterDetailDto.getUAc4());
 									tdHYGFInverterDayGenerate.setDcc1(jpInverterElectricityR.getCurrent());
 									tdHYGFInverterDayGenerate.setDcc2(jpInverterElectricityS.getCurrent());
 									tdHYGFInverterDayGenerate.setDcc3(jpInverterElectricityT.getCurrent());
 //                tdHYGFInverterDayGenerate.setDcc4(inverterDetailDto.getIAc4());
-                                    //直流电压
-                                    tdHYGFInverterDayGenerate.setAcv1(Double.valueOf(hanlderResult.get("voltagePv1").toString()));
-                                    tdHYGFInverterDayGenerate.setAcv2(Double.valueOf(hanlderResult.get("voltagePv2").toString()));
-                                    tdHYGFInverterDayGenerate.setAcv3(Double.valueOf(hanlderResult.get("voltagePv3").toString()));
-                                    tdHYGFInverterDayGenerate.setAcv4(Double.valueOf(hanlderResult.get("voltagePv4").toString()));
-                                    //直流电流
-                                    tdHYGFInverterDayGenerate.setAcc1(Double.valueOf(hanlderResult.get("currentPv1").toString()));
-                                    tdHYGFInverterDayGenerate.setAcc2(Double.valueOf(hanlderResult.get("currentPv2").toString()));
-                                    tdHYGFInverterDayGenerate.setAcc3(Double.valueOf(hanlderResult.get("currentPv3").toString()));
-                                    tdHYGFInverterDayGenerate.setAcc4(Double.valueOf(hanlderResult.get("currentPv4").toString()));
-
-                                    tdHYGFInverterDayGenerate.setPv1(Double.valueOf(hanlderResult.get("powerPv1").toString()));
-                                    tdHYGFInverterDayGenerate.setPv2(Double.valueOf(hanlderResult.get("powerPv2").toString()));
-                                    tdHYGFInverterDayGenerate.setPv3(Double.valueOf(hanlderResult.get("powerPv3").toString()));
-                                    tdHYGFInverterDayGenerate.setPv4(Double.valueOf(hanlderResult.get("powerPv4").toString()));
-                                    //功率
+									// 直流电压
+									tdHYGFInverterDayGenerate
+											.setAcv1(Double.valueOf(hanlderResult.get("voltagePv1").toString()));
+									tdHYGFInverterDayGenerate
+											.setAcv2(Double.valueOf(hanlderResult.get("voltagePv2").toString()));
+									tdHYGFInverterDayGenerate
+											.setAcv3(Double.valueOf(hanlderResult.get("voltagePv3").toString()));
+									tdHYGFInverterDayGenerate
+											.setAcv4(Double.valueOf(hanlderResult.get("voltagePv4").toString()));
+									// 直流电流
+									tdHYGFInverterDayGenerate
+											.setAcc1(Double.valueOf(hanlderResult.get("currentPv1").toString()));
+									tdHYGFInverterDayGenerate
+											.setAcc2(Double.valueOf(hanlderResult.get("currentPv2").toString()));
+									tdHYGFInverterDayGenerate
+											.setAcc3(Double.valueOf(hanlderResult.get("currentPv3").toString()));
+									tdHYGFInverterDayGenerate
+											.setAcc4(Double.valueOf(hanlderResult.get("currentPv4").toString()));
+
+									tdHYGFInverterDayGenerate
+											.setPv1(Double.valueOf(hanlderResult.get("powerPv1").toString()));
+									tdHYGFInverterDayGenerate
+											.setPv2(Double.valueOf(hanlderResult.get("powerPv2").toString()));
+									tdHYGFInverterDayGenerate
+											.setPv3(Double.valueOf(hanlderResult.get("powerPv3").toString()));
+									tdHYGFInverterDayGenerate
+											.setPv4(Double.valueOf(hanlderResult.get("powerPv4").toString()));
+									// 功率
 									tdHYGFInverterDayGenerate.setTotalPower(jpInverter.getCurrentPower());
 //                                    //频率
-                                    tdHYGFInverterDayGenerate.setFrequency(String.valueOf(jpInverterElectricityR.getFrequency()));
+									tdHYGFInverterDayGenerate
+											.setFrequency(String.valueOf(jpInverterElectricityR.getFrequency()));
 //                                    //功率因数
 									tdHYGFInverterDayGenerate.setPowerFactor(1.0);
 									tdHYGFInverterDayGenerate.setDayGen(jpInverter.getDayPowerGeneration());
 									tdHYGFInverterDayGenerate.setMonthGen(jpInverter.getMonthPowerGeneration());
 									tdHYGFInverterDayGenerate.setYearGen(jpInverter.getYearPowerGeneration());
 									tdHYGFInverterDayGenerate.setTotalGen(jpInverter.getTotalPowerGeneration());
-                                    tdHYGFInverterDayGenerate.setIgbtTemp(ObjectUtils.isEmpty(jpInverter.getIgbtTemperature()) ? null : Double.valueOf(jpInverter.getIgbtTemperature()));
+									tdHYGFInverterDayGenerate
+											.setIgbtTemp(ObjectUtils.isEmpty(jpInverter.getIgbtTemperature()) ? null
+													: Double.valueOf(jpInverter.getIgbtTemperature()));
 									tdHYGFInverterDayGenerate.setIncome(null);
 									tdHYGFInverterDayGenerate.setFullhour(0.0d);
 
-                                    tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+									tdHYGFInverterDayGenerate
+											.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
 
+									// 电站区域经销商，
+									JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>()
+											.eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
+											.eq("third_station_id", String.valueOf(jpInverter.getThirdStationId())));
 
-                                    //电站区域经销商，
-                                    JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
-                                            eq("third_code",PVProducerInfoEnum.KSOLAR.getCode()).
-                                            eq("third_station_id", String.valueOf(jpInverter.getThirdStationId())));
-
-                                    if(jpStation!=null){
+									if (jpStation != null) {
 										tdHYGFInverterDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-                                        tdHYGFInverterDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+										tdHYGFInverterDayGenerate
+												.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 										tdHYGFInverterDayGenerate.setStationName(jpStation.getName());
 										tdHYGFInverterDayGenerate.setStationState(jpStation.getState());
 
 									}
 
-
-
 									tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
-                                    //户用场站月发电量
+									// 户用场站月发电量
 									Date today1 = new Date();
-                                    TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate = tdHYGFInverterMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
+									TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate = tdHYGFInverterMonthGenerateMapper
+											.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
 													.eq("third_station_id", jpInverter.getThirdStationId())
 													.eq("sn_code", jpInverter.getSnCode())
 													.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
@@ -1062,11 +1062,13 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
 									tdHYGFInverterMonthGenerate.setName(jpInverter.getName());
 
-                                    tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
-                                    //新加
-                                    if(jpStation!=null){
+									tdHYGFInverterMonthGenerate
+											.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+									// 新加
+									if (jpStation != null) {
 										tdHYGFInverterMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-                                        tdHYGFInverterMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+										tdHYGFInverterMonthGenerate
+												.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 										tdHYGFInverterMonthGenerate.setStationName(jpStation.getName());
 										tdHYGFInverterMonthGenerate.setStationState(jpStation.getState());
 
@@ -1078,8 +1080,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									} else {
 										tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
 									}
-                                    //户用场站年发电量
-                                    TdHYGFInverterYearGenerate tdHYGFInverterYearGenerate = tdHYGFInverterYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterYearGenerate>()
+									// 户用场站年发电量
+									TdHYGFInverterYearGenerate tdHYGFInverterYearGenerate = tdHYGFInverterYearGenerateMapper
+											.selectOne(new QueryWrapper<TdHYGFInverterYearGenerate>()
 													.eq("third_station_id", jpInverter.getThirdStationId())
 													.eq("sn_code", jpInverter.getSnCode())
 													.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
@@ -1094,26 +1097,28 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
 									tdHYGFInverterYearGenerate.setName(jpInverter.getName());
 
-                                    tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
+									tdHYGFInverterYearGenerate.setFullhour(
+											jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
 
-                                    //新加
-                                    if(jpStation!=null){
+									// 新加
+									if (jpStation != null) {
 										tdHYGFInverterYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-                                        tdHYGFInverterYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+										tdHYGFInverterYearGenerate
+												.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 										tdHYGFInverterYearGenerate.setStationName(jpStation.getName());
 										tdHYGFInverterYearGenerate.setStationState(jpStation.getState());
 
 									}
 
-
 									if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
 										tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
 										tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
 									} else {
 										tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
 									}
-                                    //户用场站年发电量
-                                    TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterTotalGenerate>()
+									// 户用场站年发电量
+									TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerateMapper
+											.selectOne(new QueryWrapper<TdHYGFInverterTotalGenerate>()
 													.eq("third_station_id", jpInverter.getThirdStationId())
 													.eq("sn_code", jpInverter.getSnCode())
 													.eq("year_time", DateUtil.format(today1, "yyyy"))
@@ -1128,15 +1133,17 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
 									tdHYGFInverterTotalGenerate.setFullhour(0.0d);
 									tdHYGFInverterTotalGenerate.setName(jpInverter.getName());
-                                    //新加
-                                    if(jpStation!=null){
+									// 新加
+									if (jpStation != null) {
 										tdHYGFInverterTotalGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-                                        tdHYGFInverterTotalGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+										tdHYGFInverterTotalGenerate
+												.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 										tdHYGFInverterTotalGenerate.setStationName(jpStation.getName());
 										tdHYGFInverterTotalGenerate.setStationState(jpStation.getState());
 
 									}
-                                    tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
+									tdHYGFInverterTotalGenerate.setFullhour(
+											jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
 									if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
 										tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
 										tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
@@ -1146,13 +1153,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 								});
 							}
 
-
 						}
 
-
 					}
 
-
 //                    if (!CollectionUtils.isEmpty(result)) {
 //                        result.forEach(ksolarStationCollectData -> {
 //                            JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
@@ -1360,7 +1364,6 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 	public void inverterDetail() {
 	}
 
-
 	@Scheduled(cron = "${dataRequstScheduled.keshida}")
 	@Override
 	@Async
@@ -1372,9 +1375,10 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 		} catch (InterruptedException e) {
 			throw new RuntimeException(e);
 		}
-        List<JpInverter> ksdInverterList = jpInverterMapper.selectList(new QueryWrapper<JpInverter>().
-                eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
-        ksdInverterList = ksdInverterList.stream().filter(jpInverter -> !ObjectUtils.isEmpty(jpInverter.getSnCode())).collect(Collectors.toList());
+		List<JpInverter> ksdInverterList = jpInverterMapper
+				.selectList(new QueryWrapper<JpInverter>().eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
+		ksdInverterList = ksdInverterList.stream().filter(jpInverter -> !ObjectUtils.isEmpty(jpInverter.getSnCode()))
+				.collect(Collectors.toList());
 
 		Map<String, String> ksdInverterListMap = new HashMap<>();
 		ksdInverterList.forEach(jpInverter -> {
@@ -1385,13 +1389,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 		HashMap<String, Object> requestInfo = new HashMap<>(1);
 		String requestParaminfo = JSON.toJSONString(requestInfo);
 		String url = KSolarConstant.stationCollectAlarmUrl + "?pageNumber=1&pageSize=200";
-        List<KsolarAlarmDto> result = kSolarRequestUtil.getResPonse(
-                url,
-                KSolarConstant.requestGET,
-                requestParaminfo,
-                KSolarConstant.resovle_rows,
-                KsolarAlarmDto.class
-        );
+		List<KsolarAlarmDto> result = kSolarRequestUtil.getResPonse(url, KSolarConstant.requestGET, requestParaminfo,
+				KSolarConstant.resovle_rows, KsolarAlarmDto.class);
 		if (!CollectionUtils.isEmpty(result)) {
 			for (KsolarAlarmDto ksolarAlarmDto : result) {
 				if (!ObjectUtils.isEmpty(ksolarAlarmDto.getInverterId())) {
@@ -1406,12 +1405,12 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					if (ObjectUtils.isEmpty(snCode)) {
 						continue;
 					}
-                    List<HYGFJPInverterWarn> list = hygfjpInverterWarnMapper.selectList(new QueryWrapper<HYGFJPInverterWarn>()
-                            .eq("sn_code", snCode)
-                            .eq("start_time", DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime())
+					List<HYGFJPInverterWarn> list = hygfjpInverterWarnMapper
+							.selectList(new QueryWrapper<HYGFJPInverterWarn>().eq("sn_code", snCode).eq("start_time",
+									DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN)
+											.getTime())
 									.eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
-                            .eq("third_station_id", ksolarAlarmDto.getStationId())
-                    );
+									.eq("third_station_id", ksolarAlarmDto.getStationId()));
 					HYGFJPInverterWarn hygfjpInverterWarn = new HYGFJPInverterWarn();
 					if (!ObjectUtils.isEmpty(list)) {
 						hygfjpInverterWarn = list.get(0);
@@ -1424,19 +1423,18 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 					hygfjpInverterWarn.setContent(ksolarAlarmDto.getMessage());
 					hygfjpInverterWarn.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
 					hygfjpInverterWarn.setTreatment(ksolarAlarmDto.getSolution());
-                    hygfjpInverterWarn.setStartTime(DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
+					hygfjpInverterWarn.setStartTime(
+							DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
 					hygfjpInverterWarn.setState(KSolarConstant.alarmstatus.get(ksolarAlarmDto.getStatus()));
 					hygfjpInverterWarn.setTimeLong(null);
 					hygfjpInverterWarn.setRecoverTime(null);
 
+					// 电站区域经销商，
+					JpStation jpStation = jpStationMapper.selectOne(
+							new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
+									.eq("third_station_id", ksolarAlarmDto.getStationId()));
 
-
-                    //电站区域经销商，
-                    JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
-                            eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()).
-                            eq("third_station_id", ksolarAlarmDto.getStationId()));
-
-                    if(jpStation!=null){
+					if (jpStation != null) {
 						hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
 						hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
 						hygfjpInverterWarn.setStationName(jpStation.getName());
@@ -1444,13 +1442,14 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 
 					}
 
-
-
 					if (StringUtils.isNotBlank(ksolarAlarmDto.getRemoveTime())) {
-                        hygfjpInverterWarn.setRecoverTime(DateUtil.parse(ksolarAlarmDto.getRemoveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
+						hygfjpInverterWarn.setRecoverTime(DateUtil
+								.parse(ksolarAlarmDto.getRemoveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
 					}
-                    if (!ObjectUtils.isEmpty(ksolarAlarmDto.getSaveTime()) && !ObjectUtils.isEmpty(ksolarAlarmDto.getRemoveTime())) {
-                        hygfjpInverterWarn.setTimeLong(hygfjpInverterWarn.getRecoverTime() - hygfjpInverterWarn.getStartTime());
+					if (!ObjectUtils.isEmpty(ksolarAlarmDto.getSaveTime())
+							&& !ObjectUtils.isEmpty(ksolarAlarmDto.getRemoveTime())) {
+						hygfjpInverterWarn
+								.setTimeLong(hygfjpInverterWarn.getRecoverTime() - hygfjpInverterWarn.getStartTime());
 					}
 					if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {
 						hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());

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

@@ -6,6 +6,8 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.gson.JsonObject;
+import com.qiniu.util.Json;
 import com.yeejoin.amos.api.householdapi.Utils.SunlightUtil;
 import com.yeejoin.amos.api.householdapi.constant.ImasterConstant;
 import com.yeejoin.amos.api.householdapi.constant.KSolarConstant;
@@ -114,7 +116,6 @@ public class SunlightServiceImpl implements SunlightService {
 
 		for (Sunlight sunlight : list) {
 			sunlight.setCreatedTime(System.currentTimeMillis());
-
 			sunlightMapper.insert(sunlight);
 		}
 		logger.info("-------阳光同步电站/逆变器/采集器结束" + ts + "------- " + sdf.format(new Date()));
@@ -194,36 +195,68 @@ public class SunlightServiceImpl implements SunlightService {
 
 			jpStation.setSnCode(sunlightDto.getPs_id().toString());// sncode
 
+			try {
 				Map<String, String> map = sunlightDto.getTotal_capcity();
-			jpStation.setCapacity(
-					map != null && map.get("unit") != null ? SunlightUtil.zj.get(String.valueOf(map.get("unit")))
-							* Double.valueOf(String.valueOf(map.get("value"))) : null);// 装机容量
+				if (map != null && map.get("unit") != null && !map.get("unit").isEmpty()
+						&& !"--".equals(map.get("value"))) {
+					jpStation.setCapacity(SunlightUtil.zj.get(String.valueOf(map.get("unit")))
+							* Double.valueOf(String.valueOf(map.get("value"))));// 装机容量
+				}
 
 				Map<String, String> map1 = sunlightDto.getCurr_power();
-			jpStation.setRealTimePower(
-					map1 != null && map1.get("unit") != null ? SunlightUtil.GL.get(String.valueOf(map1.get("unit")))
-							* Double.valueOf(String.valueOf(map1.get("value"))) : null);// 实时功率
+				if (map1 != null && map1.get("unit") != null && !map1.get("unit").isEmpty()
+						&& !"--".equals(map1.get("value"))) {
+					jpStation.setRealTimePower(SunlightUtil.GL.get(String.valueOf(map1.get("unit")))
+							* Double.valueOf(String.valueOf(map1.get("value"))));// 实时功率
+				}
 
 				Map<String, String> map2 = sunlightDto.getToday_energy();
-			jpStation.setDayGenerate(
-					map2 != null && map2.get("unit") != null ? SunlightUtil.fd.get(String.valueOf(map2.get("unit")))
-							* Double.valueOf(String.valueOf(map2.get("value"))) : null);// 日发电量
+				if (map2 != null && map2.get("unit") != null && !map2.get("unit").isEmpty()
+						&& !"--".equals(map2.get("value"))) {
+					jpStation.setDayGenerate(SunlightUtil.fd.get(String.valueOf(map2.get("unit")))
+							* Double.valueOf(String.valueOf(map2.get("value"))));// 日发电量
+				}
+
 				Map<String, String> map3 = sunlightDto.getTotal_energy();
-			jpStation.setAccumulatedPower(
-					map3 != null && map3.get("unit") != null ? SunlightUtil.fd.get(String.valueOf(map3.get("unit")))
-							* Double.valueOf(String.valueOf(map3.get("value"))) : null);// 累计发电量
+				if (map3 != null && map3.get("unit") != null && !map3.get("unit").isEmpty()
+						&& !"--".equals(map3.get("value"))) {
+					jpStation.setAccumulatedPower(SunlightUtil.fd.get(String.valueOf(map3.get("unit")))
+							* Double.valueOf(String.valueOf(map3.get("value"))));// 累计发电量
+				}
+
 				Map<String, String> map4 = sunlightDto.getToday_income();
-			jpStation.setDayIncome(
-					map4 != null && map4.get("unit") != null ? SunlightUtil.sy.get(String.valueOf(map4.get("unit")))
-							* Double.valueOf(String.valueOf(map4.get("value"))) : null);// 日收益
+				if (map4 != null && map4.get("unit") != null && !map4.get("unit").isEmpty()
+						&& !"--".equals(map4.get("value"))) {
+					jpStation.setDayIncome(SunlightUtil.sy.get(String.valueOf(map4.get("unit")))
+							* Double.valueOf(String.valueOf(map4.get("value"))));// 日收益
+				}
+
 				Map<String, String> map5 = sunlightDto.getTotal_income();
-			jpStation.setCumulativeIncome(
-					map5 != null && map5.get("unit") != null ? SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
-							* Double.valueOf(String.valueOf(map5.get("value"))) : null);// 累计收益
-			if (sunlightDto.getPs_fault_status() > 2) {
-				jpStation.setState(SunlightUtil.zt.get(sunlightDto.getPs_status() + ""));// 电站状态
+				if (map5 != null && map5.get("unit") != null && !map5.get("unit").isEmpty()
+						&& !"--".equals(map5.get("value"))) {
+					jpStation.setCumulativeIncome(SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
+							* Double.valueOf(String.valueOf(map5.get("value"))));// 累计收益
+				}
+
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("阳光数据错误:" + com.alibaba.fastjson.JSONObject.toJSONString(sunlightDto));
+			}
+			
+            // 0离线 1在线
+            // 1故障 2告警 4正常
+			if ("0".equals(sunlightDto.getPs_status().toString())) {
+				jpStation.setState("离线");
+			} else if ("1".equals(sunlightDto.getPs_status().toString())) {
+				if ("1".equals(sunlightDto.getPs_fault_status().toString()) || "2".equals(sunlightDto.getPs_fault_status().toString())) {
+					jpStation.setState("报警");
+				} else if ("4".equals(sunlightDto.getPs_fault_status().toString())) {
+					jpStation.setState("在线");
 				} else {
-				jpStation.setState("报警");// 电站状态
+					jpStation.setState("在线");
+				}
+			} else {
+				jpStation.setState("在线");
 			}
 
 			// 获取电站下通讯模块
@@ -307,11 +340,6 @@ public class SunlightServiceImpl implements SunlightService {
 				jpStation.setYearGenerate(js != null ? Double.valueOf(js.get(0).get("4") + "") / 1000 : null);
 				// 年收益
 				jpStation.setYearIncome(js != null ? Double.valueOf(js.get(0).get("4") + "") / 1000 : null);
-				if (!ObjectUtils.isEmpty(jpStation.getSequenceNbr())) {
-					jpStationMapper.updateById(jpStation);
-				} else {
-					jpStationMapper.insert(jpStation);
-				}
 
 				String today = DateUtil.today();
 				String hour = new Date().getHours() + ":00";
@@ -373,10 +401,17 @@ public class SunlightServiceImpl implements SunlightService {
 //                    tdJpStation.setCreatedTime(System.currentTimeMillis());
 //                    tdJpStationMapper.insert(tdJpStation);
 //                }
+			}
+			
+			if (!ObjectUtils.isEmpty(jpStation.getSequenceNbr())) {
+				jpStationMapper.updateById(jpStation);
+			} else {
+				jpStationMapper.insert(jpStation);
+			}
 
 			this.setJpInverte(listd, jpStation, listdtx);
+			
 			this.collectorDetail(listd, jpStation);
-			}
 			
 			// 电站报表
 			// 户用场站日发电量
@@ -490,7 +525,6 @@ public class SunlightServiceImpl implements SunlightService {
 			@Override
 			public void run() {
 				try {
-
 					for (Device device : devices) {
 						if (device != null) {
 							// 获取逆变器信息存库
@@ -505,12 +539,24 @@ public class SunlightServiceImpl implements SunlightService {
 							jpInverter.setSnCode(device.getDevice_sn());
 							jpInverter.setId(device.getUuid().toString());
 
-							if (device.getGetPs_fault_status() > 2) {
-								jpInverter.setState(SunlightUtil.zt.get(device.getDev_status() + ""));
+							// 0离线 1在线
+							// 1故障 2告警 4正常
+							if ("0".equals(device.getDev_status())) {
+								jpInverter.setState("离线");
+							} else if ("1".equals(device.getDev_status())) {
+								if ("1".equals(device.getDev_fault_status())
+										|| "2".equals(device.getDev_fault_status())) {
+									jpInverter.setState("报警");
+								} else if ("4".equals(device.getDev_fault_status())) {
+									jpInverter.setState("在线");
 								} else {
-								jpInverter.setState("报警");// 电站状态
+									jpInverter.setState("在线");
 								}
-
+							} else {
+								jpInverter.setState("在线");
+							}
+							// logger.error("阳光数据解析(逆变器),无法获取状态:" +
+							// com.alibaba.fastjson.JSONObject.toJSONString(device));
 							jpInverter.setUpdateTime(new Date());
 							jpInverter.setDayPowerGeneration(jpStation.getDayGenerate());
 							jpInverter.setMonthPowerGeneration(jpStation.getMonthGenerate());
@@ -916,7 +962,7 @@ public class SunlightServiceImpl implements SunlightService {
 					jpCollector.setState("报警");// 电站状态
 				}
 			} else {
-			    //如果获取不了逆变器状态 并且逆变器没状态就默认离线 
+				// 如果获取不了逆变器状态 并且逆变器没状态就默认离线
 				if (jpCollector.getState() == null) {
 					jpCollector.setState("离线");
 				}