Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+
 import java.util.Date;
 
 /**
@@ -17,6 +17,9 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value="ShCarDto", description="三环系统-车辆信息表")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class ShCarDto {
 
    private static final long serialVersionUID = 1L;

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

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+
 import java.util.Date;
 
 /**
@@ -17,6 +17,9 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value="ShCarEquDto", description="")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class ShCarEquDto {
 
    private static final long serialVersionUID = 1L;

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
@@ -28,6 +30,10 @@ public class ShCar {
      * seq
      */
     @TableField(value = "\"SEQUENCE_NBR\"")
+    @TableId(
+            value = "\"SEQUENCE_NBR\"",
+            type = IdType.ID_WORKER
+    )
     private String sequenceNbr;
 
     /**

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
@@ -26,6 +28,10 @@ public class ShCarEqu {
      * primary key
      */
     @TableField(value = "\"SEQUENCE_NBR\"")
+    @TableId(
+            value = "\"SEQUENCE_NBR\"",
+            type = IdType.ID_WORKER
+    )
     private String sequenceNbr;
 
     /**

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.ShCarDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.ShCar;
@@ -58,8 +59,8 @@ 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") String sequenceNbr) {
-	    entity.setSequenceNbr(sequenceNbr);
+	public ResponseModel<ShCar> updateBySequenceNbrShCar(@RequestBody ShCar entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    // entity.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(shCarServiceImpl.updateWithModel(entity));
 	}
 
@@ -127,4 +128,17 @@ public class ShCarController extends BaseController {
 	public ResponseModel<List<ShCar>> selectForList() {
 	    return ResponseHelper.buildResponse(shCarServiceImpl.queryForShCarList());
 	}
+
+	/**
+	 * 数据查询，校验是否是三环系统数据
+	 *
+	 * @return 结果
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "数据查询，校验是否是三环系统数据",   notes = "数据查询，校验是否是三环系统数据")
+	@GetMapping(value = "/searchForSanHan")
+	public ResponseModel<ShCar> searchForSanHan(@RequestParam(value = "sanHuanInputValue") String sanHuanInputValue) {
+		return ResponseHelper.buildResponse(shCarServiceImpl.getBaseMapper().selectOne(new LambdaQueryWrapper<ShCar>()
+				.eq(ShCar::getSequenceNbr,"DJ1309111615548356CAE8B77CBA2")));
+	}
 }

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

@@ -53,8 +53,8 @@ public class ShCarEquController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<ShCarEqu> updateBySequenceNbrShCarEqu(@RequestBody ShCarEqu entity,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
-	    entity.setSequenceNbr(sequenceNbr);
+	public ResponseModel<ShCarEqu> updateBySequenceNbrShCarEqu(@RequestBody ShCarEqu entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    // entity.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(shCarEquServiceImpl.updateWithModel(entity));
 	}