|
@@ -4,12 +4,15 @@ import com.zd.bottle.domain.AlarmRecord;
|
|
|
import com.zd.bottle.service.AlarmRecordService;
|
|
import com.zd.bottle.service.AlarmRecordService;
|
|
|
import com.zd.bottle.vo.AlarmRecordVo;
|
|
import com.zd.bottle.vo.AlarmRecordVo;
|
|
|
import com.zd.common.core.domain.R;
|
|
import com.zd.common.core.domain.R;
|
|
|
|
|
+import com.zd.common.core.domain.per.PerFun;
|
|
|
|
|
+import com.zd.common.core.domain.per.PerPrefix;
|
|
|
import com.zd.common.core.utils.bean.TransferUtils;
|
|
import com.zd.common.core.utils.bean.TransferUtils;
|
|
|
import com.zd.common.core.utils.poi.ExcelUtil;
|
|
import com.zd.common.core.utils.poi.ExcelUtil;
|
|
|
import com.zd.common.core.web.controller.BaseController;
|
|
import com.zd.common.core.web.controller.BaseController;
|
|
|
import com.zd.common.core.web.page.TableDataInfo;
|
|
import com.zd.common.core.web.page.TableDataInfo;
|
|
|
import com.zd.common.log.annotation.Log;
|
|
import com.zd.common.log.annotation.Log;
|
|
|
import com.zd.common.log.enums.BusinessType;
|
|
import com.zd.common.log.enums.BusinessType;
|
|
|
|
|
+import com.zd.common.security.annotation.PreAuthorize;
|
|
|
import com.zd.system.api.domain.InventoryTag;
|
|
import com.zd.system.api.domain.InventoryTag;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -42,7 +45,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
|
|
|
* @param alarmRecord 参数
|
|
* @param alarmRecord 参数
|
|
|
* @return TableDataInfo
|
|
* @return TableDataInfo
|
|
|
*/
|
|
*/
|
|
|
-// @PreAuthorize(hasPermi = "bottle:alarm:record:list")
|
|
|
|
|
|
|
+ @PreAuthorize(hasPermi = PerPrefix.BOTTLE_ALARMRECORD + PerFun.LIST)
|
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
|
@ApiOperation(value = "查询报警记录列表")
|
|
@ApiOperation(value = "查询报警记录列表")
|
|
|
public TableDataInfo<AlarmRecordVo> list(AlarmRecord alarmRecord) {
|
|
public TableDataInfo<AlarmRecordVo> list(AlarmRecord alarmRecord) {
|
|
@@ -66,7 +69,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
|
|
|
* @throws IOException 异常
|
|
* @throws IOException 异常
|
|
|
*/
|
|
*/
|
|
|
@ApiOperation(value = "导出报警记录列表")
|
|
@ApiOperation(value = "导出报警记录列表")
|
|
|
-// @PreAuthorize(hasPermi = "bottle:alarm:record:export")
|
|
|
|
|
|
|
+ @PreAuthorize(hasPermi = PerPrefix.BOTTLE_ALARMRECORD + PerFun.EXPORT)
|
|
|
@Log(title = "报警记录", businessType = BusinessType.EXPORT)
|
|
@Log(title = "报警记录", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
@PostMapping("/export")
|
|
|
public void export(HttpServletResponse response, AlarmRecord alarmRecord) throws IOException {
|
|
public void export(HttpServletResponse response, AlarmRecord alarmRecord) throws IOException {
|