diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index 818c9aa..3df4938 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -44,7 +44,7 @@ public Object list(String condition) { EntityWrapper levelQuery = new EntityWrapper<>(); levelQuery.orderBy("sensor"); - return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); + return ResponseData.success(bizAlarmLevelService.selectSensorList(levelQuery)); } /** @@ -82,7 +82,7 @@ bizAlarmLevel.setTs(new Date()); bizAlarmLevel.setOperation(permissionService.getCurrLoginUser().getId()); bizAlarmLevelService.insert(bizAlarmLevel); - return ResponseData.success(); + return ResponseData.success(bizAlarmLevel.getId()); } /** @@ -116,17 +116,4 @@ bizAlarmLevelService.updateById(bizAlarmLevel); return ResponseData.success(); } - -// /** -// * 详情 -// */ -// @RequestMapping(value = "/detail/{bizAlarmLevelId}") -// @ResponseBody -// public Object detail(@PathVariable("bizAlarmLevelId") String bizAlarmLevelId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(bizAlarmLevelService.selectById(bizAlarmLevelId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java index 818c9aa..3df4938 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BizAlarmLevelController.java @@ -44,7 +44,7 @@ public Object list(String condition) { EntityWrapper levelQuery = new EntityWrapper<>(); levelQuery.orderBy("sensor"); - return ResponseData.success( bizAlarmLevelService.selectSensorList(levelQuery)); + return ResponseData.success(bizAlarmLevelService.selectSensorList(levelQuery)); } /** @@ -82,7 +82,7 @@ bizAlarmLevel.setTs(new Date()); bizAlarmLevel.setOperation(permissionService.getCurrLoginUser().getId()); bizAlarmLevelService.insert(bizAlarmLevel); - return ResponseData.success(); + return ResponseData.success(bizAlarmLevel.getId()); } /** @@ -116,17 +116,4 @@ bizAlarmLevelService.updateById(bizAlarmLevel); return ResponseData.success(); } - -// /** -// * 详情 -// */ -// @RequestMapping(value = "/detail/{bizAlarmLevelId}") -// @ResponseBody -// public Object detail(@PathVariable("bizAlarmLevelId") String bizAlarmLevelId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(bizAlarmLevelService.selectById(bizAlarmLevelId)); -// return resultData; -// } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmLevel.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmLevel.java index 595711a..8a85ce0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmLevel.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BizAlarmLevel.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.ID_WORKER) private Long id; /** * 参数编码 @@ -65,6 +65,7 @@ private String sensorName; @TableField(exist = false) private String unit; + @Override protected Serializable pkVal() { return this.id;