bugfix(all):ESEquipmentCategory，ESEquipmentCategoryDto提到common

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

@@ -14,5 +14,5 @@ public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
 
     AlertStatistics getStatisticsMessage(@Param("orgCode")String orgCode, @Param("startDate")String startDate , @Param("endDate")String endDate);
 
-    AlertStatistics statisticsInfoByRegionAndDate(@Param("regionCode")Integer regionCode, @Param("startDate")String startDate , @Param("endDate")String endDate);
+    AlertStatistics statisticsInfoByRegionAndDate(@Param("regionCode")String regionCode, @Param("startDate")String startDate , @Param("endDate")String endDate);
 }

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

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.elevator.api.service;
 
 
 import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertStatistics;
 
 import java.text.ParseException;
 import java.util.List;
-import java.util.Map;
 
 public interface IAlertStatisticsService {
 
@@ -14,5 +14,5 @@ public interface IAlertStatisticsService {
 
     List<AlertStatistics> getList(String date) throws ParseException;
 
-    JSONArray statisticInfoByRegionAndDate(Map<String, Object> queryParams);
+    JSONArray statisticInfoByRegionAndDate(DPFilterParamDto queryParams);
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.*;
 import com.yeejoin.amos.boot.module.elevator.api.service.*;
 import com.yeejoin.amos.boot.module.elevator.api.vo.*;
@@ -12,16 +13,23 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 
 @RestController
@@ -345,7 +353,11 @@ public class StatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/region/info")
     @ApiOperation(httpMethod = "POST", value = "查询区域统计信息", notes = "查询区域统计信息")
-    public ResponseModel<JSONArray> statisticsRegionInfo(@RequestBody Map<String, Object> queryParams) {
-        return ResponseHelper.buildResponse(alertStatisticsService.statisticInfoByRegionAndDate(queryParams));
+    public ResponseModel<JSONArray> statisticsRegionInfo(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(alertStatisticsService.statisticInfoByRegionAndDate(dpFilterParamDto));
     }
 }

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

-package com.yeejoin.amos.boot.module.elevator.biz.dao;
-
-import com.yeejoin.amos.boot.module.elevator.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.elevator.api.entity.EsElevator;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.elevator.biz.dao;
+//
+//import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertStatisticsServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertStatisticsDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertStatistics;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.AlertStatisticsMapper;
@@ -165,14 +166,17 @@ public class AlertStatisticsServiceImpl extends BaseService<AlertStatisticsDto,
     }
 
     @Override
-    public JSONArray statisticInfoByRegionAndDate(Map<String, Object> params) {
+    public JSONArray statisticInfoByRegionAndDate(DPFilterParamDto params) {
         LocalDate today = LocalDate.now();
-        LocalDate startDate = (LocalDate) params.get("startDate");
-        LocalDate endDate = (LocalDate) params.get("endDate");
-        Integer regionCode = (Integer) params.get("cityCode");
-        if (ObjectUtils.isEmpty(params.get("startDate")) || ObjectUtils.isEmpty(params.get("endDate"))) {
+        LocalDate startDate;
+        LocalDate endDate;
+        String regionCode = params.getCityCode();
+        if (ObjectUtils.isEmpty(params.getBeginDate()) || ObjectUtils.isEmpty(params.getBeginDate())) {
             startDate = today.minusDays(6);
             endDate = today;
+        } else {
+            startDate = LocalDate.parse(params.getBeginDate());
+            endDate = LocalDate.parse(params.getEndDate());
         }
         AlertStatistics statistics = this.baseMapper.statisticsInfoByRegionAndDate(regionCode, startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         JSONArray jsonArray = new JSONArray();

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

@@ -10,7 +10,12 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.elevator.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.EquInfoDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.EquipExportDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.EquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.UseUnitCreditCodeCategoryDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.*;
 import com.yeejoin.amos.boot.module.elevator.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.elevator.api.enums.EquipmentCategoryEnum;
@@ -18,7 +23,6 @@ import com.yeejoin.amos.boot.module.elevator.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.*;
 import com.yeejoin.amos.boot.module.elevator.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.elevator.api.vo.EquipExportVo;
-import com.yeejoin.amos.boot.module.elevator.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.elevator.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.elevator.flc.api.feign.PrivilegeFeginService;

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

-package com.yeejoin.amos.boot.module.app.api.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-/**
- * @Author cpp
- * @Description
- * @Date 2023/6/5
- */
-@Data
-@Accessors(chain = true)
-@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
-public class ESEquipmentCategoryDto {
-
-    @Id
-    private String SEQUENCE_NBR;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_NAME;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_CODE;
-
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_CREDIT_CODE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_LIST_CODE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_LIST;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CATEGORY;
-
-    @Field(type = FieldType.Text)
-    private String USE_ORG_CODE;
-
-    @Field(type = FieldType.Text)
-    private String CODE96333;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CODE;
-
-    @Field(type = FieldType.Text)
-    private String SUPERVISORY_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USE_PLACE;
-
-    @Field(type = FieldType.Text)
-    private String ADDRESS;
-
-    @Field(type = FieldType.Integer)
-    private Integer EQU_STATE;
-
-    @Field(type = FieldType.Text)
-    private String STATUS;
-
-    @Field(type = FieldType.Long)
-    private Long REC_DATE;
-
-
-}
+//package com.yeejoin.amos.boot.module.app.api.dto;
+//
+//import lombok.Data;
+//import lombok.experimental.Accessors;
+//import org.springframework.data.annotation.Id;
+//import org.springframework.data.elasticsearch.annotations.Document;
+//import org.springframework.data.elasticsearch.annotations.Field;
+//import org.springframework.data.elasticsearch.annotations.FieldType;
+//
+///**
+// * @Author cpp
+// * @Description
+// * @Date 2023/6/5
+// */
+//@Data
+//@Accessors(chain = true)
+//@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
+//public class ESEquipmentCategoryDto {
+//
+//    @Id
+//    private String SEQUENCE_NBR;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_CODE;
+//
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_CREDIT_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_LIST_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_LIST;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CATEGORY;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_ORG_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String CODE96333;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String SUPERVISORY_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_PLACE;
+//
+//    @Field(type = FieldType.Text)
+//    private String ADDRESS;
+//
+//    @Field(type = FieldType.Integer)
+//    private Integer EQU_STATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String STATUS;
+//
+//    @Field(type = FieldType.Long)
+//    private Long REC_DATE;
+//
+//
+//}

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.app.biz.dao;
-
-import com.yeejoin.amos.boot.module.app.api.dto.ESEquipmentCategoryDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.app.biz.dao;
+//
+//import com.yeejoin.amos.boot.module.app.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

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

@@ -9,31 +9,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.app.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.app.api.dto.EquInfoDto;
 import com.yeejoin.amos.boot.module.app.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.app.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.app.api.dto.UseUnitCreditCodeCategoryDto;
-import com.yeejoin.amos.boot.module.app.api.entity.CategoryOtherInfo;
-import com.yeejoin.amos.boot.module.app.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.app.api.entity.EquipmentCategoryData;
-import com.yeejoin.amos.boot.module.app.api.entity.SupervisoryCodeInfo;
-import com.yeejoin.amos.boot.module.app.api.entity.UseInfo;
+import com.yeejoin.amos.boot.module.app.api.entity.*;
 import com.yeejoin.amos.boot.module.app.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.app.api.enums.EquipmentCategoryEnum;
 import com.yeejoin.amos.boot.module.app.api.enums.EquipmentClassifityEnum;
-import com.yeejoin.amos.boot.module.app.api.mapper.CategoryOtherInfoMapper;
-import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryDataMapper;
-import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryMapper;
-import com.yeejoin.amos.boot.module.app.api.mapper.SuperviseInfoMapper;
-import com.yeejoin.amos.boot.module.app.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.app.api.mapper.UseInfoMapper;
+import com.yeejoin.amos.boot.module.app.api.mapper.*;
 import com.yeejoin.amos.boot.module.app.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.app.api.vo.EquipExportVo;
-import com.yeejoin.amos.boot.module.app.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.app.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.app.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.app.flc.api.feign.PrivilegeFeginService;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
@@ -64,17 +55,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.StringJoiner;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.alibaba.fastjson.JSON.toJSONString;

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dao/ESEquipmentCategory.java

+package com.yeejoin.amos.boot.module.common.api.dao;
+
+
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+}

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

-package com.yeejoin.amos.boot.module.cylinder.api.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-/**
- * @Author cpp
- * @Description
- * @Date 2023/6/5
- */
-@Data
-@Accessors(chain = true)
-@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
-public class ESEquipmentCategoryDto {
-
-    @Id
-    private String SEQUENCE_NBR;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_NAME;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_CODE;
-
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_CREDIT_CODE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_LIST_CODE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_LIST;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CATEGORY;
-
-    @Field(type = FieldType.Text)
-    private String USE_ORG_CODE;
-
-    @Field(type = FieldType.Text)
-    private String CODE96333;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CODE;
-
-    @Field(type = FieldType.Text)
-    private String SUPERVISORY_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USE_PLACE;
-
-    @Field(type = FieldType.Text)
-    private String ADDRESS;
-
-    @Field(type = FieldType.Integer)
-    private Integer EQU_STATE;
-
-    @Field(type = FieldType.Text)
-    private String STATUS;
-
-    @Field(type = FieldType.Long)
-    private Long REC_DATE;
-
-
-}
+//package com.yeejoin.amos.boot.module.cylinder.api.dto;
+//
+//import lombok.Data;
+//import lombok.experimental.Accessors;
+//import org.springframework.data.annotation.Id;
+//import org.springframework.data.elasticsearch.annotations.Document;
+//import org.springframework.data.elasticsearch.annotations.Field;
+//import org.springframework.data.elasticsearch.annotations.FieldType;
+//
+///**
+// * @Author cpp
+// * @Description
+// * @Date 2023/6/5
+// */
+//@Data
+//@Accessors(chain = true)
+//@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
+//public class ESEquipmentCategoryDto {
+//
+//    @Id
+//    private String SEQUENCE_NBR;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_CODE;
+//
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_CREDIT_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_LIST_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_LIST;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CATEGORY;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_ORG_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String CODE96333;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String SUPERVISORY_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_PLACE;
+//
+//    @Field(type = FieldType.Text)
+//    private String ADDRESS;
+//
+//    @Field(type = FieldType.Integer)
+//    private Integer EQU_STATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String STATUS;
+//
+//    @Field(type = FieldType.Long)
+//    private Long REC_DATE;
+//
+//
+//}

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.cylinder.biz.dao;
-
-import com.yeejoin.amos.boot.module.cylinder.api.dto.ESEquipmentCategoryDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.cylinder.biz.dao;
+//
+//import com.yeejoin.amos.boot.module.cylinder.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

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

@@ -10,7 +10,12 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.EquInfoDto;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.EquipExportDto;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.EquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.UseUnitCreditCodeCategoryDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.*;
 import com.yeejoin.amos.boot.module.cylinder.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.cylinder.api.enums.EquipmentCategoryEnum;
@@ -18,7 +23,6 @@ import com.yeejoin.amos.boot.module.cylinder.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.cylinder.api.mapper.*;
 import com.yeejoin.amos.boot.module.cylinder.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.cylinder.api.vo.EquipExportVo;
-import com.yeejoin.amos.boot.module.cylinder.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.cylinder.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.feign.PrivilegeFeginService;

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.jczs.biz.dao;
-
-import com.yeejoin.amos.boot.module.jczs.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.jczs.api.entity.EsElevator;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.jczs.biz.dao;
+//
+//import com.yeejoin.amos.boot.module.jczs.api.dto.ESEquipmentCategoryDto;
+//import com.yeejoin.amos.boot.module.jczs.api.entity.EsElevator;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

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

@@ -10,7 +10,12 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jczs.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.jczs.api.dto.EquipExportDto;
+import com.yeejoin.amos.boot.module.jczs.api.dto.EquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.jczs.api.dto.UseUnitCreditCodeCategoryDto;
+import com.yeejoin.amos.boot.module.jczs.api.dto.EquInfoDto;
 import com.yeejoin.amos.boot.module.jczs.api.entity.*;
 import com.yeejoin.amos.boot.module.jczs.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.jczs.api.enums.EquipmentCategoryEnum;
@@ -18,24 +23,15 @@ import com.yeejoin.amos.boot.module.jczs.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.jczs.api.mapper.*;
 import com.yeejoin.amos.boot.module.jczs.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.jczs.api.vo.EquipExportVo;
-import com.yeejoin.amos.boot.module.jczs.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jczs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.jczs.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.jczs.flc.api.feign.PrivilegeFeginService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -7,11 +7,13 @@ import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipInfoCylinderExcelDto;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
-import com.yeejoin.amos.boot.module.jg.biz.service.*;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgOtherInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.*;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -24,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -32,6 +35,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
+
 import static com.alibaba.fastjson.JSON.toJSONString;
 import static com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.jg.biz.dao;
-
-
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.jg.biz.dao;
+//
+//
+//import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/JYBJEventHandler.java

@@ -2,15 +2,15 @@ package com.yeejoin.amos.boot.module.jg.biz.handler;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
 import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgOtherInfoServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingServiceImpl;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/SafetyProblemEventHandlerFactory.java

 package com.yeejoin.amos.boot.module.jg.biz.handler;
 
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgOtherInfoServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingServiceImpl;
-import org.springframework.stereotype.Component;
 import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
 
 @Component
 public class SafetyProblemEventHandlerFactory {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/SafetyProblemTopicMessage.java

@@ -5,14 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
 import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
 import com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
-import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
 import com.yeejoin.amos.boot.module.jg.biz.handler.SafetyProblemEventHandlerFactory;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgOtherInfoServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingServiceImpl;
@@ -31,7 +31,6 @@ import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

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

@@ -14,6 +14,8 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipInfoCylinderExcelDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
@@ -22,9 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.config.PressureVesselListener;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
@@ -63,11 +63,13 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.stream.Collectors;
+
 import static com.alibaba.fastjson.JSON.toJSONString;
 
 

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

@@ -17,6 +17,8 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -30,7 +32,6 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
@@ -38,7 +39,6 @@ import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
@@ -73,6 +73,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -80,6 +81,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import static com.alibaba.fastjson.JSON.parseArray;
 
 /**

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

@@ -18,6 +18,8 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
@@ -28,13 +30,11 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
@@ -70,6 +70,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -86,6 +87,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
+
 import static java.util.stream.Collectors.toList;
 
 /**

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

@@ -16,6 +16,8 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -28,13 +30,11 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgVehicleInformationService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgVehicleInformationVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
@@ -67,6 +67,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.nio.file.Files;
@@ -77,6 +78,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;

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

@@ -2,14 +2,16 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.eclipse.paho.client.mqttv3.MqttException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -19,8 +21,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 /**
  * 安全追溯问题生成服务实现类
  *

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.jyjc.biz.dao;
-
-
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.jyjc.biz.dao;
+//
+//
+//import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

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

@@ -3,11 +3,11 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
 import com.yeejoin.amos.boot.module.jyjc.api.model.InspectionPlanModel;
-import com.yeejoin.amos.boot.module.jyjc.biz.dao.ESEquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
@@ -25,7 +25,7 @@ public class InspectionPlanServiceImpl {
 
     private JyjcInspectionApplicationEquipServiceImpl applicationEquipService;
 
-    private ESEquipmentCategory  esEquipmentCategory;
+    private ESEquipmentCategory esEquipmentCategory;
 
     public InspectionPlanServiceImpl(JyjcInspectionApplicationServiceImpl inspectionApplicationService,
                                      JyjcInspectionApplicationEquipServiceImpl applicationEquipService,

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

@@ -16,7 +16,9 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.*;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
@@ -24,13 +26,11 @@ import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEqu
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
-import com.yeejoin.amos.boot.module.jyjc.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEvent;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.TaskModelServiceImpl;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;

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

-package com.yeejoin.amos.boot.module.tcm.api.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-/**
- * @Author cpp
- * @Description
- * @Date 2023/6/5
- */
-@Data
-@Accessors(chain = true)
-@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
-public class ESEquipmentCategoryDto {
-
-    @Id
-    private String SEQUENCE_NBR;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_NAME;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_CREDIT_CODE;
-
-    @Field(type = FieldType.Keyword)
-    private String EQU_LIST_CODE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_LIST;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CATEGORY;
-
-    @Field(type = FieldType.Keyword)
-    private String EQU_CATEGORY_CODE;
-
-    @Field(type = FieldType.Keyword)
-    private String USE_ORG_CODE;
-
-    @Field(type = FieldType.Text)
-    private String CODE96333;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CODE;
-
-    @Field(type = FieldType.Keyword)
-    private String SUPERVISORY_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USE_PLACE;
-
-    @Field(type = FieldType.Text)
-    private String ADDRESS;
-
-    @Field(type = FieldType.Integer)
-    private Integer EQU_STATE;
-
-    @Field(type = FieldType.Keyword)
-    private String STATUS;
-
-    @Field(type = FieldType.Long)
-    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;
-
-    @Field(type = FieldType.Text)
-    private String FACTORY_NUM;
-
-    @Field(type = FieldType.Text)
-    private String PRODUCE_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String INSPECT_REPORT;
-
-    @Field(type = FieldType.Text)
-    private String NEXT_INSPECT_DATE;
-
-    @Field(type = FieldType.Text)
-    private String CONSTRUCTION_TYPE;
-
-    @Field(type = FieldType.Text)
-    private String USC_UNIT_CREDIT_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USC_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String USC_DATE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_DEFINE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_DEFINE_CODE;
-
-    @Field(type = FieldType.Text)
-    private String PRODUCT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String BRAND_NAME;
-
-    @Field(type = FieldType.Text)
-    private String EQU_TYPE;
-
-    @Field(type = FieldType.Text)
-    private String PRODUCE_DATE;
-
-    @Field(type = FieldType.Text)
-    private String DATA_SOURCE;
-
-    @Field(type = FieldType.Text)
-    private String WHETHER_VEHICLE_CYLINDER;
-
-    @Field(type = FieldType.Text)
-    private String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL;
-
-    /**
-     * 问题状态
-     */
-    @Field(type = FieldType.Text)
-    private String problemStatus;
-
-    /**
-     * 是否纳管：true - 已纳管 false-未纳管
-     */
-    @Field(type = FieldType.Boolean)
-    private Boolean IS_INTO_MANAGEMENT;
-
-}
+//package com.yeejoin.amos.boot.module.tcm.api.dto;
+//
+//import lombok.experimental.Accessors;
+//import org.springframework.data.annotation.Id;
+//import org.springframework.data.elasticsearch.annotations.Document;
+//import org.springframework.data.elasticsearch.annotations.Field;
+//import org.springframework.data.elasticsearch.annotations.FieldType;
+//
+///**
+// * @Author cpp
+// * @Description
+// * @Date 2023/6/5
+// */
+////@Data
+//@Accessors(chain = true)
+//@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
+//public class ESEquipmentCategoryDto {
+//
+//    @Id
+//    private String SEQUENCE_NBR;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_CREDIT_CODE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String EQU_LIST_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_LIST;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CATEGORY;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String EQU_CATEGORY_CODE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String USE_ORG_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String CODE96333;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CODE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String SUPERVISORY_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_PLACE;
+//
+//    @Field(type = FieldType.Text)
+//    private String ADDRESS;
+//
+//    @Field(type = FieldType.Integer)
+//    private Integer EQU_STATE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String STATUS;
+//
+//    @Field(type = FieldType.Long)
+//    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;
+//
+//    @Field(type = FieldType.Text)
+//    private String FACTORY_NUM;
+//
+//    @Field(type = FieldType.Text)
+//    private String PRODUCE_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String INSPECT_REPORT;
+//
+//    @Field(type = FieldType.Text)
+//    private String NEXT_INSPECT_DATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String CONSTRUCTION_TYPE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USC_UNIT_CREDIT_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USC_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String USC_DATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_DEFINE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_DEFINE_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String PRODUCT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String BRAND_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_TYPE;
+//
+//    @Field(type = FieldType.Text)
+//    private String PRODUCE_DATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String DATA_SOURCE;
+//
+//    @Field(type = FieldType.Text)
+//    private String WHETHER_VEHICLE_CYLINDER;
+//
+//    @Field(type = FieldType.Text)
+//    private String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL;
+//
+//    /**
+//     * 问题状态
+//     */
+//    @Field(type = FieldType.Text)
+//    private String problemStatus;
+//
+//    /**
+//     * 是否纳管：true - 已纳管 false-未纳管
+//     */
+//    @Field(type = FieldType.Boolean)
+//    private Boolean IS_INTO_MANAGEMENT;
+//
+//}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.tcm.biz.dao;
-
-
-import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.tcm.biz.dao;
+//
+//
+//import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

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

@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquipExportDto;
@@ -23,7 +24,6 @@ import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.*;
 import com.yeejoin.amos.boot.module.tcm.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.tcm.api.vo.EquipExportVo;
-import com.yeejoin.amos.boot.module.tcm.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.PrivilegeFeginService;

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

-package com.yeejoin.amos.boot.module.ymt.api.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-/**
- * @Author cpp
- * @Description
- * @Date 2023/6/5
- */
-@Data
-@Accessors(chain = true)
-@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
-public class ESEquipmentCategoryDto {
-
-    @Id
-    private String SEQUENCE_NBR;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_NAME;
-
-    @Field(type = FieldType.Text)
-    private String ORG_BRANCH_CODE;
-
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String USE_UNIT_CREDIT_CODE;
-
-    @Field(type = FieldType.Keyword)
-    private String EQU_LIST_CODE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_LIST;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CATEGORY;
-
-    @Field(type = FieldType.Keyword)
-    private String EQU_CATEGORY_CODE;
-
-    @Field(type = FieldType.Keyword)
-    private String USE_ORG_CODE;
-
-    @Field(type = FieldType.Text)
-    private String CODE96333;
-
-    @Field(type = FieldType.Text)
-    private String EQU_CODE;
-
-    @Field(type = FieldType.Keyword)
-    private String SUPERVISORY_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USE_PLACE;
-
-    @Field(type = FieldType.Text)
-    private String ADDRESS;
-
-    @Field(type = FieldType.Integer)
-    private Integer EQU_STATE;
-
-    @Field(type = FieldType.Keyword)
-    private String STATUS;
-
-    @Field(type = FieldType.Long)
-    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;
-
-    @Field(type = FieldType.Text)
-    private String FACTORY_NUM;
-
-    @Field(type = FieldType.Text)
-    private String PRODUCE_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String INSPECT_REPORT;
-
-    @Field(type = FieldType.Text)
-    private String NEXT_INSPECT_DATE;
-
-    @Field(type = FieldType.Text)
-    private String CONSTRUCTION_TYPE;
-
-    @Field(type = FieldType.Text)
-    private String USC_UNIT_CREDIT_CODE;
-
-    @Field(type = FieldType.Text)
-    private String USC_UNIT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String USC_DATE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_DEFINE;
-
-    @Field(type = FieldType.Text)
-    private String EQU_DEFINE_CODE;
-
-    @Field(type = FieldType.Text)
-    private String PRODUCT_NAME;
-
-    @Field(type = FieldType.Text)
-    private String BRAND_NAME;
-
-    @Field(type = FieldType.Text)
-    private String EQU_TYPE;
-
-    @Field(type = FieldType.Text)
-    private String PRODUCE_DATE;
-
-    @Field(type = FieldType.Text)
-    private String DATA_SOURCE;
-
-    @Field(type = FieldType.Text)
-    private String WHETHER_VEHICLE_CYLINDER;
-
-    @Field(type = FieldType.Text)
-    private String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL;
-
-
-    /**
-     * 问题状态
-     */
-    @Field(type = FieldType.Text)
-    private String problemStatus;
-
-    /**
-     * 是否纳管：true - 已纳管 false-未纳管
-     */
-    @Field(type = FieldType.Boolean)
-    private Boolean IS_INTO_MANAGEMENT;
-}
+//package com.yeejoin.amos.boot.module.ymt.api.dto;
+//
+//import lombok.Data;
+//import lombok.experimental.Accessors;
+//import org.springframework.data.annotation.Id;
+//import org.springframework.data.elasticsearch.annotations.Document;
+//import org.springframework.data.elasticsearch.annotations.Field;
+//import org.springframework.data.elasticsearch.annotations.FieldType;
+//
+///**
+// * @Author cpp
+// * @Description
+// * @Date 2023/6/5
+// */
+//@Data
+//@Accessors(chain = true)
+//@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
+//public class ESEquipmentCategoryDto {
+//
+//    @Id
+//    private String SEQUENCE_NBR;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String ORG_BRANCH_CODE;
+//
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_UNIT_CREDIT_CODE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String EQU_LIST_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_LIST;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CATEGORY;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String EQU_CATEGORY_CODE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String USE_ORG_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String CODE96333;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_CODE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String SUPERVISORY_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USE_PLACE;
+//
+//    @Field(type = FieldType.Text)
+//    private String ADDRESS;
+//
+//    @Field(type = FieldType.Integer)
+//    private Integer EQU_STATE;
+//
+//    @Field(type = FieldType.Keyword)
+//    private String STATUS;
+//
+//    @Field(type = FieldType.Long)
+//    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;
+//
+//    @Field(type = FieldType.Text)
+//    private String FACTORY_NUM;
+//
+//    @Field(type = FieldType.Text)
+//    private String PRODUCE_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String INSPECT_REPORT;
+//
+//    @Field(type = FieldType.Text)
+//    private String NEXT_INSPECT_DATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String CONSTRUCTION_TYPE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USC_UNIT_CREDIT_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String USC_UNIT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String USC_DATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_DEFINE;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_DEFINE_CODE;
+//
+//    @Field(type = FieldType.Text)
+//    private String PRODUCT_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String BRAND_NAME;
+//
+//    @Field(type = FieldType.Text)
+//    private String EQU_TYPE;
+//
+//    @Field(type = FieldType.Text)
+//    private String PRODUCE_DATE;
+//
+//    @Field(type = FieldType.Text)
+//    private String DATA_SOURCE;
+//
+//    @Field(type = FieldType.Text)
+//    private String WHETHER_VEHICLE_CYLINDER;
+//
+//    @Field(type = FieldType.Text)
+//    private String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL;
+//
+//
+//    /**
+//     * 问题状态
+//     */
+//    @Field(type = FieldType.Text)
+//    private String problemStatus;
+//
+//    /**
+//     * 是否纳管：true - 已纳管 false-未纳管
+//     */
+//    @Field(type = FieldType.Boolean)
+//    private Boolean IS_INTO_MANAGEMENT;
+//}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/IEquipmentCategoryService.java

@@ -2,8 +2,6 @@ package com.yeejoin.amos.boot.module.ymt.api.service;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.ymt.api.entity.CategoryOtherInfo;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.LinkedHashMap;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/dao/ESEquipmentCategory.java

-package com.yeejoin.amos.boot.module.ymt.biz.dao;
-
-
-import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
-}
+//package com.yeejoin.amos.boot.module.ymt.biz.dao;
+//
+//
+//import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+//import org.springframework.data.repository.PagingAndSortingRepository;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface ESEquipmentCategory  extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+//}

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

@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
@@ -24,7 +25,6 @@ import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.ymt.api.service.IGenerateCodeService;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.ymt.biz.dao.ESElavtorRepository;
-import com.yeejoin.amos.boot.module.ymt.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.PrivilegeFeginService;