提交首航接口更新

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/SoFarConstant.java

@@ -15,12 +15,11 @@ public class SoFarConstant {
 		}
 	};
 
-	public static String baseurl = "https://openapi.sofarsolarmonitor.com";
+	public static String baseurl = "https://openapi.sofarcloud.com/openapi-switch";
 	public static String appId = "447430219192733696";
 	public static String appSecret = "5881ee8c062817016a2b34425c45937d";
 	public static String corporationId = "447430928264990720";
 	public static String account = "18120415291";
-
 	public static String password = "ZXNK123456..";
 
 	public static String tokenurl = "/account/auth/createToken";

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdWxController.java

@@ -174,7 +174,7 @@ public class PeasantHouseholdWxController extends BaseController {
         } catch (Exception e) {
         	e.printStackTrace();
             log.error(e.getMessage());
-            if (null != peasantHousehold) {
+            if (null != peasantHousehold&&!StringUtils.isEmpty(peasantHousehold.getAmosUserId())) {
                 log.error("调用平台接口回滚注册的用户 => {}", e, peasantHousehold.getAmosUserId());
                 // 调用平台接口回滚注册的用户
                 RequestContext.setAppKey("AMOS_STUDIO");

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -856,7 +856,15 @@ public class MonitorFanIdxController extends BaseController {
         wrapper.eq("station_basic_id", stationBasic.getSequenceNbr());
         wrapper.groupBy("monthly");
         List<Map<String, Object>> list1 = StationPlanMapper.selectMaps(wrapper);
-        Double sumValue = list1 != null && !list1.isEmpty() ? (Double) list1.get(0).get("data_value") : 0;
+        Double sumValue =0.0;
+        if(list1!=null) 
+        {
+        	for(Map<String, Object> map :list1) 
+        	{
+        		sumValue += map.get("data_value")!=null?Double.valueOf(String.valueOf(map.get("data_value"))):0;
+        	}
+        }
+       // Double sumValue = list1 != null && !list1.isEmpty() ? (Double) list1.get(0).get("data_value") : 0;
 
         columnMap.put("年发电量完成率(%)", String.format("%.2f", Double.parseDouble(columnMap.get("年发电量").toString()) / sumValue * 100));