|
@@ -28,12 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import com.huimv.core.annotion.BusinessLog;
|
|
|
|
-import com.huimv.core.annotion.Permission;
|
|
|
|
-import com.huimv.core.context.login.LoginContextHolder;
|
|
|
|
-import com.huimv.core.enums.LogAnnotionOpTypeEnum;
|
|
|
|
-import com.huimv.core.pojo.response.ResponseData;
|
|
|
|
-import com.huimv.core.pojo.response.SuccessResponseData;
|
|
|
|
|
|
+
|
|
import com.huimv.modular.alarmrecord.entity.AlarmRecord;
|
|
import com.huimv.modular.alarmrecord.entity.AlarmRecord;
|
|
import com.huimv.modular.alarmrecord.mapper.AlarmRecordMapper;
|
|
import com.huimv.modular.alarmrecord.mapper.AlarmRecordMapper;
|
|
import com.huimv.modular.alarmrecord.param.AlarmRecordParam;
|
|
import com.huimv.modular.alarmrecord.param.AlarmRecordParam;
|
|
@@ -44,6 +39,8 @@ import com.huimv.modular.collectorregister.entity.CollectorRegister;
|
|
import com.huimv.modular.collectorregister.mapper.CollectorRegisterMapper;
|
|
import com.huimv.modular.collectorregister.mapper.CollectorRegisterMapper;
|
|
import com.huimv.modular.farmalarmnumber.entity.FarmAlarmNumber;
|
|
import com.huimv.modular.farmalarmnumber.entity.FarmAlarmNumber;
|
|
import com.huimv.modular.farmalarmnumber.mapper.FarmAlarmNumberMapper;
|
|
import com.huimv.modular.farmalarmnumber.mapper.FarmAlarmNumberMapper;
|
|
|
|
+import com.huimv.modular.pojo.response.ResponseData;
|
|
|
|
+import com.huimv.modular.pojo.response.SuccessResponseData;
|
|
import com.huimv.modular.utils.util.StringUtilsWork;
|
|
import com.huimv.modular.utils.util.StringUtilsWork;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -177,7 +174,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@GetMapping("/alarmRecord/page")
|
|
@GetMapping("/alarmRecord/page")
|
|
- @BusinessLog(title = "报警记录_查询", opType = LogAnnotionOpTypeEnum.QUERY)
|
|
|
|
|
|
+ // @BusinessLog(title = "报警记录_查询", opType = LogAnnotionOpTypeEnum.QUERY)
|
|
public ResponseData page(AlarmRecordParam alarmRecordParam) {
|
|
public ResponseData page(AlarmRecordParam alarmRecordParam) {
|
|
return new SuccessResponseData(alarmRecordService.page(alarmRecordParam));
|
|
return new SuccessResponseData(alarmRecordService.page(alarmRecordParam));
|
|
}
|
|
}
|
|
@@ -191,7 +188,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@PostMapping("/alarmRecord/add")
|
|
@PostMapping("/alarmRecord/add")
|
|
- @BusinessLog(title = "报警记录_增加", opType = LogAnnotionOpTypeEnum.ADD)
|
|
|
|
|
|
+ // @BusinessLog(title = "报警记录_增加", opType = LogAnnotionOpTypeEnum.ADD)
|
|
public ResponseData add(@RequestBody @Validated(AlarmRecordParam.add.class) AlarmRecordParam alarmRecordParam) {
|
|
public ResponseData add(@RequestBody @Validated(AlarmRecordParam.add.class) AlarmRecordParam alarmRecordParam) {
|
|
alarmRecordService.add(alarmRecordParam);
|
|
alarmRecordService.add(alarmRecordParam);
|
|
return new SuccessResponseData();
|
|
return new SuccessResponseData();
|
|
@@ -205,7 +202,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@PostMapping("/alarmRecord/delete")
|
|
@PostMapping("/alarmRecord/delete")
|
|
- @BusinessLog(title = "报警记录_删除", opType = LogAnnotionOpTypeEnum.DELETE)
|
|
|
|
|
|
+ // @BusinessLog(title = "报警记录_删除", opType = LogAnnotionOpTypeEnum.DELETE)
|
|
public ResponseData delete(@RequestBody @Validated(AlarmRecordParam.delete.class) List<AlarmRecordParam> alarmRecordParamList) {
|
|
public ResponseData delete(@RequestBody @Validated(AlarmRecordParam.delete.class) List<AlarmRecordParam> alarmRecordParamList) {
|
|
alarmRecordService.delete(alarmRecordParamList);
|
|
alarmRecordService.delete(alarmRecordParamList);
|
|
return new SuccessResponseData();
|
|
return new SuccessResponseData();
|
|
@@ -219,7 +216,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@PostMapping("/alarmRecord/edit")
|
|
@PostMapping("/alarmRecord/edit")
|
|
- @BusinessLog(title = "报警记录_编辑", opType = LogAnnotionOpTypeEnum.EDIT)
|
|
|
|
|
|
+ //@BusinessLog(title = "报警记录_编辑", opType = LogAnnotionOpTypeEnum.EDIT)
|
|
public ResponseData edit(@RequestBody @Validated(AlarmRecordParam.edit.class) AlarmRecordParam alarmRecordParam) {
|
|
public ResponseData edit(@RequestBody @Validated(AlarmRecordParam.edit.class) AlarmRecordParam alarmRecordParam) {
|
|
alarmRecordService.edit(alarmRecordParam);
|
|
alarmRecordService.edit(alarmRecordParam);
|
|
return new SuccessResponseData();
|
|
return new SuccessResponseData();
|
|
@@ -233,7 +230,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@GetMapping("/alarmRecord/detail")
|
|
@GetMapping("/alarmRecord/detail")
|
|
- @BusinessLog(title = "报警记录_查看", opType = LogAnnotionOpTypeEnum.DETAIL)
|
|
|
|
|
|
+ //@BusinessLog(title = "报警记录_查看", opType = LogAnnotionOpTypeEnum.DETAIL)
|
|
public ResponseData detail(@Validated(AlarmRecordParam.detail.class) AlarmRecordParam alarmRecordParam) {
|
|
public ResponseData detail(@Validated(AlarmRecordParam.detail.class) AlarmRecordParam alarmRecordParam) {
|
|
return new SuccessResponseData(alarmRecordService.detail(alarmRecordParam));
|
|
return new SuccessResponseData(alarmRecordService.detail(alarmRecordParam));
|
|
}
|
|
}
|
|
@@ -246,7 +243,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@GetMapping("/alarmRecord/list")
|
|
@GetMapping("/alarmRecord/list")
|
|
- @BusinessLog(title = "报警记录_列表", opType = LogAnnotionOpTypeEnum.QUERY)
|
|
|
|
|
|
+ // @BusinessLog(title = "报警记录_列表", opType = LogAnnotionOpTypeEnum.QUERY)
|
|
public ResponseData list(AlarmRecordParam alarmRecordParam) {
|
|
public ResponseData list(AlarmRecordParam alarmRecordParam) {
|
|
return new SuccessResponseData(alarmRecordService.list(alarmRecordParam));
|
|
return new SuccessResponseData(alarmRecordService.list(alarmRecordParam));
|
|
}
|
|
}
|
|
@@ -259,7 +256,7 @@ public class AlarmRecordController {
|
|
*/
|
|
*/
|
|
|
|
|
|
@GetMapping("/alarmRecord/export")
|
|
@GetMapping("/alarmRecord/export")
|
|
- @BusinessLog(title = "报警记录_导出", opType = LogAnnotionOpTypeEnum.EXPORT)
|
|
|
|
|
|
+ // @BusinessLog(title = "报警记录_导出", opType = LogAnnotionOpTypeEnum.EXPORT)
|
|
public void export(AlarmRecordParam alarmRecordParam) {
|
|
public void export(AlarmRecordParam alarmRecordParam) {
|
|
alarmRecordService.export(alarmRecordParam);
|
|
alarmRecordService.export(alarmRecordParam);
|
|
}
|
|
}
|