Merge remote-tracking branch 'origin/master'

# Conflicts:
#	license/src/main/java/iot/sixiang/license/service/impl/TerminalDeviceServiceImpl.java

license/src/main/java/iot/sixiang/license/controller/TerminalDeviceController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/iot_license/terminal_device")
 @Api(value = "终端设备模块", tags = {"终端设备模块"})
@@ -30,7 +32,7 @@ public class TerminalDeviceController {
 
     @PostMapping("/report_error_msg")
     @ApiOperation(value = "终端设备上报错误信息", notes = "终端设备上报错误信息")
-    public BaseResult reportErrorMsg(@RequestBody ReportErrorMsgDTO reportErrorMsgDTO) {
+    public BaseResult reportErrorMsg(@RequestBody List<ReportErrorMsgDTO> reportErrorMsgDTO) {
         return terminalDeviceService.reportErrorMsg(reportErrorMsgDTO);
     }
 

license/src/main/java/iot/sixiang/license/service/PmsUseService.java

@@ -19,4 +19,6 @@ public interface PmsUseService {
     PageInfoModel<PmsUseLog> getPmsUseLogList(int pageNo, int pageSize, String sn, Integer status);
 
     boolean reportErrorMsg(ReportErrorMsgDTO reportErrorMsgDTO);
+
+    boolean deletePmsUseLogById(Integer id);
 }

license/src/main/java/iot/sixiang/license/service/TerminalDeviceService.java

@@ -6,10 +6,12 @@ import iot.sixiang.license.model.dto.GetTerminalDeviceTokenDTO;
 import iot.sixiang.license.model.dto.ReportErrorMsgDTO;
 import iot.sixiang.license.model.dto.TerminalDevieBindDTO;
 
+import java.util.List;
+
 public interface TerminalDeviceService {
     ResResult getToken(GetTerminalDeviceTokenDTO getTerminalDeviceTokenDTO);
 
-    BaseResult reportErrorMsg(ReportErrorMsgDTO reportErrorMsgDTO);
+    BaseResult reportErrorMsg(List<ReportErrorMsgDTO> reportErrorMsgDTO);
 
     BaseResult terminalDeviceBind(TerminalDevieBindDTO terminalDevieBindDTO);
 }

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

@@ -35,6 +35,7 @@ public class PmsUseServiceImpl implements PmsUseService {
     @Override
     public void createFailUseLog(String sn, String message) {
         PmsUseLog pmsUseLog = getPmsUseLog(sn);
+        pmsUseLog.setStatus(0);
         pmsUseLog.setMessage(message);
         pmsUseLogMapper.insert(pmsUseLog);
     }
@@ -76,11 +77,18 @@ public class PmsUseServiceImpl implements PmsUseService {
         pmsUseLog.setMessage(errorMsg);
         pmsUseLog.setUpdateTime(new Date());
         int res = pmsUseLogMapper.updateById(pmsUseLog);
-        if (res >= 0) {
-            return true;
-        } else {
-            return false;
+        return res > 0;
     }
+
+    @Override
+    public boolean deletePmsUseLogById(Integer id) {
+        PmsUseLog pmsUseLog = new PmsUseLog();
+        pmsUseLog.setId(id);
+        pmsUseLog.setStatus(0);
+        pmsUseLog.setUpdateTime(new Date());
+        pmsUseLog.setDeleted(0);
+        int res = pmsUseLogMapper.updateById(pmsUseLog);
+        return res > 0;
     }
 
     private PmsUseLog getPmsUseLog(String sn) {

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

@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -59,11 +61,27 @@ public class TerminalDeviceServiceImpl implements TerminalDeviceService {
     }
 
     @Override
-    public BaseResult reportErrorMsg(ReportErrorMsgDTO reportErrorMsgDTO) {
+    public BaseResult reportErrorMsg(List<ReportErrorMsgDTO> reportErrorMsgDTOs) {
+        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);
             Integer id = reportErrorMsgDTO.getId();
             if (id == null || id == 0) {
                 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 {
                 boolean res = pmsUseService.reportErrorMsg(reportErrorMsgDTO);
                 if (res) {
                     return BaseResult.success();
@@ -71,6 +89,8 @@ public class TerminalDeviceServiceImpl implements TerminalDeviceService {
                     return BaseResult.failed();
                 }
             }
+        }
+    }
 
     @Override
     public BaseResult terminalDeviceBind(TerminalDevieBindDTO terminalDevieBindDTO) {

license/src/main/resources/mapper/PmsUseLogMapper.xml

@@ -10,5 +10,7 @@
         <if test="null != status">
             and status = #{status}
         </if>
+        and deleted = 0
+        order by create_time desc
     </select>
 </mapper>
\ No newline at end of file