From aa2e74fc93779df8b19a03c80cb5c8d7cbaf0bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Thu, 8 May 2025 11:41:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gd/app/controller/ContainerController.java | 6 +-- .../gd/app/controller/CraftsController.java | 14 ++--- .../gd/app/controller/DeviceParamController.java | 4 +- .../gd/app/controller/DevicePointController.java | 60 ++++++++++++++++++++++ .../iflytop/gd/app/controller/OresController.java | 8 +-- .../gd/app/controller/SolutionsController.java | 2 +- .../iflytop/gd/app/controller/UserController.java | 8 +-- .../gd/app/mapper/DevicePositionMapper.java | 12 +++++ .../iflytop/gd/app/model/dto/ResumeCraftsDTO.java | 13 +++++ .../iflytop/gd/app/model/dto/ResumeCraftsDto.java | 14 ----- .../iflytop/gd/app/model/dto/StopCraftsDTO.java | 13 +++++ .../iflytop/gd/app/model/dto/StopCraftsDto.java | 14 ----- .../gd/app/model/entity/DevicePosition.java | 34 ++++++++++++ .../iflytop/gd/app/model/vo/DevicePositionVO.java | 39 ++++++++++++++ .../iflytop/gd/app/service/ContainerService.java | 2 +- .../com/iflytop/gd/app/service/CraftsService.java | 8 --- .../gd/app/service/DevicePositionService.java | 43 ++++++++++++++++ .../gd/common/enums/data/DevicePositionCode.java | 12 +++++ .../gd/common/enums/data/DevicePositionType.java | 31 +++++++++++ src/main/resources/sql/init.sql | 11 ++++ 20 files changed, 290 insertions(+), 58 deletions(-) create mode 100644 src/main/java/com/iflytop/gd/app/controller/DevicePointController.java create mode 100644 src/main/java/com/iflytop/gd/app/mapper/DevicePositionMapper.java create mode 100644 src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDTO.java delete mode 100644 src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java create mode 100644 src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDTO.java delete mode 100644 src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java create mode 100644 src/main/java/com/iflytop/gd/app/model/entity/DevicePosition.java create mode 100644 src/main/java/com/iflytop/gd/app/model/vo/DevicePositionVO.java create mode 100644 src/main/java/com/iflytop/gd/app/service/DevicePositionService.java create mode 100644 src/main/java/com/iflytop/gd/common/enums/data/DevicePositionCode.java create mode 100644 src/main/java/com/iflytop/gd/common/enums/data/DevicePositionType.java diff --git a/src/main/java/com/iflytop/gd/app/controller/ContainerController.java b/src/main/java/com/iflytop/gd/app/controller/ContainerController.java index c045f32..5eabfca 100644 --- a/src/main/java/com/iflytop/gd/app/controller/ContainerController.java +++ b/src/main/java/com/iflytop/gd/app/controller/ContainerController.java @@ -22,13 +22,13 @@ public class ContainerController { @Operation(summary = "容器列表") @GetMapping("/list") - public Result> getAllContainer() { - return Result.success(containerService.getAllContainer()); + public Result> getList() { + return Result.success(containerService.getList()); } @Operation(summary = "更新容器配置") @PutMapping("") - public Result updateContainer(@Valid @RequestBody Container container) { + public Result update(@Valid @RequestBody Container container) { return Result.success(containerService.updateById(container)); } } diff --git a/src/main/java/com/iflytop/gd/app/controller/CraftsController.java b/src/main/java/com/iflytop/gd/app/controller/CraftsController.java index 6358641..533c68b 100644 --- a/src/main/java/com/iflytop/gd/app/controller/CraftsController.java +++ b/src/main/java/com/iflytop/gd/app/controller/CraftsController.java @@ -30,7 +30,7 @@ public class CraftsController { @Operation(summary = "根据矿石id获取工艺列表") @GetMapping("/list/{oresId}") - public Result> getAllCrafts( + public Result> getList( @NotNull(message = "矿石ID 不能为空") @Min(value = 1, message = "矿石ID 必须大于等于 1") @Parameter(description = "矿石ID") @PathVariable Long oresId) { @@ -40,10 +40,10 @@ public class CraftsController { @Operation(summary = "添加新工艺") @PostMapping("") - public Result addCrafts(@Valid @RequestBody Crafts crafts) { + public Result add(@Valid @RequestBody Crafts crafts) { Crafts existingCrafts = craftsService.findByName(crafts.getName()); if (existingCrafts == null) { - boolean isSuccess = craftsService.addCrafts(crafts); + boolean isSuccess = craftsService.save(crafts); if (isSuccess) { return Result.success(); } @@ -56,7 +56,7 @@ public class CraftsController { @Operation(summary = "更新工艺") @PutMapping("") public Result updateCrafts(@Valid @RequestBody Crafts crafts) { - boolean isSuccess = craftsService.updateCrafts(crafts); + boolean isSuccess = craftsService.updateById(crafts); if (isSuccess) { return Result.success(); } @@ -65,7 +65,7 @@ public class CraftsController { @Operation(summary = "删除工艺") @DeleteMapping("/{ids}") - public Result deleteCrafts( + public Result delete( @Parameter(description = "工艺ID，多个以英文逗号(,)分割") @PathVariable String ids) { boolean isSuccess = craftsService.deleteCrafts(ids); if (isSuccess) { @@ -97,14 +97,14 @@ public class CraftsController { @Operation(summary = "恢复执行工艺") @PostMapping("/resume") - public Result resumeCrafts(@Valid @RequestBody ResumeCraftsDto resumeCraftsDto) { + public Result resumeCrafts(@Valid @RequestBody ResumeCraftsDTO resumeCraftsDto) { craftsService.resumeCrafts(resumeCraftsDto.getHeatId()); return Result.success(); } @Operation(summary = "停止执行工艺") @PostMapping("/stop") - public Result stopCrafts(@Valid @RequestBody StopCraftsDto stopCraftsDto) { + public Result stopCrafts(@Valid @RequestBody StopCraftsDTO stopCraftsDto) { craftsService.stopCrafts(stopCraftsDto.getHeatId()); return Result.success(); } diff --git a/src/main/java/com/iflytop/gd/app/controller/DeviceParamController.java b/src/main/java/com/iflytop/gd/app/controller/DeviceParamController.java index 8457b05..065f43a 100644 --- a/src/main/java/com/iflytop/gd/app/controller/DeviceParamController.java +++ b/src/main/java/com/iflytop/gd/app/controller/DeviceParamController.java @@ -30,7 +30,7 @@ public class DeviceParamController { @Operation(summary = "获取所有设备配置") @GetMapping("/list") - public Result> listGroupedParams() { + public Result> getList() { List vos = deviceParamConfigService.listGroupedByModule(); return Result.success(vos); } @@ -66,7 +66,7 @@ public class DeviceParamController { @Operation(summary = "删除配置") @DeleteMapping("/{ids}") - public Result deleteOres(@Parameter(description = "矿石ID，多个以英文逗号(,)分割") @PathVariable String ids) { + public Result delete(@Parameter(description = "矿石ID，多个以英文逗号(,)分割") @PathVariable String ids) { boolean isSuccess = deviceParamConfigService.deleteDeviceParam(ids); if (isSuccess) { return Result.success(); diff --git a/src/main/java/com/iflytop/gd/app/controller/DevicePointController.java b/src/main/java/com/iflytop/gd/app/controller/DevicePointController.java new file mode 100644 index 0000000..90a1d2d --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/controller/DevicePointController.java @@ -0,0 +1,60 @@ +package com.iflytop.gd.app.controller; + +import com.iflytop.gd.app.model.entity.DevicePosition; +import com.iflytop.gd.app.model.vo.DevicePositionVO; +import com.iflytop.gd.app.service.DevicePositionService; +import com.iflytop.gd.common.result.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 设备点位接口 + */ +@Tag(name = "设备位置配置") +@RestController +@RequestMapping("/api/device-point") +@RequiredArgsConstructor +@Slf4j +public class DevicePointController { + + private final DevicePositionService devicePointService; + + @Operation(summary = "列表") + @GetMapping("/list") + public Result> listGroupedParams() { + List devicePointVOList = devicePointService.getList(); + return Result.success(devicePointVOList); + } + + @Operation(summary = "添加") + @PostMapping("") + public Result add(@Valid @RequestBody DevicePosition devicePoint) { + devicePointService.save(devicePoint); + return Result.success(); + } + + @Operation(summary = "修改") + @PutMapping("") + public Result update(@Valid @RequestBody DevicePosition devicePoint) { + devicePointService.updateById(devicePoint); + return Result.success(); + } + + @Operation(summary = "删除") + @DeleteMapping("/{ids}") + public Result delete(@Parameter(description = "位置ID，多个以英文逗号(,)分割") @PathVariable String ids) { + boolean isSuccess = devicePointService.deletePositon(ids); + if (isSuccess) { + return Result.success(); + } + return Result.failed(); + } +} diff --git a/src/main/java/com/iflytop/gd/app/controller/OresController.java b/src/main/java/com/iflytop/gd/app/controller/OresController.java index 90d3fa6..c496e68 100644 --- a/src/main/java/com/iflytop/gd/app/controller/OresController.java +++ b/src/main/java/com/iflytop/gd/app/controller/OresController.java @@ -26,14 +26,14 @@ public class OresController { @Operation(summary = "矿石工艺列表") @GetMapping("/list") - public PageResult getAllOres(BasePageQuery pageQuery) { + public PageResult getList(BasePageQuery pageQuery) { IPage result = oresService.getPage(pageQuery); return PageResult.success(result); } @Operation(summary = "添加新矿石") @PostMapping("") - public Result addOres(@Valid @RequestBody Ores ores) { + public Result add(@Valid @RequestBody Ores ores) { Ores existingOres = oresService.findByName(ores.getName()); if (existingOres == null) { boolean isSuccess = oresService.addOres(ores); @@ -48,7 +48,7 @@ public class OresController { @Operation(summary = "更新矿石") @PutMapping("") - public Result updateOres(@Valid @RequestBody Ores ores) { + public Result update(@Valid @RequestBody Ores ores) { Ores existingOres = oresService.findByName(ores.getName()); if (existingOres == null) { boolean isSuccess = oresService.updateOres(ores); @@ -63,7 +63,7 @@ public class OresController { @Operation(summary = "删除矿石") @DeleteMapping("/{ids}") - public Result deleteOres(@Parameter(description = "矿石ID，多个以英文逗号(,)分割") @PathVariable String ids) { + public Result delete(@Parameter(description = "矿石ID，多个以英文逗号(,)分割") @PathVariable String ids) { boolean isSuccess = oresService.deleteOres(ids); if (isSuccess) { return Result.success(); diff --git a/src/main/java/com/iflytop/gd/app/controller/SolutionsController.java b/src/main/java/com/iflytop/gd/app/controller/SolutionsController.java index 0c318b0..e3a1a21 100644 --- a/src/main/java/com/iflytop/gd/app/controller/SolutionsController.java +++ b/src/main/java/com/iflytop/gd/app/controller/SolutionsController.java @@ -63,7 +63,7 @@ public class SolutionsController { @Operation(summary = "删除溶液") @DeleteMapping("/{ids}") - public Result deleteUser(@Parameter(description = "溶液ID，多个以英文逗号(,)分割") @PathVariable String ids) { + public Result delete(@Parameter(description = "溶液ID，多个以英文逗号(,)分割") @PathVariable String ids) { boolean isSuccess = solutionsService.deleteSolutions(ids); if (isSuccess) { return Result.success(); diff --git a/src/main/java/com/iflytop/gd/app/controller/UserController.java b/src/main/java/com/iflytop/gd/app/controller/UserController.java index 0fc5ca8..885ed79 100644 --- a/src/main/java/com/iflytop/gd/app/controller/UserController.java +++ b/src/main/java/com/iflytop/gd/app/controller/UserController.java @@ -27,7 +27,7 @@ public class UserController { @Operation(summary = "用户列表") @GetMapping("/list") - public PageResult getAllUsers(BasePageQuery pageQuery) { + public PageResult getList(BasePageQuery pageQuery) { IPage result = userService.page(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), null); result.getRecords().forEach(user -> user.setPassword(null)); return PageResult.success(result); @@ -35,7 +35,7 @@ public class UserController { @Operation(summary = "添加新用户") @PostMapping("") - public Result addUser(@Valid @RequestBody User user) { + public Result add(@Valid @RequestBody User user) { User existingUser = userService.getOne(new LambdaQueryWrapper().eq(User::getUsername, user.getUsername())); if (existingUser == null) { user.setFixedUser(null); @@ -51,7 +51,7 @@ public class UserController { @Operation(summary = "更新用户信息") @PutMapping("") - public Result updateUser(@Valid @RequestBody User user) { + public Result update(@Valid @RequestBody User user) { boolean isSuccess = userService.updateById(user); if (isSuccess) { return Result.success(); @@ -61,7 +61,7 @@ public class UserController { @Operation(summary = "删除用户") @DeleteMapping("/{ids}") - public Result deleteUser(@Parameter(description = "用户ID，多个以英文逗号(,)分割") @PathVariable String ids) { + public Result delete(@Parameter(description = "用户ID，多个以英文逗号(,)分割") @PathVariable String ids) { boolean isSuccess = userService.deleteUser(ids); if (isSuccess) { return Result.success(); diff --git a/src/main/java/com/iflytop/gd/app/mapper/DevicePositionMapper.java b/src/main/java/com/iflytop/gd/app/mapper/DevicePositionMapper.java new file mode 100644 index 0000000..1e41f93 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/mapper/DevicePositionMapper.java @@ -0,0 +1,12 @@ +package com.iflytop.gd.app.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iflytop.gd.app.model.entity.DevicePosition; +import org.apache.ibatis.annotations.Mapper; + +/** + * 设备位置持久层接口 + */ +@Mapper +public interface DevicePositionMapper extends BaseMapper { +} diff --git a/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDTO.java b/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDTO.java new file mode 100644 index 0000000..3e7b058 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDTO.java @@ -0,0 +1,13 @@ +package com.iflytop.gd.app.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "恢复执行工艺") +@Data +public class ResumeCraftsDTO { + @NotNull + @Schema(description = "加热区id") + private String heatId; +} diff --git a/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java b/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java deleted file mode 100644 index bbc67fe..0000000 --- a/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.iflytop.gd.app.model.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Schema(description = "恢复执行工艺") -@Data -public class ResumeCraftsDto { - @NotNull - @Schema(description = "加热区id") - private String heatId; -} diff --git a/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDTO.java b/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDTO.java new file mode 100644 index 0000000..af407de --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDTO.java @@ -0,0 +1,13 @@ +package com.iflytop.gd.app.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "恢复执行工艺") +@Data +public class StopCraftsDTO { + @NotNull + @Schema(description = "加热区id") + private String heatId; +} diff --git a/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java b/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java deleted file mode 100644 index 235dbfa..0000000 --- a/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.iflytop.gd.app.model.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Schema(description = "恢复执行工艺") -@Data -public class StopCraftsDto { - @NotNull - @Schema(description = "加热区id") - private String heatId; -} diff --git a/src/main/java/com/iflytop/gd/app/model/entity/DevicePosition.java b/src/main/java/com/iflytop/gd/app/model/entity/DevicePosition.java new file mode 100644 index 0000000..ba64e44 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/entity/DevicePosition.java @@ -0,0 +1,34 @@ +package com.iflytop.gd.app.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.gd.common.base.BaseEntity; +import com.iflytop.gd.common.enums.data.DevicePositionCode; +import com.iflytop.gd.common.enums.data.DevicePositionType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Schema(description = "设备位置记录") +@TableName("device_position") +@Data +public class DevicePosition extends BaseEntity { + + @Schema(description = "位置名称") + private String name; + + @Schema(description = "位置代码") + private DevicePositionCode code; + + @Schema(description = "位置类型") + private DevicePositionType type; + + @NotNull + @NotBlank + @Schema(description = "位置数据") + private String position; + + +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/gd/app/model/vo/DevicePositionVO.java b/src/main/java/com/iflytop/gd/app/model/vo/DevicePositionVO.java new file mode 100644 index 0000000..ccb55c0 --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/model/vo/DevicePositionVO.java @@ -0,0 +1,39 @@ +package com.iflytop.gd.app.model.vo; + +import com.iflytop.gd.app.model.entity.DevicePosition; +import com.iflytop.gd.common.enums.data.DevicePositionCode; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * 设备位置记录 的展示视图 + */ +@Data +@AllArgsConstructor +@Schema(description = "设备位置记录") +public class DevicePositionVO { + + private Long id; + + @Schema(description = "位置名称") + private String name; + + @Schema(description = "位置代码") + private DevicePositionCode code; + + @Schema(description = "位置类型") + private String type; + + @Schema(description = "位置数据") + private String position; + + public DevicePositionVO(DevicePosition devicePosition) { + this.id = devicePosition.getId(); + this.name = devicePosition.getName(); + this.code = devicePosition.getCode(); + this.type = devicePosition.getType().getName(); + this.position = devicePosition.getPosition(); + } + +} diff --git a/src/main/java/com/iflytop/gd/app/service/ContainerService.java b/src/main/java/com/iflytop/gd/app/service/ContainerService.java index 57936ae..4447b9f 100644 --- a/src/main/java/com/iflytop/gd/app/service/ContainerService.java +++ b/src/main/java/com/iflytop/gd/app/service/ContainerService.java @@ -16,7 +16,7 @@ import java.util.List; public class ContainerService extends ServiceImpl{ private final ContainerMapper containerMapper; - public List getAllContainer() { + public List getList() { return this.list(); } diff --git a/src/main/java/com/iflytop/gd/app/service/CraftsService.java b/src/main/java/com/iflytop/gd/app/service/CraftsService.java index 74066d8..e99533c 100644 --- a/src/main/java/com/iflytop/gd/app/service/CraftsService.java +++ b/src/main/java/com/iflytop/gd/app/service/CraftsService.java @@ -185,14 +185,6 @@ public class CraftsService extends ServiceImpl { return this.getOne(new LambdaQueryWrapper<>(new Crafts()).eq(Crafts::getName, name)); } - public boolean addCrafts(Crafts crafts) { - return this.save(crafts); - } - - public boolean updateCrafts(Crafts crafts) { - return this.updateById(crafts); - } - public boolean deleteCrafts(String idsStr) { List ids = Arrays.stream(idsStr.split(",")).map(Long::parseLong).collect(Collectors.toList()); return this.removeByIds(ids); diff --git a/src/main/java/com/iflytop/gd/app/service/DevicePositionService.java b/src/main/java/com/iflytop/gd/app/service/DevicePositionService.java new file mode 100644 index 0000000..eed748f --- /dev/null +++ b/src/main/java/com/iflytop/gd/app/service/DevicePositionService.java @@ -0,0 +1,43 @@ +package com.iflytop.gd.app.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iflytop.gd.app.mapper.DevicePositionMapper; +import com.iflytop.gd.app.model.entity.DevicePosition; +import com.iflytop.gd.app.model.vo.DevicePositionVO; +import com.iflytop.gd.common.enums.data.DevicePositionCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 设备位置服务 + */ +@Service +@RequiredArgsConstructor +public class DevicePositionService extends ServiceImpl { + + public List getList() { + List devicePositions = super.list(); + return devicePositions.stream() + .map(DevicePositionVO::new) + .collect(Collectors.toList()); + } + + /** + * 根据位置类型获取位置 + */ + public DevicePosition getPoint(DevicePositionCode code) { + return this.getOne(new LambdaQueryWrapper<>(DevicePosition.class).eq(DevicePosition::getCode, code)); + } + + public boolean deletePositon(String idsStr) { + List ids = Arrays.stream(idsStr.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()); + return this.removeByIds(ids); + } +} diff --git a/src/main/java/com/iflytop/gd/common/enums/data/DevicePositionCode.java b/src/main/java/com/iflytop/gd/common/enums/data/DevicePositionCode.java new file mode 100644 index 0000000..e38d33e --- /dev/null +++ b/src/main/java/com/iflytop/gd/common/enums/data/DevicePositionCode.java @@ -0,0 +1,12 @@ +package com.iflytop.gd.common.enums.data; + +import lombok.Getter; + +/** + * 设备位置代码 + */ +@Getter +public enum DevicePositionCode { + test + +} diff --git a/src/main/java/com/iflytop/gd/common/enums/data/DevicePositionType.java b/src/main/java/com/iflytop/gd/common/enums/data/DevicePositionType.java new file mode 100644 index 0000000..48dba3d --- /dev/null +++ b/src/main/java/com/iflytop/gd/common/enums/data/DevicePositionType.java @@ -0,0 +1,31 @@ +package com.iflytop.gd.common.enums.data; + +import lombok.Getter; + +/** + * 设备位置类型 + */ +@Getter +public enum DevicePositionType { + /** + * 直线距离 + */ + DISTANCE("直线距离"), + /** + * 二维点 + */ + POINT_2D("二维点"), + /** + * 三维点 + */ + POINT_3D("三维点"); + + + private final String name; + + // 构造函数 + DevicePositionType(String name) { + this.name = name; + } + +} diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index e5ed07e..a4957fb 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -89,6 +89,17 @@ CREATE TABLE IF NOT EXISTS device_config ( update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); +-- 设备位置 表 +CREATE TABLE IF NOT EXISTS device_position ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + name TEXT, + code TEXT, + type TEXT, + position TEXT, + create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); + -- 系统配置 表 CREATE TABLE IF NOT EXISTS system_config ( id INTEGER PRIMARY KEY AUTOINCREMENT,