dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dyf-device'

Browse Source 
# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
This commit is contained in:
daiyongfei
2025-07-31 09:16:52 +08:00
parent 6827ff0a3c 5a23359112
commit 0dc896586d
17 changed files with 674 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
View File

@ -147,19 +147,19 @@ public class DeviceController extends BaseController {
return R.ok();
}
/**
* @param id
* @return
* @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters）
* 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。
*/
// @Log("解绑设备")
@Operation(summary = "WEB端解绑设备")
@GetMapping(value = "/unbind")
public R<Void> unbindDevice(@Validated Long id) {
return toAjax(deviceService.webUnBindDevice(id));
}
//
// /**
// * @param id
// * @return
// * @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters）
// * 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。
// */
// // @Log("解绑设备")
// @Operation(summary = "WEB端解绑设备")
// @GetMapping(value = "/unbind")
// public R<Void> unbindDevice(@Validated Long id) {
// return toAjax(deviceService.webUnBindDevice(id));
// }
@Operation(summary = "导出数据设备")

106
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceLogController.java Normal file
View File

@ -0,0 +1,106 @@
package com.fuyuanshen.equipment.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 com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
import com.fuyuanshen.common.log.annotation.Log;
import com.fuyuanshen.common.web.core.BaseController;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.core.validate.AddGroup;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.log.enums.BusinessType;
import com.fuyuanshen.common.excel.utils.ExcelUtil;
import com.fuyuanshen.equipment.domain.vo.DeviceLogVo;
import com.fuyuanshen.equipment.domain.bo.DeviceLogBo;
import com.fuyuanshen.equipment.service.IDeviceLogService;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
/**
* 设备日志
*
* @author Lion Li
* @date 2025-07-29
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/equipment/log")
public class DeviceLogController extends BaseController {
private final IDeviceLogService deviceLogService;
/**
* 查询设备日志列表
*/
@SaCheckPermission("equipment:log:list")
@GetMapping("/list")
public TableDataInfo<DeviceLogVo> list(DeviceLogBo bo, PageQuery pageQuery) {
return deviceLogService.queryPageList(bo, pageQuery);
}
/**
* 导出设备日志列表
*/
@SaCheckPermission("equipment:log:export")
@Log(title = "设备日志", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DeviceLogBo bo, HttpServletResponse response) {
List<DeviceLogVo> list = deviceLogService.queryList(bo);
ExcelUtil.exportExcel(list, "设备日志", DeviceLogVo.class, response);
}
/**
* 获取设备日志详细信息
*
* @param id 主键
*/
@SaCheckPermission("equipment:log:query")
@GetMapping("/{id}")
public R<DeviceLogVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(deviceLogService.queryById(id));
}
/**
* 新增设备日志
*/
@SaCheckPermission("equipment:log:add")
@Log(title = "设备日志", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceLogBo bo) {
return toAjax(deviceLogService.insertByBo(bo));
}
/**
* 修改设备日志
*/
@SaCheckPermission("equipment:log:edit")
@Log(title = "设备日志", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceLogBo bo) {
return toAjax(deviceLogService.updateByBo(bo));
}
/**
* 删除设备日志
*
* @param ids 主键串
*/
@SaCheckPermission("equipment:log:remove")
@Log(title = "设备日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(deviceLogService.deleteWithValidByIds(List.of(ids), true));
}
}

51
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java
View File

@ -1,40 +1,51 @@
package com.fuyuanshen.equipment.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fuyuanshen.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* @Description:
* @Author: WY
* @Date: 2025/5/24
**/
* 设备日志对象 device_log
*
* @author Lion Li
* @date 2025-07-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("device_log")
public class DeviceLog extends TenantEntity {
public class DeviceLog extends BaseEntity {
@TableId(value = "id", type = IdType.AUTO)
// @Schema(value = "ID")
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@TableId(value = "id")
private Long id;
// @Schema(value = "设备行为")
/**
* 设备行为
*/
private String deviceAction;
// @Schema(value = "设备名称")
/**
* 设备名称
*/
private String deviceName;
// @Schema(value = "数据来源")
/**
* 数据来源
*/
private String dataSource;
// @Schema(value = "内容")
/**
* 内容
*/
private String content;
public void copy(DeviceLog source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
}

49
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceLogBo.java Normal file
View File

@ -0,0 +1,49 @@
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.equipment.domain.DeviceLog;
import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 设备日志业务对象 device_log
*
* @author Lion Li
* @date 2025-07-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = DeviceLog.class, reverseConvertGenerate = false)
public class DeviceLogBo extends BaseEntity {
/**
* ID
*/
@NotNull(message = "ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 设备行为
*/
private String deviceAction;
/**
* 设备名称
*/
private String deviceName;
/**
* 数据来源
*/
private String dataSource;
/**
* 内容
*/
private String content;
}

62
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceLogVo.java Normal file
View File

@ -0,0 +1,62 @@
package com.fuyuanshen.equipment.domain.vo;
import com.fuyuanshen.equipment.domain.DeviceLog;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
import com.fuyuanshen.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;
/**
* 设备日志视图对象 device_log
*
* @author Lion Li
* @date 2025-07-29
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = DeviceLog.class)
public class DeviceLogVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ExcelProperty(value = "ID")
private Long id;
/**
* 设备行为
*/
@ExcelProperty(value = "设备行为")
private String deviceAction;
/**
* 设备名称
*/
@ExcelProperty(value = "设备名称")
private String deviceName;
/**
* 数据来源
*/
@ExcelProperty(value = "数据来源")
private String dataSource;
/**
* 内容
*/
@ExcelProperty(value = "内容")
private String content;
}

15
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceLogMapper.java Normal file
View File

@ -0,0 +1,15 @@
package com.fuyuanshen.equipment.mapper;
import com.fuyuanshen.equipment.domain.DeviceLog;
import com.fuyuanshen.equipment.domain.vo.DeviceLogVo;
import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 设备日志Mapper接口
*
* @author Lion Li
* @date 2025-07-29
*/
public interface DeviceLogMapper extends BaseMapperPlus<DeviceLog, DeviceLogVo> {
}

68
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceLogService.java Normal file
View File

@ -0,0 +1,68 @@
package com.fuyuanshen.equipment.service;
import com.fuyuanshen.equipment.domain.vo.DeviceLogVo;
import com.fuyuanshen.equipment.domain.bo.DeviceLogBo;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 设备日志Service接口
*
* @author Lion Li
* @date 2025-07-29
*/
public interface IDeviceLogService {
/**
* 查询设备日志
*
* @param id 主键
* @return 设备日志
*/
DeviceLogVo queryById(Long id);
/**
* 分页查询设备日志列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 设备日志分页列表
*/
TableDataInfo<DeviceLogVo> queryPageList(DeviceLogBo bo, PageQuery pageQuery);
/**
* 查询符合条件的设备日志列表
*
* @param bo 查询条件
* @return 设备日志列表
*/
List<DeviceLogVo> queryList(DeviceLogBo bo);
/**
* 新增设备日志
*
* @param bo 设备日志
* @return 是否新增成功
*/
Boolean insertByBo(DeviceLogBo bo);
/**
* 修改设备日志
*
* @param bo 设备日志
* @return 是否修改成功
*/
Boolean updateByBo(DeviceLogBo bo);
/**
* 校验并批量删除设备日志信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

135
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceLogServiceImpl.java Normal file
View File

@ -0,0 +1,135 @@
package com.fuyuanshen.equipment.service.impl;
import com.fuyuanshen.common.core.utils.MapstructUtils;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.fuyuanshen.equipment.domain.bo.DeviceLogBo;
import com.fuyuanshen.equipment.domain.vo.DeviceLogVo;
import com.fuyuanshen.equipment.domain.DeviceLog;
import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
import com.fuyuanshen.equipment.service.IDeviceLogService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 设备日志Service业务层处理
*
* @author Lion Li
* @date 2025-07-29
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class DeviceLogServiceImpl implements IDeviceLogService {
private final DeviceLogMapper baseMapper;
/**
* 查询设备日志
*
* @param id 主键
* @return 设备日志
*/
@Override
public DeviceLogVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询设备日志列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 设备日志分页列表
*/
@Override
public TableDataInfo<DeviceLogVo> queryPageList(DeviceLogBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DeviceLog> lqw = buildQueryWrapper(bo);
Page<DeviceLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的设备日志列表
*
* @param bo 查询条件
* @return 设备日志列表
*/
@Override
public List<DeviceLogVo> queryList(DeviceLogBo bo) {
LambdaQueryWrapper<DeviceLog> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<DeviceLog> buildQueryWrapper(DeviceLogBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DeviceLog> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(DeviceLog::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDeviceAction()), DeviceLog::getDeviceAction, bo.getDeviceAction());
lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceLog::getDeviceName, bo.getDeviceName());
lqw.eq(StringUtils.isNotBlank(bo.getDataSource()), DeviceLog::getDataSource, bo.getDataSource());
lqw.eq(StringUtils.isNotBlank(bo.getContent()), DeviceLog::getContent, bo.getContent());
return lqw;
}
/**
* 新增设备日志
*
* @param bo 设备日志
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(DeviceLogBo bo) {
DeviceLog add = MapstructUtils.convert(bo, DeviceLog.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改设备日志
*
* @param bo 设备日志
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(DeviceLogBo bo) {
DeviceLog update = MapstructUtils.convert(bo, DeviceLog.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DeviceLog entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除设备日志信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

2
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/c/map/GetAddressFromLatUtil.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/map/GetAddressFromLatUtil.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.equipment.utils.c.map;
package com.fuyuanshen.equipment.utils.map;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;

2
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/c/map/LngLonUtil.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/map/LngLonUtil.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.equipment.utils.c.map;
package com.fuyuanshen.equipment.utils.map;
/**
* @author: 默苍璃

7
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuyuanshen.equipment.mapper.DeviceLogMapper">
</mapper>