drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java
@@ -106,19 +106,12 @@ @TableField("md5") private String md5; /** * 是否生成过ai 图 0 =未生成过 1=已生成过 */ private Integer isGenerateAiImg; @TableField("is_deleted") private Integer isDeleted; //区域 @TableField(exist = false) private String areaCode; @TableField(exist = false) private List<String> wayLineJobIds; public String getMd5() { String link = this.link; drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java
@@ -12,35 +12,23 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.RoleConstant; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateTimeUtil; import org.springblade.core.tool.utils.Func; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.sxkj.common.constant.CommonConstant; import org.sxkj.common.model.ResponseResult; import org.sxkj.common.model.TimeRange; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.common.utils.TimeRangeUtils; import org.sxkj.resource.dto.AttachDto; import org.sxkj.resource.dto.WaylineJobInfoQueryDto; import org.sxkj.resource.dto.WaylineJobInfoQueryParam; import org.sxkj.resource.entity.Attach; import org.sxkj.resource.feign.IAttachClient; import org.sxkj.resource.param.AttachPageParam; import org.sxkj.resource.param.AttachParam; import org.sxkj.resource.service.IAttachService; import org.sxkj.resource.vo.*; import org.sxkj.system.vo.TreeVo; import org.sxkj.resource.vo.AttachVO; import org.sxkj.resource.vo.AttachmentDownloadParam; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; @@ -49,12 +37,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Objects; import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE; /** * 附件表 控制器 @@ -136,9 +119,9 @@ @ApiOperationSupport(order = 2) @ApiOperation(value = "附件分页", notes = "传入attach") public R<IPage<Attach>> list(Attach attach, Query query) { List<String> wayLineJobIds = attach.getWayLineJobIds(); QueryWrapper<Attach> queryWrapper1 = Condition.getQueryWrapper(attach); QueryWrapper<Attach> queryWrapper = queryWrapper1.in(!CollectionUtils.isEmpty(wayLineJobIds), "wayline_job_id", wayLineJobIds); String patrolTaskId = attach.getPatrolTaskId(); QueryWrapper<Attach> queryWrapper1 = Condition.getQueryWrapper(attach); QueryWrapper<Attach> queryWrapper = queryWrapper1.eq(!StringUtils.isEmpty(patrolTaskId), "patrol_task_id", patrolTaskId); queryWrapper.eq("is_deleted", 0); IPage<Attach> pages = attachService.page(Condition.getPage(query), queryWrapper); return R.data(pages); drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
@@ -69,7 +69,6 @@ and info.is_deleted = 0 and attach.is_thumbnail = 0 and (rela.is_deleted = 0 or rela.is_deleted is null) and attach.is_generate_ai_img = 0 and wj.`status` in (2, 3, 5, 6, 7) <if test="attach.jobName!=null and attach.jobName!=''"> and wj.name like concat('%',#{attach.jobName},'%') @@ -851,7 +850,6 @@ a.is_thumbnail, a.longitude, a.latitude, a.is_generate_ai_img, a.media_category, a.media_create_time, a.is_deleted drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
@@ -1,6 +1,7 @@ package org.sxkj.fw.cockpit.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; import org.sxkj.fw.cockpit.service.ICockpitService; import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO; @@ -19,18 +20,19 @@ import javax.annotation.Resource; import java.util.List; import java.util.Optional; @Service public class CockpitServiceImpl implements ICockpitService { @Resource private IFwDroneAlarmRecordService fwDroneAlarmRecordService; private IFwDroneAlarmRecordService fwDroneAlarmRecordService; @Resource private IFwDeviceService fwDeviceService; private IFwDeviceService fwDeviceService; @Resource private IFwEffectEvalService fwEffectEvalService; private IFwEffectEvalService fwEffectEvalService; @Override @@ -50,9 +52,14 @@ @Override public boolean interferenceAndExpulsion(FwEffectEvalParam fwEffectEvalParam) { // 告警记录 FwDroneAlarmRecordEntity alarmRecordEntity = fwDroneAlarmRecordService.getById(fwEffectEvalParam.getAlarmRecordId()); // 设备信息 FwDeviceEntity device = fwDeviceService.getById(alarmRecordEntity.getDeviceId()); FwEffectEvalEntity fwEffectEvalEntity = new FwEffectEvalEntity(); // 反制效果 FwEffectEvalEntity one = fwEffectEvalService.getOne(Wrappers.<FwEffectEvalEntity>lambdaQuery().eq(FwEffectEvalEntity::getAlarmRecordId, fwEffectEvalParam.getAlarmRecordId())); FwEffectEvalEntity fwEffectEvalEntity = Optional.ofNullable(one) .orElse(new FwEffectEvalEntity()); // 告警记录相关字段 fwEffectEvalEntity.setAlarmRecordId(fwEffectEvalParam.getAlarmRecordId()); @@ -75,9 +82,9 @@ fwEffectEvalEntity.setAreaCode(device.getAreaCode()); // 反制效果及工作模式（从参数获取，否则使用默认值） fwEffectEvalEntity.setCounterEffect( "1"); // 1.success/2.fail fwEffectEvalEntity.setCounterEffect("1"); // 1.success/2.fail fwEffectEvalEntity.setCoverRadiusM(2500); // 覆盖范围（米） fwEffectEvalEntity.setWorkMode( "1"); // 1.机动/2.固定 fwEffectEvalEntity.setWorkMode("1"); // 1.机动/2.固定 fwDroneAlarmRecordService.updateById(alarmRecordEntity); return fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity); } @@ -87,7 +94,7 @@ // 设备统计 AlarmStatisticsVO alarmStatisticsVO = fwDeviceService.statisticalDeviceAtt(); // 告警统计 AlarmStatisticsVO alarmStatistics = fwDroneAlarmRecordService.alarmTypeStatistics(); AlarmStatisticsVO alarmStatistics = fwDroneAlarmRecordService.alarmTypeStatistics(); alarmStatisticsVO.setHistoryAlarmCount(alarmStatistics.getHistoryAlarmCount()); alarmStatisticsVO.setRealTimeAlarmCount(alarmStatistics.getRealTimeAlarmCount()); return alarmStatisticsVO; drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -118,6 +118,7 @@ and dar.area_name like CONCAT('%', #{param2.areaName}, '%') </if> </where> order by dar.favorited desc </select>
@@ -119,8 +119,4 @@ @ApiModelProperty(value = "设备位置") private String location; @ApiModelProperty(value = "设备部门") private String deviceDeptName; } drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
@@ -69,10 +69,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.*; import java.util.stream.Collectors; import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; @@ -206,6 +203,8 @@ String times = OrderNumUtils.initOrderNum2(WordOrderConstant.ORG_CODE); String deptCode = WordOrderConstant.ORG_PREFIX + times; deptEntity.setDeptCode(deptCode); deptEntity.setCreateTime(new Date()); deptEntity.setUpdateTime(new Date()); if (deptService.submit(deptEntity)) { CacheUtil.clear(SYS_CACHE); CacheUtil.clear(SYS_CACHE, Boolean.FALSE); drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java
@@ -148,6 +148,7 @@ @ApiOperation(value = "修改", notes = "传入region") @ApiLog("行政区划数据修改") public R update(@Valid @RequestBody Region region) { region.setUpdateTime(DateUtil.now()); return R.status(regionService.updateById(region)); } @@ -160,6 +161,8 @@ @ApiLog("行政区划数据新增或修改") public R submit(@Valid @RequestBody RegionAddParam region) { Region regionEntity = Objects.requireNonNull(BeanUtil.copy(region, Region.class)); regionEntity.setUpdateTime(DateUtil.now()); regionEntity.setCreateTime(DateUtil.now()); return R.status(regionService.submit(regionEntity)); }
@@ -290,8 +290,8 @@ <if test="param2.fullName!=null and param2.fullName!=''"> and bd.full_name like concat(concat('%', #{param2.fullName}),'%') </if> <if test="param2.areaCode!=null and param2.areaCode!=''"> and bd.area_code = #{param2.areaCode} <if test="param2.deptCode!=null and param2.deptCode!=''"> and bd.dept_code = #{param2.deptCode} </if> ORDER BY bd.create_time DESC </select> drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml
@@ -162,7 +162,11 @@ and district_name like concat(concat('%', #{param2.districtName}),'%') </if> <if test="param2.parentName!=null and param2.parentName!=''"> and parent_name like concat(concat('%', #{param2.parentName}),'%') and ( (region_level = '5' AND town_name LIKE CONCAT(CONCAT('%', #{param2.parentName}), '%')) OR (region_level = '4' AND district_name LIKE CONCAT(CONCAT('%', #{param2.parentName}), '%')) OR (region_level = '3' AND city_name LIKE CONCAT(CONCAT('%', #{param2.parentName}), '%')) ) </if> <if test="param2.regionLevel!=null"> and region_level = #{param2.regionLevel} drone-service/drone-system/src/main/java/org/sxkj/system/param/DeptPageParam.java
@@ -9,8 +9,8 @@ @ApiModelProperty(value = "部门名称") private String deptName; @ApiModelProperty(value = "部门全称") private String fullName; @ApiModelProperty(value = "机构编码") private String deptCode; @ApiModelProperty(value = "所属区划") private String areaCode;
