|
@@ -5,8 +5,10 @@ import com.ozs.common.core.domain.AjaxResult;
|
|
|
import com.ozs.common.exception.ServiceException;
|
|
|
import com.ozs.common.utils.bean.BeanValidators;
|
|
|
import com.ozs.service.entity.BaseCameraManagement;
|
|
|
+import com.ozs.service.entity.BaseDeviceDynamicManagement;
|
|
|
import com.ozs.service.mapper.BaseCameraManagementMapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
|
|
|
import com.ozs.service.service.BaseCameraManagementService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -31,6 +33,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
|
|
|
protected Validator validator;
|
|
|
@Resource
|
|
|
BaseCameraManagementMapper baseCameraManagementMapper;
|
|
|
+ @Autowired
|
|
|
+ BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
|
|
|
|
|
|
/**
|
|
|
* 相机台账管理表导入
|
|
@@ -53,17 +57,27 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
|
|
|
// 判断相机编码是否存在
|
|
|
LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
if (!ObjectUtils.isEmpty(accountManagement.getCameraCode())) {
|
|
|
- lw.eq(BaseCameraManagement::getId, accountManagement.getCameraCode());
|
|
|
+ lw.eq(BaseCameraManagement::getCameraCode, accountManagement.getCameraCode());
|
|
|
}
|
|
|
BaseCameraManagement baseAccountManagement = baseCameraManagementMapper.selectOne(lw);
|
|
|
if (ObjectUtils.isEmpty(baseAccountManagement)) {
|
|
|
BeanValidators.validateWithException(validator, accountManagement);
|
|
|
baseCameraManagementMapper.insert(accountManagement);
|
|
|
+ BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
|
|
|
+ baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
|
|
|
+ baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
|
|
|
successNum++;
|
|
|
successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
|
|
|
} else if (updateSupport) {
|
|
|
BeanValidators.validateWithException(validator, accountManagement);
|
|
|
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());
|
|
|
+ baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
|
|
|
successNum++;
|
|
|
successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
|
|
|
} else {
|