queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+// list.forEach(deviceDto -> {
+// deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+// deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+// });
+// //获取导出文件header
+// super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName());
+//
+// }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+// list.forEach(deviceDto -> {
+// deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+// deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+// });
+// //获取导出文件header
+// super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName());
+//
+// }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 717a6c4..c943564 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -6,8 +6,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.BussinessLog;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.ServiceException;
@@ -15,13 +15,15 @@
import com.casic.missiles.model.log.LogObjectHolder;
import com.casic.missiles.model.response.ErrorResponseData;
import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.BusWellConst;
import com.casic.missiles.modular.system.dto.BatchExportDataDto;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.dto.WellInfoRequest;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.system.service.IBusWellInfoService;
import com.casic.missiles.modular.system.util.ReturnUtil;
import com.casic.missiles.modular.system.util.Utility;
@@ -32,8 +34,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -60,6 +60,8 @@
private IBusWellInfoService iBusWellInfoService;
@Autowired
private AbstractPermissionContext permissionService;
+ @Autowired
+ private AbstractDictService dictService;
@ApiOperation("获取点位列表信息")
@@ -196,5 +198,19 @@
super.exportExcel(BatchExportDataDto.class, list, "点位列表");
}
+
+ @ApiOperation("获取点位类型列表信息")
+ @GetMapping("/wellTypeList")
+ public ReturnDTO> wellTypeList() {
+ List list = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(dict -> {
+ selectDtos.add(new DeviceSelectDto(dict.getName(), Long.valueOf(dict.getCode())));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+// list.forEach(deviceDto -> {
+// deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+// deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+// });
+// //获取导出文件header
+// super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName());
+//
+// }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 717a6c4..c943564 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -6,8 +6,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.BussinessLog;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.ServiceException;
@@ -15,13 +15,15 @@
import com.casic.missiles.model.log.LogObjectHolder;
import com.casic.missiles.model.response.ErrorResponseData;
import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.BusWellConst;
import com.casic.missiles.modular.system.dto.BatchExportDataDto;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.dto.WellInfoRequest;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.system.service.IBusWellInfoService;
import com.casic.missiles.modular.system.util.ReturnUtil;
import com.casic.missiles.modular.system.util.Utility;
@@ -32,8 +34,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -60,6 +60,8 @@
private IBusWellInfoService iBusWellInfoService;
@Autowired
private AbstractPermissionContext permissionService;
+ @Autowired
+ private AbstractDictService dictService;
@ApiOperation("获取点位列表信息")
@@ -196,5 +198,19 @@
super.exportExcel(BatchExportDataDto.class, list, "点位列表");
}
+
+ @ApiOperation("获取点位类型列表信息")
+ @GetMapping("/wellTypeList")
+ public ReturnDTO> wellTypeList() {
+ List list = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(dict -> {
+ selectDtos.add(new DeviceSelectDto(dict.getName(), Long.valueOf(dict.getCode())));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
index a7c0dc0..1c83e03 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
@@ -1,11 +1,35 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.dto.BusWellWellRequest;
+import com.casic.missiles.modular.system.dto.NoiseRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.model.Noise;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -18,7 +42,66 @@
@Api(tags = "点位关联模块接口")
@RestController
@RequestMapping("/busWellWell")
-public class BusWellWellController {
+public class BusWellWellController extends ExportController {
+
+ @Autowired
+ private IBusWellWellService iBusWellWellService;
+
+ @Autowired
+ private IBusDeviceService deviceService;
+
+ @Autowired
+ private AbstractPermissionContext permissionService;
+
+ @ApiOperation("新增关联关系")
+ @PostMapping("/add")
+ public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+ Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+ });
+ try {
+ return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("删除关联关系")
+ @PostMapping("/delete")
+ public ReturnDTO batchDeletes(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(iBusWellWellService.removeByIds(ids));
+ }
+
+
+ @ApiOperation("修改关联关系")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusWellWell busWellWell) {
+ Assert.isFalse(Objects.isNull(busWellWell.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusWellWell oldDevice = this.iBusWellWellService.getById(busWellWell.getId());
+ LogObjectHolder.me().set(oldDevice);
+ return ReturnUtil.success(iBusWellWellService.updateById(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody BusWellWellRequest busWellWellRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = iBusWellWellService.selectDataScopePage(dataScope, page, busWellWellRequest.getKeywords());
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+// list.forEach(deviceDto -> {
+// deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+// deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+// });
+// //获取导出文件header
+// super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName());
+//
+// }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 717a6c4..c943564 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -6,8 +6,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.BussinessLog;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.ServiceException;
@@ -15,13 +15,15 @@
import com.casic.missiles.model.log.LogObjectHolder;
import com.casic.missiles.model.response.ErrorResponseData;
import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.BusWellConst;
import com.casic.missiles.modular.system.dto.BatchExportDataDto;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.dto.WellInfoRequest;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.system.service.IBusWellInfoService;
import com.casic.missiles.modular.system.util.ReturnUtil;
import com.casic.missiles.modular.system.util.Utility;
@@ -32,8 +34,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -60,6 +60,8 @@
private IBusWellInfoService iBusWellInfoService;
@Autowired
private AbstractPermissionContext permissionService;
+ @Autowired
+ private AbstractDictService dictService;
@ApiOperation("获取点位列表信息")
@@ -196,5 +198,19 @@
super.exportExcel(BatchExportDataDto.class, list, "点位列表");
}
+
+ @ApiOperation("获取点位类型列表信息")
+ @GetMapping("/wellTypeList")
+ public ReturnDTO> wellTypeList() {
+ List list = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(dict -> {
+ selectDtos.add(new DeviceSelectDto(dict.getName(), Long.valueOf(dict.getCode())));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
index a7c0dc0..1c83e03 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
@@ -1,11 +1,35 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.dto.BusWellWellRequest;
+import com.casic.missiles.modular.system.dto.NoiseRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.model.Noise;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -18,7 +42,66 @@
@Api(tags = "点位关联模块接口")
@RestController
@RequestMapping("/busWellWell")
-public class BusWellWellController {
+public class BusWellWellController extends ExportController {
+
+ @Autowired
+ private IBusWellWellService iBusWellWellService;
+
+ @Autowired
+ private IBusDeviceService deviceService;
+
+ @Autowired
+ private AbstractPermissionContext permissionService;
+
+ @ApiOperation("新增关联关系")
+ @PostMapping("/add")
+ public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+ Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+ });
+ try {
+ return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("删除关联关系")
+ @PostMapping("/delete")
+ public ReturnDTO batchDeletes(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(iBusWellWellService.removeByIds(ids));
+ }
+
+
+ @ApiOperation("修改关联关系")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusWellWell busWellWell) {
+ Assert.isFalse(Objects.isNull(busWellWell.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusWellWell oldDevice = this.iBusWellWellService.getById(busWellWell.getId());
+ LogObjectHolder.me().set(oldDevice);
+ return ReturnUtil.success(iBusWellWellService.updateById(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody BusWellWellRequest busWellWellRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = iBusWellWellService.selectDataScopePage(dataScope, page, busWellWellRequest.getKeywords());
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java
new file mode 100644
index 0000000..0ad366a
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dto.NoiseConfigRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ *
+ * 点位关联表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-07
+ */
+@Api(tags = "设备配置模块接口")
+@RestController
+@RequestMapping("/noiseConfig")
+public class NoiseConfigController {
+
+// @Autowired
+// private IBusConfigService iBusConfigService;
+//
+//
+// @ApiOperation("设备配置")
+// @PostMapping("/config")
+// public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+// Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+// throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+// });
+// try {
+// return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+// } catch (DataAccessException dax) {
+// throw new BusinessException(2002, dax.getMessage().contains("违反唯一约束") && dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+// }
+// }
+//
+// /**
+// * 噪声获取配置列表
+// */
+// @RequestMapping(value = "/noiseConfig/list")
+// public Object noiseConfigList(@RequestParam(required = false) String keywords,
+// @RequestParam(required = false) String deptid) {
+// SuccessResponseData successResult = new SuccessResponseData();
+// try {
+// Page page = PageFactory.defaultPage();//page使用
+// DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+// List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords,
+// deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope);
+// page.setRecords(busConfigDTOList);
+// successResult.setData(super.packForBT(page));
+// successResult.setMessage("success");
+// } catch (Exception e) {
+// e.printStackTrace();
+// successResult.setCode(500);
+// successResult.setMessage("false");
+// }
+// return successResult;
+// }
+//
+//
+// /**
+// * 新增噪声配置
+// */
+// @RequestMapping(value = "/noiseConfig/config")
+// @BussinessLog(value = "新增噪声配置", key = "deviceId,collectTime,collectInterval,collectCount,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+// public Object addDNoise(@RequestBody NoiseConfigRequest busConfigDTO) {
+// try {
+// busNoiseConfigService.addConfig(busConfigDTO);
+// } catch (Exception e) {
+// e.printStackTrace();
+// return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+// }
+// return ResponseData.success();
+// }
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+// list.forEach(deviceDto -> {
+// deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+// deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+// });
+// //获取导出文件header
+// super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName());
+//
+// }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 717a6c4..c943564 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -6,8 +6,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.BussinessLog;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.ServiceException;
@@ -15,13 +15,15 @@
import com.casic.missiles.model.log.LogObjectHolder;
import com.casic.missiles.model.response.ErrorResponseData;
import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.BusWellConst;
import com.casic.missiles.modular.system.dto.BatchExportDataDto;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.dto.WellInfoRequest;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.system.service.IBusWellInfoService;
import com.casic.missiles.modular.system.util.ReturnUtil;
import com.casic.missiles.modular.system.util.Utility;
@@ -32,8 +34,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -60,6 +60,8 @@
private IBusWellInfoService iBusWellInfoService;
@Autowired
private AbstractPermissionContext permissionService;
+ @Autowired
+ private AbstractDictService dictService;
@ApiOperation("获取点位列表信息")
@@ -196,5 +198,19 @@
super.exportExcel(BatchExportDataDto.class, list, "点位列表");
}
+
+ @ApiOperation("获取点位类型列表信息")
+ @GetMapping("/wellTypeList")
+ public ReturnDTO> wellTypeList() {
+ List list = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(dict -> {
+ selectDtos.add(new DeviceSelectDto(dict.getName(), Long.valueOf(dict.getCode())));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
index a7c0dc0..1c83e03 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
@@ -1,11 +1,35 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.dto.BusWellWellRequest;
+import com.casic.missiles.modular.system.dto.NoiseRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.model.Noise;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -18,7 +42,66 @@
@Api(tags = "点位关联模块接口")
@RestController
@RequestMapping("/busWellWell")
-public class BusWellWellController {
+public class BusWellWellController extends ExportController {
+
+ @Autowired
+ private IBusWellWellService iBusWellWellService;
+
+ @Autowired
+ private IBusDeviceService deviceService;
+
+ @Autowired
+ private AbstractPermissionContext permissionService;
+
+ @ApiOperation("新增关联关系")
+ @PostMapping("/add")
+ public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+ Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+ });
+ try {
+ return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("删除关联关系")
+ @PostMapping("/delete")
+ public ReturnDTO batchDeletes(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(iBusWellWellService.removeByIds(ids));
+ }
+
+
+ @ApiOperation("修改关联关系")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusWellWell busWellWell) {
+ Assert.isFalse(Objects.isNull(busWellWell.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusWellWell oldDevice = this.iBusWellWellService.getById(busWellWell.getId());
+ LogObjectHolder.me().set(oldDevice);
+ return ReturnUtil.success(iBusWellWellService.updateById(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody BusWellWellRequest busWellWellRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = iBusWellWellService.selectDataScopePage(dataScope, page, busWellWellRequest.getKeywords());
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java
new file mode 100644
index 0000000..0ad366a
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dto.NoiseConfigRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ *
+ * 点位关联表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-07
+ */
+@Api(tags = "设备配置模块接口")
+@RestController
+@RequestMapping("/noiseConfig")
+public class NoiseConfigController {
+
+// @Autowired
+// private IBusConfigService iBusConfigService;
+//
+//
+// @ApiOperation("设备配置")
+// @PostMapping("/config")
+// public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+// Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+// throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+// });
+// try {
+// return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+// } catch (DataAccessException dax) {
+// throw new BusinessException(2002, dax.getMessage().contains("违反唯一约束") && dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+// }
+// }
+//
+// /**
+// * 噪声获取配置列表
+// */
+// @RequestMapping(value = "/noiseConfig/list")
+// public Object noiseConfigList(@RequestParam(required = false) String keywords,
+// @RequestParam(required = false) String deptid) {
+// SuccessResponseData successResult = new SuccessResponseData();
+// try {
+// Page page = PageFactory.defaultPage();//page使用
+// DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+// List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords,
+// deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope);
+// page.setRecords(busConfigDTOList);
+// successResult.setData(super.packForBT(page));
+// successResult.setMessage("success");
+// } catch (Exception e) {
+// e.printStackTrace();
+// successResult.setCode(500);
+// successResult.setMessage("false");
+// }
+// return successResult;
+// }
+//
+//
+// /**
+// * 新增噪声配置
+// */
+// @RequestMapping(value = "/noiseConfig/config")
+// @BussinessLog(value = "新增噪声配置", key = "deviceId,collectTime,collectInterval,collectCount,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+// public Object addDNoise(@RequestBody NoiseConfigRequest busConfigDTO) {
+// try {
+// busNoiseConfigService.addConfig(busConfigDTO);
+// } catch (Exception e) {
+// e.printStackTrace();
+// return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+// }
+// return ResponseData.success();
+// }
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java
index 0e91b4e..2b8a5c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java
@@ -1,44 +1,53 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.BaseController;
-//import com.casic.missiles.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.baomidou.mybatisplus.mapper.EntityWrapper;
-//import java.util.List;
-//import com.casic.missiles.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.casic.missiles.modular.system.model.Noise;
-//import com.casic.missiles.modular.system.service.INoiseService;
-//
-///**
-// * 相关仪上传数据控制器
-// *
-// * @author dev
-// * @Date 2024-02-28 16:42:27
-// */
-//@Controller
-//@RequestMapping("/noise")
-//public class NoiseController extends BaseController {
-//
-//
-// @Autowired
-// private INoiseService noiseService;
-//
-//
-// /**
-// * 获取相关仪上传数据列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String condition) {
-// return noiseService.selectList(null);
-// }
-//
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.NoiseRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.Noise;
+import com.casic.missiles.modular.system.service.INoiseService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 相关仪上传数据控制器
+ *
+ * @author dev
+ * @Date 2024-02-28 16:42:27
+ */
+@Api(tags = "数据管理模块接口")
+@RestController
+@RequestMapping("/noise")
+public class NoiseController extends ExportController {
+
+ @Autowired
+ private INoiseService noiseService;
+
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody NoiseRequest noiseRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(noiseRequest.getKeywords()),"devcode",noiseRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(noiseRequest.getBeginTime()), "UPTIME", noiseRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(noiseRequest.getEndTime()), "UPTIME", noiseRequest.getEndTime());
+ queryWrapper.orderByDesc("UPTIME");
+ return ReturnUtil.success(super.packForBT(noiseService.page( page,queryWrapper)));
+ }
+
+
// /**
// * 获取相关仪上传数据分页列表
// */
@@ -102,4 +111,4 @@
// resultData.setData(noiseService.selectById(noiseId));
// return resultData;
// }
-//}
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+// list.forEach(deviceDto -> {
+// deviceDto.setBfztName(dictService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
+// deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+// });
+// //获取导出文件header
+// super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName());
+//
+// }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 717a6c4..c943564 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -6,8 +6,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.BussinessLog;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.ServiceException;
@@ -15,13 +15,15 @@
import com.casic.missiles.model.log.LogObjectHolder;
import com.casic.missiles.model.response.ErrorResponseData;
import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.constant.BusWellConst;
import com.casic.missiles.modular.system.dto.BatchExportDataDto;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.dto.WellInfoRequest;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.system.service.IBusWellInfoService;
import com.casic.missiles.modular.system.util.ReturnUtil;
import com.casic.missiles.modular.system.util.Utility;
@@ -32,8 +34,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
-
-import org.springframework.stereotype.Controller;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -60,6 +60,8 @@
private IBusWellInfoService iBusWellInfoService;
@Autowired
private AbstractPermissionContext permissionService;
+ @Autowired
+ private AbstractDictService dictService;
@ApiOperation("获取点位列表信息")
@@ -196,5 +198,19 @@
super.exportExcel(BatchExportDataDto.class, list, "点位列表");
}
+
+ @ApiOperation("获取点位类型列表信息")
+ @GetMapping("/wellTypeList")
+ public ReturnDTO> wellTypeList() {
+ List list = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(dict -> {
+ selectDtos.add(new DeviceSelectDto(dict.getName(), Long.valueOf(dict.getCode())));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
index a7c0dc0..1c83e03 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellWellController.java
@@ -1,11 +1,35 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.dto.BusWellWellRequest;
+import com.casic.missiles.modular.system.dto.NoiseRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.model.Noise;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -18,7 +42,66 @@
@Api(tags = "点位关联模块接口")
@RestController
@RequestMapping("/busWellWell")
-public class BusWellWellController {
+public class BusWellWellController extends ExportController {
+
+ @Autowired
+ private IBusWellWellService iBusWellWellService;
+
+ @Autowired
+ private IBusDeviceService deviceService;
+
+ @Autowired
+ private AbstractPermissionContext permissionService;
+
+ @ApiOperation("新增关联关系")
+ @PostMapping("/add")
+ public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+ Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+ });
+ try {
+ return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("删除关联关系")
+ @PostMapping("/delete")
+ public ReturnDTO batchDeletes(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(iBusWellWellService.removeByIds(ids));
+ }
+
+
+ @ApiOperation("修改关联关系")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusWellWell busWellWell) {
+ Assert.isFalse(Objects.isNull(busWellWell.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusWellWell oldDevice = this.iBusWellWellService.getById(busWellWell.getId());
+ LogObjectHolder.me().set(oldDevice);
+ return ReturnUtil.success(iBusWellWellService.updateById(busWellWell));
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2002, dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+ }
+ }
+
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody BusWellWellRequest busWellWellRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = iBusWellWellService.selectDataScopePage(dataScope, page, busWellWellRequest.getKeywords());
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java
new file mode 100644
index 0000000..0ad366a
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseConfigController.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.common.annotion.BussinessLog;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.model.response.SuccessResponseData;
+import com.casic.missiles.modular.system.dto.NoiseConfigRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IBusDeviceService;
+import com.casic.missiles.modular.system.service.IBusWellWellService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ *
+ * 点位关联表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-07
+ */
+@Api(tags = "设备配置模块接口")
+@RestController
+@RequestMapping("/noiseConfig")
+public class NoiseConfigController {
+
+// @Autowired
+// private IBusConfigService iBusConfigService;
+//
+//
+// @ApiOperation("设备配置")
+// @PostMapping("/config")
+// public ReturnDTO add(@RequestBody BusWellWell busWellWell) {
+// Assert.isFalse(ObjectUtil.hasEmpty(busWellWell.getWellId1(), busWellWell.getWellId2()), () -> {
+// throw new BusinessException(BusinessExceptionEnum.RELATION_IDS_IS_NULL);
+// });
+// try {
+// return ReturnUtil.success(iBusWellWellService.save(busWellWell));
+// } catch (DataAccessException dax) {
+// throw new BusinessException(2002, dax.getMessage().contains("违反唯一约束") && dax.getMessage().contains("wellIds_index") ? "点位已绑定" : "新增异常");
+// }
+// }
+//
+// /**
+// * 噪声获取配置列表
+// */
+// @RequestMapping(value = "/noiseConfig/list")
+// public Object noiseConfigList(@RequestParam(required = false) String keywords,
+// @RequestParam(required = false) String deptid) {
+// SuccessResponseData successResult = new SuccessResponseData();
+// try {
+// Page page = PageFactory.defaultPage();//page使用
+// DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+// List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords,
+// deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope);
+// page.setRecords(busConfigDTOList);
+// successResult.setData(super.packForBT(page));
+// successResult.setMessage("success");
+// } catch (Exception e) {
+// e.printStackTrace();
+// successResult.setCode(500);
+// successResult.setMessage("false");
+// }
+// return successResult;
+// }
+//
+//
+// /**
+// * 新增噪声配置
+// */
+// @RequestMapping(value = "/noiseConfig/config")
+// @BussinessLog(value = "新增噪声配置", key = "deviceId,collectTime,collectInterval,collectCount,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+// public Object addDNoise(@RequestBody NoiseConfigRequest busConfigDTO) {
+// try {
+// busNoiseConfigService.addConfig(busConfigDTO);
+// } catch (Exception e) {
+// e.printStackTrace();
+// return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+// }
+// return ResponseData.success();
+// }
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java
index 0e91b4e..2b8a5c4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java
@@ -1,44 +1,53 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.BaseController;
-//import com.casic.missiles.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.baomidou.mybatisplus.mapper.EntityWrapper;
-//import java.util.List;
-//import com.casic.missiles.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.casic.missiles.modular.system.model.Noise;
-//import com.casic.missiles.modular.system.service.INoiseService;
-//
-///**
-// * 相关仪上传数据控制器
-// *
-// * @author dev
-// * @Date 2024-02-28 16:42:27
-// */
-//@Controller
-//@RequestMapping("/noise")
-//public class NoiseController extends BaseController {
-//
-//
-// @Autowired
-// private INoiseService noiseService;
-//
-//
-// /**
-// * 获取相关仪上传数据列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String condition) {
-// return noiseService.selectList(null);
-// }
-//
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.NoiseRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.Noise;
+import com.casic.missiles.modular.system.service.INoiseService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 相关仪上传数据控制器
+ *
+ * @author dev
+ * @Date 2024-02-28 16:42:27
+ */
+@Api(tags = "数据管理模块接口")
+@RestController
+@RequestMapping("/noise")
+public class NoiseController extends ExportController {
+
+ @Autowired
+ private INoiseService noiseService;
+
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody NoiseRequest noiseRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(noiseRequest.getKeywords()),"devcode",noiseRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(noiseRequest.getBeginTime()), "UPTIME", noiseRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(noiseRequest.getEndTime()), "UPTIME", noiseRequest.getEndTime());
+ queryWrapper.orderByDesc("UPTIME");
+ return ReturnUtil.success(super.packForBT(noiseService.page( page,queryWrapper)));
+ }
+
+
// /**
// * 获取相关仪上传数据分页列表
// */
@@ -102,4 +111,4 @@
// resultData.setData(noiseService.selectById(noiseId));
// return resultData;
// }
-//}
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BaseDeviceModelsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BaseDeviceModelsMapper.java
new file mode 100644
index 0000000..c81191e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BaseDeviceModelsMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 设备型号表 Mapper 接口
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+public interface BaseDeviceModelsMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
index 4275f0c..983985f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/MybatisPlusConfig.java
@@ -12,10 +12,10 @@
@Configuration
public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(){
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
- return interceptor;
- }
+// @Bean
+// public MybatisPlusInterceptor mybatisPlusInterceptor(){
+// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+// return interceptor;
+// }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
new file mode 100644
index 0000000..ae8b002
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/constant/ModularDictConst.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.constant;
+
+
+public class ModularDictConst {
+ /**
+ * 布防状态字典类型
+ */
+ public static final String BFZT = "bfzt";
+
+ /**
+ * 在线状态字典类型
+ */
+ public static final String ONLINESTATUS = "onlineStatus";
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
index dee717e..82749a2 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordsController.java
@@ -1,21 +1,68 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.service.IAlarmRecordsService;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRecords")
-public class AlarmRecordsController {
+public class AlarmRecordsController extends ExportController {
+
+ @Autowired
+ private IAlarmRecordsService alarmRecordsService;
+ @Resource
+ private AbstractPermissionContext iCommonPermissionService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRecordRequest alarmRecordRequest) {
+ Page page = PageFactory.defaultPage();
+ DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRecordRequest.getKeywords()), "devcode", alarmRecordRequest.getKeywords());
+ queryWrapper.ge(ObjectUtil.isNotEmpty(alarmRecordRequest.getBeginTime()), "ALARM_TIME", alarmRecordRequest.getBeginTime());
+ queryWrapper.le(ObjectUtil.isNotEmpty(alarmRecordRequest.getEndTime()), "ALARM_TIME", alarmRecordRequest.getEndTime());
+ return ReturnUtil.success(super.packForBT(alarmRecordsService.page(page, queryWrapper)));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
index 8f67f57..b33ab34 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java
@@ -1,9 +1,32 @@
package com.casic.missiles.modular.system.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.AlarmRuleRequest;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.AlarmRule;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.model.BusWellWell;
+import com.casic.missiles.modular.system.service.IAlarmRuleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
*
@@ -13,9 +36,57 @@
* @author zt
* @since 2024-03-06
*/
-@Controller
+@Api(tags = "报警规则模块接口")
+@Slf4j
+@RestController
@RequestMapping("/alarmRule")
-public class AlarmRuleController {
+public class AlarmRuleController extends ExportController {
+
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ @ApiOperation("分页查询列表")
+ @GetMapping("/list")
+ public ReturnDTO> list(@RequestBody AlarmRuleRequest alarmRuleRequest) {
+ Page page = PageFactory.defaultPage();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ObjectUtil.isNotEmpty(alarmRuleRequest.getKeywords()),"devcode",alarmRuleRequest.getKeywords());
+ return ReturnUtil.success(super.packForBT(alarmRuleService.page( page,queryWrapper)));
+ }
+
+ @ApiOperation("新增告警规则")
+ @PostMapping("/add")
+ public Object add(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
+ }
+ return ResponseData.success();
+ }
+
+
+ @ApiOperation("删除告警规则")
+ @PostMapping("/delete")
+ public ReturnDTO delete(@RequestBody List ids) {
+ Assert.isFalse(Objects.isNull(ids), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(alarmRuleService.removeByIds(ids));
+ }
+
+ @ApiOperation("更新告警规则")
+ @PostMapping("/update")
+ public ReturnDTO updateRule(@RequestBody @Valid AlarmRule alarmRule) {
+ try {
+ alarmRuleService.updateRule(alarmRule.getDevcode(), alarmRule.getHighvalue(), alarmRule.getLowvalue());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ReturnUtil.failed(ResponseData.DEFAULT_ERROR_CODE, "更新告警规则失败");
+ }
+ return ReturnUtil.success();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
new file mode 100644
index 0000000..5959d64
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceModels;
+import com.casic.missiles.modular.system.service.IBaseDeviceModelsService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
+
+/**
+ *
+ * 设备型号表 前端控制器
+ *
+ *
+ * @author zt
+ * @since 2024-03-13
+ */
+@Api(tags = "设备型号模块接口")
+@Slf4j
+@RestController
+@RequestMapping("/baseDeviceModels")
+public class BaseDeviceModelsController {
+ @Autowired
+ private IBaseDeviceModelsService deviceModelsService;
+
+ @ApiOperation("设备类型获取设备型号")
+ @GetMapping("/model")
+ public ReturnDTO> model(String deviceType) {
+ //设备类型列表查询
+ QueryWrapper query = new QueryWrapper<>();
+ if (ObjectUtil.isNotEmpty(deviceType)) {
+ query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
+ }
+ List list = deviceModelsService.list(query);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceModels -> {
+ selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
+}
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
index 417c8eb..2c86fc4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceTypeController.java
@@ -1,9 +1,22 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.casic.missiles.modular.system.dto.DeviceSelectDto;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.model.BaseDeviceType;
+import com.casic.missiles.modular.system.service.IBaseDeviceTypeService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -13,9 +26,29 @@
* @author zt
* @since 2024-03-08
*/
-@Controller
+@Api(tags = "设备类型模块接口")
+@Slf4j
+@RestController
@RequestMapping("/baseDeviceType")
public class BaseDeviceTypeController {
+ @Autowired
+ private IBaseDeviceTypeService deviceTypeService;
+
+
+ @ApiOperation("设备类型列表")
+ @GetMapping("/list-type")
+ public ReturnDTO> type() {
+ //设备类型列表查询
+ List list = deviceTypeService.list(null);
+ List selectDtos = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(list)) {
+ list.forEach(deviceType -> {
+ selectDtos.add(new DeviceSelectDto(deviceType.getTypeName(), deviceType.getId()));
+ });
+ }
+ return ReturnUtil.success(selectDtos);
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 7eb49f8..32a4302 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -2,7 +2,17 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.log.LogObjectHolder;
+import com.casic.missiles.modular.system.constant.ModularDictConst;
+import com.casic.missiles.modular.system.dto.DeviceDto;
+import com.casic.missiles.modular.system.dto.DeviceRequest;
import com.casic.missiles.modular.system.dto.ReturnDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
@@ -14,9 +24,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
@@ -33,15 +45,34 @@
@Slf4j
@RestController
@RequestMapping("/busDevice")
-public class BusDeviceController {
+public class BusDeviceController extends ExportController {
+
+ @Resource
+ private AbstractDictService dictService;
@Autowired
private IBusWellInfoService busWellInfoService;
@Autowired
private IBusDeviceService deviceService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+
+ @ApiOperation("分页列表")
+ @GetMapping("/list-page")
+ public ReturnDTO> listPage(@RequestBody DeviceRequest deviceRequest) {
+ Page page = PageFactory.defaultPage();
+ //查询数据权限 使用默认DEPTID 字段
+ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+ List list = deviceService.selectDataScopePage(dataScope, page, "", "", deviceRequest.getBeginTime(), deviceRequest.getEndTime(), deviceRequest.getKeywords(), deviceRequest.getIsOnline());
+ list.forEach(deviceDto -> {
+ deviceDto.setOnlineStateName(dictService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+ });
+ page.setRecords(list);
+ return ReturnUtil.success(super.packForBT(page));
+ }
@ApiOperation("添加设备")
@PostMapping("/add")
- @ResponseBody
public ReturnDTO add(@RequestBody @Valid BusDevice device, BindingResult bindingResult) {
Assert.isFalse(bindingResult.hasErrors(), () -> {
throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
@@ -59,5 +90,70 @@
return ReturnUtil.success(deviceService.batchDeletes(ids));
}
+
+ @ApiOperation("修改设备信息")
+ @PostMapping("/update")
+ public ReturnDTO update(@RequestBody @Valid BusDevice device) {
+ Assert.isFalse(Objects.isNull(device.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ try {
+ BusDevice oldDevice = this.deviceService.getById(device.getId());
+ LogObjectHolder.me().set(oldDevice);
+ deviceService.updateById(device);
+ } catch (DataAccessException dax) {
+ throw new BusinessException(2001, dax.getMessage().contains("DEVCODE") ? "设备编号重复" : "编辑异常");
+ }
+ return ReturnUtil.success();
+ }
+
+// @RequestMapping(value = "/batchImport", method = RequestMethod.POST)
+// @Permission
+// @ResponseBody
+// public Object batchImport(@RequestParam("file") MultipartFile file) {
+// List results = new ArrayList<>();
+// //设置表头与字段映射,可通过反射获取
+// Map mapper = new HashMap<>();
+// //判断唯一
+// mapper.put("设备编号", "devcode");
+// mapper.put("设备名称", "deviceName");
+// mapper.put("设备类型", "deviceTypeName");
+// mapper.put("设备型号", "modelName");
+// mapper.put("点位编号", "wellCode");
+// mapper.put("数据集中器编号", "concenCode");
+// mapper.put("设备安装时间", "installDateFmt");
+// try {
+// results = this.importExcel(Device.class, file, null, null);
+// List list = deviceService.addDeviceBatch(results);
+// if (!CollectionUtil.isEmpty(list)) {
+// //获取第校验报错信息
+// return new ErrorResponseData(list.get(0));
+// }
+// } catch (Exception e) {
+// return catchMybatisPlusException(e, "导入设备失败");
+// }
+// return ResponseData.success();
+// }
+//
+// @RequestMapping(value = "/batchExport")
+// @Permission
+// @ResponseBody
+// public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException {
+//
+// Page page = PageFactory.defaultPage();
+// page.setCurrent(1);
+// page.setSearchCount(false);
+// page.setSize(Integer.MAX_VALUE);
+// DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+// List