+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c4b6c82..536b0b1 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,25 @@+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 设备表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusDeviceService extends IService+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 设备表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusDeviceService extends IService+ * 闸井信息表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusWellInfoService extends IService+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 设备表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusDeviceService extends IService+ * 闸井信息表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusWellInfoService extends IService+ * 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRecordsServiceImpl extends ServiceImpl+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 设备表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusDeviceService extends IService+ * 闸井信息表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusWellInfoService extends IService+ * 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRecordsServiceImpl extends ServiceImpl+ * 报警规则表 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRuleServiceImpl extends ServiceImpl+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 设备表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusDeviceService extends IService+ * 闸井信息表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusWellInfoService extends IService+ * 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRecordsServiceImpl extends ServiceImpl+ * 报警规则表 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRuleServiceImpl extends ServiceImpl+ * 设备表 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class BusDeviceServiceImpl extends ServiceImpl+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper+ * + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_records") +@ApiModel(value = "AlarmRecords对象", description = "") +public class AlarmRecords implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("设备ID") + private Long deviceId; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("闸井编号") + private String wellCode; + + @ApiModelProperty("告警类型") + private String alarmType; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("告警数值") + private String alarmValue; + + @ApiModelProperty("告警等级") + private Integer alarmLevel; + + @ApiModelProperty("告警时间") + private LocalDateTime alarmTime; + + @ApiModelProperty("告警状态( 0:因新报警而自动取消,1:正在报警,2:因工单结束而消警,3:因数据正常而消警)") + private String status; + + @ApiModelProperty("工单编号") + private Long jobId; + + @ApiModelProperty("告警详情") + private String alarmMsg; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(String alarmContent) { + this.alarmContent = alarmContent; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public Integer getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(Integer alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public LocalDateTime getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(LocalDateTime alarmTime) { + this.alarmTime = alarmTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public String getAlarmMsg() { + return alarmMsg; + } + + public void setAlarmMsg(String alarmMsg) { + this.alarmMsg = alarmMsg; + } + + @Override + public String toString() { + return "AlarmRecords{" + + "id=" + id + + ", deviceId=" + deviceId + + ", devcode=" + devcode + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmValue=" + alarmValue + + ", alarmLevel=" + alarmLevel + + ", alarmTime=" + alarmTime + + ", status=" + status + + ", jobId=" + jobId + + ", alarmMsg=" + alarmMsg + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java new file mode 100644 index 0000000..559479b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/AlarmRule.java @@ -0,0 +1,152 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 报警规则表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("alarm_rule") +@ApiModel(value = "AlarmRule对象", description = "报警规则表") +public class AlarmRule implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("自增主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("报警上限") + private Float highvalue; + + @ApiModelProperty("报警下限") + private Float lowvalue; + + @ApiModelProperty("超时时间") + private Float overtime; + + @ApiModelProperty("突然阈值") + private Float saltation; + + @ApiModelProperty("传感器编号") + private String sensorcode; + + @ApiModelProperty("报警等级") + private String grade; + + @ApiModelProperty("时间戳") + private LocalDateTime ts; + + @ApiModelProperty("操作人姓名") + private String operator; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public Float getHighvalue() { + return highvalue; + } + + public void setHighvalue(Float highvalue) { + this.highvalue = highvalue; + } + + public Float getLowvalue() { + return lowvalue; + } + + public void setLowvalue(Float lowvalue) { + this.lowvalue = lowvalue; + } + + public Float getOvertime() { + return overtime; + } + + public void setOvertime(Float overtime) { + this.overtime = overtime; + } + + public Float getSaltation() { + return saltation; + } + + public void setSaltation(Float saltation) { + this.saltation = saltation; + } + + public String getSensorcode() { + return sensorcode; + } + + public void setSensorcode(String sensorcode) { + this.sensorcode = sensorcode; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public LocalDateTime getTs() { + return ts; + } + + public void setTs(LocalDateTime ts) { + this.ts = ts; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Override + public String toString() { + return "AlarmRule{" + + "id=" + id + + ", devcode=" + devcode + + ", highvalue=" + highvalue + + ", lowvalue=" + lowvalue + + ", overtime=" + overtime + + ", saltation=" + saltation + + ", sensorcode=" + sensorcode + + ", grade=" + grade + + ", ts=" + ts + + ", operator=" + operator + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java new file mode 100644 index 0000000..3f96b01 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusDevice.java @@ -0,0 +1,176 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 设备表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_device") +@ApiModel(value = "BusDevice对象", description = "设备表") +public class BusDevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("设备编号") + private String devcode; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("在线状态") + private String onlineState; + + @ApiModelProperty("设备类型") + private String deviceType; + + private String signal; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("安装时间") + private LocalDate installDate; + + @ApiModelProperty("最新状态时间") + private LocalDateTime logtime; + + @ApiModelProperty("设备型号(关联型号表)") + private Long version; + + @ApiModelProperty("安装高度") + private Double installHeight; + + @ApiModelProperty("浮子电线长度") + private Double lineLength; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getSignal() { + return signal; + } + + public void setSignal(String signal) { + this.signal = signal; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public LocalDate getInstallDate() { + return installDate; + } + + public void setInstallDate(LocalDate installDate) { + this.installDate = installDate; + } + + public LocalDateTime getLogtime() { + return logtime; + } + + public void setLogtime(LocalDateTime logtime) { + this.logtime = logtime; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public Double getInstallHeight() { + return installHeight; + } + + public void setInstallHeight(Double installHeight) { + this.installHeight = installHeight; + } + + public Double getLineLength() { + return lineLength; + } + + public void setLineLength(Double lineLength) { + this.lineLength = lineLength; + } + + @Override + public String toString() { + return "BusDevice{" + + "id=" + id + + ", devcode=" + devcode + + ", deviceName=" + deviceName + + ", onlineState=" + onlineState + + ", deviceType=" + deviceType + + ", signal=" + signal + + ", valid=" + valid + + ", installDate=" + installDate + + ", logtime=" + logtime + + ", version=" + version + + ", installHeight=" + installHeight + + ", lineLength=" + lineLength + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java new file mode 100644 index 0000000..d147505 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -0,0 +1,343 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *+ * 闸井信息表 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@TableName("bus_well_info") +@ApiModel(value = "BusWellInfo对象", description = "闸井信息表") +public class BusWellInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("井盖编号") + private String wellCode; + + @ApiModelProperty("井盖名称") + private String wellName; + + @ApiModelProperty("井深") + private Float deep; + + @ApiModelProperty("第三方坐标系X") + private String coordinateX; + + @ApiModelProperty("第三方坐标Y") + private String coordinateY; + + @ApiModelProperty("百度经度") + private String lngBaidu; + + @ApiModelProperty("百度纬度") + private String latBaidu; + + @ApiModelProperty("高德经度") + private String lngGaode; + + @ApiModelProperty("高德纬度") + private String latGaode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("部门编号(权属单位)") + private String deptid; + + @ApiModelProperty("责任部门(维护部门)") + private Long responsibleDept; + + @ApiModelProperty("路标图片路径集合") + private String photos; + + @ApiModelProperty("备注") + private String notes; + + @ApiModelProperty("井类型") + private String wellType; + + @ApiModelProperty("责任人") + private String staff; + + @ApiModelProperty("电话") + private String tel; + + @ApiModelProperty("时间戳") + private LocalDate ts; + + @ApiModelProperty("是否有效") + private String valid; + + @ApiModelProperty("布防状态") + private String bfzt; + + @ApiModelProperty("井标签备用1,分组") + private String wellFlag1; + + @ApiModelProperty("井标签备用2") + private String wellFlag2; + + @ApiModelProperty("井标签备用3") + private String wellFlag3; + + private String road; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public Float getDeep() { + return deep; + } + + public void setDeep(Float deep) { + this.deep = deep; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public Long getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(Long responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public LocalDate getTs() { + return ts; + } + + public void setTs(LocalDate ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getRoad() { + return road; + } + + public void setRoad(String road) { + this.road = road; + } + + @Override + public String toString() { + return "BusWellInfo{" + + "id=" + id + + ", wellCode=" + wellCode + + ", wellName=" + wellName + + ", deep=" + deep + + ", coordinateX=" + coordinateX + + ", coordinateY=" + coordinateY + + ", lngBaidu=" + lngBaidu + + ", latBaidu=" + latBaidu + + ", lngGaode=" + lngGaode + + ", latGaode=" + latGaode + + ", area=" + area + + ", position=" + position + + ", deptid=" + deptid + + ", responsibleDept=" + responsibleDept + + ", photos=" + photos + + ", notes=" + notes + + ", wellType=" + wellType + + ", staff=" + staff + + ", tel=" + tel + + ", ts=" + ts + + ", valid=" + valid + + ", bfzt=" + bfzt + + ", wellFlag1=" + wellFlag1 + + ", wellFlag2=" + wellFlag2 + + ", wellFlag3=" + wellFlag3 + + ", road=" + road + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java index ab68658..9dae90d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Noise.java @@ -38,6 +38,11 @@ @TableField("DDATA") private String ddata; /** + * 原始数据 + */ + @TableField("RAWDATA") + private String rawData; + /** * 采集时间 */ @TableField("UPTIME") @@ -49,6 +54,13 @@ private Date logtime; @TableField("DESCN") private String descn; + + @TableField("pci") + private String pci; + @TableField("rsrp") + private String rsrp; + @TableField("snr") + private String snr; @Override public String toString() { return "Noise{" + @@ -60,4 +72,21 @@ ", descn=" + descn + "}"; } + + public Noise() { + } + + public Noise(String devcode, String ddata, String rawData, + Date uptime, Date logtime, String descn, + String pci, String rsrp, String snr) { + this.devcode = devcode; + this.ddata = ddata; + this.rawData = rawData; + this.uptime = uptime; + this.logtime = logtime; + this.descn = descn; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java new file mode 100644 index 0000000..8e593ce --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordsService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *+ * 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRecordsService extends IService+ * 报警规则表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IAlarmRuleService extends IService+ * 设备表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusDeviceService extends IService+ * 闸井信息表 服务类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface IBusWellInfoService extends IService+ * 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRecordsServiceImpl extends ServiceImpl+ * 报警规则表 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class AlarmRuleServiceImpl extends ServiceImpl+ * 设备表 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class BusDeviceServiceImpl extends ServiceImpl+ * 闸井信息表 服务实现类 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Service +public class BusWellInfoServiceImpl extends ServiceImpl+ * 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRecords") +public class AlarmRecordsController { + +} + 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 new file mode 100644 index 0000000..8f67f57 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *+ * 报警规则表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/alarmRule") +public class AlarmRuleController { + +} + 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 new file mode 100644 index 0000000..12eb38b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.service.IBusWellInfoService; +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.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +/** + *+ * 设备表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Api(tags = "设备表接口") +@Slf4j +@RestController +@RequestMapping("/busDevice") +public class BusDeviceController { + @Autowired + private IBusWellInfoService busWellInfoService; + + @ApiOperation("添加设备") + @GetMapping("/add") + public Object add(BusWellInfo busWellInfo) { + + try { + if(null==busWellInfo.getResponsibleDept()){ + busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString())); + } + +// List+ * 点位信息表 前端控制器 + *
+ * + * @author zt + * @since 2024-03-06 + */ +@Controller +@RequestMapping("/busWellInfo") +public class BusWellInfoController { + +} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 87b6fec..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.application.event.core.EventPublisher; -import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.event.UserEvent; -import com.casic.missiles.modular.system.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - @Autowired - private EventPublisher publisher; - - /** - * 获取mockToken - */ - @PostMapping("/list") - @ResponseBody - public Object list() { - User user = new User(); - user.setAccount("张三"); - publisher.publishEvent(new UserEvent(ModelEventTypeEnum.ADD, user)); - return ResponseData.success(); - } - - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java new file mode 100644 index 0000000..7b9749c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.AlarmRecords; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRecordsMapper extends BaseMapper+ * 报警规则表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface AlarmRuleMapper extends BaseMapper+ * 设备表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusDeviceMapper extends BaseMapper+ * 闸井信息表 Mapper 接口 + *
+ * + * @author zt + * @since 2024-03-06 + */ +public interface BusWellInfoMapper extends BaseMapper