查询设备所有属性

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

@@ -83,21 +83,6 @@ public class AlarmSettingController {
         boolean result = alarmSettingService.insertBatch(listAlarmSetting);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
-    /**
-     * 根据id查询报警设置数据
-     *
-     * @param id
-     * @return
-     */
-    @RequestMapping(value = "selectById", method = RequestMethod.GET)
-    @ApiOperation(value = "根据id查询报警配置数据")
-    public AjaxMessage<AlarmSetting> selectById(@RequestParam Integer id) {
-        if(id==null) {
-            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
-        }
-        AlarmSetting result = alarmSettingService.selectById(id);
-        return new AjaxMessage<>(ResultStatus.OK, result);
-    }
 
     /**
      * 分页查询报警设置数据
@@ -111,9 +96,11 @@ 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) {
         AlarmSettingDto alarmSettingDto=new AlarmSettingDto();
+        alarmSettingDto.setId(id);
         alarmSettingDto.setAttributeName(attributeName);
         alarmSettingDto.setSceneId(sceneId);
         IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
@@ -121,4 +108,19 @@ public class AlarmSettingController {
         Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+    /**
+     * 根据设备id查询属性信息
+     *
+     * @param deviceId
+     * @return
+     */
+    @RequestMapping(value = "selectAttributes", method = RequestMethod.GET)
+    @ApiOperation(value = "根据设备id查询属性信息")
+    public AjaxMessage<List<AlarmSettingDto>> selectAttributes(@RequestParam Integer deviceId) {
+        if(deviceId==null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        List<AlarmSettingDto> result = alarmSettingService.selectAttributes(deviceId);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
 }

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

@@ -84,13 +84,16 @@ public class SystemSettingController {
      * @return
      */
     @RequestMapping(value = "selectGis", method = RequestMethod.GET)
-    @ApiOperation(value = "根据机构查询Gis配置数据")
+    @ApiOperation(value = "查询Gis配置数据")
     public AjaxMessage<List<GisSetting>> selectGis(
             @ApiParam(value = "所属公司", required = false) @RequestParam(required = false) Integer companyOrgId,
             @ApiParam(value = "所属部门", required = false) @RequestParam(required = false) Integer deptOrgId,
             @ApiParam(value = "服务类型", required = false) @RequestParam(required = false) String serviceType) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        //如果机构id不传，默认查询当前角色下所属机构
         if(companyOrgId==null&&deptOrgId==null) {
-            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+            companyOrgId=currentUser.getCompanyId();
+            deptOrgId=currentUser.getDepartmentId();
         }
 
         List<GisSetting> result = gisSettingService.selectGis(companyOrgId,deptOrgId,serviceType);

sms_water/src/main/java/com/huaxu/dao/AlarmSettingMapper.java

@@ -8,6 +8,8 @@ import com.huaxu.entity.AlarmSetting;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  *
@@ -24,4 +26,11 @@ public interface AlarmSettingMapper extends BaseMapper<AlarmSetting> {
      * @param  alarmSettingDto 实体类
      */
     Page<AlarmSettingDto> findPage(IPage<AlarmSettingDto> page, @Param("alarm") AlarmSettingDto alarmSettingDto);
+    /**
+     * 根据设备id查询属性信息
+     *
+     * @param deviceId
+     * @return
+     */
+    List<AlarmSettingDto> selectAttributes(@Param("deviceId")Integer deviceId);
 }

sms_water/src/main/java/com/huaxu/service/AlarmSettingService.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaxu.dao.AlarmSettingMapper;
 import com.huaxu.dto.AlarmSettingDto;
 import com.huaxu.entity.AlarmSetting;
-import com.huaxu.entity.GisSetting;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -69,4 +68,13 @@ public class AlarmSettingService extends ServiceImpl<AlarmSettingMapper, AlarmSe
      public IPage<AlarmSettingDto> selectPage(IPage<AlarmSettingDto> page, AlarmSettingDto alarmSettingDto){
         return alarmSettingMapper.findPage(page,alarmSettingDto);
     }
-}
+    /**
+     * 根据设备id查询属性信息
+     *
+     * @param deviceId
+     * @return
+     */
+    public List<AlarmSettingDto> selectAttributes(Integer deviceId){
+        return alarmSettingMapper.selectAttributes(deviceId);
+    }
+}

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

@@ -56,4 +56,12 @@
         </where>
     </select>
 
+    <select id="selectAttributes" resultMap="alarmSettingMap">
+        select t3.id attribute_id,t3.name attribute_name
+        from  sms_device t1
+        inner join sms_device_type t2 on t1.device_type_id=t2.id
+        inner join sms_device_attribute t3 on t2.id=t3.device_mode_id
+        where t1.id=#{deviceId} and t3.status=1
+    </select>
+
 </mapper>