报警统计功能

alarm-service/src/main/java/com/gyee/alarm/service/AlarmWtService.java

@@ -94,20 +94,19 @@ public class AlarmWtService {
 
                     if (!alarmls.isEmpty()) {
                         for (ProEconAlarmConfiguration alarm : alarmls) {
-//                            if (pointMap.containsKey(alarm.getUniformCode())) {
-//                                ProBasicEquipmentPoint equipmentPoint = pointMap.get(alarm.getUniformCode());
-//
-//                                if(StringUtils.notEmp(initialcode) &&
-//                                        StringUtils.notEmp(equipmentPoint.getNemCode()) &&
-//                                        !equipmentPoint.getNemCode().equals(initialcode))
-//                                {
+                            if (pointMap.containsKey(alarm.getUniformCode())) {
+                                ProBasicEquipmentPoint equipmentPoint = pointMap.get(alarm.getUniformCode());
+
+                                if(StringUtils.notEmp(initialcode) &&
+                                        StringUtils.notEmp(equipmentPoint.getNemCode()) &&
+                                        !equipmentPoint.getNemCode().equals(initialcode))
+                                {
                                     AlarmVo vo=new AlarmVo();
                                     StringBuilder tbName = new StringBuilder();
                                     tbName.append(wt.getId()).append("_").append(alarm.getId());
                                     vo.setTbName(String.valueOf(tbName));
                                     vo.setAlarmid(alarm.getId());
-//                                    vo.setTagid(equipmentPoint.getNemCode());
-                            vo.setTagid(alarm.getTagId());
+                                    vo.setTagid(equipmentPoint.getNemCode());
                                     vo.setAlarmtype(alarm.getAlarmType());
                                     vo.setCharacteristic(alarm.getCharacteristic());
                                     vo.setComponents(alarm.getComponents());
@@ -143,9 +142,9 @@ public class AlarmWtService {
                                     vo.setUniformcode(alarm.getUniformCode());
                                     vo.setSuperTableName(AlarmSuperTalbeType.WT.getCode());
                                     alarmVoList.add(vo);
-//                                }
-//
-//                            }
+                                }
+
+                            }
                         }
                     }
                 }

alarm-web/src/main/java/com/gyee/alarm/service/AlarmRuleService.java

@@ -7,12 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.alarm.init.CacheContext;
 import com.gyee.alarm.mapper.auto.AlarmTsMapper;
 import com.gyee.alarm.mapper.auto.ProEconAlarmRuleMapper;
-import com.gyee.alarm.model.auto.ProBasicPowerstation;
-import com.gyee.alarm.model.auto.ProEconAlarmRule;
+import com.gyee.alarm.model.auto.*;
 
 
-import com.gyee.alarm.model.auto.ProEconAlarmType;
-import com.gyee.alarm.model.auto.ProEconCurveFittingMain;
 import com.gyee.alarm.model.vo.AlarmRuleVo;
 import com.gyee.alarm.service.auto.IProEconAlarmTypeService;
 import com.gyee.alarm.util.SnowflakeGenerator;
@@ -140,6 +137,12 @@ public class AlarmRuleService {
                     ProEconAlarmType type=CacheContext.alarmTypeMap.get(ar.getRelatedParts());
                     ar.setRelatedPartsName(type.getName());
                 }
+
+                if(CacheContext.subwpmap.containsKey(ar.getStationId()))
+                {
+                    ProBasicSubStation type=CacheContext.subwpmap.get(ar.getStationId());
+                    ar.setStationName(type.getName());
+                }
             }
         }
         return alertruleIPage;

log/ota.log

@@ -1185,3 +1185,57 @@ Caused by: java.lang.IllegalArgumentException: Result Maps collection does not c
 	at org.apache.ibatis.builder.MapperBuilderAssistant.getStatementResultMaps(MapperBuilderAssistant.java:339) ~[mybatis-3.5.4.jar:3.5.4]
 	... 87 common frames omitted
 
+2023-08-16 10:57:42.042  INFO 14356 --- [main] com.gyee.alarm.AlarmWeb                  : Starting AlarmWeb on sltc with PID 14356 (E:\idea_workspace\alarmNew\alarm-web\target\classes started by shilin in E:\idea_workspace\alarmNew)
+2023-08-16 10:57:42.044  INFO 14356 --- [main] com.gyee.alarm.AlarmWeb                  : The following profiles are active: jn
+2023-08-16 10:57:43.215  INFO 14356 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-08-16 10:57:43.217  INFO 14356 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2023-08-16 10:57:43.286  INFO 14356 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 59ms. Found 0 Redis repository interfaces.
+2023-08-16 10:57:43.628  INFO 14356 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-08-16 10:57:43.633  INFO 14356 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$139eb590] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-08-16 10:57:43.650  INFO 14356 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-08-16 10:57:43.916  INFO 14356 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 6015 (http)
+2023-08-16 10:57:43.926  INFO 14356 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2023-08-16 10:57:43.926  INFO 14356 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.29]
+2023-08-16 10:57:44.048  INFO 14356 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2023-08-16 10:57:44.048  INFO 14356 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1826 ms
+2023-08-16 10:57:44.318  INFO 14356 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1,master} inited
+2023-08-16 10:57:44.319 ERROR 14356 --- [main] com.alibaba.druid.pool.DruidDataSource   : testWhileIdle is true, validationQuery not set
+2023-08-16 10:57:44.320  INFO 14356 --- [main] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2,slave} inited
+2023-08-16 10:57:44.320  INFO 14356 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [slave] success
+2023-08-16 10:57:44.320  INFO 14356 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource - add a datasource named [master] success
+2023-08-16 10:57:44.320  INFO 14356 --- [main] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2023-08-16 10:57:45.928 ERROR 14356 --- [main] c.b.m.core.MybatisConfiguration          : mapper[com.gyee.alarm.mapper.auto.AlarmTsMapper.createTable] is ignored, because it exists, maybe from xml file
+2023-08-16 10:57:48.771  INFO 14356 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2023-08-16 10:57:48.831  INFO 14356 --- [main] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)]
+2023-08-16 10:57:48.950  INFO 14356 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2023-08-16 10:57:49.560  INFO 14356 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2023-08-16 10:57:49.572  INFO 14356 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2023-08-16 10:57:49.599  INFO 14356 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2023-08-16 10:57:49.731  INFO 14356 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteAlertruleUsingDELETE_1
+2023-08-16 10:57:49.732  INFO 14356 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importExcelUsingPOST_1
+2023-08-16 10:57:49.733  INFO 14356 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: importTemplateUsingGET_1
+2023-08-16 10:57:49.736  INFO 14356 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: queryByPageUsingGET_1
+2023-08-16 10:57:49.751  INFO 14356 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: saveAndUpdateAlertruleUsingPOST_1
+2023-08-16 10:57:49.807  INFO 14356 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 6015 (http) with context path ''
+2023-08-16 10:57:49.810  INFO 14356 --- [main] com.gyee.alarm.AlarmWeb                  : Started AlarmWeb in 8.123 seconds (JVM running for 9.515)
+2023-08-16 10:57:49.815  INFO 14356 --- [main] com.gyee.alarm.init.CacheContext         : 缓存开始------------------------------------------------------------
+2023-08-16 10:57:49.815  INFO 14356 --- [main] com.gyee.alarm.init.CacheContext         : SXJ_KGDL_NJL_FDC_STA------------------19
+2023-08-16 10:57:50.820  INFO 14356 --- [main] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2023-08-16 10:57:50.823  INFO 14356 --- [main] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2023-08-16 10:57:52.804  INFO 14356 --- [main] com.gyee.alarm.init.CacheContext         : 3177
+2023-08-16 10:58:18.589  INFO 14356 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
+2023-08-16 10:58:18.591  INFO 14356 --- [main] com.gyee.alarm.AlarmWeb                  : 
+-------------------------------------------------------------------
+	智能报警系统启动成功，访问路径如下:
+	本地路径: 		http://localhost:6015/
+	网络地址: 		http://192.168.56.1:6015/
+	API文档: 		http://192.168.56.1:6015//swagger-ui.html
+-----------------------------------------------------------------------
+2023-08-16 10:58:20.123  INFO 14356 --- [RMI TCP Connection(7)-192.168.56.1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2023-08-16 10:58:20.123  INFO 14356 --- [RMI TCP Connection(7)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2023-08-16 10:58:20.130  INFO 14356 --- [RMI TCP Connection(7)-192.168.56.1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 6 ms
+2023-08-16 10:58:46.900  INFO 14356 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2023-08-16 10:58:47.030  INFO 14356 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
+2023-08-16 10:58:47.034  INFO 14356 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
+2023-08-16 10:58:47.036  INFO 14356 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
+2023-08-16 10:58:47.036  INFO 14356 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye