Commit 9b9c84f6 by 赵剑炜

修改单警柜接口

parent 932ce440
...@@ -36,6 +36,10 @@ public class CabinetBoxDto implements Serializable { ...@@ -36,6 +36,10 @@ public class CabinetBoxDto implements Serializable {
* 箱门绑定警员id * 箱门绑定警员id
*/ */
private String policeId; private String policeId;
/**
* 装备配置
*/
private String equipmentConfig;
/** /**
* 箱门绑定警员名称 * 箱门绑定警员名称
......
...@@ -67,12 +67,7 @@ public class CabinetBox implements Serializable { ...@@ -67,12 +67,7 @@ public class CabinetBox implements Serializable {
@ApiModelProperty(value = "别名") @ApiModelProperty(value = "别名")
@TableField("box_name") @TableField("box_name")
private String boxName; private String boxName;
/**
* 箱门类型:1单警柜,2公共柜
*/
@ApiModelProperty(value = "箱门类型:1单警柜,2公共柜")
@TableField("box_type")
private String boxType;
/** /**
* 使用日志存储位置信息 * 使用日志存储位置信息
*/ */
......
...@@ -103,7 +103,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl ...@@ -103,7 +103,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
box.setCabinetId(cabinet.getId()); box.setCabinetId(cabinet.getId());
box.setPower(boxReq.getPower()); box.setPower(boxReq.getPower());
box.setEquipmentConfig(boxReq.getEquipmentConfig()); box.setEquipmentConfig(boxReq.getEquipmentConfig());
box.setBoxType(boxReq.getBoxType()); box.setBoxType(Integer.valueOf(boxReq.getBoxType()));
box.setState(0); box.setState(0);
box.setNum(boxReq.getNum()); box.setNum(boxReq.getNum());
return box; return box;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论