相机版本升级 条件修改 回退

.idea/encodings.xml

@@ -7,5 +7,7 @@
     <file url="file://$PROJECT_DIR$/hazard-admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -336,53 +336,14 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
             wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
-////            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-//            // 判断
-//            wrapper.and((wp) -> {
-//                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-//            });
-//        }
-        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
-        List<BaseCameraManagement> baseCameraManagementList = new ArrayList<>();
-        for (BaseCameraManagement baseCameraManagement1 : baseCameraManagements) {
-            if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getVersionId())) {
-                if (baseCameraManagement1.getVersionId().equals(baseCameraManagement.getVersionId())) {
-                    LambdaQueryWrapper<CameraUpdateLog> wrapperCameraUpdateLog = new LambdaQueryWrapper<>();
-                    wrapperCameraUpdateLog.eq(CameraUpdateLog::getVersionId, baseCameraManagement1.getVersionId());
-                    wrapperCameraUpdateLog.orderByDesc(CameraUpdateLog::getCreateTime);
-                    List<CameraUpdateLog> cameraUpdateLogs = cameraUpdateLogMapper.selectList(wrapperCameraUpdateLog);
-                    if (!StringUtils.isEmptySunhh(cameraUpdateLogs) && cameraUpdateLogs.size() > 0) {
-                        CameraUpdateLog cameraUpdateLog = cameraUpdateLogs.get(0);
-                        if (!StringUtils.isEmptySunhh(cameraUpdateLog) && !StringUtils.isEmptySunhh(cameraUpdateLog.getId())) {
-                            LambdaQueryWrapper<CameraLogDetail> wrapperCameraLogDetail = new LambdaQueryWrapper<>();
-                            wrapperCameraLogDetail.eq(CameraLogDetail::getLogId, cameraUpdateLog.getId());
-                            if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getCameraCode())) {
-                                wrapperCameraLogDetail.eq(CameraLogDetail::getCameraCode, baseCameraManagement1.getCameraCode());
-                            }
-                            wrapperCameraLogDetail.orderByDesc(CameraLogDetail::getUpdateTime);
-                            List<CameraLogDetail> cameraLogDetails = cameraLogDetailMapper.selectList(wrapperCameraLogDetail);
-                            if (!StringUtils.isEmptySunhh(cameraLogDetails) && cameraLogDetails.size() > 0) {
-                                CameraLogDetail cameraLogDetail = cameraLogDetails.get(0);
-                                if (!StringUtils.isEmptySunhh(cameraLogDetail) && !StringUtils.isEmptySunhh(cameraLogDetail.getStatus())) {
-                                    if (3 == cameraLogDetail.getStatus()) {
-                                        baseCameraManagementList.add(baseCameraManagement1);
-                                    }
-                                }
-                            } else {
-                                baseCameraManagementList.add(baseCameraManagement1);
-                            }
-                        }
-                    } else {
-                        baseCameraManagementList.add(baseCameraManagement1);
-                    }
-                } else {
-                    baseCameraManagementList.add(baseCameraManagement1);
-                }
-            } else {
-                baseCameraManagementList.add(baseCameraManagement1);
-            }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+//            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            // 判断
+            wrapper.and((wp) -> {
+                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            });
         }
-        return baseCameraManagementList;
+        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
+        return baseCameraManagements;
     }
 }

hazard-admin/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/data/service/hazard-admin/logs"/>
-<!--      <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
+<!--    <property name="log.path" value="/data/service/hazard-admin/logs"/>-->
+      <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>