fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysGatewayUserTask.java

@@ -17,7 +17,6 @@ import com.ruoyi.zhdd.domain.GatewayOrg;
 import com.ruoyi.zhdd.domain.GatewaySUser;
 import com.ruoyi.zhdd.domain.SingleDevice;
 import com.ruoyi.zhdd.domain.bo.SingleDeviceBo;
-import com.ruoyi.zhdd.domain.vo.SingleDeviceVo;
 import com.ruoyi.zhdd.service.ISingleDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -228,7 +227,7 @@ public class SysGatewayUserTask {
         }
     }
 
-    @KafkaListener(topics = "executestation_5ee63b516d4e4d79a46cdf88a202caa1")
+    @KafkaListener(topics = "gps_executestation_581a2b5cb28e429bb56a3c6b8cbdf5a6")
     public void onDeviceMessage(String message) {
         log.info("kafka单兵设备信息消费：{}", message);
         JSONObject jsonObject = JSONUtil.parseObj(message);

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceServiceImpl.java

@@ -1,29 +1,29 @@
 package com.ruoyi.zhdd.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.zhdd.domain.Resource;
 import com.ruoyi.zhdd.domain.ResourceDetail;
-import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
-import com.ruoyi.zhdd.service.IResourceDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zhdd.domain.bo.ResourceBo;
+import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
 import com.ruoyi.zhdd.domain.vo.ResourceVo;
-import com.ruoyi.zhdd.domain.Resource;
 import com.ruoyi.zhdd.mapper.ResourceMapper;
+import com.ruoyi.zhdd.service.IResourceDetailService;
 import com.ruoyi.zhdd.service.IResourceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 应急资源Service业务层处理
@@ -38,7 +38,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     private IResourceDetailService resourceDetailService;
 
     @Override
-    public ResourceVo queryById(String id){
+    public ResourceVo queryById(String id) {
         ResourceVo voById = getVoById(id);
         if (voById.getResourceType() == 1) {
             // 应急仓库的类型查询仓库物资
@@ -63,6 +63,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Resource> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getResourceType() != null, Resource::getResourceType, bo.getResourceType());
+        lqw.eq(StringUtils.isNotBlank(bo.getLocationType()), Resource::getLocationType, bo.getLocationType());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Resource::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getAddress()), Resource::getAddress, bo.getAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), Resource::getLongitude, bo.getLongitude());
@@ -94,14 +95,14 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(Resource entity){
+    private void validEntityBeforeSave(Resource entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         // 删除资源明细内容
@@ -111,6 +112,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
 
     /**
      * 插入应急资源数据
+     *
      * @param bo
      * @return
      */
@@ -140,6 +142,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
 
     /**
      * 更新资源信息
+     *
      * @param bo
      * @return
      */