相机导入修改和筛选

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

@@ -80,6 +80,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             try {
                 BaseCameraManagement accountManagement = new BaseCameraManagement();
                 BeanUtils.copyProperties(cameraManagementVos, accountManagement);
+                accountManagement.setBeginMile(AppendUtils.stringSplit(accountManagement.getBeginMiles()));
+                accountManagement.setEndMile(AppendUtils.stringSplit(accountManagement.getEndMiles()));
+                accountManagement.setInstallMile(AppendUtils.stringSplit(accountManagement.getInstallMiles()));
                 // 判断相机编码是否存在
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(accountManagement.getCameraCode())) {
@@ -100,42 +103,15 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                         }
                         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                         if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
-                            if (!accountManagement.getInstallMiles().matches(PATTERN)) {
-                                failureNum++;
-                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,安装里程位置填写格式不正确,请填写数字");
-                            } else {
-                                BigDecimal install = new BigDecimal(accountManagement.getInstallMiles());
                                 accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
-                                accountManagement.setInstallMile( install.multiply(BigDecimal.valueOf(1000)).intValue());
-                                if (!ObjectUtils.isEmpty(accountManagement.getBeginMiles()) && !ObjectUtils.isEmpty(accountManagement.getEndMiles())) {
-                                    BigDecimal end = new BigDecimal(accountManagement.getEndMiles());
-                                    BigDecimal begin =new BigDecimal(accountManagement.getBeginMiles());
-                                    accountManagement.setEndMile(end.multiply(BigDecimal.valueOf(1000)).intValue());
-                                    accountManagement.setBeginMile(begin.multiply(BigDecimal.valueOf(1000)).intValue());
-                                    if (!accountManagement.getBeginMiles().matches(PATTERN) || !accountManagement.getEndMiles().matches(PATTERN)) {
-                                        failureNum++;
-                                        failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围里程位置填写格式不正确,请填写数字");
-                                    } else {
-                                            baseCameraManagementMapper.insert(accountManagement);
-                                            BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
-                                            baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                                            baseDeviceDynamicManagement.setUpdateBy(userId);
-                                            baseDeviceDynamicManagement.setCreateBy(userId);
-                                            baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
-                                            successNum++;
-                                            successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
-                                    }
-                                } else {
-                                    baseCameraManagementMapper.insert(accountManagement);
-                                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
-                                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                                    baseDeviceDynamicManagement.setUpdateBy(userId);
-                                    baseDeviceDynamicManagement.setCreateBy(userId);
-                                    baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
-                                    successNum++;
-                                    successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
-                                }
-                            }
+                                baseCameraManagementMapper.insert(accountManagement);
+                                BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                                baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                                baseDeviceDynamicManagement.setUpdateBy(userId);
+                                baseDeviceDynamicManagement.setCreateBy(userId);
+                                baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                                successNum++;
+                                successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
                         } else {
                             failureNum++;
                             String msg = failureNum + "、相机所属线路名称 " + accountManagement.getRailwayName() + "不存在， 导入失败：";

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -55,6 +55,9 @@
             <if test="installMile != null and installMile != 0">
                 and a.install_mile =#{installMile}
             </if>
+            <if test="railwayCode != null">
+                and a.railway_code =#{railwayCode}
+            </if>
             <if test="ids != null and ids.size>0">
                 and a.id in
                 <foreach item="items" collection="ids" separator="," open="(" close=")" index="">