|
@@ -11,7 +11,6 @@ import com.ozs.service.entity.BaseCameraVersion;
|
|
|
import com.ozs.service.entity.vo.BaseCameraVersionVo;
|
|
|
import com.ozs.service.mapper.BaseCameraVersionMapper;
|
|
|
import com.ozs.service.service.BaseCameraVersionService;
|
|
|
-import com.ozs.system.service.ISysDictDataService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
@@ -29,8 +28,8 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
|
|
|
|
|
|
@Autowired
|
|
|
private BaseCameraVersionMapper baseCameraVersionMapper;
|
|
|
- @Autowired
|
|
|
- private ISysDictDataService dictDataService;
|
|
|
+// @Autowired
|
|
|
+// private ISysDictDataService dictDataService;
|
|
|
|
|
|
@Override
|
|
|
public AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId) {
|
|
@@ -78,10 +77,10 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
|
|
|
BaseCameraVersionVo baseCameraVersionVo1 = new BaseCameraVersionVo();
|
|
|
BeanUtils.copyProperties(o, baseCameraVersionVo1);
|
|
|
// 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
|
|
|
- String upgradeTypeName = dictDataService.selectDictLabel("upgrade_type", o.getUpgradeType());
|
|
|
- if (!StringUtils.isEmptySunhh(upgradeTypeName)) {
|
|
|
- baseCameraVersionVo1.setUpgradeTypename(upgradeTypeName);
|
|
|
- }
|
|
|
+// String upgradeTypeName = dictDataService.selectDictLabel("upgrade_type", o.getUpgradeType());
|
|
|
+// if (!StringUtils.isEmptySunhh(upgradeTypeName)) {
|
|
|
+// baseCameraVersionVo1.setUpgradeTypename(upgradeTypeName);
|
|
|
+// }
|
|
|
return baseCameraVersionVo1;
|
|
|
}).collect(Collectors.toList());
|
|
|
pageR.setRecords(dto1);
|