修改了RFID的BUG

dev-device/device-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java

@@ -135,7 +135,7 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
                 predicateBuilder.lt("destroyTime", deviceDestoryBillSelectVo.getEndTime());
             }
         }
-        predicateBuilder.eq("destroyStatus",2);
+        predicateBuilder.in("destroyStatus",2);
         return predicateBuilder.build();
     }
 }

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -216,10 +216,14 @@ public class RfidController {
 
     @ApiOperation(value = "告警管理概览",notes = "可以通过这个接口查询当前单位库房告警日志")
     @PostMapping(value = "/alert/summary")
-    public ResponseEntity<Page<LibraryWarningLog>> alertSummary(@RequestBody WaringLogSelectVo waringLogSelectVo) throws ParseException {
+    public ResponseEntity<HashMap<String,Object>> alertSummary(@RequestBody WaringLogSelectVo waringLogSelectVo) throws ParseException {
         //todo 这里改了返回样式记得通知前端
+        HashMap<String,Object> map = new HashMap<>();
         Page<LibraryWarningLog> page = libraryWarningLogService.getPage(waringLogSelectVo.toWarningVo());
-        return ResultUtil.success(page);
+        WarningCountVo warningCountVo = libraryWarningLogService.getCount(waringLogSelectVo.toWarningVo());
+        map.put("pageContent",page);
+        map.put("count",warningCountVo);
+        return ResultUtil.success(map);
     }
 
     @ApiOperation(value = "首页告警日志查询",notes = "可以通过这个接口查询当前单位库房告警日志")

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/InventoryTime.java

+package com.tykj.dev.rfid.entity.domin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author HuangXiahao
+ * @version V1.0
+ * @class InventoryTime
+ * @packageName com.tykj.dev.rfid.entity.domin
+ **/
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@SQLDelete(sql = "update library_warning_log set delete_tag = 1 where id = ?")
+@Where(clause = "delete_tag = 0")
+@ApiModel("盘存时间")
+public class InventoryTime {
+
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(name = "主键id")
+    private Integer id;
+
+    @ApiModelProperty(value = "盘存时间")
+    private Integer timeStep ;
+
+    /**
+     * 创建用户id
+     */
+    @ApiModelProperty(value = "创建用户id")
+    private Integer createUserId = 0;
+    /**
+     * 创建时间
+     */
+    @CreatedDate
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新用户id
+     */
+    @ApiModelProperty(value = "更新用户id")
+    private Integer updateUserId = 0;
+    /**
+     * 更新时间
+     */
+    @LastModifiedDate
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    /**
+     * 删除标记(0:未删除，1:已删除)
+     */
+    @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
+    private Integer deleteTag = 0;
+}

dev-rfid/src/main/java/com/tykj/dev/rfid/timeTask/InventoryScheduled.java

@@ -46,6 +46,7 @@ public class InventoryScheduled {
     DeviceLibraryService deviceLibraryService;
 
     public InventoryScheduled(RfidChangeBillService rfidChangeBillService, LibraryWarningLogService libraryWarningLogService, LibraryWarningLogDetailDao libraryWarningLogDetailDao) {
+
         this.rfidChangeBillService = rfidChangeBillService;
         this.libraryWarningLogService = libraryWarningLogService;
         this.libraryWarningLogDetailDao = libraryWarningLogDetailDao;