重点人脸,车辆抓拍与房屋单元返回

develop
hanrenchun 10 months ago
parent 2bdec541de
commit 07c2a8aa68

@ -468,6 +468,7 @@ public class BigScreenController extends BaseController {
// queryWrapperEstate.like("real_estate_address", para); // 你需要替换成实际的模糊查询条件
queryWrapperEstate.eq("real_estate_brief_address", para);
queryWrapperEstate.eq("building_name", buildName);
queryWrapperEstate.orderByAsc("unit_name");
// 执行查询
List<MetaRealEstateInfo> realEstateInfos = realEstateInfoService.list(queryWrapperEstate);
@ -476,8 +477,10 @@ public class BigScreenController extends BaseController {
.map(MetaRealEstateInfo::getRealEstateAddress)
.distinct()
.collect(Collectors.toList());
List<String> stringList = realEstateInfos.stream()
.map(MetaRealEstateInfo::getUnitName)
.distinct()
.collect(Collectors.toList());
// 创建查询条件,使用 in 条件
QueryWrapper<MetaActualUserInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.in("habitation_address", realEstateAddressList);
@ -514,7 +517,7 @@ public class BigScreenController extends BaseController {
actualVo.setCzryCount("0");
actualVo.setZzryCount("0");
actualVo.setLdCount(StringKit.toString(ldrkCount.size()));
actualVo.setUnitList(stringList);
return AjaxResult.success(actualVo);
} catch (Exception e) {
logger.info(StringKit.toString(e));
@ -559,6 +562,7 @@ public class BigScreenController extends BaseController {
// queryWrapper.like("real_estate_address", para);
queryWrapper.eq("building_name", buildName);
queryWrapper.eq("unit_name", unit);
queryWrapper.orderByAsc("home_name");
List<MetaRealEstateInfo> estateInfoList = realEstateInfoService.list(queryWrapper);
List<MetaRealEstateInfoVo> modifiedEstateInfoList = estateInfoList.stream()
@ -569,6 +573,7 @@ public class BigScreenController extends BaseController {
return modifiedInfo;
})
.collect(Collectors.toList());
Map<String, List<Map<String, String>>> resultMap = modifiedEstateInfoList.stream()
.filter(info -> info.getHomeName() != "0" || info.getHomeName().length() < 5)
.collect(Collectors.groupingBy(

@ -87,7 +87,7 @@ public class PoachingController extends BaseController {
bean.setFfblsc(ffblscMap);
Map ffslaMap = new HashMap();
ffslaMap.put("name", "非法狩猎案");
ffslaMap.put("value", ffslaCount);
ffslaMap.put("value", ffslaCount + ffslbsCount);
ffslaMap.put("percentage", ffslaPerceStr);
bean.setFfsla(ffslaMap);
// Map ffslbsMap = new HashMap();

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* vo
*
@ -60,4 +62,9 @@ public class BuildInfoActualVo {
private String ldCount;
@ApiModelProperty("楼栋单元信息")
private List<String> unitList;
}

@ -0,0 +1,50 @@
package com.ruoyi.database.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.database.domain.DevopsVideoStatus;
import com.ruoyi.database.domain.DisposalInfo;
import com.ruoyi.database.service.DisposalInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "预警信息处置表")
@RestController
@RequiredArgsConstructor
@RequestMapping("/base/DisposalInfo")
public class DisposalInfoController extends BaseController {
private final DisposalInfoService disposalInfoService;
@GetMapping
@ApiOperation("查询预警信息处置表")
public TableDataInfo<DisposalInfo> list(DisposalInfo disposalInfo) {
startPage();
List<DisposalInfo> list = disposalInfoService.list(new QueryWrapper<>(disposalInfo));
return getDataTable(list);
}
@PostMapping
@ApiOperation("新增预警信息处置表")
@Log(title = "预警信息处置表", businessType = BusinessType.INSERT)
public AjaxResult insert(@RequestBody DisposalInfo disposalInfo) {
return toAjax(disposalInfoService.save(disposalInfo));
}
@PutMapping
@ApiOperation("修改预警信息处置表")
@Log(title = "预警信息处置表", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DisposalInfo disposalInfo) {
return toAjax(disposalInfoService.updateById(disposalInfo));
}
}

@ -40,9 +40,16 @@ public class MetaHuntersInfoController extends BaseController {
@ApiOperation("查询非法狩猎人员信息表")
public TableDataInfo<MetaHuntersInfo> list(MetaHuntersInfo metaHuntersInfo) {
startPage();
LambdaQueryWrapper<MetaHuntersInfo> queryWrapper = new LambdaQueryWrapper<>(metaHuntersInfo);
if (metaHuntersInfo.getFirstTime() != null && metaHuntersInfo.getEndTime() != null) {
queryWrapper.between(MetaHuntersInfo::getRegistrationTime, metaHuntersInfo.getFirstTime(), metaHuntersInfo.getEndTime());
LambdaQueryWrapper<MetaHuntersInfo> queryWrapper = new LambdaQueryWrapper<>();
if (metaHuntersInfo.getHuntersUserType() != null){
if (metaHuntersInfo.getHuntersUserType() != 1){
ArrayList<Integer> integers = new ArrayList<>();
integers.add(2);
integers.add(3);
queryWrapper.in(MetaHuntersInfo::getHuntersUserType,integers);
}else{
queryWrapper.eq(MetaHuntersInfo::getHuntersUserType,metaHuntersInfo.getHuntersUserType());
}
}
// 添加排序条件:根据 userPic 倒序排序
queryWrapper.orderByDesc(MetaHuntersInfo::getUserPic);

@ -8,6 +8,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.database.domain.TransitImpUserRecord;
import com.ruoyi.database.domain.TransitUserRecord;
@ -25,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
@ -46,16 +48,27 @@ public class TransitUserRecordController extends BaseController {
@GetMapping
@ApiOperation("查询人脸记录表")
public TableDataInfo<TransitUserRecord> list(TransitUserRecord transitUserRecord) {
public TableDataInfo<TransitUserRecord> list(TransitUserRecord transitUserRecord) throws Exception{
startPage();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime now = LocalDateTime.now();
LocalDateTime minusDay = now.minusDays(1);
QueryWrapper<TransitUserRecord> queryWrapper = new QueryWrapper<>(transitUserRecord);
queryWrapper.between("partition_field",formatter.format(minusDay),formatter.format(now));
queryWrapper.orderByDesc("partition_field");
List<TransitUserRecord> list = transitUserRecordService.list(queryWrapper);
return getDataTable(list);
QueryWrapper<TransitImpUserRecord> impUserRecordQueryWrapper = new QueryWrapper<>();
impUserRecordQueryWrapper.eq("device_code",transitUserRecord.getDeviceCode());
impUserRecordQueryWrapper.between("partition_field", formatter.format(minusDay), formatter.format(now));
impUserRecordQueryWrapper.orderByDesc("partition_field");
List<TransitImpUserRecord> list1 = transitImpUserRecordService.list(impUserRecordQueryWrapper);
if (list1.isEmpty()) {
PageUtils.startPage();
QueryWrapper<TransitUserRecord> queryWrapper = new QueryWrapper<>(transitUserRecord);
queryWrapper.between("partition_field", formatter.format(minusDay), formatter.format(now));
queryWrapper.orderByDesc("partition_field");
List<TransitUserRecord> list = transitUserRecordService.list(queryWrapper);
return getDataTable(list);
}
return getDataTable(list1);
}

@ -54,11 +54,20 @@ public class TransitVehicleRecordController extends BaseController {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime now = LocalDateTime.now();
LocalDateTime minusDay = now.minusDays(1);
QueryWrapper<TransitVehicleRecord> queryWrapper = new QueryWrapper<>(transitVehicleRecord);
queryWrapper.between("partition_field",formatter.format(minusDay),formatter.format(now));
queryWrapper.orderByDesc("partition_field");
List<TransitVehicleRecord> list = transitVehicleRecordService.list(queryWrapper);
return getDataTable(list);
QueryWrapper<TransitImpVehicleRecord> vehicleRecordQueryWrapper = new QueryWrapper<>();
vehicleRecordQueryWrapper.eq("device_code",transitVehicleRecord.getDoorwayCode());
vehicleRecordQueryWrapper.between("partition_field",formatter.format(minusDay),formatter.format(now));
vehicleRecordQueryWrapper.orderByDesc("partition_field");
List<TransitImpVehicleRecord> list1 = transitImpVehicleRecordService.list(vehicleRecordQueryWrapper);
if (list1.isEmpty()) {
PageUtils.startPage();
QueryWrapper<TransitVehicleRecord> queryWrapper = new QueryWrapper<>(transitVehicleRecord);
queryWrapper.between("partition_field", formatter.format(minusDay), formatter.format(now));
queryWrapper.orderByDesc("partition_field");
List<TransitVehicleRecord> list = transitVehicleRecordService.list(queryWrapper);
return getDataTable(list);
}
return getDataTable(list1);
}
@PostMapping

@ -0,0 +1,75 @@
package com.ruoyi.database.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @TableName disposal_info
*/
@Data
@TableName(value = "disposal_info")
@ApiModel(value = "DisposalInfo", description = "预警信息处置表")
public class DisposalInfo extends BaseEntity {
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("非法狩猎人员预警表主键")
@Excel(name = "非法狩猎人员预警表主键")
private Long huntersModelRecordId;
@ApiModelProperty("预警接收民警")
@Excel(name = "预警接收民警")
private String receptionPoliceman;
@ApiModelProperty("预警接收单位")
@Excel(name = "预警接收单位")
private String receptionPoliceStation;
@ApiModelProperty("指派单位")
@Excel(name = "指派单位")
private String assignPoliceStation;
@ApiModelProperty("处置结果")
@Excel(name = "处置结果")
private Integer disposalResult;
@TableField(exist = false)
private String disposalResultCn;
@ApiModelProperty("风险描述")
@Excel(name = "风险描述")
private String riskDesc;
@ApiModelProperty("预警签收民警")
@Excel(name = "预警签收民警")
private String signPoliceman;
@ApiModelProperty("预警签收单位")
@Excel(name = "预警签收单位")
private String signPoliceStation;
@ApiModelProperty("签收状态")
@Excel(name = "签收状态")
private Integer signStatus;
@TableField(exist = false)
private String signStatusCn;
@ApiModelProperty("风险反馈")
@Excel(name = "风险反馈")
private String riskFeedback;
}

@ -3,6 +3,7 @@ package com.ruoyi.database.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@ -77,7 +78,7 @@ public class TransitImpUserRecord extends BaseEntity {
*/
@ApiModelProperty("人脸图")
@Excel(name = "人脸图")
private String userPic;
private String personPic;
/**
*
@ -119,6 +120,7 @@ public class TransitImpUserRecord extends BaseEntity {
*/
@ApiModelProperty("过车时间(分区)")
@Excel(name = "过车时间(分区)")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date partitionField;
/**

@ -0,0 +1,20 @@
package com.ruoyi.database.mapper;
import com.ruoyi.database.domain.DisposalInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @author 28758
* @description disposal_info()Mapper
* @createDate 2024-01-27 17:23:03
* @Entity com.ruoyi.database.domain.DisposalInfo
*/
@Mapper
public interface DisposalInfoMapper extends BaseMapper<DisposalInfo> {
}

@ -0,0 +1,13 @@
package com.ruoyi.database.service;
import com.ruoyi.database.domain.DisposalInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author 28758
* @description disposal_info()Service
* @createDate 2024-01-27 17:23:03
*/
public interface DisposalInfoService extends IService<DisposalInfo> {
}

@ -0,0 +1,21 @@
package com.ruoyi.database.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.database.domain.DisposalInfo;
import com.ruoyi.database.service.DisposalInfoService;
import com.ruoyi.database.mapper.DisposalInfoMapper;
import org.springframework.stereotype.Service;
/**
* @author 28758
* @description disposal_info()Service
* @createDate 2024-01-27 17:23:03
*/
@Service
public class DisposalInfoServiceImpl extends ServiceImpl<DisposalInfoMapper, DisposalInfo> implements DisposalInfoService{
}
Loading…
Cancel
Save