diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java
index f708839..ab4163d 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java
@@ -90,6 +90,7 @@ public class ScreenController extends BaseController {
         }
         return successful(kilnInfoList);
     }
+
     @PostMapping(value = "getEleList")
     @ApiOperation(value = "获取加工炉最近十条加工任务电能消耗信息")
     public R countEleByKiln(@Validated @RequestBody IdParam idParam) {
@@ -447,6 +448,7 @@ public class ScreenController extends BaseController {
         if (parRotSpeedValueList.size() > 0) {
             if (kilnType == 1) {
                 List<EnergyVo> rot1Consume = new ArrayList<>();
+                List<EnergyVo> rot2Consume = new ArrayList<>();
                 for (ParRotSpeedValue parRotSpeedValue : parRotSpeedValueList
                 ) {
                     EnergyVo rot1Vo = EnergyVo.builder().build();
@@ -456,8 +458,17 @@ public class ScreenController extends BaseController {
                     rot1Vo.setValue(parRotSpeedValue.getOilStiSpeedAValue());
                     rot1Vo.setTime(parRotSpeedValue.getCreateTime());
                     rot1Consume.add(rot1Vo);
+
+                    EnergyVo rot2Vo = EnergyVo.builder().build();
+                    rot2Vo.setCode(currTask.getStoveCode());
+                    rot2Vo.setUnit("转/min");
+                    rot2Vo.setName("2号油搅拌转速");
+                    rot2Vo.setValue(parRotSpeedValue.getOilStiSpeedBValue());
+                    rot2Vo.setTime(parRotSpeedValue.getCreateTime());
+                    rot2Consume.add(rot2Vo);
                 }
                 rot1ConsumeList.add(rot1Consume);
+                rot2ConsumeList.add(rot2Consume);
             }
         }
         //温度趋势（实际温度、设定温度）油槽温度外区温度
@@ -559,9 +570,27 @@ public class ScreenController extends BaseController {
                     setTempVo.setName("设定温度");
                     setupTempConsume.add(setTempVo);
 
+                    EnergyVo outer1TempVo = EnergyVo.builder().build();
+                    outer1TempVo.setTime(parTemValue.getCreateTime());
+                    outer1TempVo.setCode(currTask.getStoveCode());
+                    outer1TempVo.setUnit("℃");
+                    outer1TempVo.setValue(parTemValue.getOuterZone1Temp());
+                    outer1TempVo.setName("外一区温度");
+                    outerZone1TempConsume.add(outer1TempVo);
+
+                    EnergyVo outer2TempVo = EnergyVo.builder().build();
+                    outer2TempVo.setTime(parTemValue.getCreateTime());
+                    outer2TempVo.setCode(currTask.getStoveCode());
+                    outer2TempVo.setUnit("℃");
+                    outer2TempVo.setValue(parTemValue.getOuterZone2Temp());
+                    outer2TempVo.setName("外二区温度");
+                    outerZone2TempConsume.add(outer2TempVo);
+
                 }
                 tempConsumeList.add(actualTempConsume);
                 tempConsumeList.add(setupTempConsume);
+                outerZone1TempConsumeList.add(outerZone1TempConsume);
+                outerZone2TempConsumeList.add(outerZone2TempConsume);
             }
         }
         map.put("checkResult", checkResultList);
@@ -579,6 +608,7 @@ public class ScreenController extends BaseController {
         map.put("ammon", ammoniaConsumeList);
         map.put("car", carbonConsumeList);
         map.put("rot1", rot1ConsumeList);
+        map.put("rot2", rot2ConsumeList);
         map.put("temp", tempConsumeList);
         map.put("oilTemp", oilTempConsumeList);
         return successful(JSONObject.parseObject(JSON.toJSONString(map)));