crp / crp-operation

Go to a project
Toggle navigation Toggle navigation pinning
wanghongbo
2c67211b 1 parent c1f35773

标记字段修改

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -23,5 +23,5 @@ public class MarkParam { @@ -23,5 +23,5 @@ public class MarkParam {
23 /** 23 /**
24 * 标记类型 markStart；markEnd 24 * 标记类型 markStart；markEnd
25 */ 25 */
26 - private String type; 26 + private String operationType;
27 } 27 }
@@ -196,13 +196,13 @@ public class RoomOperationServiceImpl implements RoomOperationSerivice { @@ -196,13 +196,13 @@ public class RoomOperationServiceImpl implements RoomOperationSerivice {
196 .in(MonitorMark::getOperationType, RoomOperationEnum.MARK_START.getCode(), RoomOperationEnum.MARK_EDN.getCode()) 196 .in(MonitorMark::getOperationType, RoomOperationEnum.MARK_START.getCode(), RoomOperationEnum.MARK_EDN.getCode())
197 .orderByDesc(MonitorMark::getCreatedTime).last("limit 1"); 197 .orderByDesc(MonitorMark::getCreatedTime).last("limit 1");
198 MonitorMark lastMark = monitorMarkMapper.selectOne(wrapper); 198 MonitorMark lastMark = monitorMarkMapper.selectOne(wrapper);
199 - if(lastMark != null && lastMark.getOperationType().equals(markParam.getType())){ 199 + if(lastMark != null && lastMark.getOperationType().equals(markParam.getOperationType())){
200 return ResultBean.repeat(lastMark); 200 return ResultBean.repeat(lastMark);
201 } 201 }
202 202
203 MonitorMark monitorMark = new MonitorMark(); 203 MonitorMark monitorMark = new MonitorMark();
204 monitorMark.setRoomId(markParam.getRoomId()); 204 monitorMark.setRoomId(markParam.getRoomId());
205 - monitorMark.setOperationType(markParam.getType()); 205 + monitorMark.setOperationType(markParam.getOperationType());
206 monitorMark.setCreatedTime(LocalDateTime.now()); 206 monitorMark.setCreatedTime(LocalDateTime.now());
207 monitorMark.setOperationTime(markParam.getMarkTime()); 207 monitorMark.setOperationTime(markParam.getMarkTime());
208 monitorMark.setCreatedBy("admin"); 208 monitorMark.setCreatedBy("admin");