fix(jg):三环车用气瓶认领 接口

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

@@ -3,9 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 import java.util.Date;
 
@@ -18,6 +16,9 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("tzs_jg_certificate_change_record")
 public class JgCertificateChangeRecord extends BaseEntity {
 

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

@@ -2,9 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -16,6 +15,9 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("tzs_jg_certificate_change_record_eq")
 public class JgCertificateChangeRecordEq extends BaseEntity {
 

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

@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
@@ -20,6 +19,9 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("tzs_jg_use_registration_manage")
 public class JgUseRegistrationManage extends BaseEntity {
 

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

@@ -3,8 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 import java.util.Date;
 
@@ -17,6 +16,9 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("tzs_jg_vehicle_information")
 public class JgVehicleInformation extends BaseEntity {
 

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

@@ -3,8 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 import java.util.Date;
 
@@ -17,6 +16,9 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("tzs_jg_vehicle_information_eq")
 public class JgVehicleInformationEq extends BaseEntity {
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IShCarService.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.ShCarDto;
 
+import java.util.Map;
+
 /**
  * 三环系统-车辆信息表接口类
  *
@@ -12,4 +14,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ShCarDto;
 public interface IShCarService {
 
     Page<ShCarDto> queryForShCarPage(Page<ShCarDto> page, ShCarDto dto);
+
+    Boolean claim(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/controller/ShCarController.java

@@ -20,16 +20,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
- *
  * @author system_generator
  * @date 2024-11-08
  */
@@ -46,6 +45,7 @@ public class ShCarController extends BaseController {
 
     @Autowired
     IShCarService iShCarService;
+
     /**
      * 新增
      *
@@ -68,7 +68,7 @@ public class ShCarController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<ShCar> updateBySequenceNbrShCar(@RequestBody ShCar entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<ShCar> updateBySequenceNbrShCar(@RequestBody ShCar entity, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         // entity.setSequenceNbr(sequenceNbr);
         entity.setSequenceNbr(String.valueOf(sequenceNbr));
         return ResponseHelper.buildResponse(shCarServiceImpl.updateWithModel(entity));
@@ -83,7 +83,7 @@ public class ShCarController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(shCarServiceImpl.removeById(sequenceNbr));
     }
 
@@ -95,7 +95,7 @@ public class ShCarController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
     public ResponseModel<ShCar> selectOne(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(shCarServiceImpl.queryBySeq(sequenceNbr));
     }
@@ -109,7 +109,7 @@ public class ShCarController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
     public ResponseModel<Page<ShCarDto>> queryForPage(@RequestParam(value = "current") int current,
                                                       @RequestParam(value = "size") int size,
                                                       ShCarDto dto) {
@@ -133,7 +133,7 @@ public class ShCarController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<ShCar>> selectForList() {
         return ResponseHelper.buildResponse(shCarServiceImpl.queryForShCarList());
@@ -145,11 +145,26 @@ public class ShCarController extends BaseController {
      * @return 结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "数据查询，校验是否是三环系统数据",   notes = "数据查询，校验是否是三环系统数据")
+    @ApiOperation(httpMethod = "GET", value = "数据查询，校验是否是三环系统数据", notes = "数据查询，校验是否是三环系统数据")
     @GetMapping(value = "/searchForSanHan")
-	public ResponseModel<ShCar> searchForSanHan(@RequestParam(value = "sanHuanInputValue") String sanHuanInputValue) {
-		// sanHuanInputValue 可能是 使用登记证号，车牌号，车辆VIN码（车架号） 和 设备代码
-		ShCar shCar = shCarServiceImpl.getBaseMapper()
+    public ResponseModel<ShCar> searchForSanHan(@RequestParam Map<?, ?> map) {
+        // 检查 map 是否为空
+        if (map == null || map.isEmpty()) {
+            return ResponseHelper.buildResponse(new ShCar()); // 返回空对象
+        }
+
+        ShCar shCar = null;
+
+        for (Object value : map.values()) {
+            String sanHuanInputValue = String.valueOf(value);
+
+            // 如果值为空，直接跳过
+            if (ValidationUtil.isEmpty(sanHuanInputValue)) {
+                continue;
+            }
+
+            // 查询 ShCar 表
+            shCar = shCarServiceImpl.getBaseMapper()
                     .selectList(new LambdaQueryWrapper<ShCar>()
                             .eq(ShCar::getClaimedFlag, Boolean.FALSE)
                             .and(w -> w
@@ -159,23 +174,48 @@ public class ShCarController extends BaseController {
                                     .or()
                                     .eq(ShCar::getFrameNumber, sanHuanInputValue)
                             )
-				).stream().findFirst().orElse(new ShCar());
+                    ).stream().findFirst().orElse(null);
 
-		if (!ValidationUtil.isEmpty(shCar.getSequenceNbr())) {
+            // 如果找到符合条件的 ShCar，直接返回
+            if (shCar != null && !ValidationUtil.isEmpty(shCar.getSequenceNbr())) {
                 return ResponseHelper.buildResponse(shCar);
             }
 
+            // 查询 ShCarEqu 表
             Optional<ShCarEqu> carEqu = shCarEquServiceImpl.getBaseMapper()
                     .selectList(new LambdaQueryWrapper<ShCarEqu>()
                             .eq(ShCarEqu::getEquCode, sanHuanInputValue))
                     .stream().findFirst();
 
-		shCar = carEqu.map(equ -> shCarServiceImpl.getBaseMapper()
+            // 如果 ShCarEqu 存在，继续查询 ShCar
+            if (carEqu.isPresent()) {
+                shCar = shCarServiceImpl.getBaseMapper()
                         .selectList(new LambdaQueryWrapper<ShCar>()
                                 .eq(ShCar::getClaimedFlag, Boolean.FALSE)
-								.eq(ShCar::getSequenceNbr, equ.getCarId())
-						).stream().findFirst().orElse(new ShCar()))
-				.orElse(shCar);
+                                .eq(ShCar::getSequenceNbr, carEqu.get().getCarId())
+                        ).stream().findFirst().orElse(null);
+
+                // 如果找到，直接返回
+                if (shCar != null && !ValidationUtil.isEmpty(shCar.getSequenceNbr())) {
                     return ResponseHelper.buildResponse(shCar);
                 }
+            }
+        }
+
+        // 如果未找到，返回空对象
+        return ResponseHelper.buildResponse(new ShCar());
+    }
+
+
+    /**
+     * 认领三环系统数据
+     *
+     * @return result
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "认领三环系统数据", notes = "认领三环系统数据")
+    @PostMapping(value = "/claim")
+    public ResponseModel<Boolean> claim(@RequestBody Map<String, Object> paramMap) {
+        return ResponseHelper.buildResponse(shCarServiceImpl.claim(paramMap));
+    }
 }