1.新增行政区域--》医院--》分院--》保安 2.警情实体类新增字段

Administrator

2021-06-05 5f3684985585bfd1b466dfe6e7cf7b03a17bceab

1.新增行政区域--》医院--》分院--》保安
2.警情实体类新增字段

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java

@@ -162,8 +162,17 @@
    private String aaddress;
    private String uids;

//    @TableLogic
//    private Integer isDeleted;

    /**
     * 接警的保安人员 id
     */
    @TableField("securityId")
    private String securityId;

    /**
     * 通知的保安人员的 id 字符串，多个连接
     */
    @TableField("securityArr")
    private String securityArr;

}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java

@@ -364,4 +364,17 @@
        return R.data(tree);
    }


    /**
     * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
     * @return
     */
    @GetMapping("/getBigTree")
    public R<List<catalogVO>> getBigTree() {
        List<catalogVO> tree = catalogService.getBigTree();
        return R.data(tree);
    }



}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java

@@ -44,4 +44,10 @@
    void addCatalog(String name, String eqid,String pid);

    List<catalogVO> tree();

    /**
     * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
     * @return
     */
    List<catalogVO> getBigTree();
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml

@@ -125,4 +125,43 @@
       INSERT INTO sys_catalog (name,eqid,pId) VALUES (#{name},#{eqid},#{pid})
    </insert>

    <!--获取行政区-》客户-》部门机构 -》安保人员 树形数据-->
    <select id="getBigTree" resultMap="treeNodeResultMap">
        (
            SELECT
                id,
                pId as parent_id,
                name AS title,
                id AS "value",
                id AS "key"
            FROM
                sys_catalog
        )

        union all

        (
            select
                bu.id,
                sc.id as parent_id,
                bu.real_name AS title,
                bu.id AS "value",
                bu.id AS "key"
            from
                jfpthpublicsecurity.blade_user bu
            left join
                sys_catalog sc
            on
                sc.dept_id = SUBSTRING(bu.dept_id,-19)
            left join
                jfpthpublicsecurity.blade_role br
            on
                bu.role_id = br.id
            where
                br.role_alias = '处警员'
            and
                bu.is_deleted=0
        )
    </select>

</mapper>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java

@@ -42,4 +42,10 @@
    void addCatalog(String name, String eqid,String pid);

    List<catalogVO> tree();

    /**
     * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
     * @return
     */
    List<catalogVO> getBigTree();
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java

@@ -87,4 +87,13 @@
    public void addCatalog(String name, String eqid,String pid) {
        baseMapper.addCatalog(name, eqid,pid);
    }

    /**
     * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
     * @return
     */
    @Override
    public List<catalogVO> getBigTree() {
        return ForestNodeMerger.merge(baseMapper.getBigTree());
    }
}