>60 
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, msg);
61
62 
		return null;
29 63 
	}
64
65
66
67
30 68 
}

+ 8 - 16
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/MapTagManageServiceImpl.java
Bestand weergeven 

@ -9,6 +9,8 @@ import com.ai.bss.components.common.model.PageBean;
9 9 
import com.ai.bss.location.rescue.service.interfaces.MapTagManageService;
10 10 
import com.ai.bss.location.rescue.util.EbcConstant;
11 11 
import com.ai.bss.position.model.MapArea;
12 
import com.ai.bss.position.model.MapAreaBusinessType;
13 
import com.ai.bss.position.service.api.MapAreaQuery;
12 14 
import com.ai.bss.user.dto.UserDto;
13 15 
import com.ai.bss.user.service.api.UserDtoQuery;
14 16 
import com.ai.bss.worker.model.MapTagInfoDto;
 
@ -34,6 +36,9 @@ public class MapTagManageServiceImpl implements MapTagManageService {
34 36 
	private MapAreaTagQuery mapAreaTagQuery;
35 37
36 38 
	@Autowired
39 
	private MapAreaQuery mapAreaQuery;
40
41 
	@Autowired
37 42 
	CharacteristicSpecService characteristicSpecService;
38 43
39 44 
	@Override
 
@ -69,22 +74,9 @@ public class MapTagManageServiceImpl implements MapTagManageService {
69 74 
	}
70 75
71 76 
	@Override
72 
	public List<Map<String,String>> queryMapAreaTypeList() {
73 
		CharacteristicSpec characteristicSpec = characteristicSpecService
74 
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
75 
		if (characteristicSpec == null) {
76 
			return new ArrayList<Map<String,String>>();
77 
		}
78
79 
		List<Map<String,String>> resultList=new ArrayList<Map<String,String>>();
80 
		for (CharacteristicSpecValue characteristicSpecValue:characteristicSpec.getCharacteristicSpecValues()) {
81 
			Map<String,String> map=new HashMap<String,String>();
82 
			map.put("mapAreaTypeId",characteristicSpecValue.getCode());
83 
			map.put("mapAreaTypeName",characteristicSpecValue.getValue());
84 
			resultList.add(map);
85 
		}
86
87 
		return resultList;
77 
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
78 
		CommonRequest var1=new CommonRequest(null);
79 
		return mapAreaQuery.queryAllMapAreaBusinessType(var1);
88 80 
	}
89 81
90 82 
	@Override

+ 6 - 6
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/EquipmentManageService.java
Bestand weergeven 

@ -1,9 +1,5 @@
1 1 
package com.ai.bss.location.rescue.service.interfaces;
2 2
3 
import java.util.HashMap;
4 
import java.util.List;
5 
import java.util.Map;
6
7 3 
import com.ai.abc.api.model.CommonRequest;
8 4 
import com.ai.abc.api.model.CommonResponse;
9 5 
import com.ai.bss.components.common.model.PageBean;
 
@ -11,10 +7,14 @@ import com.ai.bss.components.common.model.PageInfo;
11 7 
import com.ai.bss.work.tool.model.ResourceTool;
12 8 
import com.ai.bss.work.tool.model.ResourceToolType;
13 9
10 
import java.util.HashMap;
11 
import java.util.List;
12 
import java.util.Map;
13
14 14 
public interface EquipmentManageService {
15 15
16 16 
    CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception;
17
17
18 18 
    CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception;
19 19
20 20 
    CommonResponse<ResourceTool> deleteEquipmentInfo(CommonRequest<List<String>> resourceToolCommonRequest) throws Exception;
 
@ -23,5 +23,5 @@ public interface EquipmentManageService {
23 23
24 24 
    CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest);
25 25
26 
    CommonResponse<PageInfo<Map<String, Object>>>queryAllEquipmentNotBind() throws Exception;
26 
    CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception;
27 27 
}

+ 2 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/LocationManagementService.java
Bestand weergeven 

@ -1,6 +1,7 @@
1 1 
package com.ai.bss.location.rescue.service.interfaces;
2 2
3 3 
import java.util.List;
4 
import java.util.Map;
4 5
5 6 
import com.ai.abc.api.model.CommonResponse;
6 7 
import com.ai.bss.position.service.api.outparam.LoadMapViewParam;
 
@ -18,6 +19,6 @@ public interface LocationManagementService {
18 19 
     * @return
19 20 
     * @throws Exception
20 21 
     */
21 
    CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception;
22 
    CommonResponse<Map<String,Object>> loadMapLocationView() throws Exception;
22 23
23 24 
}

+ 3 - 2
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/MapTagManageService.java
Bestand weergeven 

@ -5,6 +5,7 @@ import java.util.Map;
5 5
6 6 
import com.ai.abc.api.model.CommonResponse;
7 7 
import com.ai.bss.components.common.model.PageBean;
8 
import com.ai.bss.position.model.MapAreaBusinessType;
8 9 
import com.ai.bss.worker.model.MapTagInfoDto;
9 10
10 11 
public interface MapTagManageService {
 
@ -35,10 +36,10 @@ public interface MapTagManageService {
35 36 
	CommonResponse<List<Map<String, Object>>> queryOneMapTagInfo(Map<String, String> params) throws Exception;
36 37
37 38 
	/**
38 
	 * 获取围栏类型下拉列表
39 
	 * 获取所有围栏类型
39 40 
	 * @return
40 41 
	 */
41 
	List<Map<String,String>> queryMapAreaTypeList();
42 
	CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList();
42 43
43 44 
	/**
44 45 
	 * 新增围栏信息

lotread - Nuosi Git Service
Etusivu Tutki Apua
Kirjaudu sisään
lotread
Repot Julkinen toiminta