部分模块微调

src/main/java/com/hb/proj/allconfig/SpringMvcConfigurer.java

@@ -13,8 +13,6 @@ import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.hb.xframework.util.ApplicationContextUtils;
-
 @Configuration
 public class SpringMvcConfigurer implements WebMvcConfigurer {
 
@@ -64,15 +62,6 @@ public class SpringMvcConfigurer implements WebMvcConfigurer {
         
         return bean;
     }
-    
-    @Bean
-    public ApplicationContextUtils applicationContextUtils() {
-    	return new ApplicationContextUtils();
-    }
-    
-  
-    
-	
-
+   
 
 }

src/main/java/com/hb/proj/api/controller/APIController.java

@@ -6,6 +6,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.hb.proj.gather.business.DataTransConfig;
 import com.hb.proj.gather.protocol.ChannelGroupMgr;
 import com.hb.proj.gather.protocol.ZLOpdProtCMDEnum;
 import com.hb.proj.gather.utils.ByteUtils;
@@ -51,4 +52,26 @@ public class APIController {
 		
 		return RespVOBuilder.ok(ByteUtils.toHexString(cmdBytes));
 	}
+	
+	/**
+	 * 井参数设置更改后，通知采集程序进行更新
+	 * @param wellId
+	 * @return
+	 */
+	@RequestMapping("/synWellParams")
+	public RespVO<Object> synWellParams(@NotBlank(message="要同步的井号不能为空") String wellId){
+		DataTransConfig.reloadParams(wellId);
+		return RespVOBuilder.ok();
+	}
+	
+	/**
+	 * 井的报警设置更改后，通知采集程序进行更新
+	 * @param wellId
+	 * @return
+	 */
+	@RequestMapping("/synWellAlarams")
+	public RespVO<Object> synWellAlarams(@NotBlank(message="要同步的井号不能为空") String wellId){
+		DataTransConfig.reloadAlarms(wellId);
+		return RespVOBuilder.ok();
+	}
 }

src/main/java/com/hb/proj/gather/business/DataAssembler.java

@@ -12,6 +12,7 @@ import com.hb.proj.gather.model.SingleCombPO;
 
 /**
  * 采集数据组装器（将分批采集的数据组装成完整数据，特别是功图数据）
+ * 目前不使用线程定时检测
  * @author cwen
  *
  */

src/main/java/com/hb/proj/gather/business/DataPieceDiagramBox.java

@@ -84,7 +84,14 @@ public class DataPieceDiagramBox {
 		
 		clearPiece(othkey1,othkey2,othkey3); //组装功图后，清除原数据，避免轮询检测发现还有数据又进行功图的组装
 		
-		return new DiagramPO(channelSerial,diagramCode,disps,oths);
+		DiagramPO po = new DiagramPO(channelSerial,diagramCode,disps,oths);
+		
+		//如果是功率则清空位移数据
+		if(DiagramPO.DIAGRAM_POWER_CODE.equalsIgnoreCase(diagramCode)) {
+			clearPiece(dispCode1,dispCode2,dispCode3);
+		}
+		
+		return po;
 		
 	}
 	

src/main/java/com/hb/proj/gather/business/GatherTask.java

@@ -47,7 +47,7 @@ public class GatherTask implements Runnable{
 				channel.writeAndFlush(byteBuf);
 				channel.attr(ChannelGroupMgr.ATTR_KEY_CMD).set(cmd.name());
 				logger.info("发送完指令：{}",cmd.name());
-				channel.wait(5*1000);  //等待接收返回数据后继续，最多等待5s，此处释放锁，回复还未收到就被多值任务获得锁并发指令，会导致两个指令间隔很短
+				channel.wait(20*1000);  //等待接收返回数据后继续，最多等待5s，此处释放锁，回复还未收到就被多值任务获得锁并发指令，会导致两个指令间隔很短
 			}
 		}
 		catch (InterruptedException e) {
@@ -65,7 +65,7 @@ public class GatherTask implements Runnable{
 			
 			if(!channel.attr(ChannelGroupMgr.ATTR_KEY_DIAGRAM_READY).get()) { 
 				logger.info("功图数据还未准备就绪，准备重试一次");
-				Thread.sleep(500); //重试一次
+				Thread.sleep(1000); //重试一次
 				checkDiagramPoint(alloc);
 			}
 			
@@ -96,7 +96,7 @@ public class GatherTask implements Runnable{
 				channel.writeAndFlush(byteBuf);
 				channel.attr(ChannelGroupMgr.ATTR_KEY_CMD).set(cmd.name());
 				logger.info("发送完后指令：{}",cmd.name());
-				channel.wait(10*1000);  //等待接收返回数据后继续，最多等待10s
+				channel.wait(20*1000);  //等待接收返回数据后继续，最多等待10s
 			}
 		}
 		catch (InterruptedException e) {
@@ -112,6 +112,7 @@ public class GatherTask implements Runnable{
 		byteBuf.writeBytes(preCmd.getCmd());
 		channel.writeAndFlush(byteBuf);
 		channel.attr(ChannelGroupMgr.ATTR_KEY_CMD).set(preCmd.name());
+		logger.info("发送完后指令：{}",preCmd.name());
 		channel.wait(10*1000);
 	}
 }