fix bug

storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java

@@ -174,5 +174,9 @@ public interface DeviceService {
     void upLoadAlarmLog(AlarmDeseCaBinetLog alarmDeseCaBinetLog);
 
 
-
+    /**
+     * 获取在线设备数量
+     * @return
+     */
+    Integer OnlinedeviceNum();
 }

storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java

@@ -477,7 +477,10 @@ public class DeviceImpl implements DeviceService {
         alarmDeseCaBinetLogRepository.save(alarmDeseCaBinetLog);
     }
 
-
+    @Override
+    public Integer OnlinedeviceNum() {
+        return null;
+    }
 
 
     /**

system/src/main/java/com/storeroom/modules/system/controller/NoticeController.java

@@ -35,9 +35,6 @@ public class NoticeController {
     @ApiOperation("添加通知信息")
     @PostMapping("create")
     public ApiResponse<Object> create(@RequestBody NoticeDto noticeDto) {
-//        if (!StringUtils.isEmpty(noticeDto.getId())) {
-//            throw new BaseException("id不为空");
-//        }
         if (!ObjectUtils.isEmpty(noticeDto.getDeviceInfoId())) {
             noticeService.createDeviceNotice(noticeDto);
             return ApiResponse.success(ResponseStatus.SUCCESS);

system/src/main/java/com/storeroom/modules/system/controller/UserController.java

@@ -182,7 +182,6 @@ public class UserController {
         }
         noticeService.updateNoticeUserState(ids);
         return ApiResponse.success(ResponseStatus.SUCCESS);
-
     }
 
 

system/src/main/java/com/storeroom/modules/system/repository/NoticeUsersRepository.java

@@ -3,15 +3,20 @@ package com.storeroom.modules.system.repository;
 import com.storeroom.modules.system.domain.NoticeUsers;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 public interface NoticeUsersRepository extends JpaRepository<NoticeUsers, String>, JpaSpecificationExecutor<NoticeUsers> {
 
     /**
      * 根据用户id 查询
+     *
      * @param id
      * @return
      */
-    List<NoticeUsers> findByUserId(Long id);
+    @Query(value = "SELECT * FROM sys_notice_users WHERE user_id=?1 or  create_time>?2 AND create_time<?3 ", nativeQuery = true)
+    List<NoticeUsers> findByUserId(Long id, Timestamp startTime, Timestamp endTime);
+
 }

system/src/main/java/com/storeroom/modules/system/service/NoticeService.java

@@ -54,7 +54,7 @@ public interface NoticeService {
     /**
      * 获取用户通知信息
      *
-     * @param id
+     * @param
      * @return
      */
     Object queryNoticeUser(NoticeUserCriteria criteria, Pageable pageable);

system/src/main/java/com/storeroom/modules/system/service/impl/NoticeServiceImpl.java

@@ -51,7 +51,6 @@ public class NoticeServiceImpl implements NoticeService {
             noticeEntity.setId(noticeDto.getId());
         }
         noticeEntity.setNoticeContent(noticeDto.getNoticeContent());
-        //noticeEntity.setNoticeTitle(noticeDto.getNoticeTitle());
         noticeEntity.setStatus(false);
         noticeEntity.setPushType(noticeDto.getPushType());
         noticeEntity.setNoticeType(noticeDto.getNoticeType());
@@ -82,12 +81,14 @@ public class NoticeServiceImpl implements NoticeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createDeviceNotice(NoticeDto noticeDto) {
-        noticeDto.setId(NanoIdUtils.randomNanoId());
-
         Notice noticeEntity = new Notice();
-        noticeEntity.setId(noticeDto.getId());
+        if (StringUtils.isEmpty(noticeDto.getId())) {
+            noticeDto.setId(NanoIdUtils.randomNanoId());
+            noticeEntity.setId(noticeDto.getId());
+        } else {
+            noticeEntity.setId(noticeDto.getId());
+        }
         noticeEntity.setNoticeContent(noticeDto.getNoticeContent());
-        //noticeEntity.setNoticeTitle(noticeDto.getNoticeTitle());
         noticeEntity.setStatus(false);
         noticeEntity.setPushType(noticeDto.getPushType());
         Set<String> deviceInfos = noticeDto.getDeviceInfoId();
@@ -100,6 +101,7 @@ public class NoticeServiceImpl implements NoticeService {
             HashMap<String, String> map = new HashMap<>();
             map.put("Content-type", "application/json");
             body.put("notice", noticeDto.getNoticeContent());
+            //TODO:第三方接口指定，暂时屏蔽判断第三方接口状态
 //            HttpResponse response = HttpUtils.doPost(url, "/IntelligentCabinetAPIServer/getNotice", "POST", map, null, body);
 //            if (response.getStatusLine().getStatusCode() != 200) {
 //                throw new BaseException("接口调用失败");
@@ -127,7 +129,7 @@ public class NoticeServiceImpl implements NoticeService {
 
     @Override
     public Object queryNoticeUser(NoticeUserCriteria criteria, Pageable pageable) {
-        List<NoticeUsers> noticeUsersList = noticeUsersRepository.findByUserId(criteria.getUserId());
+        List<NoticeUsers> noticeUsersList = noticeUsersRepository.findByUserId(criteria.getUserId(), criteria.getCreateTime().get(0), criteria.getCreateTime().get(1));
         noticeUsersList.sort(Comparator.comparing(NoticeUsers::getIsRead));
         List<Notice> noticeList = new ArrayList<>();
         for (NoticeUsers noticeUsers : noticeUsersList) {