Ver Fonte

update 医院接口文档修改
update 基类接口修改

18339543638 há 3 anos atrás
pai
commit
64eef44252

+ 1 - 1
coffee-common/src/main/java/com/coffee/common/crud/controller/BaseDeleteController.java

@@ -25,7 +25,7 @@ public interface BaseDeleteController<E, K extends Serializable> extends BaseCur
      */
     BaseService<? extends Mapper<E>,E,K> getService();
 
-    @DeleteMapping("/{id:.+}")
+    @PostMapping("/remove/{id:.+}")
     @Operation(summary = "根据ID删除")
     default R delete(@PathVariable K id) {
         deleteAuth();

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

@@ -31,7 +31,7 @@ public interface BaseQueryController<E, K extends Serializable> extends
      * @return 分页查询结果
      * @see
      */
-    @PostMapping("/_query")
+    @PostMapping("/page")
     @Operation(summary = "使用POST方式分页动态查询")
     default R<IPage<E>> queryPager(@Parameter(hidden = true)@RequestBody QueryParamEntity<E> query) {
         queryAuth();

+ 2 - 2
coffee-common/src/main/java/com/coffee/common/crud/controller/BaseSaveController.java

@@ -71,7 +71,7 @@ public interface BaseSaveController<E,K extends Serializable> extends
         return getService().saveBatch(payload)?R.success():R.fail("数据新增失败");
     }
 
-    @PostMapping
+    @PostMapping("/add")
     @Operation(summary = "新增单个数据,并返回新增后的数据.")
     default R add(@RequestBody E payload) {
         saveAuth();
@@ -80,7 +80,7 @@ public interface BaseSaveController<E,K extends Serializable> extends
     }
 
 
-    @PutMapping
+    @PostMapping("/refresh")
     @Operation(summary = "根据ID修改数据")
     default R update(@RequestBody E payload) {
         editAuth();

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

@@ -1,5 +1,6 @@
 package com.coffee.common.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
@@ -7,7 +8,7 @@ import lombok.Setter;
 
 
 public abstract class  GenericEntity<PK> implements Entity {
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
     @Getter
     @Setter

+ 1 - 0
coffee-common/src/main/java/com/coffee/common/entity/RecordCreationEntity.java

@@ -2,6 +2,7 @@ package com.coffee.common.entity;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.Date;

+ 0 - 1
coffee-common/src/main/java/com/coffee/common/entity/RecordModifierEntity.java

@@ -24,7 +24,6 @@ public interface RecordModifierEntity extends Entity {
 
 
 
-
     default void setModifyTimeNow() {
         setUpdateTime(new Date());
     }

+ 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, String> {
+public class BusHospitalController extends BaseCrudController<BusHospitalEntity, Long> {
     private final LocalBusHospitalService hospitalService;
 
 
@@ -35,7 +35,7 @@ public class BusHospitalController extends BaseCrudController<BusHospitalEntity,
     }
 
     @Override
-    public BaseService<? extends Mapper<BusHospitalEntity>, BusHospitalEntity, String> getService() {
+    public BaseService<? extends Mapper<BusHospitalEntity>, BusHospitalEntity, Long> getService() {
         return hospitalService;
     }
 }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.coffee.common.entity.GenericEntity;
 import com.coffee.common.entity.RecordCreationEntity;
 import com.coffee.common.entity.RecordModifierEntity;
-import io.lettuce.core.GeoCoordinates;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,8 +20,8 @@ import java.util.Date;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("bus_hospital")
-public class BusHospitalEntity extends GenericEntity<String> implements RecordModifierEntity, RecordCreationEntity {
+@TableName(value = "bus_hospital",autoResultMap = true)
+public class BusHospitalEntity extends GenericEntity<Long> implements RecordModifierEntity, RecordCreationEntity {
 
 
     /**
@@ -62,7 +61,7 @@ public class BusHospitalEntity extends GenericEntity<String> implements RecordMo
     private Date updateTime;
 
     @Data
-    private static class  GeoPoint{
+    public static class  GeoPoint{
         private String lon;
         private String lat;
     }

+ 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,String> {
+public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusHospitalEntity,Long> {
     @Override
     public void validateBeforeSave(BusHospitalEntity entity) {
 
@@ -25,7 +25,7 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
     }
 
     @Override
-    public void validateBeforeDelete(String id) {
+    public void validateBeforeDelete(Long id) {
 
     }
 }