修改gis接口等

ebc-sea-platform/pom.xml

@@ -53,19 +53,6 @@
				<updatePolicy>always</updatePolicy>
			</snapshots>
		</repository>
		<!-- Uspa仓库 -->
		<repository>
			<id>maven-public</id>
			<name>maven-public</name>
			<url>http://10.1.252.197:8081/repository/maven-public/</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
			</snapshots>
		</repository>
	</repositories>
	<dependencies>

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

@@ -1,13 +1,14 @@
package com.ai.ipu.server;
import com.ai.ipu.server.connect.ConnectServerStart;
import com.ai.ipu.server.connect.util.ConnectServerManager;
import com.ai.ipu.server.stomp.WebSocketStompServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.ipu.basic.reflect.ReflectUtil;
import com.ai.ipu.basic.util.IpuBaseException;
import com.ai.ipu.restful.boot.IpuRestApplication;
import com.ai.ipu.server.connect.ConnectServerStart;
import com.ai.ipu.server.connect.util.ConnectServerManager;
import com.ai.ipu.server.stomp.WebSocketStompServer;
/**
 * @author huangbo@asiainfo.com

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

@@ -20,81 +20,126 @@ import java.util.Map;
@Controller
@RequestMapping("/device")
public class DeviceManageController {
	Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
    @Autowired
    DeviceManageService deviceManageService;
	@Autowired
	DeviceManageService deviceManageService;
    Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
    /**
     * 查询终端信息
     */
    @ResponseBody
    @RequestMapping("/queryDeviceInfo")
    public JMap queryDeviceInfo(JMap params) throws Exception {
	/**
	 * 分页查询终端信息
	 */
	@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);
        JMap result = new JsonMap();
        result.put("result", deviceList);
        return result;
    }
		PageInfo deviceList = deviceManageService.queryDeviceInfo(params);
		JMap result = new JsonMap();
		result.put("result", deviceList);
		return result;
	}
	/**
	 * 添加终端信息
	 */
	@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());
			result.put("result", false);
			result.put("errMsg", "添加失败");
		}
    /**
     * 编辑终端信息、增加终端信息
     */
    @ResponseBody
    @RequestMapping("/modifyDeviceInfo")
    public JMap modifyDeviceInfo(JMap params) throws Exception {
        int num=0;
        //取值判断如果有当前id则为修改，否则为新增
        JMap params1 = params.getJMap("params");
        try{
            if(params1.getInt("MAP_TAG_ID")!=0){
                num= deviceManageService.modifyDeviceInfo(params1);
            }else{
                num= deviceManageService.addDeviceInfo(params1);
            }
        }catch(Exception e){
            logger.error("异常，原因为：" + e.getMessage());
        }
        JMap result = new JsonMap();
        if(num>0){
            result.put("result", true);
        }else{
            result.put("result", false);
        }
        return result;
    }
		return result;
	}
    /**
     * 刪除终端管理
     *
     */
    @ResponseBody
    @RequestMapping("/deleteDeviceInfo")
    public JMap deleteDeviceInfo(JMap params) throws Exception {
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            flag=  deviceManageService.deleteDeviceXyInfo(params);
        }
        JMap result = new JsonMap();
        result.put("result", flag);
        return result;
    }
    /**
     * 导入终端信息
     */
    @ResponseBody
    @RequestMapping("/importDeviceInfo")
    public JMap importDeviceInfo(JMap params) throws Exception {
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            //flag=  userManageService.importUserInfo(params);
        }
        JMap result = new JsonMap();
        result.put("result", flag);
        return result;
    }
	/**
	 * 修改终端信息
	 */
	@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());
			result.put("result", false);
			result.put("errMsg", "修改失败");
		}
		return result;
	}
	/**
	 * 删除终端信息
	 */
	@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());
			result.put("result", false);
			result.put("errMsg", "删除失败");
		}
		return result;
	}
	/**
	 * 关联终端
	 */
	@ResponseBody
	@RequestMapping("/bindDevice")
	public JMap bindDevice(JMap params) throws Exception {
		JMap result = new JsonMap(); // 返回值
		if (params.get("deviceId") != null && "".equals(params.get("deviceId"))) {
			boolean flag = false;
			flag = deviceManageService.bindDevice(params);
			result.put("result", flag);
		} else {
			logger.error("关联终端失败:设备id为空");
			result.put("result", false);
			result.put("errMsg", "关联终端失败");
		}
		return result;
	}
	/**
	 * 解绑终端
@@ -114,6 +159,19 @@ public class DeviceManageController {
		result.put("result", flag);
		return result;
	}
	/**
	 * 关联列表信息查询
	 */
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public JMap queryAssociatInfo(JMap params) throws Exception {
		List<Map<String, Object>> userList=  deviceManageService.queryAssociatInfo(params);
		JMap result = new JsonMap();
		result.put("result", userList);
		return result;
	}
    /**
     * 关联用户的用户列表信息查询
     */

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

@@ -107,10 +107,10 @@ public class EquipmentManageController {
     */
    @ResponseBody
    @RequestMapping("/importEquipmentsInfo")
    public JMap importEquipmentsInfo(JMap params) throws Exception{
    public JMap importEquipmentsInfo(List<Map<String,Object>> paramsList) throws Exception{
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            flag=  equipmentManageService.importEquipmentInfo(params);
        if(!paramsList.isEmpty()){
            flag=  equipmentManageService.importEquipmentInfo(paramsList);
        }
        JMap result = new JsonMap();
        result.put("result", flag);

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

@@ -1,6 +1,8 @@
package com.ai.ipu.server.dao.impl;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Component;

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

@@ -15,13 +15,8 @@ import org.springframework.stereotype.Service;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.EbcConstant;
import com.github.pagehelper.PageInfo;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
@@ -37,16 +32,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		return pageInfo;
	}
    @Override
    public PageInfo queryDeviceInfo(JMap params) throws Exception {
        return null;
    }
    @Override
    public int modifyDeviceInfo(JMap params) throws Exception{
        //將原來数据删除，然后在从新插入
        return 0;
    }
	@Override
	public Map<String, String> addDeviceInfo(JMap params) throws Exception {
		Map<String, String> paramsMap = new HashMap<String, String>();
@@ -62,10 +48,6 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		return map;
	}
    @Override
    public int addDeviceInfo(JMap params) throws Exception{
        return 0;
    }
	@Override
	public Map<String, String> modifyDeviceInfo(JMap params) throws Exception {
		Map<String, String> paramsMap = new HashMap<String, String>();
@@ -78,10 +60,10 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		return map;
	}
    @Override
    public boolean deleteDeviceXyInfo(JMap params) throws Exception{
        return true;
    }
	@Override
	public List<Map<String, Object>> queryAssociatInfo(JMap params) throws Exception {
		return null;
	}
    @Override
    public List<Map<String, Object>> queryAssociatUserInfo(JMap params) throws Exception{
@@ -118,6 +100,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    public int associatBoatSave(JMap params) throws Exception {
        return deviceManageDao.associatBoatSave(params);
    }
	@Override
	public Map<String, String> deleteDeviceInfo(JMap params) throws Exception {
		Map<String, String> paramsMap = new HashMap<String, String>();
@@ -139,5 +124,4 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		int num = deviceManageDao.bindDevice(params, params.getString("type"));
		return num > 0;
	}
}

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

@@ -29,11 +29,6 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
    @Override
    public PageInfo queryEquipmentInfo(JMap params) throws Exception {
        PageInfo pageInfo = new PageInfo();
        //拼接接口地址
        //String IOT_URL=UrlAddress.IOT_URL+"device";
        //Map map = HttpURLConnectionUtil.iotCallMothod(params, IOT_URL);
        return pageInfo;
        return equipmentManageDao.queryEquipmentInfo(params);
    }

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

@@ -27,9 +27,8 @@ public class GisTokenServiceImpl implements GisTokenService {
	@Override
	public Map<String, Object> queryGisToken() {
		Map<String, String> mapParams = new HashMap<>();
		HashMap<Object, Object> requestParams = new HashMap<>();
		requestParams.put("userName", gisUserName);
		requestParams.put("passwd", gisPasswd);
		mapParams.put("userName", gisUserName);
		mapParams.put("passwd", gisPasswd);
		Charset charset = Charset.forName("utf-8");
		String resultJson = HttpServiceUtil.sendPost(UrlAddress.GIS_TOKEN, mapParams, charset);

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

@@ -6,7 +6,6 @@ import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
public interface DeviceManageService {
@@ -21,7 +20,6 @@ public interface DeviceManageService {
	boolean bindDevice(JMap params) throws Exception;
	boolean unbindDevice(JMap params) throws Exception;
    boolean deleteDeviceXyInfo(JMap params) throws Exception;
    List<Map<String, Object>> queryAssociatUserInfo(JMap params) throws Exception;
@@ -30,4 +28,6 @@ public interface DeviceManageService {
    int associatUserSave(JMap params) throws Exception;
    int associatBoatSave(JMap params) throws Exception;
	List<Map<String, Object>> queryAssociatInfo(JMap params) throws Exception;
}

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

@@ -13,9 +13,9 @@ public class EbcConstant {
	public static final String beidouDevice_name = "康派北斗定位器";
	// 终端和人员绑定
	public static final String bind_device_type_user = "1";
	public static final String bind_device_type_user = "1";  //代表用户
	// 终端和船舶绑定
	public static final String bind_device_type_ship = "2";
	public static final String bind_device_type_ship = "2";  //代表船舶
}

ebc-sea-platform/src/main/resources/test/ipu-mybatis-config.xml

@@ -16,7 +16,7 @@
		<environment id="ebc">
			<transactionManager type="JDBC" />
			<dataSource type="com.ai.ipu.database.datasource.DruidDataSourceFactory">
				<property name="jdbcUrl" value="jdbc:mysql://10.21.20.135:3307/ebc" />
				<property name="jdbcUrl" value="jdbc:mysql://10.19.90.34:3307/ebc" />
				<property name="username" value="ebc" />
				<property name="password" value="ebc@123" />
			</dataSource>