报警管理查询增加数据权限控制

sms_water/src/main/java/com/huaxu/controller/AlarmSettingController.java

@@ -10,6 +10,7 @@ import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.service.AlarmSettingService;
+import com.huaxu.service.SceneService;
 import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +35,8 @@ public class AlarmSettingController {
      */
     @Autowired
     private AlarmSettingService alarmSettingService;
-
+    @Autowired
+    private SceneService sceneService;
     /**
      * 删除多条数据
      *
@@ -71,7 +73,7 @@ public class AlarmSettingController {
      * @return Response对象
      */
     @RequestMapping(value = "insertBatch", method = RequestMethod.POST)
-    @ApiOperation(value = "批量增加报警配置信息")
+    @ApiOperation(value = "批量增加报警配置信息",notes = "alarmType 为参数报警或状态报警")
     public AjaxMessage<Boolean> insertBatch(@ApiParam(value = "报警配置ids", required = true) @RequestBody List<AlarmSetting> listAlarmSetting) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         for (AlarmSetting alarm:listAlarmSetting) {
@@ -96,13 +98,14 @@ public class AlarmSettingController {
     public AjaxMessage<Pagination<AlarmSettingDto>> selectPage(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
-            @ApiParam(value = "id", required = false) @RequestParam(required = false) Integer id,
-            @ApiParam(value = "报警参数", required = false) @RequestParam(required = false) String attributeName,
-            @ApiParam(value = "场景id", required = false) @RequestParam(required = false) Integer sceneId) {
+            @ApiParam(value = "报警设置id", required = false) @RequestParam(required = false) Integer id,
+            @ApiParam(value = "报警参数id", required = false) @RequestParam(required = false) String attributeName,
+            @ApiParam(value = "场景id", required = false) @RequestParam(required = false) Long sceneId) {
         AlarmSettingDto alarmSettingDto=new AlarmSettingDto();
         alarmSettingDto.setId(id);
         alarmSettingDto.setAttributeName(attributeName);
         alarmSettingDto.setSceneId(sceneId);
+        alarmSettingDto.setSceneIds(sceneService.findByParentIdsLike(sceneId));
         IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
         iPage = alarmSettingService.selectPage(iPage, alarmSettingDto);
         Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);

sms_water/src/main/java/com/huaxu/dto/AlarmSettingDto.java

@@ -11,20 +11,35 @@ import java.util.List;
 @ApiModel("报警设置")
 public class AlarmSettingDto extends AlarmSetting {
     /**
-     * 所属公司
+     * 所属公司id
      */
-    @ApiModelProperty(value = "所属公司")
+    @ApiModelProperty(value = "所属公司id")
     private Integer companyOrgId;
     /**
-     * 所属部门
+     * 所属公司名称
      */
-    @ApiModelProperty(value = "所属部门")
+    @ApiModelProperty(value = "所属公司名称")
+    private String companyOrgName;
+    /**
+     * 所属部门id
+     */
+    @ApiModelProperty(value = "所属部门id")
     private Integer deptOrgId;
+    /**
+     * 所属部门名称
+     */
+    @ApiModelProperty(value = "所属部门名称")
+    private String deptOrgName;
     /**
      * 场景id
      */
     @ApiModelProperty(value = "场景id")
-    private Integer sceneId;
+    private Long sceneId;
+    /**
+     * 场景id
+     */
+    @ApiModelProperty(value = "场景id及所有下级id")
+    private List<Long> sceneIds;
     /**
      * 场景名称
      */

sms_water/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=8323
+server.port=8324
 spring.application.name=sms-water
 logging.level.root=info
 logging.path=./logs/sms-water

sms_water/src/main/resources/application-prd.properties

@@ -1,4 +1,4 @@
-server.port=8322
+server.port=8324
 spring.application.name=sms-water
 logging.level.root=info
 logging.path=./logs/sms-water

sms_water/src/main/resources/application-sit.properties

@@ -1,4 +1,4 @@
-server.port=8322
+server.port=8324
 spring.application.name=sms-water
 logging.level.root=info
 logging.path=./logs/sms-water

sms_water/src/main/resources/mapper/AlarmSettingMapper.xml

@@ -52,6 +52,13 @@
             <if test="alarm.sceneId != null ">
                 and t2.scene_id = #{alarm.sceneId}
             </if>
+            <if test="alarm.sceneIds != null and alarm.sceneIds.size()>0">
+                and t2.scene_id in
+                <foreach item="item" index="index" collection="alarm.sceneIds" open="("
+                         separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             and t1.STATUS =1
         </where>
     </select>