修改bug

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorController.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.elevator.api.common.BizCommonConstant;
 import com.yeejoin.amos.boot.module.elevator.api.dto.*;
 import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.elevator.api.entity.MaintainInfo;
@@ -24,8 +25,10 @@ import com.yeejoin.amos.boot.module.elevator.biz.service.impl.ElevatorServiceImp
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.MaintainInfoServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.TestInfoServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
@@ -49,6 +52,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 电梯Api
@@ -97,6 +101,10 @@ public class ElevatorController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl iDataDictionaryService;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
+    private static final String STREET = "STREET";
     /**
      * 新增电梯
      *
@@ -599,7 +607,22 @@ public class ElevatorController extends BaseController {
 //                }
 //            }
 //        }
+        List<LinkedHashMap<String, Object>> list = null;
+        if (redisUtil.hasKey(STREET)) {
+            list = (List<LinkedHashMap<String, Object>>) redisUtil.get(STREET);
+        }
         List<ElevatorMessageDto> addressListNew = elevatorMapper.getAddressListNew(elevatorListDto.getElevatorAddress());
+        if (!ObjectUtils.isEmpty(addressListNew) && !ObjectUtils.isEmpty(list)) {
+            List<LinkedHashMap<String, Object>> finalList = list;
+            addressListNew.forEach(item -> {
+                if (!ObjectUtils.isEmpty(item.getStreet())) {
+                    List<LinkedHashMap<String, Object>> streetList = finalList.stream().filter(street -> street.get("regionCode").toString().equals(item.getStreet())).collect(Collectors.toList());
+                    if (!ObjectUtils.isEmpty(streetList) && !ObjectUtils.isEmpty(streetList.get(0))) {
+                        item.setStreet(String.valueOf(streetList.get(0).get("regionName")));
+                    }
+                }
+            });
+        }
         return ResponseHelper.buildResponse(addressListNew);
     }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -524,6 +524,10 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             if (e.get("companyName").toString().contains("行政审批局")) {
                 it.remove();
             }
+            // 删除检验检测机构
+            if (!"company".equals(e.get("level")) && e.get("companyType").toString().contains("检验检测机构")){
+                it.remove();
+            }
             if (!ObjectUtils.isEmpty(e.get("children"))) {
                 deleteRegulatorTreeData((List<LinkedHashMap>) e.get("children"));
             }