增加警员查询模块及飞手批量删除

This commit is contained in:
zhulongchuan 2025-09-29 10:50:08 +08:00
parent 68b8a8a978
commit 20378eeb54
11 changed files with 757 additions and 15 deletions

View File

@ -190,7 +190,7 @@ public class AirplaneImpl implements AirplaneService {
// 部门名称
// SysDept dept = remoteDeptService.getDeptInfo(apply.getDeptId(), "inner").getData();
// dataMap.put("deptName",dept.getDeptName());
SysDept dept = deptService.selectDeptById(SecurityUtils.getDeptId());
SysDept dept = deptService.selectDeptById(apply.getDeptId());
dataMap.put("deptName",dept.getDeptName());
// 任务性质 0=飞行任务,1=飞行训练
if(apply.getTaskProp()=="0"){

View File

@ -0,0 +1,76 @@
package com.djhk.uav.sysPolice.controller;
import com.djhk.common.annotation.Log;
import com.djhk.common.core.controller.BaseController;
import com.djhk.common.core.domain.AjaxResult;
import com.djhk.common.core.page.TableDataInfo;
import com.djhk.common.enums.BusinessType;
import com.djhk.uav.sysPolice.domain.PoliceInfoEs;
import com.djhk.uav.sysPolice.service.IPoliceInfoEsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 警员信息ES
* Controller
*
* @author qpc
* @date 2025-04-14
*/
@RestController
@RequestMapping("/policeInfoEs")
public class PoliceInfoEsController extends BaseController {
@Autowired
private IPoliceInfoEsService policeInfoEsService;
/**
* 查询警员信息ES
* 列表
*/
@PostMapping("/list")
public TableDataInfo list(PoliceInfoEs policeInfoEs) {
startPage();
List<PoliceInfoEs> list = policeInfoEsService.selectPoliceInfoEsList(policeInfoEs);
return getDataTable(list);
}
// /**
// * 获取警员信息ES
// * 详细信息
// */
// @GetMapping(value = "/{fhRksj}")
// public AjaxResult getInfo(@PathVariable("fhRksj") String fhRksj) {
// return success(policeInfoEsService.selectPoliceInfoEsByFhRksj(fhRksj));
// }
/**
* 新增警员信息ES
*/
@Log(title = "警员信息ES", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PoliceInfoEs policeInfoEs) {
return toAjax(policeInfoEsService.insertPoliceInfoEs(policeInfoEs));
}
/**
* 修改警员信息ES
*/
@Log(title = "警员信息ES", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PoliceInfoEs policeInfoEs) {
return toAjax(policeInfoEsService.updatePoliceInfoEs(policeInfoEs));
}
/**
* 删除警员信息ES
*/
@Log(title = "警员信息ES ", businessType = BusinessType.DELETE)
@DeleteMapping("/{fhRksjs}")
public AjaxResult remove(@PathVariable String[] fhRksjs) {
return toAjax(policeInfoEsService.deletePoliceInfoEsByFhRksjs(fhRksjs));
}
}

View File

@ -0,0 +1,250 @@
package com.djhk.uav.sysPolice.domain;
import com.djhk.common.annotation.Excel;
import com.djhk.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 警员信息ES
对象 police_info_es
*
* @author qpc
* @date 2025-04-14
*/
public class PoliceInfoEs extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String fhRksj;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String GXSJ;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String HH;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String HIVECODE;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String JGBM;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String JH;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String MC;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String mdId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String RYID;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String RYTX;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String SFYX;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String SFZH;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String XM;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String XTMC;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String ZW;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String ZZJGID;
public void setFhRksj(String fhRksj)
{
this.fhRksj = fhRksj;
}
public String getFhRksj()
{
return fhRksj;
}
public void setGXSJ(String GXSJ)
{
this.GXSJ = GXSJ;
}
public String getGXSJ()
{
return GXSJ;
}
public void setHH(String HH)
{
this.HH = HH;
}
public String getHH()
{
return HH;
}
public void setHIVECODE(String HIVECODE)
{
this.HIVECODE = HIVECODE;
}
public String getHIVECODE()
{
return HIVECODE;
}
public void setJGBM(String JGBM)
{
this.JGBM = JGBM;
}
public String getJGBM()
{
return JGBM;
}
public void setJH(String JH)
{
this.JH = JH;
}
public String getJH()
{
return JH;
}
public void setMC(String MC)
{
this.MC = MC;
}
public String getMC()
{
return MC;
}
public void setMdId(String mdId)
{
this.mdId = mdId;
}
public String getMdId()
{
return mdId;
}
public void setRYID(String RYID)
{
this.RYID = RYID;
}
public String getRYID()
{
return RYID;
}
public void setRYTX(String RYTX)
{
this.RYTX = RYTX;
}
public String getRYTX()
{
return RYTX;
}
public void setSFYX(String SFYX)
{
this.SFYX = SFYX;
}
public String getSFYX()
{
return SFYX;
}
public void setSFZH(String SFZH)
{
this.SFZH = SFZH;
}
public String getSFZH()
{
return SFZH;
}
public void setXM(String XM)
{
this.XM = XM;
}
public String getXM()
{
return XM;
}
public void setXTMC(String XTMC)
{
this.XTMC = XTMC;
}
public String getXTMC()
{
return XTMC;
}
public void setZW(String ZW)
{
this.ZW = ZW;
}
public String getZW()
{
return ZW;
}
public void setZZJGID(String ZZJGID)
{
this.ZZJGID = ZZJGID;
}
public String getZZJGID()
{
return ZZJGID;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("fhRksj", getFhRksj())
.append("GXSJ", getGXSJ())
.append("HH", getHH())
.append("HIVECODE", getHIVECODE())
.append("JGBM", getJGBM())
.append("JH", getJH())
.append("MC", getMC())
.append("mdId", getMdId())
.append("RYID", getRYID())
.append("RYTX", getRYTX())
.append("SFYX", getSFYX())
.append("SFZH", getSFZH())
.append("XM", getXM())
.append("XTMC", getXTMC())
.append("ZW", getZW())
.append("ZZJGID", getZZJGID())
.toString();
}
}

View File

@ -0,0 +1,79 @@
package com.djhk.uav.sysPolice.mapper;
import com.djhk.uav.sysPolice.domain.PoliceInfoEs;
import java.util.List;
/**
* 警员信息ES
Mapper接口
*
* @author qpc
* @date 2025-04-14
*/
public interface PoliceInfoEsMapper
{
/**
* 查询警员信息ES
*
* @param fhRksj 警员信息ES
主键
* @return 警员信息ES
*/
public PoliceInfoEs selectPoliceInfoEsByFhRksj(String fhRksj);
/**
* 查询警员信息ES
列表
*
* @param policeInfoEs 警员信息ES
* @return 警员信息ES
集合
*/
public List<PoliceInfoEs> selectPoliceInfoEsList(PoliceInfoEs policeInfoEs);
/**
* 新增警员信息ES
*
* @param policeInfoEs 警员信息ES
* @return 结果
*/
public int insertPoliceInfoEs(PoliceInfoEs policeInfoEs);
/**
* 修改警员信息ES
*
* @param policeInfoEs 警员信息ES
* @return 结果
*/
public int updatePoliceInfoEs(PoliceInfoEs policeInfoEs);
/**
* 删除警员信息ES
*
* @param fhRksj 警员信息ES
主键
* @return 结果
*/
public int deletePoliceInfoEsByFhRksj(String fhRksj);
/**
* 批量删除警员信息ES
*
* @param fhRksjs 需要删除的数据主键集合
* @return 结果
*/
public int deletePoliceInfoEsByFhRksjs(String[] fhRksjs);
void truncate();
}

View File

@ -0,0 +1,78 @@
package com.djhk.uav.sysPolice.service;
import com.djhk.uav.sysPolice.domain.PoliceInfoEs;
import java.util.List;
/**
* 警员信息ES
Service接口
*
* @author qpc
* @date 2025-04-14
*/
public interface IPoliceInfoEsService
{
/**
* 查询警员信息ES
*
* @param fhRksj 警员信息ES
主键
* @return 警员信息ES
*/
public PoliceInfoEs selectPoliceInfoEsByFhRksj(String fhRksj);
/**
* 查询警员信息ES
列表
*
* @param policeInfoEs 警员信息ES
* @return 警员信息ES
集合
*/
public List<PoliceInfoEs> selectPoliceInfoEsList(PoliceInfoEs policeInfoEs);
/**
* 新增警员信息ES
*
* @param policeInfoEs 警员信息ES
* @return 结果
*/
public int insertPoliceInfoEs(PoliceInfoEs policeInfoEs);
/**
* 修改警员信息ES
*
* @param policeInfoEs 警员信息ES
* @return 结果
*/
public int updatePoliceInfoEs(PoliceInfoEs policeInfoEs);
/**
* 批量删除警员信息ES
*
* @param fhRksjs 需要删除的警员信息ES
主键集合
* @return 结果
*/
public int deletePoliceInfoEsByFhRksjs(String[] fhRksjs);
/**
* 删除警员信息ES
信息
*
* @param fhRksj 警员信息ES
主键
* @return 结果
*/
public int deletePoliceInfoEsByFhRksj(String fhRksj);
}

View File

@ -0,0 +1,128 @@
package com.djhk.uav.sysPolice.service.impl;
import com.djhk.common.core.domain.entity.SysDept;
import com.djhk.common.core.domain.model.LoginUser;
import com.djhk.common.exception.ServiceException;
import com.djhk.common.utils.SecurityUtils;
import com.djhk.system.mapper.SysDeptMapper;
import com.djhk.uav.sysPolice.domain.PoliceInfoEs;
import com.djhk.uav.sysPolice.mapper.PoliceInfoEsMapper;
import com.djhk.uav.sysPolice.service.IPoliceInfoEsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 警员信息ES
Service业务层处理
*
* @author qpc
* @date 2025-04-14
*/
@Service
public class PoliceInfoEsServiceImpl implements IPoliceInfoEsService
{
@Autowired
private PoliceInfoEsMapper policeInfoEsMapper;
@Autowired
private SysDeptMapper sysDeptMapper;
/**
* 查询警员信息ES
*
* @param fhRksj 警员信息ES
主键
* @return 警员信息ES
*/
@Override
public PoliceInfoEs selectPoliceInfoEsByFhRksj(String fhRksj)
{
return policeInfoEsMapper.selectPoliceInfoEsByFhRksj(fhRksj);
}
/**
* 查询警员信息ES列表
*
* @param policeInfoEs 警员信息ES
* @return 警员信息ES
*/
@Override
public List<PoliceInfoEs> selectPoliceInfoEsList(PoliceInfoEs policeInfoEs)
{
LoginUser loginUser = SecurityUtils.getLoginUser();
if (null == loginUser) {
throw new ServiceException("登录失效,请重新登录!", 500);
}
Long deptId = SecurityUtils.getDeptId();
if (deptId != 1){
SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
// if (StringUtils.equals( sysDept.getDeptName(),))
policeInfoEs.setMC(sysDept.getDeptName());
}
return policeInfoEsMapper.selectPoliceInfoEsList(policeInfoEs);
}
/**
* 新增警员信息ES
*
* @param policeInfoEs 警员信息ES
* @return 结果
*/
@Override
public int insertPoliceInfoEs(PoliceInfoEs policeInfoEs)
{
return policeInfoEsMapper.insertPoliceInfoEs(policeInfoEs);
}
/**
* 修改警员信息ES
*
* @param policeInfoEs 警员信息ES
* @return 结果
*/
@Override
public int updatePoliceInfoEs(PoliceInfoEs policeInfoEs)
{
return policeInfoEsMapper.updatePoliceInfoEs(policeInfoEs);
}
/**
* 批量删除警员信息ES
*
* @param fhRksjs 需要删除的警员信息ES
主键
* @return 结果
*/
@Override
public int deletePoliceInfoEsByFhRksjs(String[] fhRksjs)
{
return policeInfoEsMapper.deletePoliceInfoEsByFhRksjs(fhRksjs);
}
/**
* 删除警员信息ES
信息
*
* @param fhRksj 警员信息ES
主键
* @return 结果
*/
@Override
public int deletePoliceInfoEsByFhRksj(String fhRksj)
{
return policeInfoEsMapper.deletePoliceInfoEsByFhRksj(fhRksj);
}
}

View File

@ -213,15 +213,9 @@ public class UavOperatorServiceImpl extends ServiceImpl<UavOperatorMapper, UavOp
@Transactional
public int deleteUavOperatorByIds(Long[] ids)
{
AtomicInteger result = new AtomicInteger();
UavOperator uavOperator = new UavOperator();
List<Long> longList = Arrays.asList(ids);
longList.forEach(id -> {
uavOperator.setId(id);
uavOperator.setDelFlag("2");
result.addAndGet(uavOperatorMapper.updateUavOperator(uavOperator));
});
return result.get();
return uavOperatorMapper.deleteUavOperatorByIds(ids);
}
/**

View File

@ -51,10 +51,10 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(fly_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- <if test="deptId != null and deptId != '' ">-->
<!-- AND (dept_id = #{deptId} OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE-->
<!-- find_in_set(#{deptId}, ancestors) ))-->
<!-- </if>-->
<if test="deptId != null and deptId != '' ">
AND (dept_id = #{deptId} OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE
find_in_set(#{deptId}, ancestors) ))
</if>
</where>
order by create_time desc
</select>

View File

@ -336,6 +336,9 @@
<if test="modelId != null and modelId != ''">
AND equ.model_id like concat('%' , #{modelId}, '%')
</if>
<if test="createBy != null and createBy != ''">
AND equ.create_by like concat('%' , #{createBy}, '%')
</if>
<if test="equCode != null and equCode != ''">
AND equ.equ_code like concat('%' , #{equCode}, '%')
</if>

View File

@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, war_name, node_name,remark, son_node_data, create_by, create_time, del_flag, dept_id, update_by, update_time from police_war_law_library
</sql>
<select id="warNameList" resultType="com.djhk.uav.policeWarLawLibrary.domain.warNameVo">
<select id="warNameList" parameterType="com.djhk.uav.policeWarLawLibrary.domain.PoliceWarLawLibrary" resultMap="PoliceWarLawLibraryResult">
select DISTINCT war_name from police_war_law_library
<where>
<if test="warName != null and warName != ''"> and war_name like concat('%', #{warName}, '%')</if>

View File

@ -0,0 +1,134 @@
<?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="com.djhk.uav.sysPolice.mapper.PoliceInfoEsMapper">
<resultMap type="com.djhk.uav.sysPolice.domain.PoliceInfoEs" id="PoliceInfoEsResult">
<result property="fhRksj" column="FH_RKSJ" />
<result property="GXSJ" column="GXSJ" />
<result property="HH" column="HH" />
<result property="HIVECODE" column="HIVECODE" />
<result property="JGBM" column="JGBM" />
<result property="JH" column="JH" />
<result property="MC" column="MC" />
<result property="mdId" column="MD_ID" />
<result property="RYID" column="RYID" />
<result property="RYTX" column="RYTX" />
<result property="SFYX" column="SFYX" />
<result property="SFZH" column="SFZH" />
<result property="XM" column="XM" />
<result property="XTMC" column="XTMC" />
<result property="ZW" column="ZW" />
<result property="ZZJGID" column="ZZJGID" />
</resultMap>
<sql id="selectPoliceInfoEsVo">
select FH_RKSJ, GXSJ, HH, HIVECODE, JGBM, JH, MC, MD_ID, RYID, RYTX, SFYX, SFZH, XM, XTMC, ZW, ZZJGID from police_info_es
</sql>
<select id="selectPoliceInfoEsList" parameterType="com.djhk.uav.sysPolice.domain.PoliceInfoEs" resultMap="PoliceInfoEsResult">
<include refid="selectPoliceInfoEsVo"/>
<where>
<if test="fhRksj != null and fhRksj != ''"> and FH_RKSJ = #{fhRksj}</if>
<if test="GXSJ != null and GXSJ != ''"> and GXSJ = #{GXSJ}</if>
<if test="HH != null and HH != ''"> and HH = #{HH}</if>
<if test="HIVECODE != null and HIVECODE != ''"> and HIVECODE = #{HIVECODE}</if>
<if test="JGBM != null and JGBM != ''"> and JGBM = #{JGBM}</if>
<if test="JH != null and JH != ''"> and JH = #{JH}</if>
<if test="MC != null and MC != ''"> and MC like concat('%', #{MC}, '%')</if>
<if test="mdId != null and mdId != ''"> and MD_ID = #{mdId}</if>
<if test="RYID != null and RYID != ''"> and RYID = #{RYID}</if>
<if test="RYTX != null and RYTX != ''"> and RYTX = #{RYTX}</if>
<if test="SFYX != null and SFYX != ''"> and SFYX = #{SFYX}</if>
<if test="SFZH != null and SFZH != ''"> and SFZH = #{SFZH}</if>
<if test="XM != null and XM != ''"> and XM = #{XM}</if>
<if test="XTMC != null and XTMC != ''"> and XTMC = #{XTMC}</if>
<if test="ZW != null and ZW != ''"> and ZW = #{ZW}</if>
and ZW != 'GLY'
AND jh is NOT NULL
<if test="ZZJGID != null and ZZJGID != ''"> and ZZJGID = #{ZZJGID}</if>
</where>
</select>
<select id="selectPoliceInfoEsByFhRksj" parameterType="String" resultMap="PoliceInfoEsResult">
<include refid="selectPoliceInfoEsVo"/>
where FH_RKSJ = #{fhRksj}
</select>
<insert id="insertPoliceInfoEs" parameterType="com.djhk.uav.sysPolice.domain.PoliceInfoEs">
insert into police_info_es
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fhRksj != null">FH_RKSJ,</if>
<if test="GXSJ != null">GXSJ,</if>
<if test="HH != null">HH,</if>
<if test="HIVECODE != null">HIVECODE,</if>
<if test="JGBM != null">JGBM,</if>
<if test="JH != null">JH,</if>
<if test="MC != null">MC,</if>
<if test="mdId != null">MD_ID,</if>
<if test="RYID != null">RYID,</if>
<if test="RYTX != null">RYTX,</if>
<if test="SFYX != null">SFYX,</if>
<if test="SFZH != null">SFZH,</if>
<if test="XM != null">XM,</if>
<if test="XTMC != null">XTMC,</if>
<if test="ZW != null">ZW,</if>
<if test="ZZJGID != null">ZZJGID,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fhRksj != null">#{fhRksj},</if>
<if test="GXSJ != null">#{GXSJ},</if>
<if test="HH != null">#{HH},</if>
<if test="HIVECODE != null">#{HIVECODE},</if>
<if test="JGBM != null">#{JGBM},</if>
<if test="JH != null">#{JH},</if>
<if test="MC != null">#{MC},</if>
<if test="mdId != null">#{mdId},</if>
<if test="RYID != null">#{RYID},</if>
<if test="RYTX != null">#{RYTX},</if>
<if test="SFYX != null">#{SFYX},</if>
<if test="SFZH != null">#{SFZH},</if>
<if test="XM != null">#{XM},</if>
<if test="XTMC != null">#{XTMC},</if>
<if test="ZW != null">#{ZW},</if>
<if test="ZZJGID != null">#{ZZJGID},</if>
</trim>
</insert>
<update id="updatePoliceInfoEs" parameterType="com.djhk.uav.sysPolice.domain.PoliceInfoEs">
update police_info_es
<trim prefix="SET" suffixOverrides=",">
<if test="GXSJ != null">GXSJ = #{GXSJ},</if>
<if test="HH != null">HH = #{HH},</if>
<if test="HIVECODE != null">HIVECODE = #{HIVECODE},</if>
<if test="JGBM != null">JGBM = #{JGBM},</if>
<if test="JH != null">JH = #{JH},</if>
<if test="MC != null">MC = #{MC},</if>
<if test="mdId != null">MD_ID = #{mdId},</if>
<if test="RYID != null">RYID = #{RYID},</if>
<if test="RYTX != null">RYTX = #{RYTX},</if>
<if test="SFYX != null">SFYX = #{SFYX},</if>
<if test="SFZH != null">SFZH = #{SFZH},</if>
<if test="XM != null">XM = #{XM},</if>
<if test="XTMC != null">XTMC = #{XTMC},</if>
<if test="ZW != null">ZW = #{ZW},</if>
<if test="ZZJGID != null">ZZJGID = #{ZZJGID},</if>
</trim>
where FH_RKSJ = #{fhRksj}
</update>
<update id="truncate">
TRUNCATE TABLE police_info_es;
</update>
<delete id="deletePoliceInfoEsByFhRksj" parameterType="String">
delete from police_info_es where FH_RKSJ = #{fhRksj}
</delete>
<delete id="deletePoliceInfoEsByFhRksjs" parameterType="String">
delete from police_info_es where FH_RKSJ in
<foreach item="fhRksj" collection="array" open="(" separator="," close=")">
#{fhRksj}
</foreach>
</delete>
</mapper>