修改bug

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IElevatorService.java

 package com.yeejoin.amos.boot.module.elevator.api.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
@@ -37,6 +38,8 @@ public interface IElevatorService extends IService<Elevator> {
 
     Page<Map<String, Object>> selectElevators(Page<Map<String, Object>>page, ElevatorDto dto);
 
+    Page<JSONObject> queryByKeys(JSONObject map);
+
     List<ElevatorDtoNew> selectExportDataNew(ElevatorDto dto);
 
     List<Map<String, Object>> selectElevatorEsList(int pageNum,int pageSize);

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

@@ -346,6 +346,13 @@ public class ElevatorController extends BaseController {
         return ResponseHelper.buildResponse(list);
     }
 
+//    @TycloudOperation(ApiLevel = UserType.AGENCY)
+//    @GetMapping(value = "/ocp/query_elevator_list")
+//    @ApiOperation(httpMethod = "GET", value = "电梯列表", notes = "电梯列表")
+//    public ResponseModel<Page<JSONObject>> viewJgAll( @RequestParam Map<String,Object> map) {
+//        JSONObject jsonObject = new JSONObject(map);
+//        return ResponseHelper.buildResponse(iElevatorService.queryByKeys(jsonObject));
+//    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/ocp/exportData")

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -70,4 +70,15 @@ public class ESEquipmentCategoryDto {
     private Long REC_DATE;
 
 
+    @Field(type = FieldType.Text)
+    private String SAFETY_MANAGER;
+
+    @Field(type = FieldType.Text)
+    private String PHONE;
+
+    @Field(type = FieldType.Text)
+    private String MAINTAIN_UNIT;
+
+    @Field(type = FieldType.Text)
+    private String USE_INNER_CODE;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/config/FileDownLoadException.java

+package com.yeejoin.amos.boot.module.ymt.biz.config;
+
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+
+public class FileDownLoadException extends BaseException {
+
+    public FileDownLoadException(String message)
+    {
+        super(message, com.yeejoin.amos.component.robot.BadRequest.class.getSimpleName(),message);
+        this.httpStatus = 500;
+    }
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
+import com.yeejoin.amos.boot.module.ymt.biz.config.FileDownLoadException;
 import com.yeejoin.amos.boot.module.ymt.biz.service.impl.EquipmentCategoryServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.ImageUtils;
 import com.yeejoin.amos.component.robot.BadRequest;
@@ -477,10 +478,10 @@ public class EquipmentCategoryController extends BaseController {
 			lambda.in(IdxBizJgOtherInfo::getCode96333, code96333);
 			Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda);
 			if (!ObjectUtils.isEmpty(strings) && strings.size() != integer){
-				throw new BadRequest("96333码存在重复数据，请联系管理员！");
+				throw new FileDownLoadException("96333码存在重复数据，请联系管理员！");
 			}
 			if (ObjectUtils.isEmpty(strings) && !String.valueOf(code96333.size()).equals(String.valueOf(integer))) {
-				throw new BadRequest("96333码存在重复数据，请联系管理员！");
+				throw new FileDownLoadException("96333码存在重复数据，请联系管理员！");
 			}
 		}
 		List<Object> supervisoryCode = equipExportData.stream().filter(item -> !ObjectUtils.isEmpty(item.get("SUPERVISORY_CODE"))).map(item -> item.get("SUPERVISORY_CODE")).collect(Collectors.toList());
@@ -490,10 +491,10 @@ public class EquipmentCategoryController extends BaseController {
 			lambda.in(IdxBizJgOtherInfo::getSupervisoryCode, supervisoryCode);
 			Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda);
 			if (!ObjectUtils.isEmpty(strings) && strings.size() != integer){
-				throw new BadRequest("监管码存在重复数据，请联系管理员！");
+				throw new FileDownLoadException("监管码存在重复数据，请联系管理员！");
 			}
 			if (ObjectUtils.isEmpty(strings) && !String.valueOf(supervisoryCode.size()).equals(String.valueOf(integer))) {
-				throw new BadRequest("监管码存在重复数据，请联系管理员！");
+				throw new FileDownLoadException("监管码存在重复数据，请联系管理员！");
 			}
 		}
 		if (ImageSizeEnums.DT.getCode().equals(type)) {