设备管理支持选择处警员接口调整

zengh

2021-04-19 7aa5bfad46a4496bed2df8109ee2dc1479f2a697

设备管理支持选择处警员接口调整

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java

@@ -118,5 +118,23 @@
    @TableField("deptId")
    private String deptId;

    @TableField("onePhone")
    private String onePhone;
    @TableField("twoPhone")
    private String twoPhone;
    @TableField("ThreePhone")
    private String ThreePhone;
    @TableField("oneId")
    private String oneId;
    @TableField("twoId")
    private String twoId;
    @TableField("threeId")
    private String threeId;
    @TableField("oneContacts")
    private String oneContacts;
    @TableField("twoContacts")
    private String twoContacts;
    @TableField("ThreeContacts")
    private String ThreeContacts;

}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java

@@ -38,17 +38,6 @@
    private  String beginTime;
    private  String endTime;
    private  String pid;

    private String oneContacts;
    private String twoContacts;
    private String ThreeContacts;
    private String onePhone;
    private String twoPhone;
    private String ThreePhone;
    private String oneId;
    private String twoId;
    private String threeId;

    private String onlineStatus;

    //设备是否处于报警状态

 blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -131,6 +131,17 @@
    }

    /**
     * 获取处警员树形结构
     */
    @GetMapping("/Batrees")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "树形结构", notes = "树形结构")
    public R<List<DeptVO>> Batrees(String tenantId, BladeUser bladeUser) {
        List<DeptVO> tree = deptService.Batrees();
        return R.data(tree);
    }

    /**
     * 懒加载获取部门树形结构
     */
    @GetMapping("/lazy-tree")

 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java

@@ -57,6 +57,14 @@
    List<DeptVO> trees();

    /**
     * 获取保安树形节点
     *
     * @param
     * @return
     */
    List<DeptVO> Batrees();

    /**
     * 懒加载获取树形节点
     *
     * @param tenantId

 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -79,6 +79,23 @@
        ORDER BY sort
    </select>

    <select id="Batrees" resultMap="treeNodeResultMap">
        SELECT
            bu.id,
            0 as parent_id,
            bu.name AS title,
            bu.id AS "value",
            bu.id AS "key"
        FROM
            blade_user bu
            LEFT JOIN blade_role br ON bu.role_id = br.id
        WHERE
            br.role_alias = '处警员'
            AND bu.is_deleted = 0
        ORDER BY
            sort
    </select>

    <select id="lazyTree" resultMap="treeNodeResultMap" >
        SELECT
            dept.id,

 blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java

@@ -56,6 +56,14 @@
     */
    List<DeptVO> trees();

    /**
     * 保安树形结构
     *
     * @param
     * @return
     */
    List<DeptVO> Batrees();


    /**
     * 懒加载树形结构

 blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -87,6 +87,11 @@
    }

    @Override
    public List<DeptVO> Batrees() {
        return ForestNodeMerger.merge(baseMapper.Batrees());
    }

    @Override
    public List<DeptVO> lazyTree(String tenantId, Long parentId) {
        if (AuthUtil.isAdministrator()) {
            tenantId = StringPool.EMPTY;

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -100,6 +100,9 @@
        <if test="user.account!=null and user.account != ''">
            and s.account = #{user.account}
        </if>
        <if test="user.id!=null and user.id != ''">
            and s.id = #{user.id}
        </if>
        <if test="user.realName!=null and user.realName != ''">
            and s.real_name = #{user.realName}
        </if>