drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -60,8 +60,6 @@ d.device_name, d.device_type, d.status as device_status, ad.longitude as device_longitude, ad.latitude as device_latitude, ad.area_name, dz.zone_name as defense_zone_name from drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDevicePerShareController.java
New file @@ -0,0 +1,129 @@ /* * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * Neither the name of the dreamlu.net developer nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.device.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import org.sxkj.fw.device.dto.FwDevicePerShareDTO; import org.sxkj.fw.device.entity.FwDevicePerShareEntity; import org.sxkj.fw.device.vo.FwDevicePerShareVO; import org.sxkj.fw.device.wrapper.FwDevicePerShareWrapper; import org.sxkj.fw.device.service.IFwDevicePerShareService; import org.springblade.core.boot.ctrl.BladeController; import java.util.Objects; /** * 设备权限分享表 控制器 * * @author lw * @since 2026-01-28 */ @RestController @AllArgsConstructor @RequestMapping("device/fwDevicePerShare") @Api(value = "设备权限分享表", tags = "设备权限分享表接口") public class FwDevicePerShareController extends BladeController { private final IFwDevicePerShareService fwDevicePerShareService; /** * 设备权限分享表 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入fwDevicePerShare") public R<FwDevicePerShareVO> detail(FwDevicePerShareEntity fwDevicePerShare) { FwDevicePerShareEntity detail = fwDevicePerShareService.getOne(Condition.getQueryWrapper(fwDevicePerShare)); return R.data(FwDevicePerShareWrapper.build().entityVO(detail)); } /** * 设备权限分享表 分页 */ // @GetMapping("/list") // @ApiOperationSupport(order = 2) // @ApiOperation(value = "分页", notes = "传入fwDevicePerShare") // public R<IPage<FwDevicePerShareVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDevicePerShare, Query query) { // IPage<FwDevicePerShareEntity> pages = fwDevicePerShareService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDevicePerShare, FwDevicePerShareEntity.class)); // return R.data(FwDevicePerShareWrapper.build().pageVO(pages)); // } /** * 设备权限分享表 自定义分页 */ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入fwDevicePerShare") public R<IPage<FwDevicePerShareVO>> page(FwDevicePerShareVO fwDevicePerShare, Query query) { IPage<FwDevicePerShareVO> pages = fwDevicePerShareService.selectFwDevicePerSharePage(Condition.getPage(query), fwDevicePerShare); return R.data(pages); } /** * 设备权限分享表 新增 */ @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入fwDevicePerShare") public R save(@Valid @RequestBody FwDevicePerShareDTO fwDevicePerShare) { FwDevicePerShareEntity fwDevicePerShareEntity = Objects.requireNonNull(BeanUtil.copy(fwDevicePerShare, FwDevicePerShareEntity.class)); return R.status(fwDevicePerShareService.save(fwDevicePerShareEntity)); } /** * 设备权限分享表 修改 */ // @PostMapping("/update") // @ApiOperationSupport(order = 5) // @ApiOperation(value = "修改", notes = "传入fwDevicePerShare") // public R update(@Valid @RequestBody FwDevicePerShareEntity fwDevicePerShare) { // return R.status(fwDevicePerShareService.updateById(fwDevicePerShare)); // } /** * 设备权限分享表 新增或修改 */ // @PostMapping("/submit") // @ApiOperationSupport(order = 6) // @ApiOperation(value = "新增或修改", notes = "传入fwDevicePerShare") // public R submit(@Valid @RequestBody FwDevicePerShareEntity fwDevicePerShare) { // return R.status(fwDevicePerShareService.saveOrUpdate(fwDevicePerShare)); // } /** * 设备权限分享表 删除 */ @PostMapping("/remove") @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(fwDevicePerShareService.deleteLogic(Func.toLongList(ids))); } } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDevicePerShareDTO.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/dto/FwDevicePerShareDTO.java @@ -14,11 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.dto; package org.sxkj.fw.device.dto; import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** * 设备权限分享表 数据传输对象实体类 @@ -27,8 +26,25 @@ * @since 2026-01-28 */ @Data @EqualsAndHashCode(callSuper = true) public class FwDevicePerShareDTO extends FwDevicePerShareEntity { public class FwDevicePerShareDTO { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "设备ID") private Long deviceId; /** * 设备编号 */ @ApiModelProperty(value = "设备编号") private String deviceSn; /** * 借出方部门ID */ @ApiModelProperty(value = "借出方部门ID") private Long loanFromDeptId; /** * 借入方部门ID */ @ApiModelProperty(value = "借入方部门ID") private Long loanToDeptId; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDevicePerShareEntity.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/entity/FwDevicePerShareEntity.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.entity; package org.sxkj.fw.device.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -22,7 +22,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.mp.TenantEntity; /** * 设备权限分享表 实体类 @@ -53,11 +52,7 @@ */ @ApiModelProperty(value = "借入方部门ID") private Long loanToDeptId; /** * 设备权限菜单ID */ @ApiModelProperty(value = "设备权限菜单ID") private String devicePerMenuId; /** * 区域编码 */ drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDevicePerShareExcel.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/excel/FwDevicePerShareExcel.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.excel; package org.sxkj.fw.device.excel; import com.alibaba.excel.annotation.ExcelProperty; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDevicePerShareMapper.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.java @@ -14,11 +14,11 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.mapper; package org.sxkj.fw.device.mapper; import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity; import org.sxkj.fw.fwDevicePerShare.vo.FwDevicePerShareVO; import org.sxkj.fw.fwDevicePerShare.excel.FwDevicePerShareExcel; import org.sxkj.fw.device.entity.FwDevicePerShareEntity; import org.sxkj.fw.device.vo.FwDevicePerShareVO; import org.sxkj.fw.device.excel.FwDevicePerShareExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDevicePerShareMapper.xml
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.xml @@ -1,15 +1,14 @@ <?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="org.sxkj.fw.fwDevicePerShare.mapper.FwDevicePerShareMapper"> <mapper namespace="org.sxkj.fw.device.mapper.FwDevicePerShareMapper"> <!-- 通用查询映射结果 --> <resultMap id="fwDevicePerShareResultMap" type="org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity"> <resultMap id="fwDevicePerShareResultMap" type="org.sxkj.fw.device.entity.FwDevicePerShareEntity"> <result column="id" property="id"/> <result column="device_sn" property="deviceSn"/> <result column="device_id" property="deviceId"/> <result column="loan_from_dept_id" property="loanFromDeptId"/> <result column="loan_to_dept_id" property="loanToDeptId"/> <result column="device_per_menu_id" property="devicePerMenuId"/> <result column="area_code" property="areaCode"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> @@ -26,7 +25,7 @@ </select> <select id="exportFwDevicePerShare" resultType="org.sxkj.fw.fwDevicePerShare.excel.FwDevicePerShareExcel"> <select id="exportFwDevicePerShare" resultType="org.sxkj.fw.device.excel.FwDevicePerShareExcel"> SELECT * FROM ja_fw_device_per_share ${ew.customSqlSegment} </select>
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/service/IFwDevicePerShareService.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.service; package org.sxkj.fw.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity; import org.sxkj.fw.fwDevicePerShare.vo.FwDevicePerShareVO; import org.sxkj.fw.fwDevicePerShare.excel.FwDevicePerShareExcel; import org.sxkj.fw.device.entity.FwDevicePerShareEntity; import org.sxkj.fw.device.vo.FwDevicePerShareVO; import org.sxkj.fw.device.excel.FwDevicePerShareExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDevicePerShareServiceImpl.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/service/impl/FwDevicePerShareServiceImpl.java @@ -14,13 +14,13 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.service.impl; package org.sxkj.fw.device.service.impl; import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity; import org.sxkj.fw.fwDevicePerShare.vo.FwDevicePerShareVO; import org.sxkj.fw.fwDevicePerShare.excel.FwDevicePerShareExcel; import org.sxkj.fw.fwDevicePerShare.mapper.FwDevicePerShareMapper; import org.sxkj.fw.fwDevicePerShare.service.IFwDevicePerShareService; import org.sxkj.fw.device.entity.FwDevicePerShareEntity; import org.sxkj.fw.device.vo.FwDevicePerShareVO; import org.sxkj.fw.device.excel.FwDevicePerShareExcel; import org.sxkj.fw.device.mapper.FwDevicePerShareMapper; import org.sxkj.fw.device.service.IFwDevicePerShareService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDevicePerShareVO.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/vo/FwDevicePerShareVO.java @@ -14,10 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.vo; package org.sxkj.fw.device.vo; import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity; import org.springblade.core.tool.node.INode; import org.sxkj.fw.device.entity.FwDevicePerShareEntity; import lombok.Data; import lombok.EqualsAndHashCode;
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/wrapper/FwDevicePerShareWrapper.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.wrapper; package org.sxkj.fw.device.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity; import org.sxkj.fw.fwDevicePerShare.vo.FwDevicePerShareVO; import org.sxkj.fw.device.entity.FwDevicePerShareEntity; import org.sxkj.fw.device.vo.FwDevicePerShareVO; import java.util.Objects; /** drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/controller/FwDevicePerShareController.java
File was deleted drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
@@ -26,11 +26,10 @@ import org.sxkj.fw.record.mapper.FwDroneAlarmRecordMapper; import org.sxkj.fw.record.service.IFwDroneAlarmRecordService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.sxkj.system.cache.SysCache; import org.sxkj.fw.fwDevicePerShare.mapper.FwDevicePerShareMapper; import org.sxkj.fw.device.mapper.FwDevicePerShareMapper; import org.springframework.beans.factory.annotation.Autowired; import java.util.List;
