Browse Source

新增救援者信息

konghl 4 years ago
parent
commit
e13ecac6ec

+ 12 - 0
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/RescueDaoImpl.java

@ -127,4 +127,16 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
127 127
		dataMap.put("LOG_ID", params.getString("alarmLogId"));
128 128
		return dao.delete("LR_RESCUE_LOG", dataMap) > 0;
129 129
	}
130
	
131
	@Override
132
	public List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception {
133
		StringBuilder sql = new StringBuilder();
134
		
135
		sql.append(" SELECT RESCUERS_ID ID,PARTY_CODE CODE ,PARTY_NAME NAME  ");
136
		sql.append(" FROM LR_RESCUERS ");
137
		sql.append(" WHERE DATA_STATUS ='").append(EbcConstant.data_status_valid).append("' ");
138
		
139
		return dao.executeSelect(sql.toString(), pageNum, pageSize);
140
	}
141
	
130 142
}

+ 10 - 2
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/RescueDao.java

@ -41,8 +41,6 @@ public interface RescueDao {
41 41
	 */
42 42
	String addRescueLog(Map<String, Object> dataMap) throws Exception;
43 43
44
	
45
	
46 44
	/**
47 45
	 * 修改报警救援日志
48 46
	 * @param dataMap
@ -59,4 +57,14 @@ public interface RescueDao {
59 57
	 */
60 58
	boolean deleteRescueLog(JMap params) throws Exception;
61 59
	
60
	/**
61
	 * 获取救援者的下拉列表
62
	 * @param params
63
	 * @param pageNum 当前页数
64
	 * @param pageSize 每页条数
65
	 * @return
66
	 * @throws Exception
67
	 */
68
	List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception;
69
	
62 70
}

+ 6 - 6
ebc-sea-platform/src/main/java/com/ai/ipu/server/enums/UserEnums.java

@ -17,12 +17,12 @@ public enum UserEnums {
17 17
	eightUser(8, "郑十", "8888", 1, 1, "zhengshi", "员工"),
18 18
	nineUser(0, "刘一", "9999", 1, 1, "liuyi", "员工"),
19 19
	// 救援者
20
	oneRescuer(0, "童一", "1001", 2, 1, "tongyi", "员工"), 
21
	twoRescuer(0, "童二", "1002", 2, 1, "tonger", "员工"),
22
	threeRescuer(0, "童三", "1003", 2, 1, "tongsan", "员工"),
23
	fourRescuer(0, "童四", "1004", 2, 1, "tongsi", "员工"),
24
	fiveRescuer(0, "童五", "1005", 2, 1, "tongwu", "员工"), 
25
	sixRescuer(0, "童六", "1006", 2, 1, "tongliu", "员工");
20
	oneRescuer(1, "童一", "1001", 2, 1, "tongyi", "员工"), 
21
	twoRescuer(2, "童二", "1002", 2, 1, "tonger", "员工"),
22
	threeRescuer(3, "童三", "1003", 2, 1, "tongsan", "员工"),
23
	fourRescuer(4, "童四", "1004", 2, 1, "tongsi", "员工"),
24
	fiveRescuer(5, "童五", "1005", 2, 1, "tongwu", "员工"), 
25
	sixRescuer(6, "童六", "1006", 2, 1, "tongliu", "员工");
26 26
27 27
	public int id; // id
28 28
	public String userName;// 姓名

+ 4 - 3
ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/RescueServiceImpl.java

@ -5,6 +5,8 @@ import java.util.HashMap;
5 5
import java.util.List;
6 6
import java.util.Map;
7 7
8
import javax.websocket.Session;
9
8 10
import org.slf4j.Logger;
9 11
import org.slf4j.LoggerFactory;
10 12
import org.springframework.beans.factory.annotation.Autowired;
@ -30,8 +32,7 @@ public class RescueServiceImpl implements RescueService {
30 32
31 33
	@Override
32 34
	public List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception {
33
		// TODO 调用uspa接口获取人员信息 暂时用枚举(救援的部门为2)
34
		return UserEnums.getUserListByDepy(2);
35
		return rescueDao.queryListRescuerInfo(params, pageNum, pageSize);
35 36
	}
36 37
37 38
	@Override
@ -55,7 +56,7 @@ public class RescueServiceImpl implements RescueService {
55 56
	@Override
56 57
	public JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception {
57 58
		// TODO 计算求救时间、按时间查询
58
59
		
59 60
		return rescueDao.queryPageRescueLog(params, pageNum, pageSize);
60 61
	}
61 62