bug fix

src/main/java/com/tidecloud/dataacceptance/schedule/DeviceControlSchedule.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 import com.smartsanitation.common.util.ConnectException;
 import com.smartsanitation.common.util.RequestUtil;
-import com.tidecloud.dataacceptance.service.impl.DiscardServerHandler;
+import com.tidecloud.dataacceptance.service.impl.WatchServerHandler;
 
 import io.netty.channel.Channel;
 
@@ -26,8 +26,8 @@ public class DeviceControlSchedule {
     
   //  @Scheduled(cron = "0 0/1 * * * ?")
     public void settingUploadTime(){
-        Map<String, Channel> commandCopy = DiscardServerHandler.manageChannelMap;
-        Map<String, String> channelMap = DiscardServerHandler.channelMap;
+        Map<String, Channel> commandCopy = WatchServerHandler.manageChannelMap;
+        Map<String, String> channelMap = WatchServerHandler.channelMap;
         Map<String, Object> param = new HashMap<>();
         String result = null;
         if (!commandCopy.isEmpty()) {

src/main/java/com/tidecloud/dataacceptance/service/AcceptanceService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.tidecloud.dataacceptance.service.impl.DiscardServerHandler;
+import com.tidecloud.dataacceptance.service.impl.WatchServerHandler;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
@@ -27,7 +27,7 @@ public class AcceptanceService {
     private Integer port;
     
     @Autowired
-    private DiscardServerHandler watchServcie;
+    private WatchServerHandler watchServcie;
     
     @PostConstruct
     public void run() throws Exception {

src/main/java/com/tidecloud/dataacceptance/service/impl/DiscardServerHandler.java → src/main/java/com/tidecloud/dataacceptance/service/impl/WatchServerHandler.java

@@ -38,11 +38,11 @@ import redis.clients.jedis.JedisPool;
  */
 @Sharable
 @Component
-public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
+public class WatchServerHandler extends ChannelInboundHandlerAdapter {
     
     private String dataPath = "/home/service/collector_watch/rawdata/";
     // private String dataPath = "D:\\work\\rawdata1\\";
-    private static final Logger logger = LoggerFactory.getLogger(DiscardServerHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(WatchServerHandler.class);
     private static final Long TEN_M = 10485760l;
     private static final String prefixName = "watch";
     private static String PREFIX_LINK = "s.";
@@ -101,7 +101,8 @@ public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
             break;
         }
     }
-
+    
+    
     private void manageLink(Channel channel, String deviceId) {
         String channelId = UUID.randomUUID().toString();
         manageChannelMap.put(channelId, channel);
@@ -279,7 +280,7 @@ public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
             device.setStep(12);
             device.setTerminalState(12);
             device.setTimestamp(new Date());
-            new DiscardServerHandler().dataStorage(device);
+            new WatchServerHandler().dataStorage(device);
         }
     }
 

src/main/java/com/tidecloud/dataacceptance/web/WatchController.java

@@ -5,12 +5,13 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.smartsanitation.common.response.ResultWrapper;
 import com.tidecloud.dataacceptance.response.CommandCopy;
-import com.tidecloud.dataacceptance.service.impl.DiscardServerHandler;
+import com.tidecloud.dataacceptance.service.impl.WatchServerHandler;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -27,10 +28,10 @@ public class WatchController {
     
     private static final Logger logger = LoggerFactory.getLogger(WatchController.class);
     
-    @RequestMapping(value = "setting/uploadtime")
+    @RequestMapping(value = "setting/uploadtime", method = RequestMethod.GET)
     public ResultWrapper<CommandCopy> sendCommand2Device(@RequestParam String commandStr, 
                                                          @RequestParam String socketId){
-        Map<String, Channel> channelMap = DiscardServerHandler.manageChannelMap;
+        Map<String, Channel> channelMap = WatchServerHandler.manageChannelMap;
         if (channelMap.isEmpty()) {
             return ResultWrapper.ok(new CommandCopy());
         }