#定时任务bug修改

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/MainConstants.java

@@ -35,7 +35,7 @@ public interface MainConstants {
 	String LOAD_HOME_TARGET = "loadHomeTarget";
 
 	// 水利-泵站实时数据
-	String LOAD_WATER_PUMP_REAL = "loadWaterPumpReal";
+		String LOAD_WATER_PUMP_REAL = "loadWaterPumpReal";
 
 	// 水利-站点水位数据
 	String LOAD_WATER_LEVEL = "loadWaterLevel";

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IPushMsgClient.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface IPushMsgClient {
 
 	String API_PREFIX = "/feign/message";
-	String PUSH_MESSAGE_MAIL = API_PREFIX + "/sendMail";
+		String PUSH_MESSAGE_MAIL = API_PREFIX + "/sendMail";
 	String PUSH_MESSAGE_SMS = API_PREFIX + "/sendSms";
 	String PUSH_MESSAGE_APP = API_PREFIX + "/sendPush";
 	String PUSH_MESSAGE_WEB = API_PREFIX + "/sendWebsocket";

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java

@@ -189,6 +189,7 @@ public class RealTargetServiceImpl implements RealTargetService {
 			HydropowerUnitRealVo real = new HydropowerUnitRealVo();
 			real.setDeptId(device.getCreateDept());
 			real.setDeviceCode(device.getEmCode());
+			real.setOrd(device.getOrd());
 			real.setDeptName(device.getName());
 			real.setDeviceName(device.getName());
 			// 装机容量
@@ -935,8 +936,7 @@ public class RealTargetServiceImpl implements RealTargetService {
 	private Map<Integer, String> getWaterLevelMap(String instanceCode, String signage) {
 		String beginTime = DateUtil.format(new Date(), DateUtil.PATTERN_DATE)  +  " 00:00:00";
 		String endTime = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME);
-		AnalyseCodeByAnalyseDataPO po = new AnalyseCodeByAnalyseDataPO();
-		List<AnalyseDataTaosVO> datas = dataService.periodTargetData(beginTime, endTime,2, 6,instanceCode,signage);
+		List<AnalyseDataTaosVO> datas = dataService.periodTargetData(beginTime, endTime,6, 2,instanceCode,signage);
 		if(CollectionUtil.isEmpty(datas)){
 			return new HashMap<>();
 		}

hzims-service/hzims-scheduled/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -9,7 +9,9 @@
             `NUMBER` AS emCode,
             CREATE_DEPT AS createDept,
             RUN_STATUS AS runStatus,
-            EM_INDEX AS ord
+            EM_INDEX AS ord,
+            LGTD,
+            LTTD
         FROM
             `hzims_em_info`
         WHERE

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/CentralMonitorServiceImpl.java

@@ -112,14 +112,15 @@ public class CentralMonitorServiceImpl implements CentralMonitorService {
             StationEntity station = stationService.getOne(Wrappers.<StationEntity>lambdaQuery()
                     .eq(StationEntity::getCode,code)
             );
-            if(ObjectUtil.isEmpty(station)){
+            if(ObjectUtil.isNotEmpty(station)){
                 pointDataVo.setStationName(station.getName());
             }
             return pointDataVo;
         }).collect(Collectors.toList());
 
-        IPage<PointDataVo> iPage = new Page(data.getCurrent(), data.getSize());
+        IPage<PointDataVo> iPage = new Page<>(data.getCurrent(), data.getSize());
         iPage.setRecords(collect);
+        iPage.setTotal(originalDataByRealIds.getData().getTotal());
         return iPage;
     }
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java

@@ -327,7 +327,7 @@ public class WaterServiceImpl implements IWaterService {
 	 */
 	private List<HzimsAnalyzeModelStationEntity> getModelStationList() {
 		// 水利站点(All)
-		List<StationEntity> stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,true);
+		List<StationEntity> stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,false);
 		if(CollectionUtil.isEmpty(stationList)){
 			return null;
 		}
@@ -827,7 +827,7 @@ public class WaterServiceImpl implements IWaterService {
 	@Override
 	public WaterConservancyVo waterConservancy(Long deptId) {
 		// 查询水利站点
-		List<StationEntity> stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,true);
+		List<StationEntity> stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,false);
 		if (CollectionUtil.isEmpty(stations)) {
 			return new WaterConservancyVo();
 		}
@@ -888,7 +888,7 @@ public class WaterServiceImpl implements IWaterService {
 	public List<WaterDetailsVo> waterDetails(Long deptId) {
 		// 获取区域map ： key-区域机构  value-水利站点集合
 		// 获取区域或者站点map结构
-		Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true);
+		Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false);
 		if(MapUtils.isEmpty(map)){
 			return null;
 		}
@@ -933,7 +933,7 @@ public class WaterServiceImpl implements IWaterService {
 	@Override
 	public List<WaterRankingVo> waterUseEleRanking(Long deptId) {
 		// 获取区域map ： key-区域机构  value-水利站点集合
-		Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true);
+		Map<Dept,List<StationEntity>> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false);
 		if(MapUtils.isEmpty(map)){
 			return null;
 		}
@@ -1002,7 +1002,7 @@ public class WaterServiceImpl implements IWaterService {
 			return null;
 		}
 		// 获取水利站点
-		List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true);
+		List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false);
 		if(CollectionUtil.isEmpty(stationList)){
 			return null;
 		}
@@ -1062,7 +1062,7 @@ public class WaterServiceImpl implements IWaterService {
 			return null;
 		}
 		// 获取水利站点
-		List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true);
+		List<StationEntity> stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false);
 		if(CollectionUtil.isEmpty(stationList)){
 			return null;
 		}