设备管理、报警信息管理增加批量删除接口

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description
@@ -272,7 +273,11 @@ public class AlarmDetailsController {
         String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警",alarmDetailsService.selectRealTimeList(alarmDetailsDto) );
         return new AjaxMessage<>(ResultStatus.OK, filePath);
     }
-
+    @RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除")
+    public AjaxMessage<Integer> batchDelete( @ApiParam(value = "报警信息ids") @RequestParam List<Integer> ids){
+        return new AjaxMessage<>(ResultStatus.OK, alarmDetailsService.batchDelete(ids));
+    }
 
 
 }

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

@@ -114,4 +114,10 @@ public class DeviceController {
         return new AjaxMessage<>(ResultStatus.OK, deviceService.delete(id));
     }
 
+    @RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除设备信息")
+    @LogAnnotation(module = "【设备管理】批量删除")
+    public AjaxMessage<Integer> batchDelete( @ApiParam(value = "设备信息id") @RequestParam List<Integer> ids){
+        return new AjaxMessage<>(ResultStatus.OK, deviceService.batchDelete(ids));
+    }
 }

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

@@ -43,8 +43,14 @@ public interface AlarmDetailMapper {
      * @return
      */
     Integer deleteById(Integer id);
+
     /**
-     * 单条删除设备报警
+     * 设备报警
+     * @return
+     */
+    Integer batchDelete(@Param("ids") List<Integer> ids);
+    /**
+     * 挂起、恢复设备报警
      * @return
      */
     Integer suspendedById(@Param("id") Integer id, @Param("opState") Integer opState,@Param("dateUpdate")  Date dateUpdate ,@Param("updateBy") String updateBy);

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

@@ -40,6 +40,11 @@ public interface DeviceMapper {
      * @return
      */
     Integer deleteById(Integer id);
+    /**
+     * 删除设备
+     * @return
+     */
+    Integer batchDelete(@Param("ids") List<Integer> ids);
 
     /**
      * 修改设备信息

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

@@ -26,7 +26,7 @@ public class AlarmDetailsDto extends AlarmDetailsEntity {
     @ApiModelProperty("设备名称")
     private String deviceName;
     @ApiModelProperty("设备类型")
-    private Integer deviceType;
+    private String deviceType;
     @ApiModelProperty("地址")
     private String address;
     @ApiModelProperty("经度")

sms_water/src/main/java/com/huaxu/entity/DeviceEntity.java

@@ -32,7 +32,7 @@ public class DeviceEntity implements Serializable {
 
     @ApiModelProperty(value = "设备编号")
     private Integer deviceCode;
-    @ApiModelProperty(value = "设备型号")
+    @ApiModelProperty(value = "设备类型")
     private Integer deviceTypeId;
     @ApiModelProperty(value = "所属公司")
     private Integer companyOrgId;

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

@@ -39,6 +39,13 @@ public interface AlarmDetailsService {
      * @return
      */
     Integer deleteById(Integer id);
+
+    /**
+     * 批量删除
+     * @return
+     */
+    Integer batchDelete(List<Integer> ids);
+
     /**
      * 挂起/恢复
      * @return

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

@@ -30,6 +30,12 @@ public interface DeviceService {
      */
     Integer delete(Integer id);
 
+    /**
+     * 批量删除设备
+     * @return
+     */
+    Integer batchDelete(List<Integer> ids);
+
     /**
      * 修改设备信息
      * @return

sms_water/src/main/java/com/huaxu/service/impl/AlarmDetailsServiceImpl.java

@@ -52,6 +52,12 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
         return alarmDetailMapper.deleteById(id);
     }
 
+    @Override
+    public Integer batchDelete(List<Integer> ids) {
+
+        return alarmDetailMapper.batchDelete(ids);
+    }
+
     @Override
     public Integer suspendedById(Integer id , Integer opState) {
         LoginUser loginUser = UserUtil.getCurrentUser();

sms_water/src/main/java/com/huaxu/service/impl/DeviceServiceImpl.java

@@ -47,6 +47,11 @@ public class DeviceServiceImpl implements DeviceService {
         return deviceMapper.deleteById(id);
     }
 
+    @Override
+    public Integer batchDelete(List<Integer> ids) {
+
+        return deviceMapper.batchDelete(ids);
+    }
     @Override
     public Integer update(DeviceEntity deviceEntity) {
         LoginUser loginUser = UserUtil.getCurrentUser();

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

@@ -25,7 +25,7 @@
             ,a.MIN_VALUE as "minValue"
             ,a.MAX_VALUE as "maxValue"
             ,timestampdiff(MINUTE,ifnull(a.ALARM_END_TIME,now()),a.ALARM_START_TIME) as "duration"
-            ,(case when ALARM_END_TIME is not null then timestampdiff(MINUTE,a.ALARM_END_TIME,a.ALARM_START_TIME) else null end ) as "duration"
+            /*,(case when ALARM_END_TIME is not null then timestampdiff(MINUTE,a.ALARM_END_TIME,a.ALARM_START_TIME) else null end ) as "duration"*/
             ,att.`NAME` as "attributeName"
             ,s.SCENE_NAME as "sceneName"
             ,d.DEVICE_NAME as "deviceName"
@@ -231,6 +231,15 @@
          UPDATE  sms_alarm_details set STATUS  = 0 where id = #{id}
     </delete>
 
+    <!--删除-->
+    <delete id="batchDelete">
+        UPDATE  sms_alarm_details set STATUS  = 0
+        where id  in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
+
     <!-- 报警挂起、恢复 -->
     <delete id="suspendedById">
          UPDATE  sms_alarm_details set op_state  = #{opState} , DATE_UPDATE  = #{dateUpdate}, UPDATE_BY  = #{updateBy} where id = #{id}

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

@@ -180,6 +180,14 @@
          UPDATE  sms_device set STATUS  = 0 where id = #{id}
     </delete>
 
+    <!--通过主键删除-->
+    <delete id="batchDelete">
+         UPDATE  sms_device set STATUS  = 0
+         where id  in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
 
     <!-- 分页查询 -->
     <select id="selectPage" resultType="com.huaxu.dto.DeviceDto">