终端关联，终端解绑等接口

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

@@ -122,13 +122,14 @@ public class DeviceManageController {
	}
	/**
	 * 关联终端
	 * 关联终端（关联用户或者船舶的保存功能）
	 *
	 */
	@ResponseBody
	@RequestMapping("/bindDevice")
	public JMap bindDevice(JMap params) throws Exception {
		JMap result = new JsonMap(); // 返回值
		if (params.get("deviceId") != null && "".equals(params.get("deviceId"))) {
		if (params.get("DEVICE_ID") != null && !"".equals(params.get("DEVICE_ID"))) {
			boolean flag = false;
			flag = deviceManageService.bindDevice(params);
			result.put("result", flag);
@@ -138,7 +139,6 @@ public class DeviceManageController {
			result.put("errMsg", "关联终端失败");
		}
		return result;
	}
	/**
@@ -149,7 +149,7 @@ public class DeviceManageController {
	public JMap unbindDevice(JMap params) throws Exception {
		JMap result = new JsonMap(); // 返回值
		boolean flag = false;
		if (params.get("deviceId") != null && "".equals(params.get("deviceId"))) {
		if (params.get("DEVICE_ID") != null && !"".equals(params.get("DEVICE_ID"))) {
			flag = deviceManageService.unbindDevice(params);
		} else {
			logger.error("解绑终端失败:设备id为空");
@@ -172,58 +172,17 @@ public class DeviceManageController {
		return result;
	}
    /**
     * 关联用户的用户列表信息查询
     */
    @ResponseBody
    @RequestMapping("/queryAssociatUserInfo")
    public JMap queryAssociatUserInfo(JMap params) throws Exception {
        List<Map<String, Object>> userList=  deviceManageService.queryAssociatUserInfo(params);
        JMap result = new JsonMap();
        result.put("result", userList);
        return result;
    }
    /**
     * 关联用户的船舶列表信息查询
     */
    @ResponseBody
    @RequestMapping("/queryAssociatBoatInfo")
    public JMap queryAssociatBoatInfo(JMap params) throws Exception {
        List<Map<String, Object>> boatList=  deviceManageService.queryAssociatBoatInfo(params);
        JMap result = new JsonMap();
        result.put("result", boatList);
        return result;
    }
    /**
     * 关联用户的保存功能
     */
    @ResponseBody
    @RequestMapping("/associatUserSave")
    public JMap associatUserSave(JMap params) throws Exception {
        int num=deviceManageService.associatUserSave(params);
        JMap result = new JsonMap();
        result.put("result", num);
        return result;
    }
    /**
     * 关联船舶的保存功能
     */
    @ResponseBody
    @RequestMapping("/associatBoatSave")
    public JMap associatBoatSave(JMap params) throws Exception {
        int num=deviceManageService.associatBoatSave(params);
        JMap result = new JsonMap();
        result.put("result", num);
        return result;
    }
	/**
	 * 验证用户或者船舶是否有终端关联
	 */
	@ResponseBody
	@RequestMapping("/verifyUserOrBoatAssociatInfo")
	public JMap  verifyUserOrBoatAssociatInfo(JMap params) throws Exception {
		Map<String, Object> associatMap=  deviceManageService.verifyUserOrBoatAssociatInfo(params);
		JMap result = new JsonMap();
		result.put("result", associatMap);
		return result;
	}
	/**
	 * 导入终端信息
@@ -239,19 +198,4 @@ public class DeviceManageController {
		result.put("result", flag);
		return result;
	}
    /**
     * 解绑用户
     */
    @ResponseBody
    @RequestMapping("/unbundUser")
    public JMap unbundUser(JMap params) throws Exception {
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            //flag=  userManageService.unbundTerminal(params);
        }
        JMap result = new JsonMap();
        result.put("result", flag);
        return result;
    }
}

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

@@ -42,6 +42,23 @@ public class EquipmentManageController {
        return result;
    }
    /**
     * 查询设备信息增加时效验重复
     */
    @ResponseBody
    @RequestMapping("/verifyEquipmentInfoRepetition")
    public JMap verifyEquipmentInfoRepetition(JMap params) throws Exception {
        Map<String, Object> equipmentMap= equipmentManageService.verifyEquipmentInfoRepetition(params);
        JMap result = new JsonMap();
        if(equipmentMap.isEmpty()){
            result.put("result", false);
        }else{
            result.put("result", true);
        }
        return result;
    }
    /**
     * 编辑设备信息、新增设备信息

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

@@ -37,7 +37,7 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
    @Override
    public List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception {
        HashMap<String, Object> paramMap = new HashMap<>();
        paramMap.put("FACILITY_NAME","船舶");
        paramMap.put("FACILITY_TYPE","3");
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        List<Map<String, Object>> boatList = dao.selectByCond(equipmentTableName, paramMap);
        return boatList;
@@ -51,11 +51,14 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		return map;
	}
    @Override
    public List<Map<String, Object>> queryAssociatUser () throws Exception  {
        HashMap<String, Object> paramMap = new HashMap<>();
    public Map<String, Object> queryAssociatUser (JMap params) throws Exception  {
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        List<Map<String, Object>> userAndDeviceList = dao.selectByCond(userAndDevicetableName, paramMap);
        return userAndDeviceList;
		List<Map<String, Object>> userAndDeviceList = dao.selectByCond(userAndDevicetableName, params);
		if(userAndDeviceList.isEmpty()){
			return null;
		}else {
			return userAndDeviceList.get(0);
		}
    }
	@Override
@@ -65,14 +68,6 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		Map map = HttpURLConnectionUtil.iotCallMothod(url, paramsMap);
		return map;
	}
    @Override
    public int associatUserSave(JMap params) throws Exception {
        HashMap<String, Object> paramMap = new HashMap<>();
        //参数
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        int i = dao.insert(userAndDevicetableName, paramMap);
        return i;
    }
	@Override
	public Map<String, String> deleteDeviceInfo(Map<String, String> paramsMap) throws Exception {
@@ -84,31 +79,34 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
	@Override
	public int bindDevice(Map params, String type) throws Exception {
		HashMap<String, Object> paramsHashMap = new HashMap<>();
		if (EbcConstant.bind_device_type_user.equals(type)) {
			return dao.insert("LR_PARTY_TERMINAL", params);
			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)) {
			return dao.update("LR_FACILITY", params);
			paramsHashMap.put("FACILITY_ID",params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID",params.get("DEVICE_ID"));
			return dao.update(equipmentTableName, paramsHashMap);
		}
		return 0;
	}
	@Override
	public int unbindDevice(Map params, String type) throws Exception {
		HashMap<String, Object> paramsHashMap = new HashMap<>();
		if (EbcConstant.bind_device_type_user.equals(type)) {
			return dao.delete("LR_PARTY_TERMINAL", params);
			paramsHashMap.put("DEVICE_ID",params.get("DEVICE_ID"));
			return dao.delete(userAndDevicetableName, paramsHashMap,false);
		} else if (EbcConstant.bind_device_type_ship.equals(type)) {
			return dao.update("LR_FACILITY", params);
			paramsHashMap.put("FACILITY_ID",params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID",null);
			return dao.update(equipmentTableName, paramsHashMap);
		}
		return 0;
	}
    @Override
    public int associatBoatSave(JMap params) throws Exception {
        HashMap<String, Object> paramMap = new HashMap<>();
        //参数
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        int i = dao.update(equipmentTableName, paramMap);
        return i;
    }
}

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

@@ -60,14 +60,18 @@ public class EquipmentManageDaoImpl implements EquipmentManageDao {
    }
    @Override
    public boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) {
    public boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception{
        return false;
    }
    @Override
    public boolean importEquipmentInfo(List<Map<String, Object>> paramsList) {
    public boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception{
        return false;
    }
    @Override
    public Map<String, Object> verifyEquipmentInfoRepetition(JMap params) throws Exception {
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        return dao.select(equipmentTableName, params);
    }
}

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

@@ -11,16 +11,16 @@ public interface DeviceManageDao {
	Map<String, String> queryDeviceInfo(JMap params) throws Exception;
	Map<String, String> addDeviceInfo(Map<String, String> paramsMap) throws Exception;
    List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception;
	Map<String, String> modifyDeviceInfo(Map<String, String> paramsMap) throws Exception;
    List<Map<String, Object>> queryAssociatUser() throws Exception ;
    Map<String, Object> queryAssociatUser(JMap params ) throws Exception ;
	Map<String, String> deleteDeviceInfo(Map<String, String> paramsMap) throws Exception;
    int associatUserSave(JMap params) throws Exception ;
	int bindDevice(Map params,String type) throws Exception;
	int unbindDevice(Map params,String type) throws Exception;
    int associatBoatSave(JMap params) throws Exception ;
}

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

@@ -16,7 +16,9 @@ public interface EquipmentManageDao {
    boolean deleteEquipmentInfo(JMap params) throws Exception;
    boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList);
    boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception;
    boolean importEquipmentInfo(List<Map<String, Object>> paramsList);
    boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception;
    Map<String, Object> verifyEquipmentInfoRepetition(JMap params) throws Exception;
}

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

@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Iterator;
import java.util.List;
import com.ai.ipu.server.util.EbcConstant;
@@ -62,46 +61,24 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@Override
	public List<Map<String, Object>> queryAssociatInfo(JMap params) throws Exception {
		if (EbcConstant.bind_device_type_user.equals(params.get("type"))) {
			//类型是用户，查询用户列表
			//调用uspa接口获取人员信息 暂时用枚举
			List<Map<String, Object>> userList = UserEnums.getUserList();
			return userList;
		} else if (EbcConstant.bind_device_type_ship.equals(params.get("type"))){
			//类型是船舶，查询船舶列表
			return deviceManageDao.queryAssociatBoatInfo(params);
		}
		return null;
	}
    @Override
    public List<Map<String, Object>> queryAssociatUserInfo(JMap params) throws Exception{
        //调用uspa接口获取人员信息 暂时用枚举
        List<Map<String, Object>> userList = UserEnums.getUserList();
        //查询关联表，如果已关联人员剔除
        List<Map<String, Object>> userAndDeviceList=  deviceManageDao.queryAssociatUser();
        Iterator<Map<String, Object>> iterator = userList.iterator();
        while (iterator.hasNext()){
            Map<String, Object> next = iterator.next();
            for (Map<String, Object> userAndDevice : userAndDeviceList) {
                if (userAndDevice.get("PARTY_NAME").equals(next.get("userName"))) {
                    iterator.remove();
                    break;
                }
            }
        }
        return userList;
    }
    @Override
    public List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception {
        return deviceManageDao.queryAssociatBoatInfo(params);
    }
    @Override
    public int associatUserSave(JMap params) throws Exception {
        return deviceManageDao.associatUserSave(params);
    }
    @Override
    public int associatBoatSave(JMap params) throws Exception {
        return deviceManageDao.associatBoatSave(params);
    }
	@Override
	public Map<String, Object> verifyUserOrBoatAssociatInfo(JMap params) throws Exception {
		//查询用户与终端关联表，如果有数据返回，无数据返回空
		Map<String, Object> userAndDeviceMap=  deviceManageDao.queryAssociatUser(params);
		return userAndDeviceMap;
	}
	@Override
	public Map<String, String> deleteDeviceInfo(JMap params) throws Exception {
@@ -121,7 +98,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@Override
	public boolean unbindDevice(JMap params) throws Exception {
		int num = deviceManageDao.bindDevice(params, params.getString("type"));
		int num = deviceManageDao.unbindDevice(params, params.getString("type"));
		return num > 0;
	}
}

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

@@ -57,5 +57,10 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
        return equipmentManageDao.importEquipmentInfo(paramsList);
    }
    @Override
    public Map<String, Object> verifyEquipmentInfoRepetition(JMap params) throws Exception{
        return equipmentManageDao.verifyEquipmentInfoRepetition(params);
    }
}

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

@@ -21,13 +21,7 @@ public interface DeviceManageService {
	boolean unbindDevice(JMap params) throws Exception;
    List<Map<String, Object>> queryAssociatUserInfo(JMap params) throws Exception;
    List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception;
    int associatUserSave(JMap params) throws Exception;
    int associatBoatSave(JMap params) throws Exception;
	List<Map<String, Object>> queryAssociatInfo(JMap params) throws Exception;
	Map<String, Object> verifyUserOrBoatAssociatInfo(JMap params) throws Exception;
}

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

@@ -19,4 +19,6 @@ public interface EquipmentManageService {
    boolean deleteEquipmentsInfo(List<Map<String,Object>> paramsList) throws Exception;
    boolean importEquipmentInfo(List<Map<String,Object>> paramsList) throws Exception;
    Map<String, Object> verifyEquipmentInfoRepetition(JMap params) throws Exception;
}

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

@@ -14,76 +14,17 @@
			FROM
				LR_FACILITY
	        <where>
	        	<if test="FACILITY_CODE!=null">
	        	<if test="FACILITY_CODE!=null and FACILITY_CODE != ''">
               		 and FACILITY_CODE like concat(concat("%",#{FACILITY_CODE}),"%")
            	</if>
            	<if test="FACILITY_NAME!=null">
            	<if test="FACILITY_NAME!=null and FACILITY_NAME != ''">
               		 and FACILITY_NAME like concat(concat("%",#{FACILITY_NAME}),"%")
            	</if>
            	<if test="FACILITY_TYPE!=null and FACILITY_TYPE != ''">
               		 and FACILITY_TYPE = #{FACILITY_TYPE}
            	</if>
	        </where>
		</select>
		]]>
	</sql>
	<sql name="queryMapTagXyInfo">
		<![CDATA[
		<select id="queryMapTagXyInfo" resultType="java.util.Map" >
	        SELECT
				MAP_TAG_ID,
				MAP_TAG_XY_ID,
				XY_NAME,
				LATITUDE,
				LONGITUDE
			FROM
				ebc_map_tag_xy
		</select>
		]]>
	</sql>
	<sql name="addMapTagInfo">
		<![CDATA[
		<insert id="addMapTagInfo" resultType="java.util.Map" useGeneratedKeys="true" keyProperty="MAP_TAG_ID">
		   INSERT INTO  ebc_map_tag(
			MAP_TAG_NAME,MAP_TAG_TYPE,MAP_TAG_CONTENT,CREATE_DATE
			)VALUES (
			  #{MAP_TAG_NAME},
			  #{MAP_TAG_TYPE},
			  #{MAP_TAG_CONTENT},
			  #{CREATE_DATE}
			)
			</insert>
			]]>
	</sql>
	<sql name="addMapTagxyInfo">
		<![CDATA[<insert id="addMapTagxyInfo">
			INSERT INTO ebc_map_tag_xy
			(MAP_TAG_ID,XY_NAME,LONGITUDE,LATITUDE)
			VALUES
			<foreach collection ="paramsList" item="itemParams" index= "index" separator =",">
			(#{itemParams.MAP_TAG_ID},#{itemParams.XY_NAME},#{itemParams.LONGITUDE},#{itemParams.LATITUDE})
			</foreach>
		</insert>
		]]>
	</sql>
	<sql name="deleteMapTagXyInfo">
		<![CDATA[
			<delete id="deleteMapTagXyInfo">
				delete FROM ebc_map_tag_xy where MAP_TAG_ID=#{MAP_TAG_ID}
			</delete>
		]]>
	</sql>
	<sql name="deleteMapTagInfo">
		<![CDATA[
			<delete id="deleteMapTagInfo">
				delete FROM ebc_map_tag where MAP_TAG_ID=#{MAP_TAG_ID}
			</delete>
		]]>
	</sql>
</sqls>