Compare commits

..

No commits in common. "44c3e77d43b2741e5661093e631591bb7c2990f1" and "96bafe0ca885a44794caaf91d1c0d24484dfe17f" have entirely different histories.

4 changed files with 0 additions and 76 deletions

View File

@ -2,12 +2,10 @@ package com.mdd.admin.controller;
import com.mdd.admin.service.ILocationService;
import com.mdd.admin.validate.LocationCreateValidate;
import com.mdd.admin.vo.LocationDetailVo;
import com.mdd.admin.validate.LocationUpdateValidate;
import com.mdd.admin.validate.commons.IdValidate;
import com.mdd.admin.vo.LocationAllVo;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.validator.annotation.IDMust;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
@ -30,13 +28,6 @@ public class LocationController {
return AjaxResult.success(locationAllVo);
}
@GetMapping("/detail")
@ApiOperation(value = "位置详情")
public AjaxResult<LocationDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
LocationDetailVo detail = iLocationService.detail(id);
return AjaxResult.success(detail);
}
@PostMapping("/add")
@ApiOperation(value = "添加新位置", notes = "若父位置楼层不为0")
public AjaxResult<Object> add(@Validated @RequestBody LocationCreateValidate validate) {

View File

@ -2,7 +2,6 @@ package com.mdd.admin.service;
import com.mdd.admin.validate.LocationCreateValidate;
import com.mdd.admin.vo.LocationDetailVo;
import com.mdd.admin.validate.LocationUpdateValidate;
import com.mdd.admin.validate.commons.IdValidate;
import com.mdd.admin.vo.LocationAllVo;
@ -36,9 +35,4 @@ public interface ILocationService {
* 更新位置
* */
void update(LocationUpdateValidate validate);
/**
* 位置详情
* */
LocationDetailVo detail(Integer id);
}

View File

@ -3,7 +3,6 @@ package com.mdd.admin.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mdd.admin.service.ILocationService;
import com.mdd.admin.validate.LocationCreateValidate;
import com.mdd.admin.vo.LocationDetailVo;
import com.mdd.admin.validate.LocationUpdateValidate;
import com.mdd.admin.validate.commons.IdValidate;
import com.mdd.admin.vo.LocationAllVo;
@ -108,17 +107,6 @@ public class LocationServiceImpl implements ILocationService {
}
/**
* 位置详情
* */
@Override
public LocationDetailVo detail(Integer id) {
LocationDetailVo vo = new LocationDetailVo();
Location location = locationMapper.selectById(id);
BeanUtils.copyProperties(location,vo);
return vo;
}
/**
* 递归排序树
* */

View File

@ -1,49 +0,0 @@
package com.mdd.admin.vo;
import com.mdd.common.enums.LocationStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@ApiModel("位置详情")
public class LocationDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID")
private Integer id;
@ApiModelProperty(value = "位置信息如“教学楼A-301”")
private String name;
@ApiModelProperty(value = "类型名称,如 campus校区, building建筑物, floor楼层, room房间, ER设备间")
private String type;
@ApiModelProperty(value = "外部系统ID")
private Integer externalId;
@ApiModelProperty(value = "外部系统标识")
private String externalSystem;
@ApiModelProperty(value = "可容纳人数")
private Integer capacity;
@ApiModelProperty(value = "面积(平方米)")
private BigDecimal area;
@ApiModelProperty(value = "楼层号,便于排序")
private Integer floorNumber;
@ApiModelProperty(value = "状态")
private LocationStatusEnum status;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
}