修改北向接口

ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/DeviceManageController.java

@@ -1,9 +1,8 @@
package com.ai.ipu.server.controller;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +10,11 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.NorthboundInterfaceUtil;
/**
 * 终端管理
@@ -29,92 +31,147 @@ public class DeviceManageController {
	 * 分页查询终端信息
	 */
	@ResponseBody
	@RequestMapping("/queryDeviceInfo")
	public JMap queryDeviceInfo(JMap params) throws Exception {
		Map<String,String> params1 = (Map<String, String>) params.get("params"); // 参数
		PageInfo deviceList = deviceManageService.queryDeviceInfo(params);
	@RequestMapping("/queryPageDeviceInfo")
	public JMap queryPageDeviceInfo(JMap params) throws Exception {
		// 当前页数
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
		JMap result = deviceManageService.queryPageDeviceInfo(params, pageNum, pageSize);
		return result;
	}
	/**
	 * 获取下拉列表的终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryListDeviceInfo")
	public JMap queryListDeviceInfo(JMap params) throws Exception {
		JMap result = new JsonMap();
		result.put("result", deviceList);
		// 当前页数
		int pageNum = 1;
		// 每页条数
		int pageSize = EbcConstant.comboBox_maxNum;
		List<Map<String, Object>> resultList = deviceManageService.queryListDeviceInfo(params, pageNum, pageSize);
		result.put("dataList", resultList);
		return result;
	}
	/**
	 * 添加终端信息
	 * 查询单个终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneDeviceInfo")
	public JMap queryOneDeviceInfo(JMap params) throws Exception {
		JMap result = new JsonMap();
		if (params == null || params.get("deviceId") == null) {
			result.put("result", false);
			result.put("errMsg", "操作失败");
			return result;
		}
		JMap resultMap = deviceManageService.queryOneDeviceInfo(params);
		result.put("resultData", resultMap);
		return result;
	}
	/**
	 * 添加单个终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/addDeviceInfo")
	public JMap addDeviceInfo(JMap params) throws Exception {
		JMap params1 = params.getJMap("params"); // 参数
		JMap result = new JsonMap(); // 返回值
		try {
			Map<String, String> resultMap = deviceManageService.addDeviceInfo(params1);
			if ("0".equals(resultMap.get("resultCode"))) {
				result.put("result", true);
			} else {
				result.put("result", false);
				result.put("errMsg", "添加失败:" + resultMap.get("resultMsg"));
			}
		} catch (Exception e) {
			logger.error("添加失败，原因为：" + e.getMessage());
		JMap result = new JsonMap();
		if (params == null || params.get("deviceNo") == null) {
			result.put("result", false);
			result.put("errMsg", "添加失败");
			return result;
		}
		Map<String, String> resultMap = deviceManageService.addDeviceInfo(params);
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			result.put("result", true);
		} else {
			result.put("result", false);
			result.put("errMsg", "添加失败:" + resultMap.get("resultMsg"));
		}
		return result;
	}
	/**
	 * 修改终端信息
	 * 修改单个终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/modifyDeviceInfo")
	public JMap modifyDeviceInfo(JMap params) throws Exception {
		JMap params1 = params.getJMap("params"); // 参数
		JMap result = new JsonMap(); // 返回值
		try {
			Map<String, String> resultMap = deviceManageService.modifyDeviceInfo(params1);
			if ("0".equals(resultMap.get("resultCode"))) {
				result.put("result", true);
			} else {
				result.put("result", false);
				result.put("errMsg", "修改失败:" + resultMap.get("resultMsg"));
			}
		} catch (Exception e) {
			logger.error("异常，原因为：" + e.getMessage());
		JMap result = new JsonMap();
		if (params == null || params.get("deviceId") == null) {
			result.put("result", false);
			result.put("errMsg", "修改失败");
			return result;
		}
		Map<String, String> resultMap = deviceManageService.modifyDeviceInfo(params);
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			result.put("result", true);
		} else {
			result.put("result", false);
			result.put("errMsg", "修改失败:" + resultMap.get("resultMsg"));
		}
		return result;
	}
	/**
	 * 删除终端信息
	 * 删除单个终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/deleteDeviceInfo")
	public JMap deleteDeviceInfo(JMap params) throws Exception {
		JMap params1 = params.getJMap("params"); // 参数
		JMap result = new JsonMap(); // 返回值
		try {
			if (params1.get("deviceId") != null && !"".equals(params1.get("deviceId"))) {
				Map<String, String> resultMap = deviceManageService.deleteDeviceInfo(params1);
				if ("0".equals(resultMap.get("resultCode"))) {
					result.put("result", true);
				} else {
					result.put("result", false);
					result.put("errMsg", resultMap.get("resultMsg"));
				}
			} else {
				result.put("result", false);
				result.put("errMsg", "删除失败:终端为空");
			}
		} catch (Exception e) {
			logger.error("异常，原因为：" + e.getMessage());
		JMap result = new JsonMap();
		if (params == null || params.get("deviceId") == null) {
			result.put("result", false);
			result.put("errMsg", "删除失败");
			return result;
		}
		Map<String, String> resultMap = deviceManageService.deleteDeviceInfo(params);
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			result.put("result", true);
		} else {
			result.put("result", false);
			result.put("errMsg", "删除失败:" + resultMap.get("resultMsg"));
		}
		return result;
@@ -165,7 +222,7 @@ public class DeviceManageController {
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public JMap queryAssociatInfo(JMap params) throws Exception {
		List<Map<String, Object>> userList=  deviceManageService.queryAssociatInfo(params);
		List<Map<String, Object>> userList = deviceManageService.queryAssociatInfo(params);
		JMap result = new JsonMap();
		result.put("result", userList);
		return result;
@@ -176,8 +233,8 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/verifyUserOrBoatAssociatInfo")
	public JMap  verifyUserOrBoatAssociatInfo(JMap params) throws Exception {
		Map<String, Object> associatMap=  deviceManageService.verifyUserOrBoatAssociatInfo(params);
	public JMap verifyUserOrBoatAssociatInfo(JMap params) throws Exception {
		Map<String, Object> associatMap = deviceManageService.verifyUserOrBoatAssociatInfo(params);
		JMap result = new JsonMap();
		result.put("result", associatMap);
		return result;

ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/MapTagManageController.java

@@ -38,12 +38,12 @@ public class MapTagManageController {
	public JMap queryPageMapTagInfo(JMap params) throws Exception {
		// 当前页数
		int pageNum = params.getInt("pageNum") < 0 ? 0 : params.getInt("pageNum");
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
		JMap result = mapTagManageService.queryPageMapTagInfo(params, pageNum, pageSize);
		
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		return result;

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

@@ -1,6 +1,7 @@
package com.ai.ipu.server.dao.impl;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -8,12 +9,15 @@ import java.util.Map;
import org.springframework.stereotype.Component;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.database.dao.IpuDaoManager;
import com.ai.ipu.database.dao.impl.AbstractBizDao;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.model.IotUrlEnum;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.NorthboundInterfaceUtil;
import com.ai.ipu.server.util.ProductEnum;
import com.alibaba.fastjson.JSONObject;
@Component
public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageDao {
@@ -21,74 +25,134 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
	public DeviceManageDaoImpl() throws IOException {
		super("ebc");
	}
    private String connName = "ebc";
    private String userAndDevicetableName = "LR_PARTY_TERMINAL"; //人员和终端关联表
    private String equipmentTableName = "LR_FACILITY"; //设施表
	private String connName = "ebc";
	private String userAndDevicetableName = "LR_PARTY_TERMINAL"; // 人员和终端关联表
	private String equipmentTableName = "LR_FACILITY"; // 设施表
	@Override
	public Map<String, String> queryDeviceInfo(JMap params) throws Exception {
	public Map<String, String> queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		paramsMap.put("pageNumber", String.valueOf(pageNum));
		paramsMap.put("pageSize", String.valueOf(pageSize));
		paramsMap.put("businessParams", params.get("businessParams"));
		// 拼接接口地址
		String url = IotUrlEnum.queryPageDevice.getUrl();
		// Map map = HttpURLConnectionUtil.iotCallMothod(url,params);
		return null;
		Map<String, String> map = NorthboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
    @Override
    public List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception {
        HashMap<String, Object> paramMap = new HashMap<>();
        paramMap.put("FACILITY_TYPE","3");
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        List<Map<String, Object>> boatList = dao.selectByCond(equipmentTableName, paramMap);
        return boatList;
    }
	@Override
	public Map<String, String> addDeviceInfo(Map<String, String> paramsMap) throws Exception {
	public List<Map<String, Object>> getBindDeviceList() throws Exception {
		StringBuilder sql = new StringBuilder();
		sql.append(" SELECT FACILITY_NAME NAME,DEVICE_ID FROM LR_FACILITY ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND FACILITY_TYPE ='").append(ProductEnum.ship.getProductId()).append("' ");
		sql.append(" AND DEVICE_ID IS NOT NULL ");
		sql.append(" UNION ALL ");
		sql.append(" SELECT PARTY_NAME NAME,DEVICE_ID FROM LR_PARTY_TERMINAL ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND DEVICE_ID IS NOT NULL ");
		List<Map<String, Object>> list = dao.executeSelect(sql.toString());
		return list == null ? new ArrayList<Map<String, Object>>() : list;
	}
	@Override
	public JMap queryOneDeviceInfo(JMap params) throws Exception {
		// 拼接接口地址
		String url = IotUrlEnum.queryOneDevice.getUrl() + params.getString("deviceId");
		Map<String, String> map = NorthboundInterfaceUtil.iotGetCallUtil(url);
		JMap deviceInfoMap = new JsonMap(JSONObject.toJSONString(map.get("result")));
		String remarks = deviceInfoMap.getString("remarks") == null ? "" : deviceInfoMap.getString("remarks");
		deviceInfoMap.put("remarks", remarks);
		return deviceInfoMap;
	}
	@Override
	public Map<String, String> addDeviceInfo(JMap params) throws Exception {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		String deviceNo = params.getString("deviceNo");
		paramsMap.put("deviceId", deviceNo);// 终端id
		paramsMap.put("terminalSN", deviceNo); // 终端编号
		paramsMap.put("productId", EbcConstant.beidouDevice_product_id); // 所属产品
		paramsMap.put("deviceName", EbcConstant.beidouDevice_name + deviceNo); // 设备名称
		paramsMap.put("remarks", params.getString("remarks")); // 备注
		// 拼接接口地址
		String url = IotUrlEnum.addDevice.getUrl();
		Map map = NorthboundInterfaceUtil.iotCallMothod(url, paramsMap);
		Map<String, String> map = NorthboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
    @Override
    public Map<String, Object> queryAssociatUser (JMap params) throws Exception  {
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
		List<Map<String, Object>> userAndDeviceList = dao.selectByCond(userAndDevicetableName, params);
		if(userAndDeviceList.isEmpty()){
			return null;
		}else {
			return userAndDeviceList.get(0);
		}
    }
	@Override
	public Map<String, String> modifyDeviceInfo(Map<String, String> paramsMap) throws Exception {
	public Map<String, String> modifyDeviceInfo(JMap params) throws Exception {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		String deviceId = params.getString("deviceId");
		paramsMap.put("deviceId", deviceId);// 终端id
		paramsMap.put("terminalSN", deviceId); // 终端编号
		paramsMap.put("productId", EbcConstant.beidouDevice_product_id); // 所属产品
		paramsMap.put("deviceName", EbcConstant.beidouDevice_name + deviceId); // 设备名称
		paramsMap.put("remarks", params.getString("remarks")); // 备注
		// 拼接接口地址
		String url = IotUrlEnum.updateDevice.getUrl();
		Map map = NorthboundInterfaceUtil.iotCallMothod(url, paramsMap);
		Map<String, String> map = NorthboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
	@Override
	public Map<String, String> deleteDeviceInfo(Map<String, String> paramsMap) throws Exception {
	public Map<String, String> deleteDeviceInfo(JMap params) throws Exception {
		// 拼接接口地址
		String url = IotUrlEnum.deleteDevice.getUrl();
		Map map = NorthboundInterfaceUtil.iotCallMothod(url, paramsMap);
		String url = IotUrlEnum.deleteDevice.getUrl() + params.getString("deviceId");
		Map<String, String> map = NorthboundInterfaceUtil.iotGetCallUtil(url);
		return map;
	}
	@Override
	public List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception {
		HashMap<String, Object> paramMap = new HashMap<>();
		paramMap.put("FACILITY_TYPE", "3");
		CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
		List<Map<String, Object>> boatList = dao.selectByCond(equipmentTableName, paramMap);
		return boatList;
	}
	@Override
	public Map<String, Object> queryAssociatUser(JMap params) throws Exception {
		CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
		List<Map<String, Object>> userAndDeviceList = dao.selectByCond(userAndDevicetableName, params);
		if (userAndDeviceList.isEmpty()) {
			return null;
		} else {
			return userAndDeviceList.get(0);
		}
	}
	@Override
	public int bindDevice(Map params, String type) throws Exception {
		HashMap<String, Object> paramsHashMap = new HashMap<>();
		if (EbcConstant.bind_device_type_user.equals(type)) {
			if(params.get("PARTY_TERMINAL_ID")!=null){
				//将之前终端与用户关联数据删除
				paramsHashMap.put("PARTY_TERMINAL_ID",params.get("PARTY_TERMINAL_ID"));
			if (params.get("PARTY_TERMINAL_ID") != null) {
				// 将之前终端与用户关联数据删除
				paramsHashMap.put("PARTY_TERMINAL_ID", params.get("PARTY_TERMINAL_ID"));
				dao.delete(userAndDevicetableName, paramsHashMap);
			}
			//插入一条新的关联数据
			// 插入一条新的关联数据
			return dao.insert(userAndDevicetableName, params);
		} else if (EbcConstant.bind_device_type_ship.equals(type)) {
			paramsHashMap.put("FACILITY_ID",params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID",params.get("DEVICE_ID"));
			paramsHashMap.put("FACILITY_ID", params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
			return dao.update(equipmentTableName, paramsHashMap);
		}
		return 0;
@@ -98,13 +162,14 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
	public int unbindDevice(Map params, String type) throws Exception {
		HashMap<String, Object> paramsHashMap = new HashMap<>();
		if (EbcConstant.bind_device_type_user.equals(type)) {
			paramsHashMap.put("DEVICE_ID",params.get("DEVICE_ID"));
			return dao.delete(userAndDevicetableName, paramsHashMap,false);
			paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
			return dao.delete(userAndDevicetableName, paramsHashMap, false);
		} else if (EbcConstant.bind_device_type_ship.equals(type)) {
			paramsHashMap.put("FACILITY_ID",params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID",null);
			paramsHashMap.put("FACILITY_ID", params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID", null);
			return dao.update(equipmentTableName, paramsHashMap);
		}
		return 0;
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/DeviceManageDao.java

@@ -1,26 +1,67 @@
package com.ai.ipu.server.dao.interfaces;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
import com.ai.ipu.data.JMap;
public interface DeviceManageDao {
	Map<String, String> queryDeviceInfo(JMap params) throws Exception;
	/**
	 * 分页查询终端信息
	 * 
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	Map<String, String> queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 查询已和人员(船舶)绑定的终端信息
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> getBindDeviceList() throws Exception;
	/**
	 * 获取单个终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	JMap queryOneDeviceInfo(JMap params) throws Exception;
	Map<String, String> addDeviceInfo(Map<String, String> paramsMap) throws Exception;
	/**
	 * 新增终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> addDeviceInfo(JMap params) throws Exception;
    List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception;
	/**
	 * 修改终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> modifyDeviceInfo(JMap params) throws Exception;
	Map<String, String> modifyDeviceInfo(Map<String, String> paramsMap) throws Exception;
	/**
	 * 删除终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> deleteDeviceInfo(JMap params) throws Exception;
    Map<String, Object> queryAssociatUser(JMap params ) throws Exception ;
	List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception;
	Map<String, String> deleteDeviceInfo(Map<String, String> paramsMap) throws Exception;
	Map<String, Object> queryAssociatUser(JMap params) throws Exception;
	int bindDevice(Map params,String type) throws Exception;
	int bindDevice(Map params, String type) throws Exception;
	int unbindDevice(Map params,String type) throws Exception;
	int unbindDevice(Map params, String type) throws Exception;
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/model/IotUrlEnum.java

@@ -7,18 +7,16 @@ package com.ai.ipu.server.model;
 * 2020-10-20
 */
public enum IotUrlEnum {
	// 注册设备
	// 分页查询终端
	queryPageDevice("findTerminal"),
	// 添加终端
	addDevice("device"),
	// 删除设备
	deleteDevice("deleteDevice"),
	// 修改设备
	// 修改终端
	updateDevice("updateDevice"),
	// 查询指定设备
	queryDevice("device-detail"),
	// 分页查询设备
	queryPageDevice("findTerminal"),
	// 按产品id查询设备
	queryProductDevice("product/device-status");
	// 删除终端
	deleteDevice("deleteDevice?deviceId="),
	// 查询单个设备
	queryOneDevice("deviceSimpleDetail?deviceId=");
	private String url;

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/DeviceManageServiceImpl.java

@@ -1,11 +1,8 @@
package com.ai.ipu.server.service.impl;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.model.UserEnums;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.github.pagehelper.PageInfo;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
@@ -13,9 +10,13 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.model.UserEnums;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.EbcConstant;
import com.alibaba.fastjson.JSON;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
@@ -25,49 +26,121 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	DeviceManageDao deviceManageDao;
	@Override
	public PageInfo queryDeviceInfo(JMap params) throws Exception {
		PageInfo pageInfo = new PageInfo();
		Map map = deviceManageDao.queryDeviceInfo(params);
	public JMap queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception {
		String isBindDevice = params.getString("IsBindDevice");// 是否绑定设备
		boolean bindDeviceBoolean = EbcConstant.bind_device_ok.equals(isBindDevice);
		boolean unBindDeviceBoolean = EbcConstant.bind_device_no.equals(isBindDevice);
		// 获取已绑定的设备列表
		List<Map<String, Object>> bindDeviceList = deviceManageDao.getBindDeviceList();
		// 查询条件
		Map<String, String> businessParams = new HashMap<String, String>();
		businessParams.put("specId", EbcConstant.beidouDevice_product_id); // 所属产品
		businessParams.put("terminalSN", params.getString("deviceNo")); // 设备序列号
		if (bindDeviceBoolean || unBindDeviceBoolean) {
			// 获取已绑定的设备ids(用逗号隔开)
			StringBuilder deviceIds = new StringBuilder();
			for (int i = 0; i < bindDeviceList.size(); i++) {
				deviceIds.append(bindDeviceList.get(i).get("DEVICE_ID"));
				if (i < bindDeviceList.size() - 1) {
					deviceIds.append(",");
				}
			}
			if (unBindDeviceBoolean) {
				businessParams.put("resourceIdList", deviceIds.toString());
			} else if (unBindDeviceBoolean) {
				businessParams.put("notIn", deviceIds.toString());
			}
		}
		return pageInfo;
		// 查询终端信息列表
		params.put("businessParams", businessParams);
		Map<String, String> deviceInfoMap = deviceManageDao.queryPageDeviceInfo(params, pageNum, pageSize);
		List<Map> deviceInfoList = JSON.parseArray(JSON.toJSONString(deviceInfoMap.get("result")), Map.class);
		// 整理返回数据信息
		List<Map> dataList = new ArrayList<Map>();
		if (deviceInfoList != null && deviceInfoList.size() > 0) {
			for (Map map : deviceInfoList) {
				Map dataMap = new HashMap();
				// 终端编号
				String deviceId = String.valueOf(map.get("resourceId"));
				dataMap.put("deviceNo", deviceId);
				// 备注
				String remarks = String.valueOf(map.get("remarks"));
				remarks = (remarks == null || "".equals(remarks) || "null".equals(remarks)) ? "无" : remarks;
				dataMap.put("remarks", remarks);
				// 绑定信息
				dataMap.put("BIND_NAME", "--");
				if (!unBindDeviceBoolean) {
					for (Map bindDeviceMap : bindDeviceList) {
						if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
							dataMap.put("BIND_NAME", bindDeviceMap.get("NAME"));
							break;
						}
					}
				}
				dataList.add(dataMap);
			}
		}
		// 返回数据
		JMap result = new JsonMap();
		result.put("dataNum", deviceInfoMap.get("totalResultNumber"));
		result.put("dataList", dataList);
		return result;
	}
	@Override
	public Map<String, String> addDeviceInfo(JMap params) throws Exception {
		Map<String, String> paramsMap = new HashMap<String, String>();
		String deviceId = params.getString("deviceId");
	public List<Map<String, Object>> queryListDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception {
		// 查询条件
		Map<String, String> businessParams = new HashMap<String, String>();
		businessParams.put("specId", EbcConstant.beidouDevice_product_id); // 所属产品
		businessParams.put("terminalSN", params.getString("deviceNo")); // 设备序列号
		params.put("businessParams", businessParams);
		paramsMap.put("deviceId", deviceId);// 终端id
		paramsMap.put("terminalSN", deviceId); // 终端编号
		paramsMap.put("productId", EbcConstant.beidouDevice_product_id); // 所属产品
		paramsMap.put("deviceName", EbcConstant.beidouDevice_name + deviceId); // 设备名称
		paramsMap.put("remarks", params.getString("remarks")); // 备注
		Map<String, String> deviceInfoMap = deviceManageDao.queryPageDeviceInfo(params, pageNum, pageSize);
		List<Map> deviceInfoList = JSON.parseArray(deviceInfoMap.get("result"), Map.class);
		Map map = deviceManageDao.addDeviceInfo(paramsMap);
		return map;
		return queryListDeviceInfo(params, pageNum, pageSize);
	}
	@Override
	public Map<String, String> modifyDeviceInfo(JMap params) throws Exception {
		Map<String, String> paramsMap = new HashMap<String, String>();
		String deviceId = params.getString("deviceId");
	public JMap queryOneDeviceInfo(JMap params) throws Exception {
		return deviceManageDao.queryOneDeviceInfo(params);
	}
	@Override
	public Map<String, String> addDeviceInfo(JMap params) throws Exception {
		return deviceManageDao.addDeviceInfo(params);
	}
		paramsMap.put("deviceId", params.getString("deviceId"));// 终端id
		paramsMap.put("remarks", params.getString("remarks")); // 备注
	@Override
	public Map<String, String> modifyDeviceInfo(JMap params) throws Exception {
		return deviceManageDao.modifyDeviceInfo(params);
	}
		Map map = deviceManageDao.modifyDeviceInfo(paramsMap);
		return map;
	@Override
	public Map<String, String> deleteDeviceInfo(JMap params) throws Exception {
		return deviceManageDao.deleteDeviceInfo(params);
	}
	@Override
	public List<Map<String, Object>> queryAssociatInfo(JMap params) throws Exception {
		if (EbcConstant.bind_device_type_user.equals(params.get("type"))) {
			//类型是用户，查询用户列表
			//调用uspa接口获取人员信息 暂时用枚举
			// 类型是用户，查询用户列表
			// 调用uspa接口获取人员信息 暂时用枚举
			List<Map<String, Object>> userList = UserEnums.getUserList();
			return userList;
		} else if (EbcConstant.bind_device_type_ship.equals(params.get("type"))){
			//类型是船舶，查询船舶列表
		} else if (EbcConstant.bind_device_type_ship.equals(params.get("type"))) {
			// 类型是船舶，查询船舶列表
			return deviceManageDao.queryAssociatBoatInfo(params);
		}
		return null;
@@ -75,22 +148,12 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@Override
	public Map<String, Object> verifyUserOrBoatAssociatInfo(JMap params) throws Exception {
		//查询用户与终端关联表，如果有数据返回，无数据返回空
		Map<String, Object> userAndDeviceMap=  deviceManageDao.queryAssociatUser(params);
		// 查询用户与终端关联表，如果有数据返回，无数据返回空
		Map<String, Object> userAndDeviceMap = deviceManageDao.queryAssociatUser(params);
		return userAndDeviceMap;
	}
	@Override
	public Map<String, String> deleteDeviceInfo(JMap params) throws Exception {
		Map<String, String> paramsMap = new HashMap<String, String>();
		paramsMap.put("deviceId", params.getString("deviceId"));// 终端id (支持删多个，用逗号分隔)
		paramsMap.put("productId", EbcConstant.beidouDevice_product_id); // 所属产品
		Map map = deviceManageDao.deleteDeviceInfo(paramsMap);
		return map;
	}
	@Override
	public boolean bindDevice(JMap params) throws Exception {
		int num = deviceManageDao.bindDevice(params, params.getString("type"));
		return num > 0;
@@ -101,4 +164,5 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		int num = deviceManageDao.unbindDevice(params, params.getString("type"));
		return num > 0;
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/GisTokenServiceImpl.java

@@ -26,7 +26,7 @@ public class GisTokenServiceImpl implements GisTokenService {
	@Override
	public Map<String, Object> queryGisToken() {
		Map<String, String> mapParams = new HashMap<>();
		Map<String, Object> mapParams = new HashMap<>();
		mapParams.put("userName", gisUserName);
		mapParams.put("passwd", gisPasswd);

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/interfaces/DeviceManageService.java

@@ -1,20 +1,62 @@
package com.ai.ipu.server.service.interfaces;
import java.util.List;
import java.util.Map;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.List;
public interface DeviceManageService {
	PageInfo queryDeviceInfo(JMap params) throws Exception;
	/**
	 * 分页查询终端信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	JMap queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 获取下拉列表的终端信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryListDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 获取单个终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	JMap queryOneDeviceInfo(JMap params) throws Exception;
	/**
	 * 新增终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> addDeviceInfo(JMap params) throws Exception;
	/**
	 * 修改终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> modifyDeviceInfo(JMap params) throws Exception;
	/**
	 * 删除终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> deleteDeviceInfo(JMap params) throws Exception;
	boolean bindDevice(JMap params) throws Exception;

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/interfaces/MapTagManageService.java

@@ -10,6 +10,8 @@ public interface MapTagManageService {
	/**
	 * 分页查询围栏信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/EbcConstant.java

@@ -6,37 +6,40 @@ package com.ai.ipu.server.util;
 * 2020-10-20
 */
public class EbcConstant {
	// 下拉列表最大查询条数
	public static final int comboBox_maxNum = 20;
	// 终端的产品id
	public static final String beidouDevice_product_id = "57700004344";
	
	// 终端的名称前缀
	public static final String beidouDevice_name = "康派北斗定位器";
	//全部终端(已关联和未关联)
	// 全部终端(已关联和未关联)
	public static final String bind_device_all = "0";
	
	//已关联终端
	// 已关联终端
	public static final String bind_device_ok = "1";
	
	//未关联终端
	// 未关联终端
	public static final String bind_device_no = "2";
	
	// 终端和人员绑定
	public static final String bind_device_type_user = "1";
	// 终端和船舶绑定
	public static final String bind_device_type_ship = "2";
	
	//围栏标记类型：考勤区域
	// 围栏标记类型：考勤区域
	public static final String area_type_attendance = "1";
	
	//围栏标记类型：作业区域
	// 围栏标记类型：作业区域
	public static final String area_type_job = "2";
	
	//围栏标记类型：电子围栏
	// 围栏标记类型：电子围栏
	public static final String area_type_exclusion = "3";
	
	//围栏标记类型：定点
	// 围栏标记类型：定点
	public static final String area_type_temporariness = "4";
	
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/HttpServiceUtil.java

@@ -201,7 +201,7 @@ public class HttpServiceUtil {
		return responseEx(httpClient, response, encoding);
	}
	public static String sendPost(String url, Map<String, String> params, Charset encoding) {
	public static String sendPost(String url, Map<String, Object> params, Charset encoding) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";
		HttpPost httpPost = new HttpPost(url);
@@ -219,7 +219,7 @@ public class HttpServiceUtil {
		return responseEx(httpClient, response, encoding);
	}
	public static String sendPost(String url, Map<String, String> params, Charset encoding,
	public static String sendPost(String url, Map<String, Object> params, Charset encoding,
			Map<String, String> headerMap) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceUtil.java

@@ -27,6 +27,9 @@ public class NorthboundInterfaceUtil {
	private static String userCode;
	private static String passWord;
	// 调用成功标识
	public static final String resultCode_succeed = "0";
	@Value("${aap.iot.userCode}")
	public void setUserCode(String userCode) {
		NorthboundInterfaceUtil.userCode = userCode;
@@ -62,45 +65,67 @@ public class NorthboundInterfaceUtil {
	}
	/**
	 * 调用登录接口获取sessionId与sign
	 * GET请求调用北向接口方法
	 * 
	 * @param url
	 * @param params
	 * @return
	 * @throws Exception
	 */
	public static Map<String, String> iotLogin() {
		logger.debug("登录北向接口");
	public static Map<String, String> iotGetCallUtil(String url) throws Exception {
		// 调用北向服务的接口
		logger.debug("GET调用北向接口");
		// 调用登录接口获取sessionId与sign
		HashMap<String, String> loginParamMap = new HashMap<>();
		loginParamMap.put("userCode", userCode);
		loginParamMap.put("passWord", passWord);
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = NorthboundInterfaceUtil.getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("sessionId") == null) {
			// 2.如果没有调用登录接口从新获取
			NorthboundInterfaceUtil.iotLogin();
		}
		// 设置字符集
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendGet(url, charset);
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
		// 调用登录接口
		String loginResult = HttpServiceUtil.sendPost(UrlAddress.IOT_LOGIN, loginParamMap, charset);
		Map mapType = JSON.parseObject(loginResult, Map.class);
		Map result = (Map) mapType.get("result");
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
			logger.info("调用北向接口失败，需重新登录");
			// 4.调用不成功可能是登录过期
			// (1)清除缓存
			NorthboundInterfaceUtil.clear();
			// (2)重新登录
			NorthboundInterfaceUtil.iotLogin();
			// (3)再次调用接口
			String fianlresultJson = HttpServiceUtil.sendGet(url, charset);
			// (4)获取返回值
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
		}
		if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
			logger.info("登录北向接口成功");
			// 将数据存到缓存中
			NorthboundInterfaceUtil.setMapCache(result);
		// 5.判断是否调用成功
		if ("0".equals(resultMap.get("resultCode"))) {
			logger.info("调用北向接口成功");
		} else {
			logger.info("登录北向接口失败");
			logger.info("调用北向接口失败");
		}
		return cacheMap;
		return resultMap;
	}
	/**
	 * 调用北向接口方法
	 * POST请求调用北向接口方法
	 * 
	 * @param url
	 * @param params
	 * @return
	 * @throws Exception
	 */
	public static Map<String, String> iotCallMothod(String url, Map<String, String> params) throws Exception {
	public static Map<String, String> iotPostCallUtil(String url, Map<String, Object> params) throws Exception {
		// 调用北向服务的接口
		logger.debug("调用北向接口");
		logger.debug("POSt调用北向接口");
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = NorthboundInterfaceUtil.getMapCache();
@@ -110,14 +135,14 @@ public class NorthboundInterfaceUtil {
		}
		// 3.调用北向服务接口
		// 设置字符集
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// (1)调用接口
		String resultJson = HttpServiceUtil.sendPost(url, params, charset);
		// (2)将参数转为Map<String,String>【将返回值统一为String】
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendPost(url, params, charset, getMapCache());
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
		// 登录超时，需重新登录
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
			logger.info("调用北向接口失败，需重新登录");
			// 4.调用不成功可能是登录过期
@@ -126,12 +151,12 @@ public class NorthboundInterfaceUtil {
			// (2)重新登录
			NorthboundInterfaceUtil.iotLogin();
			// (3)再次调用接口
			String fianlresultJson = HttpServiceUtil.sendPost(url, params, charset);
			String fianlresultJson = HttpServiceUtil.sendPost(url, params, charset, getMapCache());
			// (4)获取返回值
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
		}
		// 判断是否调用成功
		// 5.判断是否调用成功
		if ("0".equals(resultMap.get("resultCode"))) {
			logger.info("调用北向接口成功");
		} else {
@@ -141,4 +166,36 @@ public class NorthboundInterfaceUtil {
		return resultMap;
	}
	/**
	 * 调用登录接口获取sessionId与sign
	 * 
	 * @return
	 */
	private static Map<String, String> iotLogin() {
		logger.debug("登录北向接口");
		// 调用登录接口获取sessionId与sign
		HashMap<String, Object> loginParamMap = new HashMap<>();
		loginParamMap.put("userCode", userCode);
		loginParamMap.put("passWord", passWord);
		// 设置字符集
		Charset charset = Charset.forName("utf-8");
		// 调用登录接口
		String loginResult = HttpServiceUtil.sendPost(UrlAddress.IOT_LOGIN, loginParamMap, charset);
		Map mapType = JSON.parseObject(loginResult, Map.class);
		Map result = (Map) mapType.get("result");
		if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
			logger.info("登录北向接口成功");
			// 将数据存到缓存中
			NorthboundInterfaceUtil.setMapCache(result);
		} else {
			logger.info("登录北向接口失败");
		}
		return cacheMap;
	}
}

ebc-sea-platform/src/main/resources/sql/ipu/MapTagManageDao.xml

@@ -32,13 +32,13 @@
		<update id="updateMapTagInfo" parameterType="ai.ipu.data.JMap">
		UPDATE LR_MAP_TAG
			<set>
				<if test="mapTagName != null">
				<if test="mapTagName != null and mapTagName != ''">
					MAP_TAG_NAME = #{mapTagName},
				</if>
				<if test="mapTagType != null">
				<if test="mapTagType != null and mapTagType != ''">
					MAP_TAG_TYPE = #{mapTagType},
				</if>
				<if test="mapTagShape != null">
				<if test="mapTagShape != null and mapTagShape != ''">
					MAP_TAG_SHAPE = POLYGONFROMTEXT(#{mapTagShape}),
				</if>
				<if test="mapTagContent != null">