Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

 Conflicts:

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

.idea/jarRepositories.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="public" />
       <option name="name" value="aliyun nexus" />
@@ -18,8 +8,8 @@
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
@@ -36,6 +26,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -46,5 +41,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

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

@@ -3,6 +3,7 @@ package com.ozs.service.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
@@ -111,22 +112,49 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                    log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
+                    if (!ObjectUtils.isEmpty(deptId)) {
+                        accountManagement.setDeptId(deptId);
+                        baseCameraManagementMapper.insert(accountManagement);
+                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                        baseDeviceDynamicManagement.setUpdateBy(userId);
+                        baseDeviceDynamicManagement.setCreateBy(userId);
+                        baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                        successNum++;
+                        successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                    } else {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+                        failureMsg.append(msg);
+                        log.error(msg);
+                    }
+
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
-                    accountManagement.setDeptId(deptId);
-                    baseCameraManagementMapper.update(accountManagement, lw);
-                    LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
-                        wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
+                    log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
+                    if (!ObjectUtils.isEmpty(deptId)) {
+                        accountManagement.setDeptId(deptId);
+                        baseCameraManagementMapper.update(accountManagement, lw);
+                        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+                        if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                            wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
+                        }
+                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
+                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                        baseDeviceDynamicManagement.setUpdateBy(userId);
+                        baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
+                        successNum++;
+                        successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+                    } else {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+                        failureMsg.append(msg);
+                        log.error(msg);
                     }
-                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
-                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                    baseDeviceDynamicManagement.setUpdateBy(userId);
-                    baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+
                 } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");

hazard-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ base:
   # 摄像头配置
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/
-  historyUrl: http://124.70.58.209:9080
+  historyUrl: http://124.70.58.209:9081
   webUrl: http://124.70.58.209:9080
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://124.71.171.71:18801/picbucket