对接plc

@@ -99,7 +99,7 @@ public class ControlDeviceConreoller extends BaseController {
         String body = new String(bodyBytes, request.getCharacterEncoding());
         String body = new String(bodyBytes, request.getCharacterEncoding());
         DeviceCommand deviceCommand = new DeviceCommand();
         DeviceCommand deviceCommand = new DeviceCommand();
         deviceCommand.setDeviceId(deviceId);
         deviceCommand.setDeviceId(deviceId);
-        deviceCommand.setCommandType(CommandType.write);
+        deviceCommand.setCommandType(CommandType.read);
         deviceCommand.setData(GsonConstructor.get().fromJson(body,JsonObject.class));
         deviceCommand.setData(GsonConstructor.get().fromJson(body,JsonObject.class));
         return rocketMqSendService.deviceControl(deviceCommand);
         return rocketMqSendService.deviceControl(deviceCommand);
     }
     }

@@ -101,31 +101,36 @@ public class MNPLCProtocolParserFactoryImpl implements ProtocolParserFactory {
                     number_name = keyArr[0]+"区"+keyArr[2]+"号"+iotProductPlcDevice.getName()+keyArr[2];
                     number_name = keyArr[0]+"区"+keyArr[2]+"号"+iotProductPlcDevice.getName()+keyArr[2];
                     if("YEL".equals(identifier))
                     if("YEL".equals(identifier))
                     {
                     {
-                        int type = jsonObject.get(key.replace("SENSOR","TYPE")).getAsInt();
-                        if(type==0)
+                        String yuerlTypeKey = key.replace(data_identifier,"TYPE");
+                        if (jsonObject.has(yuerlTypeKey))
                         {
                         {
-                            continue;
-                        }
-                        number += "_"+keyArr[3];
-                        number_name += keyArr[3]+"号探头";
-                        if (data_identifier.equals("SENSOR"))
-                        {
-                            switch (type)
+                            int type = jsonObject.get(yuerlTypeKey).getAsInt();
+                            if(type==0)
                             {
                             {
-                                case 3:
-                                    data_identifier = "pH";
-                                    break;
-                                case 5:
-                                    data_identifier = "dom";
-                                    break;
-                                case 16:
-                                    data_identifier = "yw";
-                                    break;
-                                case 17:
-                                    data_identifier = "yl";
-                                    break;
+                                continue;
+                            }
+                            number += "_"+keyArr[3];
+                            number_name += keyArr[3]+"号探头";
+                            if (data_identifier.equals("SENSOR"))
+                            {
+                                switch (type)
+                                {
+                                    case 3:
+                                        data_identifier = "pH";
+                                        break;
+                                    case 5:
+                                        data_identifier = "dom";
+                                        break;
+                                    case 16:
+                                        data_identifier = "yw";
+                                        break;
+                                    case 17:
+                                        data_identifier = "yl";
+                                        break;
+                                }
                             }
                             }
                         }
                         }
+
                     }
                     }
                 }
                 }
 
 

@@ -28,6 +28,7 @@ public class DeviceCommandListenServiceImpl implements DeviceCommandServiceFacto
     private static final Logger log = LoggerFactory.getLogger(DeviceCommandListenServiceImpl.class);
     private static final Logger log = LoggerFactory.getLogger(DeviceCommandListenServiceImpl.class);
     @Override
     @Override
     public NoticeMessageDto read(String deviceId, JsonObject jsonObject) {
     public NoticeMessageDto read(String deviceId, JsonObject jsonObject) {
+        log.info("不支持读功能");
         return null;
         return null;
     }
     }
 
 
@@ -40,7 +41,7 @@ public class DeviceCommandListenServiceImpl implements DeviceCommandServiceFacto
         noticeMessageDto.setTopic(topic);
         noticeMessageDto.setTopic(topic);
         noticeMessageDto.setTopicconfig(topicModel);
         noticeMessageDto.setTopicconfig(topicModel);
 
 
-        //将jsonObject里面的两层键值比如：{"1":{"key","value","key1",1}}提取成一层放在commdjson里面如{"key":"value","key1":1}
+        //将{"0":"a,b,c","1":"a,b,c"}变成{"A_SYS_0_"}
         JsonObject commdjson = flattenJsonObject(jsonObject);
         JsonObject commdjson = flattenJsonObject(jsonObject);
 
 
         noticeMessageDto.setCommd(commdjson.toString().getBytes());
         noticeMessageDto.setCommd(commdjson.toString().getBytes());

@@ -36,7 +36,8 @@
 * LEVEL：液位值
 * LEVEL：液位值
 * MODE：运行模式
 * MODE：运行模式
 * OTHER：现场扩展参数
 * OTHER：现场扩展参数
-* 
+* YWJC: 液位计自动控制
+* CXCLEAN: 冲洗次数清零
 
 
 格式示例：`A_TLJ_1_RUN`
 格式示例：`A_TLJ_1_RUN`
 
 

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.io.*;
@@ -29,6 +30,7 @@ public class LogController {
     @Autowired
     @Autowired
     private DeviceCommandListenService deviceCommandListenService;
     private DeviceCommandListenService deviceCommandListenService;
     @ApiOperation("获取")
     @ApiOperation("获取")
+    @ResponseBody
     @RequestMapping(value = "getOperation_token",method = RequestMethod.GET)
     @RequestMapping(value = "getOperation_token",method = RequestMethod.GET)
     public String getOperation_token()
     public String getOperation_token()
     {
     {

@@ -11,11 +11,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 
 import java.util.Map;
 import java.util.Map;
 
 
 @Api(tags = "系统运行接口")
 @Api(tags = "系统运行接口")
-@Controller
+@RestController
 @RequestMapping("/sys")
 @RequestMapping("/sys")
 public class SysConfigController {
 public class SysConfigController {