drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDevicePerShareController.java
File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/controller/FwDevicePerShareController.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.sxkj.fw.fwDevicePerShare.controller; package org.sxkj.fw.device.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,30 +23,21 @@ import lombok.AllArgsConstructor; import javax.validation.Valid; import org.springblade.core.secure.BladeUser; 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.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.sxkj.fw.fwDevicePerShare.dto.FwDevicePerShareDTO; 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.wrapper.FwDevicePerShareWrapper; import org.sxkj.fw.fwDevicePerShare.service.IFwDevicePerShareService; 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 org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; import java.util.List; import java.util.Objects; import javax.servlet.http.HttpServletResponse; /** * 设备权限分享表 控制器 @@ -56,7 +47,7 @@ */ @RestController @AllArgsConstructor @RequestMapping("fwDevicePerShare/fwDevicePerShare") @RequestMapping("device/fwDevicePerShare") @Api(value = "设备权限分享表", tags = "设备权限分享表接口") public class FwDevicePerShareController extends BladeController { 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,7 +14,7 @@ * 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 io.swagger.annotations.ApiModelProperty; import lombok.Data; 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; /** * 设备权限分享表 实体类 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 @@ -3,7 +3,7 @@ <mapper namespace="org.sxkj.fw.fwDevicePerShare.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"/> @@ -25,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> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDevicePerShareService.java
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; drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDevicePerShareWrapper.java
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/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;