Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderAreaDataServiceImpl.java

 package com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.KeyValueDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
 import com.yeejoin.amos.boot.module.cylinder.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.cylinder.biz.dao.ESCylinderFillingRecordRepository;
-import com.yeejoin.amos.boot.module.cylinder.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CityCylinderInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderAreaDataDto;
-import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoStatisticsDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderAreaData;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderAreaDataMapper;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderAreaDataService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import joptsimple.internal.Strings;
-import org.apache.lucene.search.comparators.DoubleComparator;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -34,7 +26,6 @@ import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;

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-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import cn.hutool.json.JSONArray;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -11,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * @author LiuLin
@@ -267,4 +269,7 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @ExcelProperty(value = "热处理温度(℃)", index = 52)
     @ApiModelProperty(value = "热处理温度(℃)")
     private String qpHeatTreatmentTemperature;
+
+    @ExcelIgnore
+    private List fileData;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeVehicleRegistrationUnitDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 单位变更登记
@@ -127,4 +129,8 @@ public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "车辆属地")
     private String vehicleApanage;
 
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
+    private List<String> roleIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeVehicleRegistrationUnit.java

@@ -233,4 +233,10 @@ public class JgChangeVehicleRegistrationUnit extends BaseEntity {
 	@TableField("vehicle_apanage")
     private String vehicleApanage;
 
+    /**
+     * 车牌号
+     */
+	@TableField("car_number")
+    private String carNumber;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeVehicleRegistrationUnitMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +18,11 @@ import java.util.Map;
 public interface JgChangeVehicleRegistrationUnitMapper extends BaseMapper<JgChangeVehicleRegistrationUnit> {
 
     List<Map<String, Object>> getEquList(@Param("records") List<String>records);
+
+    Page<JgChangeVehicleRegistrationUnit> getPage(@Param("page")Page<JgChangeVehicleRegistrationUnit>page,
+                                                  @Param("dto")JgChangeVehicleRegistrationUnitDto dto,
+                                                  @Param("type") String type,
+                                                  @Param("orgCode") String orgCode,
+                                                  @Param("currentUserId") String currentUserId,
+                                                  @Param("roleIds") List<String> roleIds);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitMapper.xml

@@ -37,8 +37,63 @@
         </foreach>
 
     </select>
-
-
+    <select id="getPage"
+            resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit">
+        select
+        cru.sequence_nbr,
+        cru.change_type,
+        cru.apply_no,
+        date_format(cru.apply_date,'%Y-%m-%d')  as applyDate,
+        date_format(cru.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+        cru.receive_org_name,
+        cru.receive_org_code,
+        cru.use_unit_name,
+        cru.new_use_unit_name,
+        cru.transfer_to_user_ids,
+        cru.car_number,
+        cru.next_execute_user_ids,
+        cru.next_task_id,
+        cru.use_regist_code,
+        cru.status,
+        cru.instance_status,
+        cru.promoter,
+        cru.next_executor_ids,
+        cru.instance_id
+        from tzs_jg_change_vehicle_registration_unit cru
+        <where>
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and cru.apply_no like concat('%', #{dto.applyNo}, '%')
+            </if>
+            <if test="dto.applyDate != null and dto.applyDate != ''">
+                and cru.apply_date = #{dto.applyDate}
+            </if>
+                <if test="dto.status != null and dto.status != ''">
+                and cru.status = #{dto.status}
+            </if>
+            <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
+                and cru.audit_pass_date = #{dto.auditPassDate}
+            </if>
+            <if test="dto.newUseUnitCreditCode != null and dto.newUseUnitCreditCode != ''">
+                and cru.new_use_unit_credit_code = #{dto.newUseUnitCreditCode}
+            </if>
+            <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
+                and cru.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            <if test="type == 'supervision'">
+                AND (cru.receive_org_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                AND cru.instance_id <![CDATA[<>]]>  ''
+            </if>
+            <if test="type == 'enterprise'">
+                AND (cru.new_use_unit_credit_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+            </if>
+            <if test="roleIds != null and type == 'supervision'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    cru.instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+        </where>
+        order by cru.rec_date desc
+    </select>
 
 
 </mapper>

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/controller/CommonController.java

@@ -5,11 +5,13 @@ import com.alibaba.fastjson.JSON;
 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.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.CodeGenerateDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
@@ -583,4 +585,12 @@ public class CommonController extends BaseController {
         commonService.historicalDataProcessingOfPressurePipeline();
         return ResponseHelper.buildResponse("success");
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getLatestJgUseRegistrationManage")
+    @ApiOperation(httpMethod = "GET", value = "获取单位下的使用登记证编号", notes = "按照类型查询车载气瓶相关的字典值")
+    public ResponseModel<JgUseRegistrationManage> getLatestJgUseRegistrationManage(@RequestParam(value = "equCategoryCode") String equCategoryCode) {
+        CompanyBo company = getSelectedOrgInfo().getCompany();
+        return ResponseHelper.buildResponse(commonService.getLatestJgUseRegistrationManage(company.getCompanyCode(),equCategoryCode));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -165,27 +165,18 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
-    public ResponseModel<List<EquipInfoCylinderExcelDto>> ImportData (@RequestPart("file") MultipartFile multipartFile) throws Exception {
-        List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>();
-        try {
-            EasyExcel.read(multipartFile.getInputStream(), EquipInfoCylinderExcelDto.class, new AnalysisEventListener<EquipInfoCylinderExcelDto>() {
-                // 每读取一行就调用该方法
-                @Override
-                public void invoke(EquipInfoCylinderExcelDto data, AnalysisContext context) {
-                    EquipInfoCylinderExcelDto fireExperts = new EquipInfoCylinderExcelDto();
-                    BeanUtils.copyProperties(data,fireExperts);
-                    aircraftList.add(fireExperts);
-                }
-                // 全部读取完成就调用该方法
-                @Override
-                public void doAfterAllAnalysed(AnalysisContext context) {
-                    System.out.println("读取完成");
-                }
-            }).headRowNumber(4).sheet().doRead();
-            return ResponseHelper.buildResponse(aircraftList);
-        } catch (Exception e) {
-            throw new Exception("系统异常");
-        }
+    public ResponseModel<?> importPressureData (@RequestPart("file") MultipartFile multipartFile) throws Exception {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureData(multipartFile));
+    }
+
+    /**
+     * 气瓶批量保存
+     * **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/savePressureVesselData")
+    @ApiOperation(httpMethod = "POST", value = "气瓶批量保存", notes = "气瓶批量保存")
+    public ResponseModel<?> savePressureVesselData(@RequestBody Map<String, Object> paramMap) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.savePressureVesselData(paramMap));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeVehicleRegistrationUnitController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -172,6 +173,13 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/delete")
+	@ApiOperation(httpMethod = "DELETE", value = "删除", notes = "删除")
+	public ResponseModel<Object> withdraw(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+		jgChangeVehicleRegistrationUnitServiceImpl.deleteMessage(sequenceNbr);
+		return ResponseHelper.buildResponse("ok");
+	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/flowExecute")
 	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
 	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
@@ -182,4 +190,23 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 				String.valueOf(map.get("nextTaskId")));
 		return ResponseHelper.buildResponse("ok");
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/getPage")
+	@ApiOperation(httpMethod = "POST", value = "车用气瓶列表", notes = "车用气瓶列表")
+	public ResponseModel<Object> getPage(JgChangeVehicleRegistrationUnitDto dto,
+										 @RequestParam(value = "number") int number,
+										 @RequestParam(value = "size") int size) {
+		Page<JgChangeVehicleRegistrationUnit> page = new Page<>(number, size);
+		ReginParams reginParams = getSelectedOrgInfo();
+		ReginParams info = getSelectedOrgInfo();
+		String type = "";
+		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+			type = "enterprise";
+		}else {
+			type = "supervision";
+		}
+
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getPage(page, dto, type, reginParams));
+	}
 }

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/ICommonService.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.InstanceRuntimeData;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 
 import javax.servlet.http.HttpServletResponse;
@@ -212,4 +213,6 @@ public interface ICommonService {
     void updateUnitTypeCache(ReginParams reginParams, String unitType, String selectedRoleSeqs);
 
     void historicalDataProcessingOfPressurePipeline();
+
+    JgUseRegistrationManage getLatestJgUseRegistrationManage(String useUnitCreditCode, String equCategoryCode);
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -37,4 +36,8 @@ public interface IIdxBizJgRegisterInfoService {
     Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject);
 
     Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile);
+
+    Object importPressureData(MultipartFile multipartFile) throws Exception;
+
+    Object savePressureVesselData(Map<String, Object> paramMap);
 }

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/CommonServiceImpl.java

@@ -2075,6 +2075,7 @@ public class CommonServiceImpl implements ICommonService {
      * @param equCategoryCode   设备类别编码
      * @return
      */
+    @Override
     public JgUseRegistrationManage getLatestJgUseRegistrationManage(String useUnitCreditCode, String equCategoryCode) {
         LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper();
         lambdaQueryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode);

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,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.EquipInfoCylinderExcelDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
@@ -22,9 +28,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;
@@ -50,6 +54,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -63,12 +68,18 @@ 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.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+
 import static com.alibaba.fastjson.JSON.toJSONString;
+import static com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER;
 
 
 /**
@@ -110,6 +121,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String IS_COPY = "isCopy";
     // 设备种类
     public static final String EQU_LIST = "EQU_LIST";
+    //模版上传集合
+    public static final String EQU_LISTS = "equLists";
     // 设备类别
     public static final String EQU_CATEGORY = "EQU_CATEGORY";
     // 设备品种
@@ -125,6 +138,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     // 设备来源 jg：新设备录入  jg_his：历史数据录入
     public static final String DATA_SOURCE = "DATA_SOURCE";
+    private static final String ATTACHMENT_UPLOAD = "attachmentUpload";
+
+    private final List<String> resultError = new ArrayList<>();
+    List<String> useInnerCodeList = new ArrayList<>();//单位内部编号集合
+    List<String> equCodeList = new ArrayList<>();//设备代码集合
+    List<String> factoryNumList = new ArrayList<>();//出厂编码集合
+
     /**
      * 业务类型 0：单个新增 1:批量导入
      */
@@ -202,6 +222,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private IdxBizJgTechParamsVesselServiceImpl idxBizJgTechParamsVesselService;
     @Autowired
     private IdxBizJgInspectionDetectionInfoServiceImpl idxBizJgInspectionDetectionInfoService;
+    @Autowired
+    private IIdxBizJgOtherInfoService idxBizJgOtherInfoService;
 
     /**
      * 将对象的属性由驼峰转为纯大写下划线格式
@@ -2009,6 +2031,346 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
+    @Override
+    public Object importPressureData(MultipartFile multipartFile) throws Exception {
+        List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>();
+        resultError.clear();useInnerCodeList.clear();
+        equCodeList.clear();
+        factoryNumList.clear();
+        try {
+            EasyExcel.read(multipartFile.getInputStream(), EquipInfoCylinderExcelDto.class, new AnalysisEventListener<EquipInfoCylinderExcelDto>() {
+                // 每读取一行就调用该方法
+                @Override
+                public void invoke(EquipInfoCylinderExcelDto data, AnalysisContext context) {
+                    EquipInfoCylinderExcelDto fireExperts = new EquipInfoCylinderExcelDto();
+                    BeanUtils.copyProperties(data,fireExperts);
+                    resultError.add(checkExcelData(data, context).toString());
+                    aircraftList.add(fireExperts);
+                    useInnerCodeList.add(data.getUseInnerCode());
+                    equCodeList.add(data.getEquCode());
+                    factoryNumList.add("0".equals(data.getWhetherVehicleCylinder()) ? data.getFactoryNum() : null);
+                }
+                // 全部读取完成就调用该方法
+                @Override
+                public void doAfterAllAnalysed(AnalysisContext context) {
+                    if (CollectionUtils.isEmpty(aircraftList)) {
+                        log.info("你上传了一个空数据的Excel文档!");
+                        resultError.add("你上传了一个空数据的Excel文档!");
+                        throw new BadRequest("你上传了一个空数据的Excel文档!");
+                    }
+                }
+            }).headRowNumber(4).sheet().doRead();
+            // 如果存在错误信息，则抛出 BadRequest 异常
+            if (!resultError.removeIf(String::isEmpty)) {
+                throw new BadRequest("校验失败");
+            }else{
+                return aircraftList;
+            }
+        } catch (Exception e) {
+            throw new Exception(resultError.stream()
+                    .filter(s -> !s.isEmpty())
+                    .collect(Collectors.joining("\n ")));
+        }
+    }
+
+    public static String getUrlByKey(List<Map<String, Object>> dataList, String key) {
+        if (dataList == null || dataList.isEmpty()) {
+            return null; // 如果 dataList 为空或 null，返回 null
+        }
+        for (Map<String, Object> item : dataList) {
+            if (key.equals(item.get("key"))) {
+                List<Map<String, String>> value = (List<Map<String, String>>) item.get("value");
+                if (value != null && !value.isEmpty()) {
+                    return value.get(0).get("url");
+                }
+            }
+        }
+        return null; // 如果找不到对应的 URL，返回 null
+    }
+
+    @Override
+    public Object savePressureVesselData(Map<String, Object> paramMap) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        CompanyBo company = reginParams.getCompany();
+        List<IdxBizJgUseInfo> useInfoList = new ArrayList<>();
+        List<IdxBizJgRegisterInfo> registerInfoList = new ArrayList<>();
+        List<IdxBizJgDesignInfo> designInfoList = new ArrayList<>();
+        List<IdxBizJgFactoryInfo> factoryInfoList = new ArrayList<>();
+        List<IdxBizJgOtherInfo> otherInfoList = new ArrayList<>();
+        List<IdxBizJgTechParamsVessel> paramsVesselList = new ArrayList<>();
+        List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = new ArrayList<>();
+        List<ESEquipmentCategoryDto> esEquipmentCategoryList = new ArrayList<>();
+
+        if (paramMap == null) {
+            throw new IllegalArgumentException("参数Map不能为空");
+        }
+        LinkedHashMap equipmentClassForm = (LinkedHashMap) checkAndCast(paramMap.get(EQUIP_CLASS_FORM_ID));
+        LinkedHashMap attachmentUpload = (LinkedHashMap) checkAndCast(paramMap.get(ATTACHMENT_UPLOAD));
+        String equListCode = (String) equipmentClassForm.get("EQU_LIST");
+        String equCategoryCode = (String) equipmentClassForm.get("EQU_CATEGORY");
+        String equDefineCode = (String) equipmentClassForm.get("EQU_DEFINE");
+        String dataSource = (String) equipmentClassForm.get("DATA_SOURCE");
+
+        List<EquipInfoCylinderExcelDto> equipInfoCylinderExcelDtoList =JSON.parseArray(JSON.toJSONString(attachmentUpload.get(EQU_LISTS)), EquipInfoCylinderExcelDto.class);
+
+        Date date = new Date();
+        String record = UUID.randomUUID().toString();
+        equipInfoCylinderExcelDtoList.forEach(data->{
+            List<Map<String, Object>> fileDataList = (List<Map<String, Object>>)(data.getFileData());
+            String productPhoto = getUrlByKey(fileDataList,"PRODUCT_PHOTO");
+            String otherAccessoriesReg = getUrlByKey(fileDataList,"OTHER_ACCESSORIES_REG");
+            String designDoc = getUrlByKey(fileDataList,"DESIGN_DOC");
+            String designStandard = getUrlByKey(fileDataList,"DESIGN_STANDARD");
+            String otherAccessoriesDes = getUrlByKey(fileDataList,"OTHER_ACCESSORIES_DES");
+            String productQualityYieldProve = getUrlByKey(fileDataList,"PRODUCT_QUALITY_YIELD_PROVE");
+            String factoryStandard = getUrlByKey(fileDataList,"FACTORY_STANDARD");
+            String insUseMaintainExplain = getUrlByKey(fileDataList,"INS_USE_MAINTAIN_EXPLAIN");
+            String otherAccessoriesFact = getUrlByKey(fileDataList,"OTHER_ACCESSORIES_FACT");
+            String factSupervisionInspectionReport = getUrlByKey(fileDataList,"FACT_SUPERVISION_INSPECTION_REPORT");
+            //使用信息
+            IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
+            BeanUtils.copyProperties(data, useInfo);
+            useInfo.setRecord(record);
+            useInfo.setRecDate(date);
+            useInfo.setDataSource(dataSource != null ? dataSource : "jg");//区分历史设备和新增设备
+            useInfo.setEquState(null);
+            useInfo.setIsIntoManagement(dataSource != null);//历史气瓶导入为已纳管设备
+            // 使用单位信息
+            if("个人主体".equals(company.getCompanyType())){
+                useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
+                useInfo.setUseUnitName(company.getCompanyName().split("_")[1]);
+            }else {
+                useInfo.setUseUnitCreditCode(company.getCompanyCode());
+                useInfo.setUseUnitName(company.getCompanyName());
+            }
+            useInfoList.add(useInfo);
+
+            //设计信息
+            IdxBizJgDesignInfo designInfo = new IdxBizJgDesignInfo();
+            BeanUtils.copyProperties(data, designInfo);
+            designInfo.setRecord(record);
+            designInfo.setRecDate(date);
+            if (data.getDesignDate() != null){
+                designInfo.setDesignDate(DateUtil.parse(data.getDesignDate(), "yyyy-MM-dd"));
+            }
+            designInfo.setDesignDoc(designDoc);
+            designInfo.setDesignStandard(designStandard);
+            designInfo.setOtherAccessoriesDes(otherAccessoriesDes);
+            designInfoList.add(designInfo);
+
+            //制造信息
+            IdxBizJgFactoryInfo factoryInfo = new IdxBizJgFactoryInfo();
+            BeanUtils.copyProperties(data, factoryInfo);
+            factoryInfo.setRecord(record);
+            factoryInfo.setRecDate(date);
+            factoryInfo.setProductQualityYieldProve(productQualityYieldProve);
+            factoryInfo.setFactoryStandard(factoryStandard);
+            factoryInfo.setInsUseMaintainExplain(insUseMaintainExplain);
+            factoryInfo.setOtherAccessoriesFact(otherAccessoriesFact);
+            factoryInfo.setFactSupervisionInspectionReport(factSupervisionInspectionReport);
+            factoryInfo.setProduceDate(DateUtil.parse(data.getProduceDate(), "yyyy-MM-dd"));
+            factoryInfo.setImported(Optional.ofNullable(data.getImported()).orElse("0"));
+            factoryInfoList.add(factoryInfo);
+
+            //注册登记
+            IdxBizJgRegisterInfo registerInfo = new IdxBizJgRegisterInfo();
+            BeanUtils.copyProperties(data, registerInfo);
+            registerInfo.setRecord(record);
+            registerInfo.setRecDate(date);
+            registerInfo.setEquCategory(equCategoryCode);
+            registerInfo.setEquDefine(equDefineCode);
+            registerInfo.setEquList(equListCode);
+
+            registerInfo.setRegisterState(idxBizJgRegisterInfoService.getRegCode());
+            registerInfo.setProductPhoto(productPhoto);
+            registerInfo.setOtherAccessoriesReg(otherAccessoriesReg);
+            registerInfoList.add(registerInfo);
+
+            //检验检测
+            IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
+            BeanUtils.copyProperties(data, inspectionDetectionInfo);
+            inspectionDetectionInfo.setInspectOrgCode( data.getInspectOrgCode());
+            inspectionDetectionInfo.setRecord(record);
+            inspectionDetectionInfo.setRecDate(date);
+            inspectionDetectionInfo.setInspectType("ZZJDJY");
+            inspectionDetectionInfo.setInspectConclusion("6040");//默认合格
+            inspectionDetectionInfo.setInspectDate(DateUtil.parse(data.getInspectDate(), "yyyy-MM-dd"));
+            // 根据条件确定增加的年数
+            inspectionDetectionInfo.setNextInspectDate(Date.from(
+                    LocalDate.parse(data.getInspectDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+                            .plusYears(SPECIAL_CYLINDER.getCode().equals(equDefineCode) ? 3 : 4)
+                            .atStartOfDay(ZoneId.systemDefault())
+                            .toInstant()));
+            inspectionDetectionInfoList.add(inspectionDetectionInfo);
+
+            // 其他信息
+            IdxBizJgOtherInfo otherInfo = new IdxBizJgOtherInfo();
+            BeanUtils.copyProperties(data, otherInfo);
+            otherInfo.setRecord(record);
+            otherInfo.setRecDate(date);
+            otherInfoList.add(otherInfo);
+
+            //技术参数
+            IdxBizJgTechParamsVessel paramsVessel = new IdxBizJgTechParamsVessel();
+            BeanUtils.copyProperties(data, paramsVessel);
+            paramsVessel.setRecord(record);
+            paramsVessel.setRecDate(date);
+            paramsVesselList.add(paramsVessel);
+
+            ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(data), ESEquipmentCategoryDto.class);
+            List<EquipmentCategory> equList = commonService.getEquipmentCategoryList(equListCode, null);
+            List<EquipmentCategory> equCategory = commonService.getEquipmentCategoryList(equCategoryCode, null);
+            List<EquipmentCategory> equDefine = commonService.getEquipmentCategoryList(equDefineCode, null);
+
+            // 使用单位信息
+            dto.setDATA_SOURCE(useInfo.getDataSource());
+            dto.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getNextInspectDate() + "");
+            dto.setREC_DATE(System.currentTimeMillis());
+            dto.setSEQUENCE_NBR(record);
+            dto.setFACTORY_NUM(factoryInfo.getFactoryNum());
+            dto.setUSE_INNER_CODE(useInfo.getUseInnerCode());
+            dto.setEQU_CATEGORY_CODE(equCategoryCode);
+            if (CollectionUtils.isNotEmpty(equCategory)) {
+                dto.setEQU_CATEGORY(equCategory.get(0).getName());
+            }
+            dto.setEQU_LIST_CODE(equListCode);
+            if (CollectionUtils.isNotEmpty(equList)) {
+                dto.setEQU_LIST(equList.get(0).getName());
+            }
+            dto.setEQU_DEFINE_CODE(equDefineCode);
+            if (CollectionUtils.isNotEmpty(equDefine)) {
+                dto.setEQU_DEFINE(equDefine.get(0).getName());
+            }
+            // 使用单位信息
+            if("个人主体".equals(company.getCompanyType())){
+                dto.setUSE_UNIT_CREDIT_CODE(company.getCompanyCode().split("_")[1]);
+                dto.setUSE_UNIT_NAME(company.getCompanyName().split("_")[1]);
+            }else {
+                dto.setUSE_UNIT_CREDIT_CODE(company.getCompanyCode());
+                dto.setUSE_UNIT_NAME(company.getCompanyName());
+            }
+            esEquipmentCategoryList.add(dto);
+
+        });
+        Optional.of(useInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgUseInfoService::saveBatch);
+        Optional.of(designInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgDesignInfoService::saveBatch);
+        Optional.of(registerInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgRegisterInfoService::saveBatch);
+        Optional.of(factoryInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgFactoryInfoService::saveBatch);
+        Optional.of(otherInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgOtherInfoService::saveBatch);
+        Optional.of(paramsVesselList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgTechParamsVesselService::saveBatch);
+        Optional.of(inspectionDetectionInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgInspectionDetectionInfoService::saveBatch);
+        Optional.of(esEquipmentCategoryList).filter(list -> !list.isEmpty()).ifPresent(esEquipmentCategory::saveAll);
+        return String.format("导入完成，成功导入: %d 条数据！", useInfoList.size());
+    }
+
+    public StringBuilder checkExcelData(EquipInfoCylinderExcelDto data, AnalysisContext context) {
+        StringBuilder result = new StringBuilder();
+        ReadRowHolder readRowHolder = context.readRowHolder();
+        int rowIndex = readRowHolder.getRowIndex() + 1;
+        try {
+            log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
+            // 检查各字段是否为空，如果为空则追加错误信息
+            checkNotBlank(data.getProductName(), "设备名称不能为空；", result);
+            checkNotBlank(data.getBrandName(), "品牌名称不能为空；", result);
+            checkNotBlank(data.getEquType(), "设备型号不能为空；", result);
+            checkNotBlank(data.getUseInnerCode(), "单位内部编号不能为空；", result);
+            if (useInnerCodeList.contains(data.getUseInnerCode())) {
+                result.append("单位内部编号不能重复；");
+            }
+            checkNotBlank(data.getWhetherVehicleCylinder(), "是否车用气瓶不能为空；", result);
+            checkNotBlank(data.getEquCodeType(), "是否有设备代码不能为空；", result);
+            if ("1".equals(data.getEquCodeType())) {
+                checkNotBlank(data.getEquCode(), "设备代码不能为空；", result);
+                String equCode = data.getEquCode();
+                if (equCode.matches("[a-zA-Z0-9]+")) {
+                    if (equCode.length() <= 17) {
+                        result.append("设备代码不能小于17位；");
+                    }
+                    if (equCode.length() >= 20) {
+                        result.append("设备代码不能大于20位；");
+                    }
+                } else {
+                    result.append("设备代码不能包含特殊字符；");
+                }
+                if (equCodeList.contains(data.getEquCode())) {
+                    result.append("设备代码不能重复；");
+                }
+                this.checkEquCodeUniqueness(data.getEquCode(), result);
+            } else {
+                data.setEquCode("");
+            }
+            checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", result);
+            checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", result);
+            Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", result));
+            Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", result));
+            checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", result);
+            checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", result);
+            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", result);
+            checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
+            if ("0".equals(data.getWhetherVehicleCylinder()) && factoryNumList.contains(data.getFactoryNum()))
+                result.append("出厂编号/产品编码不能重复；");
+            checkFactoryNumUniqueness(data.getFactoryNum(), null, result);
+            checkNotBlank(data.getProduceDate(), "制造日期不能为空；", result);
+            Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", result));
+            checkNotBlank(data.getInspectOrgName(), "检测机构名称不能为空；", result);
+            checkNotBlank(data.getInspectOrgCode(), "检测机构代码不能为空；", result);
+            checkInspectOrg(data.getInspectOrgCode(), result);
+            checkNotBlank(data.getInspectStaff(), "检测人员名称不能为空；", result);
+            checkNotBlank(data.getInspectDate(), "检测日期不能为空；", result);
+            checkDateFormatCorrect(data.getInspectDate(), "检测日期格式不正确；", result);
+            checkNotBlank(data.getSingleBottleVolume(), "单瓶容积不能为空；", result);
+            checkNotBlank(data.getChargingMedium(), "充装介质不能为空；", result);
+            checkNotBlank(data.getNominalWorkingPressure(), "公称工作压力不能为空；", result);
+            // 如果存在错误信息，则抛出 BadRequest 异常
+            if (result.length() > 0) {
+                result.insert(0, "Excel第[" + rowIndex + "]行 -> ");
+            }
+
+        } catch (Exception e) {
+            log.error(String.format("行索引数: [%s] -> 失败的 Excel 数据: [%s]", rowIndex, JSON.toJSONString(data)), e);
+            throw e;
+        }
+        return result;
+    }
+
+    private void checkEquCodeUniqueness(String equCode, StringBuilder result) {
+        // 根据设备代码检查唯一性
+        LambdaQueryWrapper<RegistrationInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RegistrationInfo::getEquCode, equCode);
+        Integer count = tzsJgRegistrationInfoMapper.selectCount(wrapper);
+        if (count > 0) {
+            result.append("设备代码系统中已存在；");
+        }
+    }
+
+    // 检查上传Excel中的日期格式是否正确
+    private void checkDateFormatCorrect(String date, String errorMessage, StringBuilder result) {
+        if (!date.matches("\\d{4}-\\d{2}-\\d{2}")) {
+            result.append(errorMessage);
+        }
+    }
+
+    private void checkInspectOrg(String inspectOrgCode, StringBuilder result){
+        List<Map<String, Object>> InspectOrgList = commonService.getAllInspectionInfo("inspection");
+        if (findUseCode(InspectOrgList, inspectOrgCode) == null) {
+            result.append("未查询到该检验机构；");
+        }
+    }
+
+    // 检查字段是否为空，如果为空则追加错误信息到result
+    private void checkNotBlank(String value, String errorMessage, StringBuilder result) {
+        if (org.apache.commons.lang3.StringUtils.isBlank(value)) {
+            result.append(errorMessage);
+        }
+    }
+
+    private void checkFactoryNumUniqueness(String factoryNum, String sequenceNbr, StringBuilder result) {
+        // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
+        if (commonService.checkFactoryNumUniquenessForVehicleCylinder(factoryNum, sequenceNbr) > 0) {
+            result.append("出厂编号/产品编码系统中已存在！");
+        }
+    }
+
     // 注入依赖
     private void injectDependencies(PressureVesselListener listener, Map<String, Object> paramMap) {
         listener.setIdxBizJgRegisterInfoService(idxBizJgRegisterInfoService);
@@ -2030,4 +2392,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         CompanyBo company = reginParams.getCompany();
         listener.setCompany(company);
     }
+
+
+    public String findUseCode(List<Map<String, Object>> unitList, String inspectOrgCode) {
+        Optional<Map<String, Object>> optional = unitList.stream()
+                .filter(map -> map.get("useCode").equals(inspectOrgCode))
+                .findFirst();
+        return optional.map(map -> (String) map.get("useCode")).orElse(null);
+    }
 }
\ No newline at end of file

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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -6,24 +6,26 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeVehicleRegistrationUnitService;
 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.ymt.api.entity.IdxBizJgFactoryInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -34,19 +36,22 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+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;
+
 /**
  * 单位变更登记服务实现类
  *
@@ -79,7 +84,14 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     private JgChangeVehicleRegistrationUnitEqServiceImpl jgChangeVehicleRegistrationUnitEqService;
     @Autowired
     private RedissonClient redissonClient;
-
+    @Autowired
+    private JgCertificateChangeRecordServiceImpl jgCertificateChangeRecordService;
+    @Autowired
+    private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqService;
+    @Autowired
+    private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
+    @Autowired
+    private IdxBizJgOtherInfoMapper otherInfoMapper;
 
     public void changeData(JgChangeVehicleRegistrationUnit dto) {
         if (!ObjectUtils.isEmpty(dto.getReceiveCompanyCode())) {
@@ -87,6 +99,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             String[] splitMaintenanceUnitCode = dto.getReceiveCompanyCode().split("_");
             dto.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
             dto.setReceiveOrgName(splitMaintenanceUnitCode[1]);
+            dto.setReceiveOrgCode(splitMaintenanceUnitCode[0]);
             dto.setReceiveCompanyOrgCode(commonService.getOneCompany(dto.getReceiveCompanyCode()).getOrgCode());
         }
         if (!ObjectUtils.isEmpty(dto.getUseUnitCreditCode())) {
@@ -200,6 +213,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return Collections.singletonList(dto);
     }
 
+    public Page<JgChangeVehicleRegistrationUnit> getPage(Page<JgChangeVehicleRegistrationUnit> page, JgChangeVehicleRegistrationUnitDto dto, String type, ReginParams reginParams){
+        String orgCode = reginParams.getCompany().getCompanyCode();
+        String currentUserId = reginParams.getUserModel().getUserId();
+       return this.getBaseMapper().getPage(page, dto, type, orgCode, currentUserId, dto.getRoleIds());
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 600000)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String nextTaskId) {
@@ -317,14 +336,16 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             // 流程结束
             jgChangeVehicleRegistrationUnit.setStatus(taskCode);
             jgChangeVehicleRegistrationUnit.setNextExecuteUserIds("");
+            jgChangeVehicleRegistrationUnit.setAuditPassDate(new Date());
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             JSONObject historyData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             // 更新代办
-            updateAgency(jgChangeVehicleRegistrationUnit);
-
+            TaskV2Model taskV2Model = updateAgency(jgChangeVehicleRegistrationUnit);
+            // 修改设备信息、添加证、设备流水信息
+            saveRecord(jgChangeVehicleRegistrationUnit, taskV2Model);
 
         }
         this.getBaseMapper().updateById(jgChangeVehicleRegistrationUnit);
@@ -332,6 +353,116 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return jgChangeVehicleRegistrationUnit;
     }
 
+    public void saveRecord(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, TaskV2Model taskV2Model){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode()).one();
+        // 业务流水生成
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr()).one();
+        JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+        JSONArray dataList = JSONObject.parseArray(jsonObject.get("dataList").toString());
+        ArrayList<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqs = new ArrayList<>();
+        JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
+        jgCertificateChangeRecord.setApplyNo(jgChangeVehicleRegistrationUnit.getApplyNo());
+        jgCertificateChangeRecord.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
+        jgCertificateChangeRecord.setAuditPassDate(new Date());
+        jgCertificateChangeRecord.setRegType(BUSINESS_NAME);
+        jgCertificateChangeRecord.setRegDate(jgChangeVehicleRegistrationUnit.getApplyDate());
+        jgCertificateChangeRecord.setChangeContent(jgChangeVehicleRegistrationUnit.getCreateUserName() + "办理了【" + BUSINESS_NAME + "】," + "单号【" + jgChangeVehicleRegistrationUnit.getApplyNo() +
+                "】,原" + jgChangeVehicleRegistrationUnit.getUseUnitName() + "变更为" + jgChangeVehicleRegistrationUnit.getNewUseUnitName() + ",办理日期" + sdf.format(jgChangeVehicleRegistrationUnit.getAuditPassDate()));
+        jgCertificateChangeRecord.setRecUserId(jgChangeVehicleRegistrationUnit.getRecUserId());
+        jgCertificateChangeRecord.setRecDate(new Date());
+        jgCertificateChangeRecord.setCreateDate(new Date());
+        jgCertificateChangeRecord.setCreateUserId(jgChangeVehicleRegistrationUnit.getCreateUserId());
+        jgCertificateChangeRecord.setUseRegistrationCode(jgChangeVehicleRegistrationUnit.getUseRegistCode());
+        jgCertificateChangeRecord.setCertificateNo(manage.getCertificateNo());
+        jgCertificateChangeRecord.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+        jgCertificateChangeRecord.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
+        jgCertificateChangeRecord.setEquCategory(manage.getEquCategory());
+        jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveCompanyCode());
+        jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
+        // 保存证流水信息
+        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
+        // 组装设备流水
+        dataList.forEach(item ->{
+            JSONObject object = JSONObject.parseObject(JSON.toJSONString(item));
+            JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
+                        jgCertificateChangeRecordEq.setEquId(object.get("record").toString());
+                        jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
+                        jgCertificateChangeRecordEq.setProductCode(object.get("factoryNum").toString());
+                        jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
+        });
+        // 保存设备流水信息
+        jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
+
+        List<String> collect = jgCertificateChangeRecordEqs.stream().map(JgCertificateChangeRecordEq::getEquId).collect(Collectors.toList());
+        if ("0".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)){
+            // 区外变更
+            // 生成使用登记证编号
+            String receiveCompanyCode = jgChangeVehicleRegistrationUnit.getReceiveCompanyCode();
+            CompanyModel receiveCompanyResult = Privilege.companyClient.queryByCompanyCode(receiveCompanyCode).getResult();
+            //查询到局级
+            // 如果不是局级公司，则查询其上级公司信息
+            if (!"prefecture-level".equals(receiveCompanyResult.getLevel())) {
+                CompanyModel receiveParentResult = Privilege.companyClient.seleteOne(receiveCompanyResult.getParentId()).getResult();
+                receiveCompanyCode = receiveParentResult.getCompanyCode();
+            }
+            String code = this.generateVehicleUseRegistrationCode(receiveCompanyCode, manage.getEquDefineCode());
+            manage.setUseRegistrationCode(code);
+            // 更新设备使用登记证信息
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> lambda = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+            lambda.in(IdxBizJgRegisterInfo::getRecord, collect);
+            IdxBizJgRegisterInfo registerInfo = new IdxBizJgRegisterInfo();
+            registerInfo.setUseOrgCode(code);
+            idxBizJgRegisterInfoService.update(registerInfo, lambda);
+            // 使用登记证下设备更新监管码
+            collect.forEach(a ->{
+                createCode(jgChangeVehicleRegistrationUnit, manage.getEquDefineCode(), a);
+            });
+        }
+        // 修改证管理信息
+        manage.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
+        manage.setAuditPassDate(new Date());
+        jgUseRegistrationManageService.updateById(manage);
+    }
+
+    /**
+     * 生成监管码
+     */
+    public void createCode(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, String equCategory, String record) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("cityCode", XI_XIAN.getCode().equals(jgChangeVehicleRegistrationUnit.getVehicleApanage()) ? XIAN_YANG.getCode() : jgChangeVehicleRegistrationUnit.getVehicleApanage());
+        map.put("isXiXian", XI_XIAN.getCode().equals(jgChangeVehicleRegistrationUnit.getVehicleApanage()) ? "1" : "0");
+        map.put("equCategory", equCategory);
+        map.put("countyCode", XI_XIAN.getCode().equals(jgChangeVehicleRegistrationUnit.getVehicleApanage()) ? XIAN_YANG.getCode() : jgChangeVehicleRegistrationUnit.getVehicleApanage());
+
+        // 调用服务创建代码
+        ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
+        Map<String, Object> result = code.getResult();
+
+        // 更新其他信息
+        if (result != null && !result.isEmpty()) {
+            LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
+            lambda.eq(IdxBizJgOtherInfo::getRecord, record);
+            IdxBizJgOtherInfo idxBizJgOtherInfo = new IdxBizJgOtherInfo();
+            idxBizJgOtherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
+            otherInfoMapper.update(idxBizJgOtherInfo, lambda);
+        }
+    }
+
+    /**
+     * 根据车辆属地生成使用登记证
+     *
+     * @param receiveCompanyCode 车辆属地
+     * @return String
+     */
+    private String generateVehicleUseRegistrationCode(String receiveCompanyCode, String equDefineCode) {
+        // 构建设备种类简称
+        String useRegistration = String.format("瓶%s%s", equDefineCode.substring(1, 3), VehicleApanageEnum.of(receiveCompanyCode));
+        // 调用服务端获取注册码
+        ResponseModel<String> stringResponseModel = tzsServiceFeignClient.useRegistrationCode(useRegistration);
+        return stringResponseModel.getResult();
+    }
+
     public InstanceRuntimeData buildInstanceRuntimeData(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit) {
         return InstanceRuntimeData.builder()
                 .nextExecuteUserIds(jgChangeVehicleRegistrationUnit.getNextExecuteUserIds())
@@ -466,10 +597,28 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             map.put("dataList", equList);
             // 组件回显
             map.put("useRegistrationCode", useRegistrationCode);
+            if (!ObjectUtils.isEmpty(information) && !ObjectUtils.isEmpty(information.getCarNumber())) {
+                map.put("carNumber", information.getCarNumber());
+            }
         }
         return map;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteMessage(String sequenceNbr) {
+        JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit = this.baseMapper.selectById(sequenceNbr);
+        // 删除代办 + 中止流程
+        commonServiceImpl.deleteTaskModel(sequenceNbr, jgChangeVehicleRegistrationUnit.getInstanceId());
+        // 删除单子
+        this.baseMapper.deleteById(sequenceNbr);
+        // 删除单子对应eq
+        jgChangeVehicleRegistrationUnitEqService.remove(new LambdaQueryWrapper<JgChangeVehicleRegistrationUnitEq>()
+                .eq(JgChangeVehicleRegistrationUnitEq::getUnitChangeId, sequenceNbr));
+        // 删除单子对应历史表数据
+        jgRegistrationHistoryService.remove(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
+        return Boolean.TRUE;
+    }
     public Map<String, Object> getDetails(String sequenceNbr) {
         JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME).one();
         if (!ObjectUtils.isEmpty(history) && !ObjectUtils.isEmpty(history.getChangeData())) {

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/JgMaintenanceContractServiceImpl.java

@@ -6,13 +6,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 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.entity.JgMaintenanceContract;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
@@ -24,14 +25,10 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
-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.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;

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;