Compare commits

..

No commits in common. 'feature/ldra' and 'master' have entirely different histories.

  1. 4
      src/main/java/com/palnet/comn/model/CtrCntrlModel.java
  2. 11
      src/main/java/com/palnet/server/handler/WebHandler.java

4
src/main/java/com/palnet/comn/model/CtrCntrlModel.java

@ -104,7 +104,7 @@ public class CtrCntrlModel implements Comparable<CtrCntrlModel>{
list.sort(Comparator.naturalOrder());
System.out.println("Sorting ASC");
System.out.println("오름차순 정렬");
for(CtrCntrlModel data :list) {
System.out.println(data.getControlStartDt());
@ -112,7 +112,7 @@ public class CtrCntrlModel implements Comparable<CtrCntrlModel>{
list.sort(Comparator.reverseOrder());
System.out.println("Sorting DESC");
System.out.println("내림차순 정렬");
for(CtrCntrlModel data :list) {
System.out.println(data.getControlStartDt());

11
src/main/java/com/palnet/server/handler/WebHandler.java

@ -29,12 +29,12 @@ import java.nio.charset.Charset;
@Slf4j
public class WebHandler extends SimpleChannelInboundHandler<WebSocketFrame> {
private final Logger logger = LoggerFactory.getLogger(getClass());
private Logger logger = LoggerFactory.getLogger(getClass());
private final CtrCntrlTaskService taskService;
private final CtrHistoryShareContext context;
private final ObjectMapper objectMapper;
private CtrCntrlTaskService taskService;
private CtrHistoryShareContext context;
private ObjectMapper objectMapper;
public WebHandler() {
this.taskService = (CtrCntrlTaskService) ContextUtils.getBean("ctrCntrlTaskService");
@ -42,8 +42,7 @@ public class WebHandler extends SimpleChannelInboundHandler<WebSocketFrame> {
this.objectMapper = JsonUtils.getObjectMapper();
}
private final ChannelCollection cc = new ChannelCollection();
ChannelCollection cc = new ChannelCollection();
@Override
protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) throws Exception {

Loading…
Cancel
Save