修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/RedissonConfig.java

@@ -44,9 +44,9 @@ public class RedissonConfig {
                 .setScanInterval(5000) // 集群状态扫描间隔时间，单位是毫秒
                 .setTimeout(30000)
                 //主节点线程池数量
-                .setMasterConnectionPoolSize(10)
+                .setMasterConnectionPoolSize(20)
                 //从节点线程池数量
-                .setSlaveConnectionPoolSize(30)
+                .setSlaveConnectionPoolSize(20)
                 .setIdleConnectionTimeout(10000)
                 .setSlaveConnectionMinimumIdleSize(20)
                 .setMasterConnectionMinimumIdleSize(20)

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -1538,7 +1538,7 @@ public class ExcelServiceImpl {
 		fireExpertsServiceImpl.saveBatch(excelEntityList);
 	}
     @Async
-	private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType,String uuidString) {
+	public void excelImportDutyPerson(MultipartFile multipartFile, String dutyType,String uuidString) {
 		try {
 			ImportDutyPerson(multipartFile,dutyType);
 			if(redisUtils.hasKey(uuidString)){

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -2729,8 +2729,10 @@
         LEFT JOIN wl_stock_detail wsd ON wsd.equipment_specific_id = wesp.id
         LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
 
-        <where>
 
+
+        <where>
+            and wec.industry_code = 2
         <if test="dto.code!=null and dto.code!=''">
             and wesp.code = #{dto.code}
         </if>