提交

smart-city-platform/src/main/java/com/bz/smart_city/dao/GridManagementMapper.java

@@ -83,8 +83,9 @@ public interface GridManagementMapper {
     int count();
 
     List<GridUser> selectGirdUserInfo(@Param("username") String username,
-                                      @Param("orgId") Integer orgId,
-                                      @Param("roleId") Integer roleId);
+                                      @Param("orgId")Integer orgId,
+                                      @Param("roleId") Integer roleId,
+                                      @Param("siteId") Integer siteId);
 
     List<Community> getCommutityByOrg(@Param("orgId") Integer orgId);
 

smart-city-platform/src/main/java/com/bz/smart_city/grid/GridManagementServiceImpl.java

@@ -1,6 +1,8 @@
 package com.bz.smart_city.grid;
 
+import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dao.GridManagementMapper;
+import com.bz.smart_city.dto.LoginUser;
 import com.bz.smart_city.entity.Building;
 import com.bz.smart_city.entity.Community;
 import com.bz.smart_city.entity.Device;
@@ -123,7 +125,10 @@ public class GridManagementServiceImpl implements GridManagementService {
     @Override
     public List<GridUser> selectGirdUserInfo(String name, Integer orgId) {
         Integer roleId=108;
-        List<GridUser> users=gridManagementMapper.selectGirdUserInfo(name,orgId,roleId);
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        Integer siteId=currentUser.getSiteId();
+
+        List<GridUser> users=gridManagementMapper.selectGirdUserInfo(name,orgId,roleId,siteId);
         return users;
     }
 

smart-city-platform/src/main/java/com/bz/smart_city/grid/GridUser.java

@@ -21,4 +21,5 @@ public class GridUser {
     private Integer peoples;
     @ApiModelProperty(value = "机构id")
     private Integer orgId;
+    private Integer siteId;
 }

smart-city-platform/src/main/resources/mapper/GridManagementMapper.xml

@@ -145,21 +145,26 @@
         from sc_grid_management
     </select>
     <select id="selectGirdUserInfo" resultType="com.bz.smart_city.grid.GridUser">
-        select b.id orgId,a.id,username,mobile_phone,a.name,b.name org_name,b.address,c.peoples from
-         sc_user a join sc_organization b on a.organ_id=b.id
+        select  b.id orgId,a.id,username,mobile_phone,a.name,b.name org_name,b.address,ifnull(c.peoples,0) peoples from
+         sc_site_user ssu   join    sc_user a on ssu.user_id=a.id
+         join sc_organization b on ssu.organ_id=b.id
          join sc_user_role d on d.uid=a.id join sc_role e on e.id=d.rid
          left join (select count(*)peoples,user_id from sc_grid_management group by user_id)c
          on a.id=c.user_id
         <where>
+                d.status=1
             <if test="username != null and username!='' ">
                 and username LIKE concat('%',#{username},'%')
             </if>
             <if test="orgId != null  ">
-                and a.organ_id = #{orgId}
+                and ssu.organ_id = #{orgId}
             </if>
             <if test="roleId != null  ">
                 and e.id = #{roleId}
             </if>
+            <if test="siteId != null  ">
+                and ssu.site_id = #{siteId}
+            </if>
        </where>
     </select>
     <select id="getCommutityByOrg" resultType="com.bz.smart_city.entity.Community">
@@ -171,7 +176,7 @@
     </select>
     <select id="getDevices" resultType="com.bz.smart_city.entity.Device">
         select * from sc_device where building_id=#{buildingId} and
-         id not in (select distinct device_id from sc_grid_management where user_id=#{userId})
+         id not in (select distinct device_id from sc_grid_management)
     </select>
 
     <select id="getByDeviceId" resultMap="GridManagementMap">

water_query_api/src/main/java/com/bz/smart_city/controller/GridManagementController.java

@@ -0,0 +1,111 @@
+package com.bz.smart_city.controller;
+
+import com.bz.smart_city.entity.GridManagement;
+import com.bz.smart_city.service.GridManagementService;
+import com.github.pagehelper.PageHelper;
+import com.zcxk.common.model.AjaxMessage;
+import com.zcxk.common.model.Pagination;
+import com.zcxk.common.model.ResultStatus;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * (GridManagement)控制层
+ *
+ * @author hym
+ * @since 2021-02-23 11:47:59
+ */
+@RestController
+@RequestMapping("/gridManagement")
+@Api(tags = "")
+public class GridManagementController {
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private GridManagementService gridManagementService;
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 参数对象
+     * @return 单条数据
+     */
+    @RequestMapping(value = "get", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施配置列表")
+    public AjaxMessage<GridManagement> selectOne(
+            @ApiParam(value = "设置配置", required = true) Integer id) {
+        GridManagement result = gridManagementService.selectById(id);
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+    /**
+     * 新增一条数据
+     *
+     * @param gridManagement 实体类
+     * @return Response对象
+     */
+    @RequestMapping(value = "insert", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施配置列表")
+    public AjaxMessage<Integer> insert(@ApiParam(value = "设置配置", required = true) @RequestBody GridManagement gridManagement) {
+        int result = gridManagementService.insert(gridManagement);
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+    /**
+     * 修改一条数据
+     *
+     * @param gridManagement 实体类
+     * @return Response对象
+     */
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施配置列表")
+    public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody GridManagement gridManagement) {
+        int result = gridManagementService.update(gridManagement);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+
+    }
+
+    /**
+     * 删除一条数据
+     *
+     * @param gridManagement 参数对象
+     * @return Response对象
+     */
+    @RequestMapping(value = "delete", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施配置列表")
+    public AjaxMessage<Integer> delete(@ApiParam(value = "设置配置", required = true) @RequestBody GridManagement gridManagement) {
+        int result = gridManagementService.deleteById(gridManagement.getId());
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  偏移
+     * @param pageSize 条数
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectPage", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施配置列表")
+    public AjaxMessage<Pagination<GridManagement>> selectPage(Integer pageNum, Integer pageSize) {
+        GridManagement gridManagement = new GridManagement();
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<GridManagement> gridManagements = gridManagementService.selectList(gridManagement);
+        Pagination<GridManagement> pages = new Pagination<>(gridManagements);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+
+}

water_query_api/src/main/java/com/bz/smart_city/dao/GridManagementMapper.java

@@ -0,0 +1,81 @@
+package com.bz.smart_city.dao;
+
+import com.bz.smart_city.entity.GridManagement;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * (GridManagement)表数据库访问层
+ *
+ * @author hym
+ * @since 2021-02-23 11:48:07
+ */
+@Mapper
+public interface GridManagementMapper {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    GridManagement selectById(Integer id);
+
+
+    /**
+     * 查询全部
+     *
+     * @return 对象列表
+     */
+    List<GridManagement> selectAll();
+
+    /**
+     * 通过实体作为筛选条件查询
+     *
+     * @param gridManagement 实例对象
+     * @return 对象列表
+     */
+    List<GridManagement> selectList(GridManagement gridManagement);
+
+    /**
+     * 新增数据
+     *
+     * @param gridManagement 实例对象
+     * @return 影响行数
+     */
+    int insert(GridManagement gridManagement);
+
+    /**
+     * 批量新增
+     *
+     * @param gridManagements 实例对象的集合
+     * @return 影响行数
+     */
+    int batchInsert(@Param("gridManagements") List<GridManagement> gridManagements);
+
+    /**
+     * 修改数据
+     *
+     * @param gridManagement 实例对象
+     * @return 影响行数
+     */
+    int update(GridManagement gridManagement);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+    /**
+     * 查询总数据数
+     *
+     * @return 数据总数
+     */
+    int count();
+
+}

water_query_api/src/main/java/com/bz/smart_city/entity/GridManagement.java

@@ -0,0 +1,64 @@
+package com.bz.smart_city.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (GridManagement)实体类
+ *
+ * @author hym
+ * @since 2021-02-23 11:48:07
+ */
+@Data
+@ApiModel
+public class GridManagement implements Serializable {
+    private static final long serialVersionUID = 458833882113660963L;
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private Integer deviceId;
+    /**
+     * 客户编号
+     */
+    @ApiModelProperty(value = "客户编号")
+    private String customerNo;
+    /**
+     * 客户手机
+     */
+    @ApiModelProperty(value = "客户手机")
+    private String customerPhone;
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+    /**
+     * 标签
+     */
+    @ApiModelProperty(value = "标签")
+    private String label;
+    /**
+     * 紧急联系人
+     */
+    @ApiModelProperty(value = "紧急联系人")
+    private String emergencyContact;
+    /**
+     * 紧急联系人电话
+     */
+    @ApiModelProperty(value = "紧急联系人电话")
+    private String emergencyContactPhoneNumber;
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+}

water_query_api/src/main/java/com/bz/smart_city/service/GridManagementService.java

@@ -0,0 +1,78 @@
+package com.bz.smart_city.service;
+
+import com.bz.smart_city.entity.GridManagement;
+
+import java.util.List;
+
+
+/**
+ * (GridManagement)表服务接口
+ *
+ * @author hym
+ * @since 2021-02-23 11:48:06
+ */
+public interface GridManagementService {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    GridManagement selectById(Integer id);
+
+
+    /**
+     * 查询全部
+     *
+     * @return 对象列表
+     */
+    List<GridManagement> selectAll();
+
+    /**
+     * 通过实体作为筛选条件查询
+     *
+     * @param gridManagement 实例对象
+     * @return 对象列表
+     */
+    List<GridManagement> selectList(GridManagement gridManagement);
+
+    /**
+     * 新增数据
+     *
+     * @param gridManagement 实例对象
+     * @return 影响行数
+     */
+    int insert(GridManagement gridManagement);
+
+    /**
+     * 批量新增
+     *
+     * @param gridManagements 实例对象的集合
+     * @return 影响行数
+     */
+    int batchInsert(List<GridManagement> gridManagements);
+
+    /**
+     * 修改数据
+     *
+     * @param gridManagement 实例对象
+     * @return 修改
+     */
+    int update(GridManagement gridManagement);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+    /**
+     * 查询总数据数
+     *
+     * @return 数据总数
+     */
+    int count();
+}

water_query_api/src/main/java/com/bz/smart_city/service/impl/GridManagementServiceImpl.java

@@ -0,0 +1,109 @@
+package com.bz.smart_city.service.impl;
+
+import com.bz.smart_city.dao.GridManagementMapper;
+import com.bz.smart_city.entity.GridManagement;
+import com.bz.smart_city.service.GridManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * (GridManagement表)服务实现类
+ *
+ * @author hym
+ * @since 2021-02-23 11:48:08
+ */
+@Service("gridManagementService")
+public class GridManagementServiceImpl implements GridManagementService {
+    @Autowired
+    private GridManagementMapper gridManagementMapper;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @Override
+    public GridManagement selectById(Integer id) {
+        return this.gridManagementMapper.selectById(id);
+    }
+
+
+    /**
+     * 查询所有
+     *
+     * @return 实例对象的集合
+     */
+    @Override
+    public List<GridManagement> selectAll() {
+        return this.gridManagementMapper.selectAll();
+    }
+
+    /**
+     * 根据条件查询
+     *
+     * @return 实例对象的集合
+     */
+    @Override
+    public List<GridManagement> selectList(GridManagement gridManagement) {
+        return this.gridManagementMapper.selectList(gridManagement);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param gridManagement 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int insert(GridManagement gridManagement) {
+        return this.gridManagementMapper.insert(gridManagement);
+    }
+
+    /**
+     * 批量新增
+     *
+     * @param gridManagements 实例对象的集合
+     * @return 生效的条数
+     */
+    @Override
+    public int batchInsert(List<GridManagement> gridManagements) {
+        return this.gridManagementMapper.batchInsert(gridManagements);
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param gridManagement 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int update(GridManagement gridManagement) {
+
+        return this.gridManagementMapper.update(gridManagement);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @Override
+    public int deleteById(Integer id) {
+        return this.gridManagementMapper.deleteById(id);
+    }
+
+    /**
+     * 查询总数据数
+     *
+     * @return 数据总数
+     */
+    @Override
+    public int count() {
+        return this.gridManagementMapper.count();
+    }
+
+}