提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -579,17 +579,24 @@ public class FireFightingSystemController extends AbstractBaseController {
         }
         log.info("orgCode当前值为：：" + equipTypeAmountPage.getBizOrgCode());
         if (StringUtil.isNotEmpty(equipTypeAmountPage.getEquipmentClassificationCode())) {
+            EquipmentCategory equipmentCategory = equipmentCategoryService.getById(equipTypeAmountPage.getEquipmentClassificationCode());
+            if(equipmentCategory!=null)
+            {
+            }else
+            {
                 QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
-            log.info("code当前值为：：" + equipTypeAmountPage.getEquipmentClassificationCode());
                 equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
-            log.info("industry_code当前值为：：" + equipTypeAmountPage.getIndustryCode());
                 equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
-            EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(equipmentCategoryQueryWrapper);
-            if (equipmentCategory == null) {
+                List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list(equipmentCategoryQueryWrapper);
+                if (CollectionUtils.isEmpty(equipmentCategoryList)) {
                     throw new RuntimeException("装备定义code有误");
                 }
+                equipmentCategory = equipmentCategoryList.get(0);
+            }
+            String code = equipmentCategory.getCode();
             int inhierarchy = 1;
             for (int i = 0; i < result.length + 1; i++) {
+
                 //进来先判断是否默认就是空，如果为空第一层
                 if (equipmentCategory.getParentId() == null) {
                     //判断是否是最下面的子节点
@@ -605,7 +612,7 @@ public class FireFightingSystemController extends AbstractBaseController {
                 }
             }
 
-            return fireFightingSystemService.getColaCategoryAmountCarListJxiop(inhierarchy, equipTypeAmountPage.getEquipmentClassificationCode().substring(0, inhierarchy), equipTypeAmountPage);
+            return fireFightingSystemService.getColaCategoryAmountCarListJxiop(inhierarchy, code.substring(0, inhierarchy), equipTypeAmountPage);
         } else {
             return fireFightingSystemService.getColaCategoryAmountCarListJxiop(0, null, equipTypeAmountPage);
         }
@@ -624,20 +631,19 @@ public class FireFightingSystemController extends AbstractBaseController {
 
         if (StringUtil.isNotEmpty(equipTypeAmountPage.getEquipmentClassificationCode())) {
             EquipmentCategory equipmentCategory = equipmentCategoryService.getById(equipTypeAmountPage.getEquipmentClassificationCode());
-            QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
             if(equipmentCategory!=null)
             {
-                equipmentCategoryQueryWrapper.eq("code", equipmentCategory.getCode());
             }else
             {
+                QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
                 equipmentCategoryQueryWrapper.eq("code", equipTypeAmountPage.getEquipmentClassificationCode());
-            }
                 equipmentCategoryQueryWrapper.eq("industry_code", equipTypeAmountPage.getIndustryCode());
                 List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list(equipmentCategoryQueryWrapper);
                 if (CollectionUtils.isEmpty(equipmentCategoryList)) {
                     throw new RuntimeException("装备定义code有误");
                 }
-            EquipmentCategory equipmentCategory = equipmentCategoryList.get(0);
+                equipmentCategory = equipmentCategoryList.get(0);
+            }
             int inhierarchy = 1;
             int flag = 0;
             for (int i = 0; i < result.length + 1; i++) {

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -59,7 +59,7 @@
 		<module>amos-boot-module-latentdanger-biz</module>
 		<module>amos-boot-module-equip-biz</module>
         <module>amos-boot-module-ccs-biz</module>
-		<module>amos-boot-module-avic-biz</module>
+		<!--<module>amos-boot-module-avic-biz</module>-->
         <module>amos-boot-module-precontrol-biz</module>
 	    <module>amos-boot-module-kgd-biz</module>
   </modules>

amos-boot-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java

@@ -46,7 +46,7 @@ public class AmostEquipApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(AmostEquipApplication.class);
 	//是否走江西电建的车辆监听器，默认不走，如果在配置文件中添加了该配置且配置的值不为false
-	@Value("${jxiop.carIotNewListener.enable:false}")
+	@Value("${jxiop.carIotNewListener.enable:true}")
 	private String jxiop;
 
 	@Autowired

amos-boot-system-equip/src/main/resources/application-kingbase.properties

@@ -40,8 +40,8 @@ spring.redis.expire.time=30000
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://192.168.0.54:1883
-emqx.user-name=super
-emqx.password=123456
+emqx.user-name=admin
+emqx.password=public
 mqtt.scene.host=mqtt://192.168.0.54:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt