diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 2b8f450..dbd1eed 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -11,19 +11,18 @@ /** * 多功能1 */ - String MULTI_DEVOCDE1="512023010001"; - + String RAIN_GAUGE1="864708062717627"; /** * 多功能2 */ - String MULTI_DEVOCDE2="512023010002"; + String RAIN_GAUGE2="864708062669653"; /** * 多功能3 */ - String MULTI_DEVOCDE3="512023010003"; + String RAIN_GAUGE3="864708062689073"; /** * 多功能4 */ - String MULTI_DEVOCDE4="512023010004"; + String RAIN_GAUGE4="864708062626919"; } diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 2b8f450..dbd1eed 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -11,19 +11,18 @@ /** * 多功能1 */ - String MULTI_DEVOCDE1="512023010001"; - + String RAIN_GAUGE1="864708062717627"; /** * 多功能2 */ - String MULTI_DEVOCDE2="512023010002"; + String RAIN_GAUGE2="864708062669653"; /** * 多功能3 */ - String MULTI_DEVOCDE3="512023010003"; + String RAIN_GAUGE3="864708062689073"; /** * 多功能4 */ - String MULTI_DEVOCDE4="512023010004"; + String RAIN_GAUGE4="864708062626919"; } diff --git a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java index 5465cb5..a736029 100644 --- a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java +++ b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java @@ -12,10 +12,10 @@ { put(RAIN_GAUGE, "1"); put(HUMI_TEMP, "2"); - put(MULTI_DEVOCDE1, "3"); - put(MULTI_DEVOCDE2, "4"); - put(MULTI_DEVOCDE3, "5"); - put(MULTI_DEVOCDE4, "6"); + put(RAIN_GAUGE1, "3"); + put(RAIN_GAUGE2, "4"); + put(RAIN_GAUGE3, "5"); + put(RAIN_GAUGE4, "6"); } }); diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 2b8f450..dbd1eed 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -11,19 +11,18 @@ /** * 多功能1 */ - String MULTI_DEVOCDE1="512023010001"; - + String RAIN_GAUGE1="864708062717627"; /** * 多功能2 */ - String MULTI_DEVOCDE2="512023010002"; + String RAIN_GAUGE2="864708062669653"; /** * 多功能3 */ - String MULTI_DEVOCDE3="512023010003"; + String RAIN_GAUGE3="864708062689073"; /** * 多功能4 */ - String MULTI_DEVOCDE4="512023010004"; + String RAIN_GAUGE4="864708062626919"; } diff --git a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java index 5465cb5..a736029 100644 --- a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java +++ b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java @@ -12,10 +12,10 @@ { put(RAIN_GAUGE, "1"); put(HUMI_TEMP, "2"); - put(MULTI_DEVOCDE1, "3"); - put(MULTI_DEVOCDE2, "4"); - put(MULTI_DEVOCDE3, "5"); - put(MULTI_DEVOCDE4, "6"); + put(RAIN_GAUGE1, "3"); + put(RAIN_GAUGE2, "4"); + put(RAIN_GAUGE3, "5"); + put(RAIN_GAUGE4, "6"); } }); diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index e9427ca..a79d6c5 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -26,11 +26,13 @@ @Override public RelayStatusDTO datagram(String msg) { if (msg.toLowerCase().contains(rainFallMark)) { + log.info("雨量计报文为----"+msg); //去掉补位 String devcode = msg.substring(0, 15); String defaultStrValue = msg.substring(26, 30); long defaultValue = Long.parseLong(defaultStrValue, 16); log.info("设备编号为" + devcode + ",设备数据为" + defaultValue); + RainFallData rainFallData = initRainFallData(devcode, defaultValue); rainFallDataMapper.insert(rainFallData); Integer isAlarm = isAlarm(String.valueOf(defaultValue), alarmLevelConfig.getRainfall()); diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 2b8f450..dbd1eed 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -11,19 +11,18 @@ /** * 多功能1 */ - String MULTI_DEVOCDE1="512023010001"; - + String RAIN_GAUGE1="864708062717627"; /** * 多功能2 */ - String MULTI_DEVOCDE2="512023010002"; + String RAIN_GAUGE2="864708062669653"; /** * 多功能3 */ - String MULTI_DEVOCDE3="512023010003"; + String RAIN_GAUGE3="864708062689073"; /** * 多功能4 */ - String MULTI_DEVOCDE4="512023010004"; + String RAIN_GAUGE4="864708062626919"; } diff --git a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java index 5465cb5..a736029 100644 --- a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java +++ b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java @@ -12,10 +12,10 @@ { put(RAIN_GAUGE, "1"); put(HUMI_TEMP, "2"); - put(MULTI_DEVOCDE1, "3"); - put(MULTI_DEVOCDE2, "4"); - put(MULTI_DEVOCDE3, "5"); - put(MULTI_DEVOCDE4, "6"); + put(RAIN_GAUGE1, "3"); + put(RAIN_GAUGE2, "4"); + put(RAIN_GAUGE3, "5"); + put(RAIN_GAUGE4, "6"); } }); diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index e9427ca..a79d6c5 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -26,11 +26,13 @@ @Override public RelayStatusDTO datagram(String msg) { if (msg.toLowerCase().contains(rainFallMark)) { + log.info("雨量计报文为----"+msg); //去掉补位 String devcode = msg.substring(0, 15); String defaultStrValue = msg.substring(26, 30); long defaultValue = Long.parseLong(defaultStrValue, 16); log.info("设备编号为" + devcode + ",设备数据为" + defaultValue); + RainFallData rainFallData = initRainFallData(devcode, defaultValue); rainFallDataMapper.insert(rainFallData); Integer isAlarm = isAlarm(String.valueOf(defaultValue), alarmLevelConfig.getRainfall()); diff --git a/src/main/java/com/casic/server/ReceiverServerHandler.java b/src/main/java/com/casic/server/ReceiverServerHandler.java index 507fa09..5346f35 100644 --- a/src/main/java/com/casic/server/ReceiverServerHandler.java +++ b/src/main/java/com/casic/server/ReceiverServerHandler.java @@ -1,6 +1,7 @@ package com.casic.server; +import com.alibaba.fastjson.JSON; import com.casic.enums.RelaySwitchEnums; import com.casic.model.RelayStatusDTO; import com.casic.resolver.DatagramResolver; @@ -15,7 +16,6 @@ import io.netty.util.concurrent.GlobalEventExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; @@ -77,19 +77,26 @@ ); } } - if (msg instanceof ByteBuf) { - log.info(ByteBufUtil.hexDump((ByteBuf) msg)); - } +// if (msg instanceof ByteBuf) { +// ByteBuf +// log.info(ByteBufUtil.hexDump((ByteBuf) msg)); +// } super.channelRead(ctx, msg); } + private void frozenInvalidByteBuf(ByteBuf byteBuf) { + byteBuf.resetReaderIndex(); + byteBuf.readBytes(byteBuf.writerIndex()); + byteBuf.markReaderIndex(); + } + private void sendMsg(ChannelHandlerContext ctx, RelayStatusDTO relayStatusDTO) { if (!ObjectUtils.isEmpty(relayStatusDTO)) { ByteBuf out = ByteBufAllocator.DEFAULT.heapBuffer(); String switchContent = preFix + relayStatusDTO.getChannelName() + "," + relayStatusDTO.getLampSwitch() + postFix; // for (int i = 1; i < 6; i++) { // switchConent = preFix + relayStatusDTO.getChannelName() + "," + 1 + postFix; - System.out.println(switchContent); + log.info(JSON.toJSONString(relayStatusDTO)+"-------"+switchContent); out.writeBytes(switchContent.getBytes()); channels.forEach(channel -> { if (channel.isActive()) { diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 2b8f450..dbd1eed 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -11,19 +11,18 @@ /** * 多功能1 */ - String MULTI_DEVOCDE1="512023010001"; - + String RAIN_GAUGE1="864708062717627"; /** * 多功能2 */ - String MULTI_DEVOCDE2="512023010002"; + String RAIN_GAUGE2="864708062669653"; /** * 多功能3 */ - String MULTI_DEVOCDE3="512023010003"; + String RAIN_GAUGE3="864708062689073"; /** * 多功能4 */ - String MULTI_DEVOCDE4="512023010004"; + String RAIN_GAUGE4="864708062626919"; } diff --git a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java index 5465cb5..a736029 100644 --- a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java +++ b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java @@ -12,10 +12,10 @@ { put(RAIN_GAUGE, "1"); put(HUMI_TEMP, "2"); - put(MULTI_DEVOCDE1, "3"); - put(MULTI_DEVOCDE2, "4"); - put(MULTI_DEVOCDE3, "5"); - put(MULTI_DEVOCDE4, "6"); + put(RAIN_GAUGE1, "3"); + put(RAIN_GAUGE2, "4"); + put(RAIN_GAUGE3, "5"); + put(RAIN_GAUGE4, "6"); } }); diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index e9427ca..a79d6c5 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -26,11 +26,13 @@ @Override public RelayStatusDTO datagram(String msg) { if (msg.toLowerCase().contains(rainFallMark)) { + log.info("雨量计报文为----"+msg); //去掉补位 String devcode = msg.substring(0, 15); String defaultStrValue = msg.substring(26, 30); long defaultValue = Long.parseLong(defaultStrValue, 16); log.info("设备编号为" + devcode + ",设备数据为" + defaultValue); + RainFallData rainFallData = initRainFallData(devcode, defaultValue); rainFallDataMapper.insert(rainFallData); Integer isAlarm = isAlarm(String.valueOf(defaultValue), alarmLevelConfig.getRainfall()); diff --git a/src/main/java/com/casic/server/ReceiverServerHandler.java b/src/main/java/com/casic/server/ReceiverServerHandler.java index 507fa09..5346f35 100644 --- a/src/main/java/com/casic/server/ReceiverServerHandler.java +++ b/src/main/java/com/casic/server/ReceiverServerHandler.java @@ -1,6 +1,7 @@ package com.casic.server; +import com.alibaba.fastjson.JSON; import com.casic.enums.RelaySwitchEnums; import com.casic.model.RelayStatusDTO; import com.casic.resolver.DatagramResolver; @@ -15,7 +16,6 @@ import io.netty.util.concurrent.GlobalEventExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; @@ -77,19 +77,26 @@ ); } } - if (msg instanceof ByteBuf) { - log.info(ByteBufUtil.hexDump((ByteBuf) msg)); - } +// if (msg instanceof ByteBuf) { +// ByteBuf +// log.info(ByteBufUtil.hexDump((ByteBuf) msg)); +// } super.channelRead(ctx, msg); } + private void frozenInvalidByteBuf(ByteBuf byteBuf) { + byteBuf.resetReaderIndex(); + byteBuf.readBytes(byteBuf.writerIndex()); + byteBuf.markReaderIndex(); + } + private void sendMsg(ChannelHandlerContext ctx, RelayStatusDTO relayStatusDTO) { if (!ObjectUtils.isEmpty(relayStatusDTO)) { ByteBuf out = ByteBufAllocator.DEFAULT.heapBuffer(); String switchContent = preFix + relayStatusDTO.getChannelName() + "," + relayStatusDTO.getLampSwitch() + postFix; // for (int i = 1; i < 6; i++) { // switchConent = preFix + relayStatusDTO.getChannelName() + "," + 1 + postFix; - System.out.println(switchContent); + log.info(JSON.toJSONString(relayStatusDTO)+"-------"+switchContent); out.writeBytes(switchContent.getBytes()); channels.forEach(channel -> { if (channel.isActive()) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 795fda7..fa60dc2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 11315 + port: 5907 ################### spring配置 ################### spring: datasource: diff --git a/pom.xml b/pom.xml index 0eaadd9..5b11d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,11 +25,11 @@ 2.4.5 - - org.springframework.boot - spring-boot-starter-tomcat - 2.4.5 - + + + + + com.oracle.database.jdbc @@ -96,7 +96,6 @@ 2.4.5 - diff --git a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java index 1fa2e20..acfb7ef 100644 --- a/src/main/java/com/casic/config/task/TaskSchedulingConfig.java +++ b/src/main/java/com/casic/config/task/TaskSchedulingConfig.java @@ -37,7 +37,7 @@ //执行定时任务 taskRegistrar.addTriggerTask( //设置日期任务 - getMangerRunnable(""), + getMangerRunnable(), //2.设置执行周期(Trigger) triggerContext -> new CronTrigger(taskCronTimeConfig.getCronTime()).nextExecutionTime(triggerContext) ); @@ -46,7 +46,7 @@ /** * 进行某类设备的查询，进行阈值最后一条数据进行判断，进行报警设置值 */ - private Runnable getMangerRunnable(String DeviceType) { + private Runnable getMangerRunnable() { return new Runnable() { @Override public void run() { diff --git a/src/main/java/com/casic/controller/TestController.java b/src/main/java/com/casic/controller/TestController.java index 51867a7..8e8b37c 100644 --- a/src/main/java/com/casic/controller/TestController.java +++ b/src/main/java/com/casic/controller/TestController.java @@ -1,18 +1,27 @@ package com.casic.controller; -import com.casic.mapper.DeviceDataMapper; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Slf4j @RestController public class TestController { - @Autowired - private DeviceDataMapper deviceDataMapper; + @Value("${casic.pdfPath}") + private String pdfXmlPath; @RequestMapping("/test") public Object testMap() { - return deviceDataMapper.getFlowData(); + return "ok"; } + + @RequestMapping("/pdf") + public String testDocxPdf() { + log.info("0000-----"); +// PdfUtils.doc2pdf("/casic/testPdf/200.docx", "/casic/testPdf/200.pdf",pdfXmlPath); + return "ok"; + } + } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 2b8f450..dbd1eed 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -11,19 +11,18 @@ /** * 多功能1 */ - String MULTI_DEVOCDE1="512023010001"; - + String RAIN_GAUGE1="864708062717627"; /** * 多功能2 */ - String MULTI_DEVOCDE2="512023010002"; + String RAIN_GAUGE2="864708062669653"; /** * 多功能3 */ - String MULTI_DEVOCDE3="512023010003"; + String RAIN_GAUGE3="864708062689073"; /** * 多功能4 */ - String MULTI_DEVOCDE4="512023010004"; + String RAIN_GAUGE4="864708062626919"; } diff --git a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java index 5465cb5..a736029 100644 --- a/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java +++ b/src/main/java/com/casic/enums/RelayDevcodeMapEnums.java @@ -12,10 +12,10 @@ { put(RAIN_GAUGE, "1"); put(HUMI_TEMP, "2"); - put(MULTI_DEVOCDE1, "3"); - put(MULTI_DEVOCDE2, "4"); - put(MULTI_DEVOCDE3, "5"); - put(MULTI_DEVOCDE4, "6"); + put(RAIN_GAUGE1, "3"); + put(RAIN_GAUGE2, "4"); + put(RAIN_GAUGE3, "5"); + put(RAIN_GAUGE4, "6"); } }); diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index e9427ca..a79d6c5 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -26,11 +26,13 @@ @Override public RelayStatusDTO datagram(String msg) { if (msg.toLowerCase().contains(rainFallMark)) { + log.info("雨量计报文为----"+msg); //去掉补位 String devcode = msg.substring(0, 15); String defaultStrValue = msg.substring(26, 30); long defaultValue = Long.parseLong(defaultStrValue, 16); log.info("设备编号为" + devcode + ",设备数据为" + defaultValue); + RainFallData rainFallData = initRainFallData(devcode, defaultValue); rainFallDataMapper.insert(rainFallData); Integer isAlarm = isAlarm(String.valueOf(defaultValue), alarmLevelConfig.getRainfall()); diff --git a/src/main/java/com/casic/server/ReceiverServerHandler.java b/src/main/java/com/casic/server/ReceiverServerHandler.java index 507fa09..5346f35 100644 --- a/src/main/java/com/casic/server/ReceiverServerHandler.java +++ b/src/main/java/com/casic/server/ReceiverServerHandler.java @@ -1,6 +1,7 @@ package com.casic.server; +import com.alibaba.fastjson.JSON; import com.casic.enums.RelaySwitchEnums; import com.casic.model.RelayStatusDTO; import com.casic.resolver.DatagramResolver; @@ -15,7 +16,6 @@ import io.netty.util.concurrent.GlobalEventExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; @@ -77,19 +77,26 @@ ); } } - if (msg instanceof ByteBuf) { - log.info(ByteBufUtil.hexDump((ByteBuf) msg)); - } +// if (msg instanceof ByteBuf) { +// ByteBuf +// log.info(ByteBufUtil.hexDump((ByteBuf) msg)); +// } super.channelRead(ctx, msg); } + private void frozenInvalidByteBuf(ByteBuf byteBuf) { + byteBuf.resetReaderIndex(); + byteBuf.readBytes(byteBuf.writerIndex()); + byteBuf.markReaderIndex(); + } + private void sendMsg(ChannelHandlerContext ctx, RelayStatusDTO relayStatusDTO) { if (!ObjectUtils.isEmpty(relayStatusDTO)) { ByteBuf out = ByteBufAllocator.DEFAULT.heapBuffer(); String switchContent = preFix + relayStatusDTO.getChannelName() + "," + relayStatusDTO.getLampSwitch() + postFix; // for (int i = 1; i < 6; i++) { // switchConent = preFix + relayStatusDTO.getChannelName() + "," + 1 + postFix; - System.out.println(switchContent); + log.info(JSON.toJSONString(relayStatusDTO)+"-------"+switchContent); out.writeBytes(switchContent.getBytes()); channels.forEach(channel -> { if (channel.isActive()) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 795fda7..fa60dc2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 11315 + port: 5907 ################### spring配置 ################### spring: datasource: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d44a245..ef11f26 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -30,4 +30,6 @@ task: cron-time: 0 0 */1 * * ? server: - port: 13764 + port: 9393 + pdfPath: /casic/testPdf/config/ +