Bläddra i källkod

fix 将所有主键换成String类型,避免精度丢失问题

18339543638 3 år sedan
förälder
incheckning
375b246579
17 ändrade filer med 31 tillägg och 31 borttagningar
  1. 3 7
      coffee-common/src/main/java/com/coffee/common/crud/controller/BaseQueryController.java
  2. 2 0
      coffee-common/src/main/java/com/coffee/common/entity/GenericEntity.java
  3. 2 0
      coffee-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java
  4. 2 2
      coffee-system/src/main/java/com/coffee/bus/controller/BuDoctorController.java
  5. 2 2
      coffee-system/src/main/java/com/coffee/bus/controller/BusAnalgesicScoreController.java
  6. 2 2
      coffee-system/src/main/java/com/coffee/bus/controller/BusHospitalController.java
  7. 2 2
      coffee-system/src/main/java/com/coffee/bus/controller/BusHospitalLogController.java
  8. 2 2
      coffee-system/src/main/java/com/coffee/bus/controller/BusTemplateAnalgesicController.java
  9. 1 1
      coffee-system/src/main/java/com/coffee/bus/entity/BusAnalgesicScoreEntity.java
  10. 1 1
      coffee-system/src/main/java/com/coffee/bus/entity/BusDoctorEntity.java
  11. 1 1
      coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalEntity.java
  12. 1 1
      coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalLogEntity.java
  13. 2 2
      coffee-system/src/main/java/com/coffee/bus/service/LocalBusAnalgesicScoreService.java
  14. 2 2
      coffee-system/src/main/java/com/coffee/bus/service/LocalBusDoctorService.java
  15. 2 2
      coffee-system/src/main/java/com/coffee/bus/service/LocalBusHospitalLogService.java
  16. 2 2
      coffee-system/src/main/java/com/coffee/bus/service/LocalBusHospitalService.java
  17. 2 2
      coffee-system/src/main/java/com/coffee/bus/service/LocalBusTemplateAnalgesicService.java

+ 3 - 7
coffee-common/src/main/java/com/coffee/common/crud/controller/BaseQueryController.java

@@ -11,10 +11,7 @@ import com.coffee.common.entity.QueryParamEntity;
 import com.coffee.common.result.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
 
@@ -47,9 +44,9 @@ public interface BaseQueryController<E, K extends Serializable> extends
     }
 
 
-    @GetMapping("/{id:.+}")
+    @GetMapping("/view")
     @Operation(summary = "根据ID查询")
-    default R<E> getById(@PathVariable K id) {
+    default R<E> getById(@RequestParam("id") K id) {
         queryAuth();
         String key=String.valueOf(id);
         if(StrUtil.isNullOrUndefined(key)){
@@ -57,5 +54,4 @@ public interface BaseQueryController<E, K extends Serializable> extends
         }
         return R.success(getService().getById(key));
     }
-
 }

+ 2 - 0
coffee-common/src/main/java/com/coffee/common/entity/GenericEntity.java

@@ -8,6 +8,8 @@ import lombok.Setter;
 
 
 public abstract class  GenericEntity<PK> implements Entity {
+    private static final long serialVersionUID = 1L;
+
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
     @Getter

+ 2 - 0
coffee-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java

@@ -12,6 +12,8 @@ import lombok.Getter;
  */
 public abstract class TenantGenericEntity<PK,TN> extends GenericEntity<PK> {
 
+    private static final long serialVersionUID = 1L;
+
     @Getter
     @TableField("tenant_id")
     private TN tenantId;

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/controller/BuDoctorController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 @RequestMapping("/bus/doctor")
 @Api(tags = "医院医生管理",description = "统一权限前缀(bus:doctor),例如新增bus:doctor:add")
-public class BuDoctorController extends BaseCrudController<BusDoctorEntity, Long> {
+public class BuDoctorController extends BaseCrudController<BusDoctorEntity, String> {
     private final LocalBusDoctorService doctorService;
 
 
@@ -37,7 +37,7 @@ public class BuDoctorController extends BaseCrudController<BusDoctorEntity, Long
     }
 
     @Override
-    public BaseService<? extends Mapper<BusDoctorEntity>, BusDoctorEntity, Long> getService() {
+    public BaseService<? extends Mapper<BusDoctorEntity>, BusDoctorEntity, String> getService() {
         return doctorService;
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/controller/BusAnalgesicScoreController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 @RequestMapping("/analgesic/score")
 @Api(tags = "评价管理",description = "统一权限前缀(analgesic:score),analgesic:score:add")
-public class BusAnalgesicScoreController extends BaseCrudController<BusAnalgesicScoreEntity, Long> {
+public class BusAnalgesicScoreController extends BaseCrudController<BusAnalgesicScoreEntity, String> {
     private final LocalBusAnalgesicScoreService scoreService;
 
 
@@ -37,7 +37,7 @@ public class BusAnalgesicScoreController extends BaseCrudController<BusAnalgesic
     }
 
     @Override
-    public BaseService<? extends Mapper<BusAnalgesicScoreEntity>, BusAnalgesicScoreEntity, Long> getService() {
+    public BaseService<? extends Mapper<BusAnalgesicScoreEntity>, BusAnalgesicScoreEntity, String> getService() {
         return scoreService;
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/controller/BusHospitalController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 @RequestMapping("/bus/hospital")
 @Api(tags = "医院管理",description = "统一权限前缀(bus:hospital),例如新增bus:hospital:add")
-public class BusHospitalController extends BaseCrudController<BusHospitalEntity, Long> {
+public class BusHospitalController extends BaseCrudController<BusHospitalEntity, String> {
     private final LocalBusHospitalService hospitalService;
 
 
@@ -35,7 +35,7 @@ public class BusHospitalController extends BaseCrudController<BusHospitalEntity,
     }
 
     @Override
-    public BaseService<? extends Mapper<BusHospitalEntity>, BusHospitalEntity, Long> getService() {
+    public BaseService<? extends Mapper<BusHospitalEntity>, BusHospitalEntity, String> getService() {
         return hospitalService;
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/controller/BusHospitalLogController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 @RequestMapping("/log/hospital")
 @Api(tags = "医院传输日志管理",description = "统一权限前缀(log:hospital),例如新增log:hospital:add")
-public class BusHospitalLogController extends BaseCrudController<BusHospitalLogEntity, Long> {
+public class BusHospitalLogController extends BaseCrudController<BusHospitalLogEntity, String> {
     private final LocalBusHospitalLogService logService;
 
 
@@ -37,7 +37,7 @@ public class BusHospitalLogController extends BaseCrudController<BusHospitalLogE
     }
 
     @Override
-    public BaseService<? extends Mapper<BusHospitalLogEntity>, BusHospitalLogEntity, Long> getService() {
+    public BaseService<? extends Mapper<BusHospitalLogEntity>, BusHospitalLogEntity, String> getService() {
         return logService;
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/controller/BusTemplateAnalgesicController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 @RequestMapping("/temp/analgesic")
 @Api(tags = "评价模板管理",description = "统一权限前缀(temp:analgesic),temp:analgesic:add")
-public class BusTemplateAnalgesicController extends BaseCrudController<BusTemplateAnalgesicEntity, Long> {
+public class BusTemplateAnalgesicController extends BaseCrudController<BusTemplateAnalgesicEntity, String> {
     private final LocalBusTemplateAnalgesicService analgesicService;
 
 
@@ -37,7 +37,7 @@ public class BusTemplateAnalgesicController extends BaseCrudController<BusTempla
     }
 
     @Override
-    public BaseService<? extends Mapper<BusTemplateAnalgesicEntity>, BusTemplateAnalgesicEntity, Long> getService() {
+    public BaseService<? extends Mapper<BusTemplateAnalgesicEntity>, BusTemplateAnalgesicEntity, String> getService() {
         return analgesicService;
     }
 }

+ 1 - 1
coffee-system/src/main/java/com/coffee/bus/entity/BusAnalgesicScoreEntity.java

@@ -36,7 +36,7 @@ import javax.validation.constraints.Size;
 @Accessors(chain = true)
 @TableName("bus_analgesic_score")
 @ApiModel(value="评价得分", description="评价得分实体类")
-public class BusAnalgesicScoreEntity extends TenantGenericEntity<Long,Long> {
+public class BusAnalgesicScoreEntity extends TenantGenericEntity<String,String> {
 
     @ApiModelProperty(value = "病号")
     @Length(max = 255,message = "病号长度不得超过255个字节")

+ 1 - 1
coffee-system/src/main/java/com/coffee/bus/entity/BusDoctorEntity.java

@@ -19,7 +19,7 @@ import org.hibernate.validator.constraints.Length;
 @Data
 @TableName(value = "bus_doctor",autoResultMap = true)
 @ApiModel(value="医院医生", description="医院医生实体类")
-public class BusDoctorEntity  extends TenantGenericEntity<Long,Long> {
+public class BusDoctorEntity  extends TenantGenericEntity<String,String> {
     @ApiModelProperty(value = "医生名称")
     @Length(max = 255,message = "医生名称长度不得超过255个字节")
     private String name;

+ 1 - 1
coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalEntity.java

@@ -28,7 +28,7 @@ import java.util.Date;
 @Data
 @TableName(value = "bus_hospital",autoResultMap = true)
 @ApiModel(value="医院", description="医院实体类")
-public class BusHospitalEntity extends GenericEntity<Long> implements RecordModifierEntity, RecordCreationEntity {
+public class BusHospitalEntity extends GenericEntity<String> implements RecordModifierEntity, RecordCreationEntity {
 
 
     /**

+ 1 - 1
coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalLogEntity.java

@@ -25,7 +25,7 @@ import java.util.Date;
 @Data
 @TableName(value = "bus_hospital_log",autoResultMap = true)
 @ApiModel(value="医院数据传输日志", description="医院数据传输日志")
-public class BusHospitalLogEntity extends TenantGenericEntity<Long,Long> {
+public class BusHospitalLogEntity extends TenantGenericEntity<String,String> {
 
     @TableField(typeHandler = DateToBigIntHandler.class)
     @ApiModelProperty(value = "医院数据接收时间")

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/service/LocalBusAnalgesicScoreService.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusAnalgesicScoreService extends BaseService<BusAnalgesicScoreMapper, BusAnalgesicScoreEntity,Long> {
+public class LocalBusAnalgesicScoreService extends BaseService<BusAnalgesicScoreMapper, BusAnalgesicScoreEntity,String> {
     @Override
     public void validateBeforeSave(BusAnalgesicScoreEntity entity) {
 
@@ -25,7 +25,7 @@ public class LocalBusAnalgesicScoreService extends BaseService<BusAnalgesicScore
     }
 
     @Override
-    public void validateBeforeDelete(Long id) {
+    public void validateBeforeDelete(String id) {
 
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/service/LocalBusDoctorService.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusDoctorService extends BaseService<BusDoctorMapper, BusDoctorEntity,Long> {
+public class LocalBusDoctorService extends BaseService<BusDoctorMapper, BusDoctorEntity,String> {
     @Override
     public void validateBeforeSave(BusDoctorEntity entity) {
 
@@ -27,7 +27,7 @@ public class LocalBusDoctorService extends BaseService<BusDoctorMapper, BusDocto
     }
 
     @Override
-    public void validateBeforeDelete(Long id) {
+    public void validateBeforeDelete(String id) {
 
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/service/LocalBusHospitalLogService.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusHospitalLogService extends BaseService<BusHospitalLogMapper, BusHospitalLogEntity,Long> {
+public class LocalBusHospitalLogService extends BaseService<BusHospitalLogMapper, BusHospitalLogEntity,String> {
     @Override
     public void validateBeforeSave(BusHospitalLogEntity entity) {
 
@@ -25,7 +25,7 @@ public class LocalBusHospitalLogService extends BaseService<BusHospitalLogMapper
     }
 
     @Override
-    public void validateBeforeDelete(Long id) {
+    public void validateBeforeDelete(String id) {
 
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/service/LocalBusHospitalService.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusHospitalEntity,Long> {
+public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusHospitalEntity,String> {
     @Override
     public void validateBeforeSave(BusHospitalEntity entity) {
 
@@ -25,7 +25,7 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
     }
 
     @Override
-    public void validateBeforeDelete(Long id) {
+    public void validateBeforeDelete(String id) {
 
     }
 }

+ 2 - 2
coffee-system/src/main/java/com/coffee/bus/service/LocalBusTemplateAnalgesicService.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-public class LocalBusTemplateAnalgesicService extends BaseService<BusTemplateAnalgesicMapper, BusTemplateAnalgesicEntity,Long> {
+public class LocalBusTemplateAnalgesicService extends BaseService<BusTemplateAnalgesicMapper, BusTemplateAnalgesicEntity,String> {
     @Override
     public void validateBeforeSave(BusTemplateAnalgesicEntity entity) {
 
@@ -25,7 +25,7 @@ public class LocalBusTemplateAnalgesicService extends BaseService<BusTemplateAna
     }
 
     @Override
-    public void validateBeforeDelete(Long id) {
+    public void validateBeforeDelete(String id) {
 
     }
 }