Sfoglia il codice sorgente

关联终端,解绑终端修改

wangchao 4 anni fa
parent
commit
332e05b5f4

+ 58 - 0
ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/AreaInOutRecordManageController.java

@ -0,0 +1,58 @@
1
package com.ai.ipu.server.controller;
2
3
import com.ai.ipu.data.JMap;
4
import com.ai.ipu.data.impl.JsonMap;
5
import com.ai.ipu.server.service.interfaces.DeviceManageService;
6
import com.ai.ipu.server.util.EbcConstant;
7
import com.ai.ipu.server.util.NorthboundInterfaceUtil;
8
import org.slf4j.Logger;
9
import org.slf4j.LoggerFactory;
10
import org.springframework.beans.factory.annotation.Autowired;
11
import org.springframework.stereotype.Controller;
12
import org.springframework.web.bind.annotation.RequestMapping;
13
import org.springframework.web.bind.annotation.ResponseBody;
14
15
import java.util.List;
16
import java.util.Map;
17
18
/**
19
 * 考勤管理
20
 */
21
@Controller
22
@RequestMapping("/areaInOutRecord")
23
public class AreaInOutRecordManageController {
24
	Logger logger = LoggerFactory.getLogger(AreaInOutRecordManageController.class);
25
26
	@Autowired
27
	DeviceManageService deviceManageService;
28
29
	/**
30
	 * 分页查询作业考勤信息
31
	 */
32
	@ResponseBody
33
	@RequestMapping("/queryPageAreaInOutRecordInfo")
34
	public JMap queryPageAreaInOutRecordInfo(JMap params) throws Exception {
35
		// 当前页数
36
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
37
		// 每页条数
38
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
39
40
	/*	JMap result = deviceManageService.queryPageAreaInOutRecordInfo(params, pageNum, pageSize);
41
		return result;*/
42
		return null;
43
	}
44
	/**
45
	 * 分页查询作业考勤信息详情
46
	 */
47
	@ResponseBody
48
	@RequestMapping("/queryPageDeviceInfo")
49
	public JMap queryPageDeviceInfo(JMap params) throws Exception {
50
		// 当前页数
51
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
52
		// 每页条数
53
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
54
55
		JMap result = deviceManageService.queryPageDeviceInfo(params, pageNum, pageSize);
56
		return result;
57
	}
58
}

+ 22 - 9
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/DeviceManageDaoImpl.java

@ -6,6 +6,8 @@ import java.util.HashMap;
6 6
import java.util.List;
7 7
import java.util.Map;
8 8
9
import com.ai.ipu.sql.mgmt.ISqlMgmtDao;
10
import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
9 11
import org.springframework.stereotype.Component;
10 12
11 13
import com.ai.ipu.data.JMap;
@ -139,16 +141,25 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
139 141
140 142
	@Override
141 143
	public int bindDevice(Map params, String type) throws Exception {
144
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
145
		HashMap<String, Object> paramsMap = new HashMap<>();
142 146
		HashMap<String, Object> paramsHashMap = new HashMap<>();
143 147
		if (EbcConstant.bind_device_type_user.equals(type)) {
144 148
			if (params.get("PARTY_TERMINAL_ID") != null) {
145 149
				// 将之前终端与用户关联数据删除
146 150
				paramsHashMap.put("PARTY_TERMINAL_ID", params.get("PARTY_TERMINAL_ID"));
147 151
				dao.delete(userAndDevicetableName, paramsHashMap);
152
				paramsMap.put("DEVICE_ID", params.get("DEVICE_ID"));
153
				dao1.executeUpdate("ipu.EquipmentManageDao", "deletePartyTerminalForDeviceId", paramsMap);
148 154
			}
149 155
			// 插入一条新的关联数据
150 156
			return dao.insert(userAndDevicetableName, params);
151 157
		} else if (EbcConstant.bind_device_type_ship.equals(type)) {
158
			//将之前的数据删除
159
			paramsMap.put("ORIGINAL_DEVICE_ID", params.get("DEVICE_ID"));
160
			paramsMap.put("DEVICE_ID", null);
161
			dao1.executeUpdate("ipu.EquipmentManageDao", "updateEquipmentInfo", paramsMap);
162
			//从新插入设备表
152 163
			paramsHashMap.put("FACILITY_ID", params.get("FACILITY_ID"));
153 164
			paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
154 165
			return dao.update(equipmentTableName, paramsHashMap);
@ -159,15 +170,17 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
159 170
	@Override
160 171
	public int unbindDevice(Map params, String type) throws Exception {
161 172
		HashMap<String, Object> paramsHashMap = new HashMap<>();
162
		if (EbcConstant.bind_device_type_user.equals(type)) {
163
			paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
164
			return dao.delete(userAndDevicetableName, paramsHashMap, false);
165
		} else if (EbcConstant.bind_device_type_ship.equals(type)) {
166
			paramsHashMap.put("FACILITY_ID", params.get("FACILITY_ID"));
167
			paramsHashMap.put("DEVICE_ID", null);
168
			return dao.update(equipmentTableName, paramsHashMap);
169
		}
170
		return 0;
173
		//删除终端人员关联表
174
		paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
175
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
176
		dao1.executeUpdate("ipu.EquipmentManageDao", "deletePartyTerminalForDeviceId", paramsHashMap);
177
		//修改设备表
178
		paramsHashMap.put("ORIGINAL_DEVICE_ID", params.get("DEVICE_ID"));
179
		paramsHashMap.put("DEVICE_ID", null);
180
		int num = dao1.executeUpdate("ipu.EquipmentManageDao", "updateEquipmentInfo", paramsHashMap);
181
		return num;
182
183
171 184
	}
172 185
173 186
}

+ 21 - 0
ebc-sea-platform/src/main/resources/sql/ipu/EquipmentManageDao.xml

@ -27,4 +27,25 @@
27 27
		</select>
28 28
		]]>
29 29
	</sql>
30
31
	<sql name="updateEquipmentInfo">
32
		<![CDATA[
33
		<update id="updateEquipmentInfo" parameterType="java.util.Map">
34
		UPDATE LR_FACILITY set
35
				DEVICE_ID = #{DEVICE_ID}
36
			where
37
				DEVICE_ID = #{ORIGINAL_DEVICE_ID}
38
		</update>
39
		]]>
40
	</sql>
41
42
	<sql name="deletePartyTerminalForDeviceId">
43
		<![CDATA[
44
		<delete id="deletePartyTerminalForDeviceId" parameterType="java.util.Map">
45
			DELETE FROM LR_PARTY_TERMINAL WHERE DEVICE_ID =#{DEVICE_ID}
46
		</delete>
47
		]]>
48
	</sql>
49
50
30 51
</sqls>