diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java new file mode 100644 index 0000000..22d5a2c --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java @@ -0,0 +1,105 @@ +package org.dromara.platform.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.platform.domain.vo.PointInfoVo; +import org.dromara.platform.domain.bo.PointInfoBo; +import org.dromara.platform.service.IPointInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 点位信息 + * + * @author gejunhao + * @date 2025-03-10 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/pointInfo") +public class PointInfoController extends BaseController { + + private final IPointInfoService pointInfoService; + + /** + * 查询点位信息列表 + */ + @SaCheckPermission("platform:pointInfo:list") + @GetMapping("/list") + public TableDataInfo list(PointInfoBo bo, PageQuery pageQuery) { + return pointInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出点位信息列表 + */ + @SaCheckPermission("platform:pointInfo:export") + @Log(title = "点位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(PointInfoBo bo, HttpServletResponse response) { + List list = pointInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "点位信息", PointInfoVo.class, response); + } + + /** + * 获取点位信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:pointInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(pointInfoService.queryById(id)); + } + + /** + * 新增点位信息 + */ + @SaCheckPermission("platform:pointInfo:add") + @Log(title = "点位信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody PointInfoBo bo) { + return toAjax(pointInfoService.insertByBo(bo)); + } + + /** + * 修改点位信息 + */ + @SaCheckPermission("platform:pointInfo:edit") + @Log(title = "点位信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody PointInfoBo bo) { + return toAjax(pointInfoService.updateByBo(bo)); + } + + /** + * 删除点位信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:pointInfo:remove") + @Log(title = "点位信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(pointInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/PointInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/PointInfo.java new file mode 100644 index 0000000..fe527e8 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/PointInfo.java @@ -0,0 +1,107 @@ +package org.dromara.platform.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 点位信息对象 point_info + * + * @author gejunhao + * @date 2025-03-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("point_info") +public class PointInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 自增id + */ + @TableId(value = "id") + private String id; + + /** + * 编码 + */ + private String code; + + /** + * 点位名称 + */ + private String pointName; + + /** + * 地址 + */ + private String address; + + /** + * 所属机构 + */ + private String organizationName; + + /** + * 维护单位 + */ + private String maintenanceUnit; + + /** + * 摄像机类型 + */ + private String cameraType; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 项目id + */ + private String projectId; + + /** + * 备注 + */ + private String remark; + + /** + * 端口 + */ + private String port; + + /** + * ip地址 + */ + private String ip; + + /** + * 当前状态 + */ + private Long status; + + /** + * 删除标志(0代表存在 2代表删除) + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/PointInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/PointInfoBo.java new file mode 100644 index 0000000..51d78db --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/PointInfoBo.java @@ -0,0 +1,114 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.PointInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 点位信息业务对象 point_info + * + * @author gejunhao + * @date 2025-03-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = PointInfo.class, reverseConvertGenerate = false) +public class PointInfoBo extends BaseEntity { + + /** + * 自增id + */ + @NotBlank(message = "自增id不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 编码 + */ + @NotBlank(message = "编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String code; + + /** + * 点位名称 + */ + @NotBlank(message = "点位名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String pointName; + + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String address; + + /** + * 所属机构 + */ + @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class }) + private String organizationName; + + /** + * 维护单位 + */ + @NotBlank(message = "维护单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintenanceUnit; + + /** + * 摄像机类型 + */ + @NotBlank(message = "摄像机类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cameraType; + + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class }) + private String longitude; + + /** + * 纬度 + */ + @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class }) + private String latitude; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 项目id + */ + @NotBlank(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectId; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + /** + * 端口 + */ + @NotBlank(message = "端口不能为空", groups = { AddGroup.class, EditGroup.class }) + private String port; + + /** + * ip地址 + */ + @NotBlank(message = "ip地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ip; + + /** + * 当前状态 + */ + @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java new file mode 100644 index 0000000..5ec6eae --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java @@ -0,0 +1,122 @@ +package org.dromara.platform.domain.vo; + +import org.dromara.platform.domain.PointInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 点位信息视图对象 point_info + * + * @author gejunhao + * @date 2025-03-10 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = PointInfo.class) +public class PointInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 自增id + */ + @ExcelProperty(value = "自增id") + private String id; + + /** + * 编码 + */ + @ExcelProperty(value = "编码") + private String code; + + /** + * 点位名称 + */ + @ExcelProperty(value = "点位名称") + private String pointName; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String address; + + /** + * 所属机构 + */ + @ExcelProperty(value = "所属机构") + private String organizationName; + + /** + * 维护单位 + */ + @ExcelProperty(value = "维护单位") + private String maintenanceUnit; + + /** + * 摄像机类型 + */ + @ExcelProperty(value = "摄像机类型") + private String cameraType; + + /** + * 经度 + */ + @ExcelProperty(value = "经度") + private String longitude; + + /** + * 纬度 + */ + @ExcelProperty(value = "纬度") + private String latitude; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private String projectId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 端口 + */ + @ExcelProperty(value = "端口") + private String port; + + /** + * ip地址 + */ + @ExcelProperty(value = "ip地址") + private String ip; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/PointInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/PointInfoMapper.java new file mode 100644 index 0000000..388ba9e --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/PointInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.PointInfo; +import org.dromara.platform.domain.vo.PointInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 点位信息Mapper接口 + * + * @author gejunhao + * @date 2025-03-10 + */ +public interface PointInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IPointInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IPointInfoService.java new file mode 100644 index 0000000..602ea10 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IPointInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.PointInfoVo; +import org.dromara.platform.domain.bo.PointInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 点位信息Service接口 + * + * @author gejunhao + * @date 2025-03-10 + */ +public interface IPointInfoService { + + /** + * 查询点位信息 + * + * @param id 主键 + * @return 点位信息 + */ + PointInfoVo queryById(String id); + + /** + * 分页查询点位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点位信息分页列表 + */ + TableDataInfo queryPageList(PointInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的点位信息列表 + * + * @param bo 查询条件 + * @return 点位信息列表 + */ + List queryList(PointInfoBo bo); + + /** + * 新增点位信息 + * + * @param bo 点位信息 + * @return 是否新增成功 + */ + Boolean insertByBo(PointInfoBo bo); + + /** + * 修改点位信息 + * + * @param bo 点位信息 + * @return 是否修改成功 + */ + Boolean updateByBo(PointInfoBo bo); + + /** + * 校验并批量删除点位信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java new file mode 100644 index 0000000..51b3a13 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java @@ -0,0 +1,141 @@ +package org.dromara.platform.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.PointInfoBo; +import org.dromara.platform.domain.vo.PointInfoVo; +import org.dromara.platform.domain.PointInfo; +import org.dromara.platform.mapper.PointInfoMapper; +import org.dromara.platform.service.IPointInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 点位信息Service业务层处理 + * + * @author gejunhao + * @date 2025-03-10 + */ +@RequiredArgsConstructor +@Service +public class PointInfoServiceImpl implements IPointInfoService { + + private final PointInfoMapper baseMapper; + + /** + * 查询点位信息 + * + * @param id 主键 + * @return 点位信息 + */ + @Override + public PointInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询点位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 点位信息分页列表 + */ + @Override + public TableDataInfo queryPageList(PointInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的点位信息列表 + * + * @param bo 查询条件 + * @return 点位信息列表 + */ + @Override + public List queryList(PointInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(PointInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), PointInfo::getCode, bo.getCode()); + lqw.like(StringUtils.isNotBlank(bo.getPointName()), PointInfo::getPointName, bo.getPointName()); + lqw.eq(StringUtils.isNotBlank(bo.getAddress()), PointInfo::getAddress, bo.getAddress()); + lqw.like(StringUtils.isNotBlank(bo.getOrganizationName()), PointInfo::getOrganizationName, bo.getOrganizationName()); + lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceUnit()), PointInfo::getMaintenanceUnit, bo.getMaintenanceUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getCameraType()), PointInfo::getCameraType, bo.getCameraType()); + lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), PointInfo::getLongitude, bo.getLongitude()); + lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), PointInfo::getLatitude, bo.getLatitude()); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), PointInfo::getProjectName, bo.getProjectName()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectId()), PointInfo::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getPort()), PointInfo::getPort, bo.getPort()); + lqw.eq(StringUtils.isNotBlank(bo.getIp()), PointInfo::getIp, bo.getIp()); + lqw.eq(bo.getStatus() != null, PointInfo::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增点位信息 + * + * @param bo 点位信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(PointInfoBo bo) { + PointInfo add = MapstructUtils.convert(bo, PointInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改点位信息 + * + * @param bo 点位信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(PointInfoBo bo) { + PointInfo update = MapstructUtils.convert(bo, PointInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(PointInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除点位信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}