增加颜色亮灯

src/main/java/com/neotel/smfcore/custom/Inventec1562/controller/InventecLightController.java

@@ -239,9 +239,9 @@ public class InventecLightController {
         String smfColor = LightColor.getColor(color);
         String smfColor = LightColor.getColor(color);
 
 
         String side = "";
         String side = "";
-        if ("R".equals(color) || "G".equals(color) || "B".equals(color)){
+        if ("R".equals(color) || "G".equals(color) || "B".equals(color) || "O".equals(color)){
             side = "A";
             side = "A";
-        } else if ("Y".equals(color) || "P".equals(color) || "C".equals(color)){
+        } else if ("Y".equals(color) || "P".equals(color) || "C".equals(color) || "W".equals(color)){
             side = "B";
             side = "B";
         }
         }
         String opName = LightAction.getOpName(action);
         String opName = LightAction.getOpName(action);
@@ -249,7 +249,7 @@ public class InventecLightController {
         String cid = storage.getCid();
         String cid = storage.getCid();
         String opKey = "lightHouseOpenOrClose";
         String opKey = "lightHouseOpenOrClose";
         String opValue = opName+"="+side+"="+smfColor;
         String opValue = opName+"="+side+"="+smfColor;
-        log.info(cid + "对应的key为:" + opKey + "value为:" + opValue);
+        log.info(cid + "对应的key为:" + opKey + ",value为:" + opValue);
         DevicesStatusUtil.clearOp(cid, opKey, opValue);
         DevicesStatusUtil.clearOp(cid, opKey, opValue);
         DevicesStatusUtil.appendOp(cid, opKey, opValue);
         DevicesStatusUtil.appendOp(cid, opKey, opValue);
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");

src/main/java/com/neotel/smfcore/custom/Inventec1562/enums/LightColor.java

@@ -4,10 +4,12 @@ public enum LightColor {
     R("red"),
     R("red"),
     G("green"),
     G("green"),
     B("blue"),
     B("blue"),
+    O("yellow"),
 
 
     Y("red"),
     Y("red"),
     P("green"),
     P("green"),
-    C("blue");
+    C("blue"),
+    W("yellow");
 
 
     private final String blue;
     private final String blue;