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

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -116,14 +116,14 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监控相机安装里程位置字符串形式
      */
     @TableField(exist = false)
-    @Excel(name = "监控相机安装里程位置")
+    @Excel(name = "监控相机安装里程位置(单位KM)")
     private String installMiles;
 
     /**
      * 监控范围开始里程位置字符串形式
      */
     @TableField(exist = false)
-    @Excel(name = "监控范围开始里程位置")
+    @Excel(name = "监控范围开始里程位置(单位KM)")
     private String beginMiles;
 
 
@@ -143,7 +143,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     @TableField(exist = false)
-    @Excel(name = "监控范围结束里程位置")
+    @Excel(name = "监控范围结束里程位置(单位KM)")
     private String endMiles;
 
     /**

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

@@ -175,10 +175,10 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉，数据导入成功！共 " + successNum + " 条,导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            failureMsg.insert(0, "很抱歉!需导入数据共有"+accountManageList.size()+"条。数据导入成功共 " + successNum + " 条。数据导入失败共 " + failureNum + " 条。错误如下：");
             throw new ServiceException(failureMsg.toString());
         } else {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条。");
+            successMsg.insert(0, "恭喜您!数据已全部导入成功！共 " + successNum + " 条。");
         }
         return successMsg.toString();
     }