mp2jpa

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java

@@ -35,9 +35,6 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
 
 
 	@Autowired
 	@Autowired
-	private MapLayerMPDao mapLayerMPDao;
-
-	@Autowired
 	private MapLayerCustomizeMPDao mapLayerCustomizeMPDao;
 	private MapLayerCustomizeMPDao mapLayerCustomizeMPDao;
 	
 	
 	@Autowired
 	@Autowired
@@ -147,7 +144,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		String layerName;
 		String layerName;
 
 
 		// 获取layerName
 		// 获取layerName
-		MapLayer layer1 = mapLayerMPDao.getByLayerId(layerId);
+		MapLayerEntity layer1 = mapLayerDao.getByLayerId(layerId);
 		if(layer1 == null) {
 		if(layer1 == null) {
 			MapLayerCustomize layer2 = mapLayerCustomizeMPDao.getByLayerId(layerId);
 			MapLayerCustomize layer2 = mapLayerCustomizeMPDao.getByLayerId(layerId);
 			if (layer2 == null) {
 			if (layer2 == null) {
@@ -273,8 +270,8 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		List<Map<String, String>> items = new ArrayList<>();
 		List<Map<String, String>> items = new ArrayList<>();
 
 
 		// 获取通用图层
 		// 获取通用图层
-		List<MapLayer> layers = mapLayerMPDao.selectList(null);
-		for(MapLayer r: layers){
+		List<MapLayerEntity> layers = mapLayerDao.findAll();
+		for(MapLayerEntity r: layers){
 			Map<String, String> m = new HashMap<>();
 			Map<String, String> m = new HashMap<>();
 			m.put("layerId", r.getLayerId());
 			m.put("layerId", r.getLayerId());
 			m.put("layerName", r.getLayer());
 			m.put("layerName", r.getLayer());