fix bug

storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmLogController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+
 @RestController
 @RequestMapping("/api/alarmlog/")
 @Api(tags = "报警日志管理")
@@ -42,6 +44,10 @@ public class AlarmLogController {
         alarmInfoService.addRemark(alarmLog);
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
+
+    public void exportAlarmLog(HttpServletResponse response,AlarmLogCriteria criteria){
+       // alarmInfoService.dowload(alarmInfoService.alarmLogList(criteria),response);
+    }
 }
 
 

storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/AlarmInfoService.java

@@ -4,6 +4,7 @@ import com.storeroom.modules.storeroom3d.domain.AlarmLog;
 import com.storeroom.modules.storeroom3d.service.dto.AlarmLogCriteria;
 import org.springframework.data.domain.Pageable;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface AlarmInfoService {
@@ -35,8 +36,17 @@ public interface AlarmInfoService {
 
     /**
      * 增加说明
+     *
      * @param alarmLog
      */
     void addRemark(AlarmLog alarmLog);
 
+    /**
+     * 导出数据
+     * @param queryAll \
+     * @param response \
+     * @throws Exception 、
+     */
+    void dowload(List<AlarmLog> queryAll, HttpServletResponse response) throws Exception;
+
 }

storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/AlarmInfoServiceImpl.java

@@ -15,6 +15,7 @@ import com.storeroom.modules.storeroom3d.service.ThirdApiService;
 import com.storeroom.modules.storeroom3d.service.dto.AlarmLogCriteria;
 import com.storeroom.modules.storeroom3d.service.dto.GetCurAlarmDto;
 import com.storeroom.modules.storeroom3d.service.impl.mapstruct.GetCurAlarmMapper;
+import com.storeroom.utils.FileUtil;
 import com.storeroom.utils.NanoIdUtils;
 import com.storeroom.utils.PageUtil;
 import com.storeroom.utils.QueryHelp;
@@ -26,10 +27,8 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -170,9 +169,27 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
     public void addRemark(AlarmLog alarmLog) {
         AlarmLog alarmLog1 = alarmLogRepository.findById(alarmLog.getId()).orElseGet(AlarmLog::new);
         alarmLog1.setRemark(alarmLog.getRemark());
+        alarmLog1.setState(alarmLog.getState());
         alarmLogRepository.save(alarmLog1);
     }
 
+    @Override
+    public void dowload(List<AlarmLog> queryAll, HttpServletResponse response) throws Exception {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (AlarmLog alarmLog : queryAll) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("库房名称", alarmLog.getStoreroomName());
+            map.put("设备名称", alarmLog.getDeviceName());
+            map.put("警情描述", alarmLog.getContent());
+            map.put("说明", alarmLog.getRemark());
+            map.put("报警时间", alarmLog.getCreateBy());
+            map.put("处理时间", alarmLog.getUpdateTime());
+            list.add(map);
+        }
+        FileUtil.downloadExcel(list,response);
+
+    }
+
     /**
      * 修改报警状态
      *

storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/DisplayConfigImpl.java

@@ -68,6 +68,8 @@ public class DisplayConfigImpl implements DisplayConfigService {
                 return displayConfigList;
             }
         }
-        return displayConfigRepository.findByStoreroomId(storeroomId);
+        List<DisplayConfig> list = displayConfigRepository.findByStoreroomId(storeroomId);
+        list.sort(Comparator.comparing(DisplayConfig::getDivPosition));
+        return list;
     }
 }