#设备编号拼接修改

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml

@@ -179,13 +179,13 @@
     </select>
 
     <select id="accessDevices" resultType="com.hnac.hzims.equipment.vo.AccessDeviceVO">
-        select info.number AS deviceCode,info.name AS deviceName,info.INS_LOCATION AS address
+        select info.number AS deviceCode,CONCAT(info.number,"_",ore.`NAME`,"_",info.name) AS deviceName,info.INS_LOCATION AS address
         FROM HZIMS_EM_INFO info
         LEFT JOIN HZIMS_EM_OREANIZATION ore ON info.REF_OREANIZATION = ore.id
         <where>
             info.IS_DELETED = 0
             <if test="alias != null and alias != '' ">
-                AND  (info.NAME LIKE CONCAT('%',#{alias},'%') or ore.NAME LIKE CONCAT('%',#{alias},'%') )
+                AND  (info.NAME LIKE CONCAT('%',#{alias},'%') or info.NUMBER LIKE CONCAT('%',#{alias},'%') or ore.NAME LIKE CONCAT('%',#{alias},'%') )
             </if>
         </where>
     </select>

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmPoolManager.java

@@ -15,7 +15,7 @@ public class AlarmPoolManager {
     @Bean
     public ThreadPoolExecutor threadPoolExecutor() {
         // 核心线程数
-        int corePoolSize = 8;
+        int corePoolSize = 16;
         // 最大线程数
         int maximumPoolSize = 16;
         // 线程空闲时的存活时间