drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.sxkj.fw.area.dto.FwPoliceStationPolygonQueryDTO; import org.sxkj.fw.area.entity.FwPoliceStationEntity; import org.sxkj.fw.area.param.FwPoliceStationQueryParam; import org.sxkj.fw.area.vo.FwPoliceStationVO; import org.sxkj.fw.area.excel.FwPoliceStationExcel; import org.sxkj.fw.area.wrapper.FwPoliceStationWrapper; @@ -73,25 +74,29 @@ FwPoliceStationEntity detail = fwPoliceStationService.getById(id); return R.data(FwPoliceStationWrapper.build().entityVO(detail)); } // /** // * 派出所信息表 分页 // */ // @GetMapping("/list") // @ApiOperationSupport(order = 2) // @ApiOperation(value = "分页", notes = "传入fwPoliceStation") // public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, Query query) { // IPage<FwPoliceStationEntity> pages = fwPoliceStationService.page(Condition.getPage(query), Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class)); // return R.data(FwPoliceStationWrapper.build().pageVO(pages)); // } // /** // * 派出所信息表 分页 // */ // @GetMapping("/list") // @ApiOperationSupport(order = 2) // @ApiOperation(value = "分页", notes = "传入fwPoliceStation") // public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String, // Object> fwPoliceStation, Query query) { // IPage<FwPoliceStationEntity> pages = // fwPoliceStationService.page(Condition.getPage(query), // Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class)); // return R.data(FwPoliceStationWrapper.build().pageVO(pages)); // } /** * 派出所信息表 列表 */ @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "获取全部派出所") public R<List<FwPoliceStationVO>> list() { List<FwPoliceStationVO> list = fwPoliceStationService.selectFwPoliceStationList(); @ApiOperation(value = "列表", notes = "获取派出所列表,支持按名称模糊查询") public R<List<FwPoliceStationVO>> list( @ApiParam(value = "派出所名称") @RequestParam(required = false) String stationName) { List<FwPoliceStationVO> list = fwPoliceStationService.selectFwPoliceStationList(stationName); return R.data(list); } @@ -101,30 +106,31 @@ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入fwPoliceStation") public R<IPage<FwPoliceStationVO>> page(FwPoliceStationVO fwPoliceStation, Query query) { IPage<FwPoliceStationVO> pages = fwPoliceStationService.selectFwPoliceStationPage(Condition.getPage(query), fwPoliceStation); public R<IPage<FwPoliceStationVO>> page(FwPoliceStationQueryParam param, Query query) { IPage<FwPoliceStationVO> pages = fwPoliceStationService.selectFwPoliceStationPage(Condition.getPage(query), param); return R.data(pages); } // /** // * 派出所信息表 新增 // */ // @PostMapping("/save") // @ApiOperationSupport(order = 4) // @ApiOperation(value = "新增", notes = "传入fwPoliceStation") // public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) { // return R.status(fwPoliceStationService.save(fwPoliceStation)); // } // // /** // * 派出所信息表 修改 // */ // @PostMapping("/update") // @ApiOperationSupport(order = 5) // @ApiOperation(value = "修改", notes = "传入fwPoliceStation") // public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) { // return R.status(fwPoliceStationService.updateById(fwPoliceStation)); // } // /** // * 派出所信息表 新增 // */ // @PostMapping("/save") // @ApiOperationSupport(order = 4) // @ApiOperation(value = "新增", notes = "传入fwPoliceStation") // public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) { // return R.status(fwPoliceStationService.save(fwPoliceStation)); // } // // /** // * 派出所信息表 修改 // */ // @PostMapping("/update") // @ApiOperationSupport(order = 5) // @ApiOperation(value = "修改", notes = "传入fwPoliceStation") // public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) { // return R.status(fwPoliceStationService.updateById(fwPoliceStation)); // } /** * 派出所信息表 新增或修改 @@ -146,7 +152,6 @@ return R.status(fwPoliceStationService.deleteLogic(Func.toLongList(ids))); } /** * 导出数据 */ @@ -154,11 +159,14 @@ @GetMapping("/export-fwPoliceStation") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入fwPoliceStation") public void exportFwPoliceStation(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper<FwPoliceStationEntity> queryWrapper = Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(FwPoliceStation::getTenantId, bladeUser.getTenantId()); //} public void exportFwPoliceStation(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper<FwPoliceStationEntity> queryWrapper = Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class); // if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(FwPoliceStation::getTenantId, // bladeUser.getTenantId()); // } queryWrapper.lambda().eq(FwPoliceStationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); List<FwPoliceStationExcel> list = fwPoliceStationService.exportFwPoliceStation(queryWrapper); ExcelUtil.export(response, "派出所信息表数据" + DateUtil.time(), "派出所信息表数据表", list, FwPoliceStationExcel.class); drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.java
@@ -17,6 +17,7 @@ package org.sxkj.fw.area.mapper; import org.sxkj.fw.area.entity.FwPoliceStationEntity; import org.sxkj.fw.area.param.FwPoliceStationQueryParam; import org.sxkj.fw.area.vo.FwPoliceStationVO; import org.sxkj.fw.area.excel.FwPoliceStationExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -37,18 +38,18 @@ * 自定义分页 * * @param page * @param fwPoliceStation * @param param * @return */ List<FwPoliceStationVO> selectFwPoliceStationPage(IPage page, FwPoliceStationVO fwPoliceStation); List<FwPoliceStationVO> selectFwPoliceStationPage(IPage page, FwPoliceStationQueryParam param); /** * 列表 * * @param stationName * @return */ List<FwPoliceStationVO> selectFwPoliceStationList(); List<FwPoliceStationVO> selectFwPoliceStationList(String stationName); /** * 获取导出数据 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.xml
@@ -75,6 +75,9 @@ select * from ja_fw_police_station <where> is_deleted = 0 <if test="stationName != null and stationName != ''"> and station_name like concat('%', #{stationName}, '%') </if> </where> </select>
New file @@ -0,0 +1,123 @@ /* * 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.area.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import java.io.Serializable; import java.util.Date; /** * 派出所信息查询参数 * * @author lw * @since 2026-02-02 */ @Data public class FwPoliceStationQueryParam implements Serializable { private static final long serialVersionUID = 1L; /** * 主键id */ @ApiModelProperty(value = "主键id") @JsonSerialize(using = ToStringSerializer.class) private Long id; /** * 派出所名称（模糊） */ @ApiModelProperty(value = "派出所名称（模糊）") private String stationName; /** * 派出所地址（模糊） */ @ApiModelProperty(value = "派出所地址（模糊）") private String address; /** * 经度 */ @ApiModelProperty(value = "经度") private Double longitude; /** * 纬度 */ @ApiModelProperty(value = "纬度") private Double latitude; /** * 联系人（模糊） */ @ApiModelProperty(value = "联系人（模糊）") private String contactPerson; /** * 联系方式 */ @ApiModelProperty(value = "联系方式") private String contactPhone; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; /** * 创建人 */ @ApiModelProperty(value = "创建人") private Long createUser; /** * 创建部门 */ @ApiModelProperty(value = "创建部门") private Long createDept; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新人 */ @ApiModelProperty(value = "更新人") private Long updateUser; /** * 更新时间 */ @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 状态（0正常 1停用） */ @ApiModelProperty(value = "状态（0正常 1停用）") private Integer status; } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.fw.area.entity.FwPoliceStationEntity; import org.sxkj.fw.area.param.FwPoliceStationQueryParam; import org.sxkj.fw.area.vo.FwPoliceStationVO; import org.sxkj.fw.area.excel.FwPoliceStationExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -35,18 +36,19 @@ * 自定义分页 * * @param page * @param fwPoliceStation * @param param * @return */ IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation); IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationQueryParam param); /** * 列表 * * @param stationName * @return */ List<FwPoliceStationVO> selectFwPoliceStationList(); List<FwPoliceStationVO> selectFwPoliceStationList(String stationName); /** * 导出数据 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
@@ -20,6 +20,7 @@ import org.springblade.core.tool.utils.StringUtil; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.fw.area.entity.FwPoliceStationEntity; import org.sxkj.fw.area.param.FwPoliceStationQueryParam; import org.sxkj.fw.area.vo.FwPoliceStationVO; import org.sxkj.fw.area.excel.FwPoliceStationExcel; import org.sxkj.fw.area.mapper.FwPoliceStationMapper; @@ -38,25 +39,27 @@ * @since 2026-01-08 */ @Service public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity> implements IFwPoliceStationService { public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity> implements IFwPoliceStationService { @Override public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation) { return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation)); public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationQueryParam param) { return page.setRecords(baseMapper.selectFwPoliceStationPage(page, param)); } @Override public List<FwPoliceStationVO> selectFwPoliceStationList() { return baseMapper.selectFwPoliceStationList(); public List<FwPoliceStationVO> selectFwPoliceStationList(String stationName) { return baseMapper.selectFwPoliceStationList(stationName); } @Override public List<FwPoliceStationExcel> exportFwPoliceStation(Wrapper<FwPoliceStationEntity> queryWrapper) { List<FwPoliceStationExcel> fwPoliceStationList = baseMapper.exportFwPoliceStation(queryWrapper); //fwPoliceStationList.forEach(fwPoliceStation -> { // fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwPoliceStation.getType())); //}); // fwPoliceStationList.forEach(fwPoliceStation -> { // fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO, // FwPoliceStation.getType())); // }); return fwPoliceStationList; } @@ -100,19 +103,19 @@ deptId = null; } } // String areaCode = HeaderUtils.getAreaCode(); // if (StringUtil.isBlank(areaCode)) { // areaCode = fwPoliceStation.getAreaCode(); // } // String areaCode = HeaderUtils.getAreaCode(); // if (StringUtil.isBlank(areaCode)) { // areaCode = fwPoliceStation.getAreaCode(); // } Date now = new Date(); fwPoliceStation.setCreateUser(userId); fwPoliceStation.setUpdateUser(userId); if (deptId != null) { fwPoliceStation.setCreateDept(deptId); } // if (StringUtil.isNotBlank(areaCode)) { // fwPoliceStation.setAreaCode(areaCode); // } // if (StringUtil.isNotBlank(areaCode)) { // fwPoliceStation.setAreaCode(areaCode); // } fwPoliceStation.setCreateTime(now); fwPoliceStation.setUpdateTime(now); } drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml
@@ -15,6 +15,9 @@ <select id="selectGdMaterialPage" resultMap="gdMaterialResultMap"> select * from ja_gd_material where is_deleted = 0 <if test="gdMaterial.materialName != null"> and material_name like concat('%',#{gdMaterial.materialName},'%') </if> </select>
@@ -54,7 +54,7 @@ * 是否适用全部情形：1是 0否 */ @ApiModelProperty(value = "是否适用全部情形：1是 0否") private Byte isAllScenario; private Integer isAllScenario; /** * 材料说明 */
