diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
index 0bc3a8a86..e022b3e5c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
@@ -16,6 +16,7 @@ import com.zhgd.xmgl.modules.environment.mapper.EnvironmentDevMapper;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper;
 import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
+import com.zhgd.xmgl.modules.sprayrt.service.ISprayRtDevService;
 import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import com.zhgd.xmgl.util.WindDirectionUtils;
@@ -49,6 +50,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
     @Autowired
     private AsyncEnvironment asyncEnvironment;
 
+
     @Override
     public List<DustNoiseData> selectDustNoiseData(Map<String, Object> map) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
index e7dd4dc18..9c271c758 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
@@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
 import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
+import com.zhgd.xmgl.modules.sprayrt.service.ISprayRtDevService;
 import com.zhgd.xmgl.util.DateUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -51,8 +52,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
     private EnvironmentAlarmMapper environmentAlarmMapper;
     @Autowired
     private EnvironmentWarningMapper environmentWarningMapper;
-    /*@Autowired
-    private NoticeMapper noticeMapper;*/
     @Autowired
     private INoticeService noticeService;
     @Autowired
@@ -67,6 +66,8 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
     private String videoAnalysisUrl;
     @Value("${serverUrl}")
     private String serverUrl;
+    @Autowired
+    private ISprayRtDevService sprayRtDevService;
 
     @Override
     public IPage<EntityMap> queryEnvironmentAlarmPageList(Map<String, Object> map) {
@@ -95,7 +96,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
         List<Long> alarmIdList = new ArrayList<>();
         if (Objects.equals(dustNoiseData.getNoiseAlarmType(), 1) && alarmMap != null && alarmMap.getNoiseWarning() != null && dustNoiseData.getNoise() != null
                 && dustNoiseData.getNoise().doubleValue() >= alarmMap.getNoiseWarning()) {
-            //if () {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
             environmentAlarm.setAlarmTypeId(3L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
@@ -126,13 +126,11 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
 
         } else {
             if (Objects.equals(dustNoiseData.getNoiseAlarmType(), 1) && warningMap != null && warningMap.getNoiseWarning() != null && dustNoiseData.getNoise() != null
                     && dustNoiseData.getNoise().doubleValue() >= warningMap.getNoiseWarning().doubleValue()) {
-                //if (dustNoiseData.getNoise().doubleValue() > Double.valueOf(warningMap.get("noiseWarning").toString())) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
                 environmentAlarm.setAlarmTypeId(3L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
@@ -162,7 +160,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
 
             }
@@ -172,9 +169,7 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
         // 比较实时 PM2.5
         if (Objects.equals(dustNoiseData.getPm25AlarmType(), 1) && alarmMap != null && alarmMap.getPm25Warning() != null && dustNoiseData.getPm25() != null
                 && dustNoiseData.getPm25().doubleValue() >= alarmMap.getPm25Warning().doubleValue()) {
-            //if (dustNoiseData.getPm25().doubleValue() > Double.valueOf(alarmMap.get("pm25Warning").toString())) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(1L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getPm25().doubleValue());
@@ -204,15 +199,15 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
 
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
         } else {
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
+
             if (Objects.equals(dustNoiseData.getPm25AlarmType(), 1) && warningMap != null && warningMap.getPm25Warning() != null && dustNoiseData.getPm25() != null
                     && dustNoiseData.getPm25().doubleValue() >= warningMap.getPm25Warning().doubleValue()) {
-                //if (dustNoiseData.getPm25().doubleValue() > Double.valueOf(warningMap.get("pm25Warning").toString())) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(1L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getPm25().doubleValue());
@@ -241,7 +236,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
 
             }
@@ -249,9 +243,7 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
         // 比较实时 PM10
         if (Objects.equals(dustNoiseData.getPm10AlarmType(), 1) && alarmMap != null && alarmMap.getPm10Warning() != null && dustNoiseData.getPm10() != null
                 && dustNoiseData.getPm10().doubleValue() >= alarmMap.getPm10Warning().doubleValue()) {
-            //if (dustNoiseData.getPm10().doubleValue() > Double.valueOf(alarmMap.get("pm10Warning").toString())) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(2L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getPm10().doubleValue());
@@ -281,14 +273,14 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
         } else {
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
+
             if (Objects.equals(dustNoiseData.getPm10AlarmType(), 1) && warningMap != null && warningMap.getPm10Warning() != null && dustNoiseData.getPm10() != null
                     && dustNoiseData.getPm10().doubleValue() >= warningMap.getPm10Warning().doubleValue()) {
-                //if (dustNoiseData.getPm10().doubleValue() > Double.valueOf(warningMap.get("pm10Warning").toString())) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(2L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getPm10().doubleValue());
@@ -317,7 +309,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    // jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
             }
         }
@@ -325,9 +316,7 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
         // 比较实时 Tsp
         if (Objects.equals(dustNoiseData.getTspAlarmType(), 1) && alarmMap != null && alarmMap.getRealTimeTsp() != null && dustNoiseData.getTsp() != null
                 && dustNoiseData.getTsp().doubleValue() >= alarmMap.getRealTimeTsp().doubleValue()) {
-            //if (dustNoiseData.getTsp().doubleValue() > (Double) alarmMap.get("realTimeTsp")) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(6L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getTsp().doubleValue());
@@ -357,15 +346,15 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
 
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
         } else {
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
+
             if (Objects.equals(dustNoiseData.getTspAlarmType(), 1) && warningMap != null && warningMap.getRealTimeTsp() != null && dustNoiseData.getTsp() != null
                     && dustNoiseData.getTsp().doubleValue() >= warningMap.getRealTimeTsp().doubleValue()) {
-                //if (dustNoiseData.getTsp().doubleValue() > (Double) warningMap.get("realTimeTsp")) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(6L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getTsp().doubleValue());
@@ -394,16 +383,13 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
             }
         }
         //风速
         if (Objects.equals(dustNoiseData.getWindSpeedAlarmType(), 1) && alarmMap != null && alarmMap.getWindSpeed() != null && dustNoiseData.getWindspeed() != null
                 && dustNoiseData.getWindspeed().doubleValue() >= alarmMap.getWindSpeed().doubleValue()) {
-            //if (dustNoiseData.getWindspeed().doubleValue() > (Double) alarmMap.get("windSpeed")) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(5L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getWindspeed().doubleValue());
@@ -432,14 +418,11 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
         } else {
             if (Objects.equals(dustNoiseData.getWindSpeedAlarmType(), 1) && warningMap != null && warningMap.getWindSpeed() != null && dustNoiseData.getWindspeed() != null
                     && dustNoiseData.getWindspeed().doubleValue() >= warningMap.getWindSpeed().doubleValue()) {
-                //if (dustNoiseData.getWindspeed().doubleValue() > (Double) warningMap.get("windSpeed")) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(5L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getWindspeed().doubleValue());
@@ -467,7 +450,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
 
             }
@@ -475,9 +457,7 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
         //最高温度
         if (Objects.equals(dustNoiseData.getTemperatureAlarmType(), 1) && alarmMap != null && alarmMap.getMaxTemperature() != null && dustNoiseData.getTemperature() != null
                 && dustNoiseData.getTemperature().doubleValue() >= alarmMap.getMaxTemperature().doubleValue()) {
-            //if (dustNoiseData.getTemperature().doubleValue() > (Double) alarmMap.get("maxTemperature")) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(7L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getTemperature().doubleValue());
@@ -507,14 +487,11 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
         } else {
             if (Objects.equals(dustNoiseData.getTemperatureAlarmType(), 1) && warningMap != null && warningMap.getMaxTemperature() != null && dustNoiseData.getTemperature() != null
                     && dustNoiseData.getTemperature().doubleValue() >= warningMap.getMaxTemperature().doubleValue()) {
-                //if (dustNoiseData.getTemperature().doubleValue() > (Double) warningMap.get("maxTemperature")) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(7L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getTemperature().doubleValue());
@@ -543,18 +520,13 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
 
             }
-            //}
         }
-        //最低温度
         if (Objects.equals(dustNoiseData.getTemperatureAlarmType(), 1) && alarmMap != null && alarmMap.getMinTemperature() != null && dustNoiseData.getTemperature() != null
                 && dustNoiseData.getTemperature().doubleValue() <= alarmMap.getMinTemperature().doubleValue()) {
-            //if (dustNoiseData.getTemperature().doubleValue() < (Double) alarmMap.get("minTemperature")) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(7L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getTemperature().doubleValue());
@@ -584,15 +556,12 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
 
         } else {
             if (Objects.equals(dustNoiseData.getTemperatureAlarmType(), 1) && warningMap != null && warningMap.getMinTemperature() != null && dustNoiseData.getTemperature() != null
                     && dustNoiseData.getTemperature().doubleValue() <= warningMap.getMinTemperature().doubleValue()) {
-                //if (dustNoiseData.getTemperature().doubleValue() < (Double) warningMap.get("minTemperature")) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(7L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getTemperature().doubleValue());
@@ -621,19 +590,15 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
 
             }
 
-            //}
         }
         //湿度
         if (Objects.equals(dustNoiseData.getHumidityAlarmType(), 1) && alarmMap != null && alarmMap.getRealTimeHumidity() != null && dustNoiseData.getHumidity() != null
                 && dustNoiseData.getHumidity().doubleValue() >= alarmMap.getRealTimeHumidity().doubleValue()) {
-            //if (dustNoiseData.getHumidity().doubleValue()>(Double) alarmMap.get("realTimeHumidity")) {
             EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-            // environmentAlarmService.saveAlarm();
             environmentAlarm.setAlarmTypeId(8L);
             environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
             environmentAlarm.setAvgData(dustNoiseData.getHumidity().doubleValue());
@@ -663,15 +628,12 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     notice.setType("7");
                     noticeService.addNotice(notice, true);
                 }
-                //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备报警",title ,msg,  null);
             }
 
         } else {
             if (Objects.equals(dustNoiseData.getHumidityAlarmType(), 1) && warningMap != null && warningMap.getRealTimeHumidity() != null && dustNoiseData.getHumidity() != null
                     && dustNoiseData.getHumidity().doubleValue() >= warningMap.getRealTimeHumidity().doubleValue()) {
-                //if (dustNoiseData.getHumidity().doubleValue()>(Double) warningMap.get("realTimeHumidity")) {
                 EnvironmentAlarm environmentAlarm = new EnvironmentAlarm();
-                // environmentAlarmService.saveAlarm();
                 environmentAlarm.setAlarmTypeId(8L);
                 environmentAlarm.setAlarmTime(new Timestamp(System.currentTimeMillis()));
                 environmentAlarm.setAvgData(dustNoiseData.getHumidity().doubleValue());
@@ -700,7 +662,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                         notice.setType("7");
                         noticeService.addNotice(notice, true);
                     }
-                    //jpushClientUtil.sendToAliases(String.valueOf(pushPerson),"扬尘监测设备预警",title ,msg,  null);
                 }
 
 
@@ -725,27 +686,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
         }
     }
 
-   /* public static void main(String[] args) {
-        List<Map<String,Object>> list=new ArrayList<>();
-        Map<String,Object> video=new HashMap<>();
-        video.put("appId","24017757");
-        video.put("appSecret","VJz0FbzmE6drPQ7egsBi");
-        video.put("ip","182.101.141.23");
-        video.put("port","18443");
-        video.put("serialNumber","34ad8813a79d4cbaaebdbeaddaa53598");
-        list.add(video);
-        List<Integer> alarmIdList=new ArrayList<>();
-        alarmIdList.add(1);
-        Map<String,Object> object=new HashMap<>();
-        object.put("projectSn","78C47B615CE44A8394105E32EB014BBC");
-        object.put("videoList",list);
-        object.put("dataId",alarmIdList);
-        object.put("type",1);
-        log.info(JSONUtil.toJsonStr(object));
-        String result=HttpUtil.postJson("http://127.0.0.1:6500/api/analysisVideo", JSONUtil.toJsonStr(object));
-        log.info(result);
-    }*/
-
     @Override
     public List<NewEnvironmentAlarmVo> selectNewEnvironmentAlarmList(Map<String, Object> map) {
         return environmentAlarmMapper.selectNewEnvironmentAlarmList(map);
@@ -780,7 +720,6 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                 } else {
                     map.put("companyType", 5);
                 }
-                //map.put("companyType",MapUtils.getString(result,"type"));
                 List<Map<String, Object>> dataList = environmentAlarmMapper.selectHistoryEnvironmentAlarmList(map);
                 List<Map<String, Object>> tempList = new ArrayList<>();
                 for (String day : dayList) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java b/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java
index e87042e4e..17feacb94 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java
@@ -55,6 +55,8 @@ public class SprayRtDev implements Serializable {
 	@Excel(name = "项目sn", width = 15)
 	@ApiModelProperty(value = "项目sn")
 	private java.lang.String projectSn;
+	@ApiModelProperty(value = "喷淋模式：1手动模式2自动模式")
+	private java.lang.Integer sprayMode;
 	/**
 	 * 创建时间 yyyy-MM-dd HH:mm:ss
 	 */
diff --git a/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java b/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java
index efd2c50c9..323e13cc1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java
@@ -24,4 +24,6 @@ public interface ISprayRtDevService extends IService<SprayRtDev> {
     void edit(SprayRtDev sprayRtDev);
 
     void editByDevSn(SprayRtDev sprayRtDev);
+
+    void setSwitchStatusIf(String projectSn, Integer switchStatus);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/impl/SprayRtDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/impl/SprayRtDevServiceImpl.java
index 969870309..36b385739 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/impl/SprayRtDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sprayrt/service/impl/SprayRtDevServiceImpl.java
@@ -2,24 +2,24 @@ package com.zhgd.xmgl.modules.sprayrt.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhgd.jeecg.common.execption.OpenAlertException;
-import com.zhgd.xmgl.modules.sprayrt.entity.SprayRtDev;
-import com.zhgd.xmgl.modules.sprayrt.mapper.SprayRtDevMapper;
-import com.zhgd.xmgl.modules.sprayrt.service.ISprayRtDevService;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.util.PageUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.modules.sprayrt.entity.SprayRtDev;
+import com.zhgd.xmgl.modules.sprayrt.mapper.SprayRtDevMapper;
+import com.zhgd.xmgl.modules.sprayrt.service.ISprayRtDevService;
+import com.zhgd.xmgl.util.PageUtil;
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
-
-import com.zhgd.xmgl.util.RefUtil;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Objects;
 
 /**
  * @Description: 喷淋榕图-设备
@@ -80,4 +80,21 @@ public class SprayRtDevServiceImpl extends ServiceImpl<SprayRtDevMapper, SprayRt
         BeanUtil.copyProperties(sprayRtDev, d);
         sprayRtDevMapper.updateById(d);
     }
+
+    /**
+     * @param projectSn
+     * @param switchStatus 开关状态，1关，2开
+     */
+    @Override
+    public void setSwitchStatusIf(String projectSn, Integer switchStatus) {
+        List<SprayRtDev> devs = sprayRtDevMapper.selectList(new LambdaQueryWrapper<SprayRtDev>()
+                .eq(SprayRtDev::getDevSn, projectSn));
+        for (SprayRtDev dev : devs) {
+            if (Objects.equals(dev.getSprayMode(), 2)) {
+                dev.setSwitchStatus(switchStatus);
+                sprayRtDevMapper.updateById(dev);
+            }
+        }
+
+    }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDataController.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDataController.java
index 5b08c79e7..7697e0353 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDataController.java
@@ -1,11 +1,16 @@
 package com.zhgd.xmgl.modules.stablewater.controller;
 
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
+import com.zhgd.xmgl.base.entity.vo.TrendVo;
+import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
 import com.zhgd.xmgl.modules.stablewater.service.IStableWaterMixStationDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParams;
+
 import java.util.HashMap;
+
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
@@ -141,4 +146,37 @@ public class StableWaterMixStationDataController {
 		return result;
 	}
 
+
+	@ApiOperation(value = "各设备产量趋势", notes = "各设备产量趋势", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"),
+	})
+	@PostMapping(value = "/countConcreteMixStationDataTrend")
+	public Result<List<TrendVo>> countConcreteMixStationDataTrend(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+		return Result.success(stableWaterMixStationDataService.countConcreteMixStationDataTrend(paramMap));
+	}
+
+	@ApiOperation(value = "统计混凝土拌合站生产数据（实时监测）", notes = "统计混凝土拌合站生产数据（实时监测）", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"),
+	})
+	@PostMapping(value = "/countConcreteMixStationData")
+	public Result<CountConcreteMixStationDataVo> countConcreteMixStationData(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+		return Result.success(stableWaterMixStationDataService.countConcreteMixStationData(paramMap));
+	}
+
+	@ApiOperation(value = "各配比产量", notes = "各配比产量", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"),
+			@ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"),
+	})
+	@PostMapping(value = "/countPowerLevel")
+	public Result<SectorVo> countPowerLevel(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+		return Result.success(stableWaterMixStationDataService.countPowerLevel(paramMap));
+	}
+
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationRawMaterialDataController.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationRawMaterialDataController.java
index 7b74034eb..2e24a3dd7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationRawMaterialDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationRawMaterialDataController.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.stablewater.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
 import com.zhgd.xmgl.modules.stablewater.service.IStableWaterMixStationRawMaterialDataService;
 import io.swagger.annotations.Api;
@@ -180,14 +181,24 @@ public class StableWaterMixStationRawMaterialDataController {
 		}
 
 		//Step.2 AutoPoi 导出Excel
-		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-		List<StableWaterMixStationRawMaterialData> pageList = stableWaterMixStationRawMaterialDataService.list(queryWrapper);
-		//导出文件名称
-		mv.addObject(NormalExcelConstants.FILE_NAME, "水稳拌合站原材数据列表");
-		mv.addObject(NormalExcelConstants.CLASS, StableWaterMixStationRawMaterialData.class);
-		mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("水稳拌合站原材数据列表数据", "导出人:Jeecg", "导出信息"));
-		mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-		return mv;
-	}
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<StableWaterMixStationRawMaterialData> pageList = stableWaterMixStationRawMaterialDataService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "水稳拌合站原材数据列表");
+        mv.addObject(NormalExcelConstants.CLASS, StableWaterMixStationRawMaterialData.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("水稳拌合站原材数据列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
 
+    @ApiOperation(value = "原材用量统计", notes = "原材用量统计", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"),
+    })
+    @PostMapping(value = "/countMaterialName")
+    public Result<SectorVo> countMaterialName(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(stableWaterMixStationRawMaterialDataService.countMaterialName(paramMap));
+    }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationDataMapper.java
index 28662ed88..e295fa7e5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationDataMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationDataMapper.java
@@ -4,11 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
+import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
+import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationData;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -23,4 +28,11 @@ public interface StableWaterMixStationDataMapper extends BaseMapper<StableWaterM
     List<StableWaterMixStationData> queryList(@Param(Constants.WRAPPER) QueryWrapper<StableWaterMixStationData> queryWrapper);
 
     IPage<StableWaterMixStationData> queryList(Page<StableWaterMixStationData> page, @Param(Constants.WRAPPER) QueryWrapper<StableWaterMixStationData> queryWrapper);
+
+    List<TrendOneVo> countConcreteMixStationDataTrend(HashMap<String, Object> paramMap);
+
+    CountConcreteMixStationDataVo countConcreteMixStationData(HashMap<String, Object> paramMap);
+
+
+    ArrayList<SectorOneVo> countPowerLevel(HashMap<String, Object> paramMap);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java
index 5cbb3ceb5..830492cb9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java
@@ -1,7 +1,9 @@
 package com.zhgd.xmgl.modules.stablewater.mapper;
 
+import java.util.HashMap;
 import java.util.List;
 
+import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface StableWaterMixStationRawMaterialDataMapper extends BaseMapper<StableWaterMixStationRawMaterialData> {
 
+    List<SectorOneVo> countMaterialName(HashMap<String, Object> paramMap);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationDataMapper.xml
index 950f45056..46b5604b8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationDataMapper.xml
@@ -6,4 +6,72 @@
         join stable_water_mix_station_dev d on d.dev_sn=swmsd.dev_sn
         ${ew.customSqlSegment}
     </select>
+
+    <select id="countConcreteMixStationDataTrend" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
+        select
+        <if test="type == '1'.toString()">
+            date_format(scsj, '%H:00') x,
+        </if>
+        <if test="type == '2'.toString()">
+            date_format(scsj, '%Y-%m-%d') x,
+        </if>
+        <if test="type == '3'.toString()">
+            date_format(scsj, '%Y-%m-%d') x,
+        </if>
+        ifnull(sum(scsl),0) y,
+        dev_sn sn
+        from stable_water_mix_station_data
+        where project_sn = #{projectSn}
+        <if test="type == '1'.toString()">
+            and scsj > current_date
+            group by dev_sn, date_format(scsj, '%Y-%m-%d %H:00')
+        </if>
+        <if test="type == '2'.toString()">
+            and scsj > date_sub(scsj, interval 6 day)
+            group by dev_sn, date_format(scsj, '%Y-%m-%d')
+        </if>
+        <if test="type == '3'.toString()">
+            and scsj > date_sub(scsj, interval 29 day)
+            group by dev_sn, date_format(scsj, '%Y-%m-%d')
+        </if>
+    </select>
+
+    <select id="countConcreteMixStationData"
+            resultType="com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo">
+        select ifnull(sum(if(scsj > current_date, scsl, 0)), 0) dailyOutput,
+        ifnull(sum(scsl), 0) totalOutput,
+        ifnull(sum(if(scsj > current_date, 1, 0)), 0) dayNumber,
+        count(*) totalNumber
+        from stable_water_mix_station_data
+        where 1 = 1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+    </select>
+
+
+    <select id="countPowerLevel" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
+        select qddj name,ifnull(sum(scsl),0) count
+        from stable_water_mix_station_data
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+        <if test="type == '1'.toString()">
+            and scsj > current_date
+        </if>
+        <if test="type == '2'.toString()">
+            and scsj > date_sub(scsj,interval 6 day)
+        </if>
+        <if test="type == '3'.toString()">
+            and scsj > date_sub(scsj,interval 29 day)
+        </if>
+        group by qddj
+    </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml
index c1c1f067b..0ce734f7d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/xml/StableWaterMixStationRawMaterialDataMapper.xml
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.stablewater.mapper.StableWaterMixStationRawMaterialDataMapper">
+    <select id="countMaterialName" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
+        select clmc name,ifnull(sum(sjhl),0) count
+        from stable_water_mix_station_raw_material_data
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+        <if test="type == '1'.toString()">
+            and create_date > current_date
+        </if>
+        <if test="type == '2'.toString()">
+            and create_date > date_sub(create_date,interval 6 day)
+        </if>
+        <if test="type == '3'.toString()">
+            and create_date > date_sub(create_date,interval 29 day)
+        </if>
+        group by clmc
+        order by count desc
+    </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java
index 542456d8d..d41c32e8b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java
@@ -1,8 +1,12 @@
 package com.zhgd.xmgl.modules.stablewater.service;
 
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
+import com.zhgd.xmgl.base.entity.vo.TrendVo;
+import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationData;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.HashMap;
 import java.util.List;
 
@@ -21,4 +25,11 @@ public interface IStableWaterMixStationDataService extends IService<StableWaterM
     void add(StableWaterMixStationData stableWaterMixStationData);
 
     void edit(StableWaterMixStationData stableWaterMixStationData);
+
+    SectorVo countPowerLevel(HashMap<String, Object> paramMap);
+
+    List<TrendVo> countConcreteMixStationDataTrend(HashMap<String, Object> paramMap);
+
+    CountConcreteMixStationDataVo countConcreteMixStationData(HashMap<String, Object> paramMap);
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java
index 9c5f284b0..c0221deb7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.stablewater.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@ public interface IStableWaterMixStationRawMaterialDataService extends IService<S
     void add(StableWaterMixStationRawMaterialData stableWaterMixStationRawMaterialData);
 
     void edit(StableWaterMixStationRawMaterialData stableWaterMixStationRawMaterialData);
+
+    SectorVo countMaterialName(HashMap<String, Object> paramMap);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java
index 7a177ae3a..479cb56f6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java
@@ -8,6 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
+import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
+import com.zhgd.xmgl.base.entity.vo.TrendVo;
+import com.zhgd.xmgl.enums.ParamEnum;
+import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
+import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationDev;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationData;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationDev;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
@@ -17,15 +24,19 @@ import com.zhgd.xmgl.modules.stablewater.mapper.StableWaterMixStationDevMapper;
 import com.zhgd.xmgl.modules.stablewater.mapper.StableWaterMixStationRawMaterialDataMapper;
 import com.zhgd.xmgl.modules.stablewater.mapper.StableWaterMixStationSetDataMapper;
 import com.zhgd.xmgl.modules.stablewater.service.IStableWaterMixStationDataService;
+import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RefUtil;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 水稳拌合站数据
@@ -116,4 +127,40 @@ public class StableWaterMixStationDataServiceImpl extends ServiceImpl<StableWate
     public void edit(StableWaterMixStationData stableWaterMixStationData) {
         baseMapper.updateById(stableWaterMixStationData);
     }
+
+    @Override
+    public List<TrendVo> countConcreteMixStationDataTrend(HashMap<String, Object> paramMap) {
+        String projectSn = MapUtils.getString(paramMap, "projectSn");
+        Integer type = MapUtils.getInteger(paramMap, "type");
+        List<TrendVo> trendVos = stableWaterMixStationDevMapper.selectList(new LambdaQueryWrapper<StableWaterMixStationDev>()
+                .eq(StableWaterMixStationDev::getProjectSn, projectSn)).stream().map(c -> new TrendVo(c.getDevName(), c.getDevSn())).collect(Collectors.toList());
+        List<TrendOneVo> list = baseMapper.countConcreteMixStationDataTrend(paramMap);
+        if (Objects.equals(type, 1)) {
+            List<String> dateTimeStrList = DateUtils.getDateTimeStrList(100, "HH:00");
+            String format = "HH:00";
+            return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format);
+        } else if (Objects.equals(type, 2)) {
+            List<String> dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd");
+            String format = "yyyy-MM-dd";
+            return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format);
+        } else if (Objects.equals(type, 3)) {
+            List<String> dateTimeStrList = DateUtils.getDateTimeStrList(80, "yyyy-MM-dd");
+            String format = "yyyy-MM-dd";
+            return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public CountConcreteMixStationDataVo countConcreteMixStationData(HashMap<String, Object> paramMap) {
+        return baseMapper.countConcreteMixStationData(paramMap);
+    }
+
+
+    @Override
+    public SectorVo countPowerLevel(HashMap<String, Object> paramMap) {
+        ArrayList<SectorOneVo> list = baseMapper.countPowerLevel(paramMap);
+        return SectorVo.getSectorVo(list);
+    }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationRawMaterialDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationRawMaterialDataServiceImpl.java
index 6378767c5..eac9befe3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationRawMaterialDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationRawMaterialDataServiceImpl.java
@@ -1,5 +1,7 @@
 package com.zhgd.xmgl.modules.stablewater.service.impl;
 
+import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
 import com.zhgd.xmgl.modules.stablewater.mapper.StableWaterMixStationRawMaterialDataMapper;
 import com.zhgd.xmgl.modules.stablewater.service.IStableWaterMixStationRawMaterialDataService;
@@ -66,4 +68,10 @@ public class StableWaterMixStationRawMaterialDataServiceImpl extends ServiceImpl
     public void edit(StableWaterMixStationRawMaterialData stableWaterMixStationRawMaterialData) {
         baseMapper.updateById(stableWaterMixStationRawMaterialData);
     }
+
+    @Override
+    public SectorVo countMaterialName(HashMap<String, Object> paramMap) {
+        List<SectorOneVo> list = baseMapper.countMaterialName(paramMap);
+        return SectorVo.getSectorVo(list);
+    }
 }