Merge remote-tracking branch 'origin/master'

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

@@ -170,7 +170,7 @@ public class BasePhotovoltaicPlantService extends BaseService {
             ouId = input.getParentOuId();
             viewList = mapper.selectOuSonByParentOuId(record);
         }
-        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, 0);
+        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE);
         List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper);
         plantList.forEach(item -> {
             SysOrganizationView view = new SysOrganizationView();

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

@@ -18,6 +18,7 @@ import pps.core.base.mapper.BasePhotovoltaicPlantViewMapper;
 import pps.core.base.mapper.PlantPredictedPowerDataMapper;
 import pps.core.base.mapper.WeatherDataMapper;
 import pps.core.base.utils.HttpUtils;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.utils.DateUtil;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
@@ -50,7 +51,7 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
             //1.获取电站数据，并根据电站数据，获取到电站所在城市，然后获取到天气数据
             BasePhotovoltaicPlantViewMapper mapper = context.getBean(BasePhotovoltaicPlantViewMapper.class);
             BasePhotovoltaicPlantView view = new BasePhotovoltaicPlantView();
-            view.setIsDeleted(ScadaConstant.IS_DELETE_FLASE);
+            view.setIsDeleted(BusinessConstant.ONE);
             List<BasePhotovoltaicPlantView> plantList = mapper.selectPlantDetailList(view);
             for(BasePhotovoltaicPlantView item : plantList){
                 if(XStringUtils.isNotEmpty(item.getCityCode()) && XStringUtils.isNotEmpty(item.getProvinceCode())){