Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -496,7 +496,7 @@ public class WorkOrderManageController {
         ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
                 loginUser.getTenantId(),
                 loginUser.getCompanyId(),
-                workOrderManage.getOrderTypeId());
+                orderTypeId);
         if(processDefinition == null){
            return new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能派单！");
         }

sms_water/src/main/java/com/huaxu/controller/HomePageReportController.java

@@ -94,6 +94,13 @@ public class HomePageReportController {
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.monitorDataFifteenDays(sceneId,"水厂",3));
     }
 
+    @RequestMapping(value = "getWaterMakingFifteenDaysForPumpingStation",method = RequestMethod.GET)
+    @ApiOperation(value = "综合展示——泵站制水15天")
+    public AjaxMessage<List<DeviceWaterSupply>> getWaterMakingFifteenDaysForPumpingStation(
+            @ApiParam(value = "泵站id",required = true) @RequestParam Integer sceneId){
+        return new AjaxMessage<>(ResultStatus.OK,homePageReportService.monitorDataFifteenDays(sceneId,"泵站",3));
+    }
+
     @RequestMapping(value = "getWaterQualityRateForWaterSource",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——水库水质")
     public AjaxMessage<WaterQualityRateForScene> waterQualityRateForWaterSource(

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataServiceImpl.java

@@ -174,23 +174,21 @@ public class MonitorDataServiceImpl implements MonitorDataService , Initializing
                 dateTime = dateTime.plusHours(-1);
                 //设备id
                 deviceIds = lastHourDataMap.values().stream().map(d -> d.getDeviceId().intValue()).distinct().collect(Collectors.toList());
-                if(deviceIds.size()>0){
+                if(deviceIds.size() ==0){break;}
 
-                    //前几小时有统计数据的设备id
-                    List<Integer> deviceIdsIsExit = monitorDataMapper.checkReportDataExit(dateTime.getYear(),dateTime.getMonthValue(),dateTime.getDayOfMonth(),dateTime.getHour(),deviceIds);
-                    //需要补充数据的设备
-                    deviceIds = deviceIds.stream().filter(deviceId -> !deviceIdsIsExit.contains(deviceId)).collect(Collectors.toList());
-                    if(deviceIds.size()>0) {
+                //前几小时有统计数据的设备id
+                List<Integer> deviceIdsIsExit = monitorDataMapper.checkReportDataExit(dateTime.getYear(),dateTime.getMonthValue(),dateTime.getDayOfMonth(),dateTime.getHour(),deviceIds);
+                //需要补充数据的设备
+                deviceIds = deviceIds.stream().filter(deviceId -> !deviceIdsIsExit.contains(deviceId)).collect(Collectors.toList());
+                if(deviceIds.size() ==0){break;}
 
-                        //查询需要补充数据的设备数据信息
-                        hourDatas = new ArrayList<>(lastHourDataMap.values());
+                //查询需要补充数据的设备数据信息
+                hourDatas = lastHourDataMap.values().stream().filter(d -> !deviceIdsIsExit.contains(d.getDeviceId())).collect(Collectors.toList());
 
-                        lastHourDatas = getMonitorDataGroupByHour(dateTime.plusHours(-1), deviceIds);
-                        lastHourDataMap = lastHourDatas.stream().collect(Collectors.toMap(DayReportEntity::getMapkey, a -> a, (k1, k2) -> k1));
-                        //保存日报表数据
-                        saveReportDataByHour(hourDatas, lastHourDataMap);
-                    }
-                }
+                lastHourDatas = getMonitorDataGroupByHour(dateTime.plusHours(-1), deviceIds);
+                lastHourDataMap = lastHourDatas.stream().collect(Collectors.toMap(DayReportEntity::getMapkey, a -> a, (k1, k2) -> k1));
+                //保存日报表数据
+                saveReportDataByHour(hourDatas, lastHourDataMap);
             }
         }
 
@@ -233,11 +231,4 @@ public class MonitorDataServiceImpl implements MonitorDataService , Initializing
         monitorDataMapper.batchInsertYearReport(dateTime.getYear(),dateTime.getMonthValue());
     }
 
-
-
-
-
-
-
-
 }

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -231,6 +231,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 			tenantMenuEntity.setMenuImage(menu.getMenuImage());
 			tenantMenuEntity.setMenuName(menu.getName());
 			tenantMenuEntity.setMenuSeq(menu.getSeq());
+			tenantMenuEntity.setRemark(menu.getRemark());
 		}
 		boolean isOk = false;
 		switch (userType) {

user_center/src/main/resources/mapper/TenantMapper.xml

@@ -162,7 +162,7 @@
     <!-- 生成租户菜单 -->
     <insert id="createTenantMenu">
         insert into uims_tenant_menu (TENANT_ID ,MENU_ID ,MENU_NAME ,MENU_IMAGE ,MENU_SEQ ,LINK_PATH ,STATUS
-        ,DATE_CREATE ,CREATE_BY ,DATE_UPDATE ,UPDATE_BY)
+        ,DATE_CREATE ,CREATE_BY ,DATE_UPDATE ,UPDATE_BY,REMARK)
         select
             #{tenantId},
             id,
@@ -174,7 +174,8 @@
             now(),
             #{userName},
             now(),
-            #{userName}
+            #{userName},
+            remark
         from uims_menu
         where id in (
         <foreach collection="menuIds" item="item" index="index" separator=",">