机构和区划接口优化

linwei

2026-01-23 a48221b7377fc843f3e9fd9afadcc9e0db3e0394

机构和区划接口优化

 drone-service-api/drone-system-api/src/main/java/org/sxkj/system/entity/Region.java

@@ -139,5 +139,8 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "状态 0:禁用 1：启用 ")
    private Integer status;


}

 drone-service-api/drone-system-api/src/main/java/org/sxkj/system/vo/RegionVO.java

@@ -20,6 +20,7 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tool.node.INode;
@@ -55,6 +56,7 @@
    /**
     * 父节点名称
     */
    @ApiModelProperty(value = "父节点名称")
    private String parentName;

    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java

@@ -89,16 +89,6 @@
        GdPatrolTaskEntity detail = gdPatrolTaskService.getOne(Condition.getQueryWrapper(gdPatrolTask));
        return R.data(GdPatrolTaskWrapper.build().entityVO(detail));
    }
    /**
     * 巡查任务表 分页
     */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入gdPatrolTask")
    // public R<IPage<GdPatrolTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, Query query) {
    //     IPage<GdPatrolTaskEntity> pages = gdPatrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class));
    //     return R.data(GdPatrolTaskWrapper.build().pageVO(pages));
    // }

    /**
     * 巡查任务表 自定义分页
@@ -130,25 +120,7 @@
        return R.status(gdPatrolTaskService.savePatrolTask(taskEntityList));
    }

    /**
     * 巡查任务表 修改
     */
    // @PostMapping("/update")
    // @ApiOperationSupport(order = 5)
    // @ApiOperation(value = "修改", notes = "传入gdPatrolTask")
    // public R update(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
    //     return R.status(gdPatrolTaskService.updateById(gdPatrolTask));
    // }

    /**
     * 巡查任务表 新增或修改
     */
    // @PostMapping("/submit")
    // @ApiOperationSupport(order = 6)
    // @ApiOperation(value = "新增或修改", notes = "传入gdPatrolTask")
    // public R submit(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
    //     return R.status(gdPatrolTaskService.saveOrUpdate(gdPatrolTask));
    // }

    /**
     * 巡查任务表 删除

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml

@@ -13,6 +13,7 @@
        <result column="patrol_route_url" property="patrolRouteUrl"/>
        <result column="recommend_flyer_name" property="recommendFlyerName"/>
        <result column="device_id" property="deviceId"/>
        <result column="device_name" property="deviceName"/>
        <result column="task_desc" property="taskDesc"/>
        <result column="task_status" property="taskStatus"/>
        <result column="area_code" property="areaCode"/>
@@ -29,20 +30,30 @@


    <select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
        select pt.*,
        wo.work_order_name,
        IFNULL(tr.result_count, 0) as result_count,
        IFNULL(tr.issue_event_count, 0) as issue_event_count
        from ja_gd_patrol_task pt
        left join ja_gd_work_order wo on pt.work_order_id = wo.id
        left join (
        select patrol_task_id,
        count(*) as result_count,
        sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
        from ja_gd_task_result
        where is_deleted = 0
        group by patrol_task_id
        ) tr on tr.patrol_task_id = pt.id
        select
            pt.*,
            md.device_name,
            wo.work_order_name,
            IFNULL(tr.result_count, 0) as result_count,
            IFNULL(tr.issue_event_count, 0) as issue_event_count
        from
            ja_gd_patrol_task pt
        left join
            ja_gd_work_order wo on pt.work_order_id = wo.id
        left join
                ja_gd_manage_device md on md.id = pt.device_id
        left join
            (
            select patrol_task_id,
                count(*) as result_count,
                sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
            from
                ja_gd_task_result
            where
                is_deleted = 0
            group by
                patrol_task_id
            ) tr on tr.patrol_task_id = pt.id
        <where>
            <if test="param2.workOrderId != null and param2.workOrderId != ''">
                and pt.work_order_id = #{param2.workOrderId}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java

@@ -83,6 +83,9 @@
     */
    @ApiModelProperty(value = "关联设备ID")
    private Long deviceId;

    @ApiModelProperty(value = "设备名称")
    private String deviceName;
    /**
     * 任务描述
     */

 drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java

@@ -36,6 +36,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.sxkj.common.node.TreeStringNode;
@@ -47,6 +48,7 @@
import org.sxkj.system.enums.DictEnum;
import org.sxkj.system.mapper.DeptMapper;
import org.sxkj.system.mapper.UserMapper;
import org.sxkj.system.param.DeptAddParam;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
import org.sxkj.system.vo.DeptVO;
@@ -57,6 +59,7 @@
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -91,7 +94,7 @@
    }

    /**
     * 飞手表 自定义分页
     * 机构 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
@@ -181,13 +184,13 @@
    /**
     * 新增或修改
     */
//    @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入dept")
    @ApiLog("组织机构信息新增或修改")
    public R submit(@Valid @RequestBody Dept dept) {
        if (deptService.submit(dept)) {
    public R submit(@Valid @RequestBody DeptAddParam dept) {
        Dept deptEntity = Objects.requireNonNull(BeanUtil.copy(dept, Dept.class));
        if (deptService.submit(deptEntity)) {
            CacheUtil.clear(SYS_CACHE);
            CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
            List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getDeptId, dept.getId()));

 drone-service/drone-system/src/main/java/org/sxkj/system/controller/RegionController.java

@@ -29,10 +29,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.sxkj.system.entity.Region;
import org.sxkj.system.excel.RegionExcel;
import org.sxkj.system.excel.RegionImporter;
import org.sxkj.system.param.RegionAddParam;
import org.sxkj.system.param.RegionPageParam;
import org.sxkj.system.service.IRegionService;
import org.sxkj.system.vo.RegionVO;
import org.sxkj.system.vo.TreeVo;
@@ -46,6 +49,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/**
 * 行政区划表 控制器
@@ -84,6 +88,17 @@
    }

    /**
     * 行政区划表 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = " ")
    public R<IPage<RegionVO>> page(RegionPageParam regionPageParam, Query query) {
        IPage<RegionVO> pages = regionService.selectRegionPage(Condition.getPage(query), regionPageParam);
        return R.data(pages);
    }

    /**
     * 懒加载列表
     */
    @GetMapping("/lazy-list")
@@ -116,13 +131,14 @@
    /**
     * 新增 行政区划表
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "新增", notes = "传入region")
    @ApiLog("行政区划数据新增")
    public R save(@Valid @RequestBody Region region) {
        return R.status(regionService.save(region));
    }
    // @PostMapping("/save")
    // @ApiOperationSupport(order = 5)
    // @ApiOperation(value = "新增", notes = "传入region")
    // @ApiLog("行政区划数据新增")
    // public R save(@Valid @RequestBody RegionAddParam region) {
    //     Region regionEntity = Objects.requireNonNull(BeanUtil.copy(region, Region.class));
    //     return R.status(regionService.save(regionEntity));
    // }

    /**
     * 修改 行政区划表
@@ -142,8 +158,9 @@
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "新增或修改", notes = "传入region")
    @ApiLog("行政区划数据新增或修改")
    public R submit(@Valid @RequestBody Region region) {
        return R.status(regionService.submit(region));
    public R submit(@Valid @RequestBody RegionAddParam region) {
        Region regionEntity = Objects.requireNonNull(BeanUtil.copy(region, Region.class));
        return R.status(regionService.submit(regionEntity));
    }



 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml

@@ -289,6 +289,9 @@
        <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>
    </select>



 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.java

@@ -18,9 +18,11 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.sxkj.system.entity.Region;
import org.sxkj.system.excel.RegionExcel;
import org.sxkj.system.param.RegionPageParam;
import org.sxkj.system.vo.RegionVO;

import java.util.List;
@@ -71,4 +73,11 @@
     */
    List<Region> getCodeLess12DataList(@Param("size") Integer size);

    /**
     *
     * @param page
     * @param regionPageParam
     * @return
     */
    IPage<RegionVO> selectRegionPage(IPage<RegionVO> page, RegionPageParam regionPageParam);
}

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml

@@ -57,10 +57,11 @@

    <select id="lazyList" resultMap="regionVOResultMap">
        SELECT
            region.*,
            ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM blade_region WHERE parent_code = region.code ) AS "has_children"
        region.*,
        ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM blade_region WHERE parent_code = region.code ) AS
        "has_children"
        FROM
            blade_region region
        blade_region region
        <where>
            <if test="param1!=null">
                and region.parent_code = #{param1}
@@ -76,14 +77,15 @@

    <select id="lazyTree" resultMap="treeNodeResultMap">
        SELECT
            region.code AS "id",
            region.parent_code AS "parent_id",
            region.name AS "title",
            region.code AS "value",
            region.code AS "key",
            ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM blade_region WHERE parent_code = region.code ) AS "has_children"
        region.code AS "id",
        region.parent_code AS "parent_id",
        region.name AS "title",
        region.code AS "value",
        region.code AS "key",
        ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM blade_region WHERE parent_code = region.code ) AS
        "has_children"
        FROM
            blade_region region
        blade_region region
        <where>
            <if test="param1!=null">
                and region.parent_code = #{param1}
@@ -99,19 +101,72 @@
    </select>

    <select id="exportRegion" resultType="org.sxkj.system.excel.RegionExcel">
        SELECT * FROM blade_region ${ew.customSqlSegment}
        SELECT *
        FROM blade_region ${ew.customSqlSegment}
    </select>

    <!--查询parentCode 长度少于12 的-->
    <select id="getCodeLess12DataCount" resultType="java.lang.Integer">
        SELECT count(*) FROM blade_region
        SELECT count(*)
        FROM blade_region
        where length(parent_code) &lt; 12
    </select>

    <!--查询parentCode 长度少于12 的-->
    <select id="getCodeLess12DataList" resultType="org.sxkj.system.entity.Region">
        SELECT * FROM blade_region
        where length(parent_code) &lt; 12
        limit 0,#{size}
        SELECT *
        FROM blade_region
        where length(parent_code) &lt; 12 limit 0,#{size}
    </select>
    <select id="selectRegionPage" resultType="org.sxkj.system.vo.RegionVO">
        SELECT
            id,
            code,
            parent_code,
            ancestors,
            `name`,
            province_code,
            province_name,
            city_code,
            city_name,
            district_code,
            district_name,
            town_code,
            town_name,
            village_code,
            village_name,
            region_level,
            type,
            sort,
            remark,
            `status`,
            CASE
            WHEN
                region_level = '5' THEN town_name
            WHEN
                region_level = '4' THEN district_name
            WHEN
                region_level = '3' THEN city_name
            ELSE NULL
            END AS parent_name
        FROM
            blade_region
        <where>
            <if test="param2.status!=null">
                and status = #{param1.status}
            </if>
            <if test="param2.cityCode!=null and param2.cityCode!='' ">
                and city_code like concat(concat('%', #{param2.cityCode}),'%')
            </if>
            <if test="param2.districtName!=null and param2.districtName!=''">
                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}),'%')
            </if>
            <if test="param2.regionLevel!=null">
                and region_level = #{param2.regionLevel}
            </if>
        </where>
    </select>
</mapper>

 drone-service/drone-system/src/main/java/org/sxkj/system/param/DeptAddParam.java

New file
@@ -0,0 +1,96 @@
package org.sxkj.system.param;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class DeptAddParam {

    /**
     * 主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 租户ID
     */
    @ApiModelProperty(value = "租户ID")
    private String tenantId;

    /**
     * 父主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "父主键")
    private Long parentId;

    /**
     * 机构名
     */
    @ApiModelProperty(value = "机构名")
    private String deptName;

    /**
     * 机构全称
     */
    @ApiModelProperty(value = "机构全称")
    private String fullName;

    /**
     * 祖级机构主键
     */
    @ApiModelProperty(value = "祖级机构主键")
    private String ancestors;

    /**
     * 机构类型
     */
    @ApiModelProperty(value = "机构类型")
    private Integer deptCategory;

    /**
     * 机构性质
     */
    @ApiModelProperty(value = "机构性质")
    private Integer deptNature;

    /**
     * 排序
     */
    @ApiModelProperty(value = "排序")
    private Integer sort;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;


    @ApiModelProperty(value = "组织id")
    private Integer bingId;

    /**
     * 是否已删除
     */
    @TableLogic
    @ApiModelProperty(value = "是否已删除")
    private Integer isDeleted;

    /**
     * 行政区划代码
     */
    @ApiModelProperty(value = "行政区划代码")
    private String areaCode;

    @ApiModelProperty(value = "状态 0：禁用 1：启用")
    private Integer status;
}

 drone-service/drone-system/src/main/java/org/sxkj/system/param/DeptPageParam.java

@@ -11,4 +11,7 @@

    @ApiModelProperty(value = "部门全称")
    private String fullName;

    @ApiModelProperty(value = "所属区划")
    private String areaCode;
}

 drone-service/drone-system/src/main/java/org/sxkj/system/param/RegionAddParam.java

New file
@@ -0,0 +1,116 @@
package org.sxkj.system.param;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class RegionAddParam {

    /**
     * 主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * 区划编号
     */
//    @TableId(value = "code", type = IdType.INPUT)
    @ApiModelProperty(value = "区划编号")
    private String code;
    /**
     * 父区划编号
     */
    @ApiModelProperty(value = "父区划编号")
    private String parentCode;
    /**
     * 祖区划编号
     */
    @ApiModelProperty(value = "祖区划编号")
    private String ancestors;
    /**
     * 区划名称
     */
    @ApiModelProperty(value = "区划名称")
    private String name;
    /**
     * 省级区划编号
     */
    @ApiModelProperty(value = "省级区划编号")
    private String provinceCode;
    /**
     * 省级名称
     */
    @ApiModelProperty(value = "省级名称")
    private String provinceName;
    /**
     * 市级区划编号
     */
    @ApiModelProperty(value = "市级区划编号")
    private String cityCode;
    /**
     * 市级名称
     */
    @ApiModelProperty(value = "市级名称")
    private String cityName;
    /**
     * 区级区划编号
     */
    @ApiModelProperty(value = "区级区划编号")
    private String districtCode;
    /**
     * 区级名称
     */
    @ApiModelProperty(value = "区级名称")
    private String districtName;
    /**
     * 镇级区划编号
     */
    @ApiModelProperty(value = "镇级区划编号")
    private String townCode;
    /**
     * 镇级名称
     */
    @ApiModelProperty(value = "镇级名称")
    private String townName;
    /**
     * 村级区划编号
     */
    @ApiModelProperty(value = "村级区划编号")
    private String villageCode;
    /**
     * 村级名称
     */
    @ApiModelProperty(value = "村级名称")
    private String villageName;
    /**
     * 层级
     */
    @ApiModelProperty(value = "层级")
    private Integer regionLevel;
    /**
     * 城乡分类代码
     */
    @ApiModelProperty(value = "城乡分类代码")
    private Integer type;
    /**
     * 排序
     */
    @ApiModelProperty(value = "排序")
    private Integer sort;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "状态 0:禁用 1：启用 ")
    private Integer status;

}

 drone-service/drone-system/src/main/java/org/sxkj/system/param/RegionPageParam.java

New file
@@ -0,0 +1,24 @@
package org.sxkj.system.param;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class RegionPageParam {

    @ApiModelProperty(value = "父级")
    private String parentName;

    @ApiModelProperty(value = "区划代码")
    private String cityCode;

    @ApiModelProperty(value = "状态 0:禁用 1：启用 ")
    private Integer status;

    @ApiModelProperty(value = "区域名称")
    private String districtName;

    @ApiModelProperty(value = "区域等级")
    private Integer regionLevel;

}

 drone-service/drone-system/src/main/java/org/sxkj/system/service/IRegionService.java

@@ -17,9 +17,11 @@
package org.sxkj.system.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.sxkj.system.entity.Region;
import org.sxkj.system.excel.RegionExcel;
import org.sxkj.system.param.RegionPageParam;
import org.sxkj.system.vo.RegionVO;
import org.sxkj.system.vo.TreeVo;

@@ -104,4 +106,12 @@
     * @return
     */
    public TreeVo buildRegionTree(String parentCode);

    /**
     *
     * @param page
     * @param regionPageParam
     * @return
     */
    IPage<RegionVO> selectRegionPage(IPage<RegionVO> page, RegionPageParam regionPageParam);
}

 drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java

@@ -297,6 +297,12 @@
        return list;
    }

    /**
     * 分页查询
     * @param page
     * @param deptPageParam
     * @return
     */
    @Override
    public IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam) {
        return baseMapper.selectDeptPage(page, deptPageParam);

 drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/RegionServiceImpl.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,7 @@
import org.sxkj.system.entity.Region;
import org.sxkj.system.excel.RegionExcel;
import org.sxkj.system.mapper.RegionMapper;
import org.sxkj.system.param.RegionPageParam;
import org.sxkj.system.service.IRegionService;
import org.sxkj.system.vo.RegionVO;
import org.springframework.stereotype.Service;
@@ -225,6 +227,10 @@
        return treeVo;
    }

    @Override
    public IPage<RegionVO> selectRegionPage(IPage<RegionVO> page, RegionPageParam regionPageParam) {
        return baseMapper.selectRegionPage(page, regionPageParam);
    }

    /**
     * Query regions by parentCode and build a recursive tree structure