Merge remote-tracking branch 'origin/V0.0.6-iot' into V0.0.6-iot

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/IotAlarmRuleController.java

@@ -3,6 +3,7 @@ package com.xunmei.iot.controller;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.iot.dto.alarm.IotAlarmRuleDto;
+import com.xunmei.iot.dto.alarm.IotAlarmRuleQueryDto;
 import com.xunmei.iot.service.IotAlarmRuleService;
 import com.xunmei.iot.vo.alarm.IotInitAlarmRuleVo;
 import io.swagger.annotations.ApiOperation;
@@ -43,15 +44,12 @@ public class IotAlarmRuleController {
     }
 
     @ApiOperation(value = "查询报警规则")
-    @GetMapping(value = "/getRules/{alarmType}/{pageIndex}/{pageSize}/{ruleName}")
-    public TableDataInfo<IotInitAlarmRuleVo> getRules(@PathVariable String alarmType,
-                                                      @PathVariable String ruleName,
-                                                      @PathVariable Integer pageIndex,
-                                                      @PathVariable Integer pageSize){
+    @PostMapping(value = "/getRules")
+    public TableDataInfo<IotInitAlarmRuleVo> getRules(@RequestBody IotAlarmRuleQueryDto args){
         try {
-            ruleName = ruleName.trim();
-            if(ruleName.equals("undefined")) ruleName = "";
-            TableDataInfo<IotInitAlarmRuleVo> alarmRuleData = iotAlarmRuleService.getAlarmRuleDatas(alarmType,ruleName,pageIndex,pageSize);
+//            ruleName = ruleName.trim();
+//            if(ruleName.equals("undefined")) ruleName = "";
+            TableDataInfo<IotInitAlarmRuleVo> alarmRuleData = iotAlarmRuleService.getAlarmRuleDatas(args.getRuleType(),args.getRuleName(),args.getPageNum(),args.getPageSize());
             return alarmRuleData;
         } catch (Exception e) {
             e.printStackTrace();

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/alarm/IotAlarmRuleQueryDto.java

@@ -0,0 +1,12 @@
+package com.xunmei.iot.dto.alarm;
+
+import com.xunmei.common.core.web.domain.PageDto;
+import lombok.Data;
+
+@Data
+public class IotAlarmRuleQueryDto extends PageDto {
+
+    private String ruleName;
+
+    private String ruleType;
+}

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/IotAlarmRuleService.java

@@ -35,7 +35,7 @@ public interface IotAlarmRuleService extends IService<IotAlarmRule> {
      * @param pageSize
      * @return {@link IotInitAlarmRuleVo}
      */
-    TableDataInfo<IotInitAlarmRuleVo> getAlarmRuleDatas(String alarmType, String ruleName, Integer pageIndex, Integer pageSize) throws Exception;
+    TableDataInfo<IotInitAlarmRuleVo> getAlarmRuleDatas(String alarmType, String ruleName, Long pageIndex, Long pageSize) throws Exception;
 
     /**
      *

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotAlarmRuleServiceImpl.java

@@ -134,7 +134,7 @@ public class IotAlarmRuleServiceImpl extends ServiceImpl<IotAlarmRuleMapper, Iot
     }
 
     @Override
-    public TableDataInfo<IotInitAlarmRuleVo> getAlarmRuleDatas(String alarmType, String ruleName, Integer pageIndex, Integer pageSize) throws Exception {
+    public TableDataInfo<IotInitAlarmRuleVo> getAlarmRuleDatas(String alarmType, String ruleName, Long pageIndex, Long pageSize) throws Exception {
         LambdaQueryWrapper<IotAlarmRule> queryWrapper = new LambdaQueryWrapper<>();
         if(alarmType!=null && !alarmType.isEmpty())
         {