Merge remote-tracking branch 'origin/master'

license/src/main/java/iot/sixiang/license/service/impl/TerminalDeviceServiceImpl.java

@@ -63,31 +63,23 @@ public class TerminalDeviceServiceImpl implements TerminalDeviceService {
         if (reportErrorMsgDTOs == null || reportErrorMsgDTOs.size() == 0) {
             return BaseResult.validate_failed();
         }
-        reportErrorMsgDTOs.sort(Comparator.comparingInt(ReportErrorMsgDTO::getId));
-        for (int i = 0; i < reportErrorMsgDTOs.size() - 1; i++) {
-            ReportErrorMsgDTO reportErrorMsgDTO = reportErrorMsgDTOs.get(i);
+        for (ReportErrorMsgDTO reportErrorMsgDTO : reportErrorMsgDTOs) {
             Integer id = reportErrorMsgDTO.getId();
-            if (id == null || id == 0) {
+            if (id == null || id == 0 || reportErrorMsgDTO.getErrorCode() == null) {
                 return BaseResult.validate_failed();
             }
-            pmsUseService.deletePmsUseLogById(id);
-        }
-        ReportErrorMsgDTO reportErrorMsgDTO = reportErrorMsgDTOs.get(reportErrorMsgDTOs.size() - 1);
-        if (reportErrorMsgDTO.getId() == null || reportErrorMsgDTO.getId() == 0 || reportErrorMsgDTO.getErrorCode() == null) {
-            return BaseResult.validate_failed();
-        } else {
             if ("0".equals(reportErrorMsgDTO.getErrorCode())) {
                 pmsUseService.success(reportErrorMsgDTO.getId());
-                return BaseResult.success();
+            } else if ("-1".equals(reportErrorMsgDTO.getErrorCode())) {
+                pmsUseService.deletePmsUseLogById(id);
             } else {
                 boolean res = pmsUseService.reportErrorMsg(reportErrorMsgDTO);
-                if (res) {
-                    return BaseResult.success();
-                } else {
+                if (!res) {
                     return BaseResult.failed();
                 }
             }
         }
+        return BaseResult.success();
     }
 
     @Override