Merge remote-tracking branch 'origin/master'

C02-system/pps-core-system/src/main/java/pps/core/system/mapper/SysOrganizationViewMapper.java

@@ -76,4 +76,6 @@ public interface SysOrganizationViewMapper {
      * @return {@link List}<{@link SysOrganizationView}>
      */
     List<SysOrganizationView> selectOrgAndLineList(SysOrganizationView record);
+
+    SysOrganizationView selectOrgProvince(SysOrganizationView record);
 }

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -585,4 +585,16 @@
          WHERE ou_id = #{id}
          ORDER BY modify_time DESC)
     </select>
+
+    <select id="selectOrgProvince" parameterType="pps.core.system.entity.SysOrganizationView" resultMap="BaseResultMap">
+        SELECT
+            province ,
+            sa.name province_name
+        from
+            sys_organization so
+                left join sys_area sa on
+                sa.id = so.province
+        where
+            so.id = #{id}
+    </select>
 </mapper>

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java

@@ -113,9 +113,15 @@ public class BasePhotovoltaicPlantService extends BaseService{
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
         }
-        //根据组织机构的路径获取
         GetBasePhotovoltaicPlantOutput output = new GetBasePhotovoltaicPlantOutput();
         XCopyUtils.copyObject(entity, output);
+        //根据组织机构的路径获取
+        SysOrganizationViewMapper organizationViewMapper = context.getBean(SysOrganizationViewMapper.class);
+        SysOrganizationView organizationView = new SysOrganizationView();
+        organizationView.setId(entity.getOuId());
+        organizationView = organizationViewMapper.selectOrgProvince(organizationView);
+        if(null != organizationView)
+            output.setProvince(organizationView.getProvinceName());
         return XSingleResult.success(output);
     }
     @XText("分页查询")

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherCloudServiceImpl.java

@@ -307,6 +307,9 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
                 for (PlantPredictedPowerDataEnt item :allList ){
                     mapper.insert(item);
                 }
+                //自动调用预测接口
+                HttpUtils.send2("http://127.0.0.1:10098/aiprediction/xgbreason?plantId=" + plantId,
+                        "");
             }
         }catch (Exception e) {
             context.getLogger().error(e.getMessage());