修改地图管理文件

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

@@ -45,15 +45,6 @@ public class CallRescuerController {
        return result;
    }
    /**
     * 导出地图标记到excel
     */
    @ResponseBody
    @RequestMapping("/exportCallRescuerInfoToExcel")
    public ResponseEntity<byte[]> exportCallRescuerInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportExcel(request,response,params);
    }
    /**
     * 编辑地图标记

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

@@ -1,34 +1,22 @@
package com.ai.ipu.server.controller;
import com.ai.ipu.basic.util.IpuUtility;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.ExportService;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.RestScaffoldConstant;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Controller
@RequestMapping("/device")
public class DeviceManageController {
    @Autowired
    ExportService exportService;
    @Autowired
    DeviceManageService deviceManageService;
    Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
@@ -45,18 +33,9 @@ public class DeviceManageController {
        return result;
    }
    /**
     * 导出終端设备信息到excel
     */
    @ResponseBody
    @RequestMapping("/exportDeviceInfoToExcel")
    public ResponseEntity<byte[]> exportDeviceInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportExcel(request,response,params);
    }
    /**
     * 编辑地图标记
     * 编辑终端信息、增加终端信息
     */
    @ResponseBody
    @RequestMapping("/modifyDeviceInfo")
@@ -71,7 +50,7 @@ public class DeviceManageController {
                num= deviceManageService.addDeviceInfo(params1);
            }
        }catch(Exception e){
            logger.error(">>>>>>>>>>导出excel 异常，原因为：" + e.getMessage());
            logger.error("异常，原因为：" + e.getMessage());
        }
        JMap result = new JsonMap();
        if(num>0){
@@ -83,11 +62,12 @@ public class DeviceManageController {
    }
    /**
     * 刪除地图标记
     * 刪除终端管理
     *
     */
    @ResponseBody
    @RequestMapping("/deleteDeviceXyInfo")
    public JMap deleteDeviceXyInfo(JMap params) throws Exception {
    @RequestMapping("/deleteDeviceInfo")
    public JMap deleteDeviceInfo(JMap params) throws Exception {
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            flag=  deviceManageService.deleteDeviceXyInfo(params);
@@ -96,5 +76,48 @@ public class DeviceManageController {
        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("/associatUser")
    public JMap associatUser(JMap params) throws Exception {
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            //flag=  userManageService.associatTerminal(params);
        }
        JMap result = new JsonMap();
        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

@@ -1,24 +1,17 @@
package com.ai.ipu.server.controller;
import com.ai.ipu.basic.util.IpuUtility;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.ExportService;
import com.ai.ipu.server.service.interfaces.EquipmentManageService;
import com.ai.ipu.server.util.RestScaffoldConstant;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Controller
@RequestMapping("/equipment")
@@ -45,15 +38,6 @@ public class EquipmentManageController {
        return result;
    }
    /**
     * 导出设备信息到excel
     */
    @ResponseBody
    @RequestMapping("/exportEquipmentInfoToExcel")
    public ResponseEntity<byte[]> exportEquipmentInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportExcel(request,response,params);
    }
    /**
     * 编辑设备信息、新增设备信息
@@ -71,7 +55,7 @@ public class EquipmentManageController {
                num= equipmentManageService.addEquipmentInfo(params1);
            }
        }catch(Exception e){
            logger.error(">>>>>>>>>>导出excel 异常，原因为：" + e.getMessage());
            logger.error("异常，原因为：" + e.getMessage());
        }
        JMap result = new JsonMap();
        if(num>0){
@@ -83,7 +67,7 @@ public class EquipmentManageController {
    }
    /**
     * 刪除删除设备信息
     * 删除设备信息
     */
    @ResponseBody
    @RequestMapping("/deleteEquipmentInfo")
@@ -117,7 +101,7 @@ public class EquipmentManageController {
     */
    @ResponseBody
    @RequestMapping("/importEquipmentsInfo")
    public JMap importEquipmentsInfo(JMap params) throws Exception {
    public JMap importEquipmentsInfo(JMap params) throws Exception{
        boolean flag=false;
        if(params.getInt("MAP_TAG_ID")!=0){
            flag=  equipmentManageService.importEquipmentInfo(params);

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

@@ -4,6 +4,7 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.server.service.interfaces.ExportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@RequestMapping("/ExportToExcel")
@Controller
public class ExportToExcelController {
    @Autowired
    ExportService exportService;
@@ -25,5 +27,44 @@ public class ExportToExcelController {
        return exportService.exportMapTagInfoToExcel(request,response,params);
    }
    /**
     * 导出用户信息到excel
     */
    @ResponseBody
    @RequestMapping("/exportUserInfoToExcel")
    public ResponseEntity<byte[]> exportUserInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportMapTagInfoToExcel(request,response,params);
    }
    /**
     * 导出地图标记到excel
     */
    @ResponseBody
    @RequestMapping("/exportCallRescuerInfoToExcel")
    public ResponseEntity<byte[]> exportCallRescuerInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportMapTagInfoToExcel(request,response,params);
    }
    /**
     * 导出終端设备信息到excel
     */
    @ResponseBody
    @RequestMapping("/exportDeviceInfoToExcel")
    public ResponseEntity<byte[]> exportDeviceInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportMapTagInfoToExcel(request,response,params);
    }
    /**
     * 导出设备信息到excel
     */
    @ResponseBody
    @RequestMapping("/exportEquipmentInfoToExcel")
    public ResponseEntity<byte[]> exportEquipmentInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportMapTagInfoToExcel(request,response,params);
    }
}

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

@@ -54,27 +54,18 @@ public class MapTagManageController {
    }
    /**
     * 查询地图标记信息修改用表关联
     * 查询地图标记信息用作修改
     */
    @ResponseBody
    @RequestMapping("/queryMapTagforModifyInfo")
    public JMap queryMapTagforModifyInfo(JMap params) throws Exception {
        PageInfo mapTagList=  mapTagManageService.queryMapTagInfo(params);
        Map<String, Object> mapTagList=  mapTagManageService.queryMapTagforModifyInfo(params);
        JMap result = new JsonMap();
        result.put("result", mapTagList);
        return result;
    }
    /**
     * 导出地图标记到excel
     */
    @ResponseBody
    @RequestMapping("/exportMapTagInfoToExcel")
    public ResponseEntity<byte[]> exportMapTagInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportExcel(request,response,params);
    }
    /**
     * 编辑地图标记
@@ -92,9 +83,7 @@ public class MapTagManageController {
                num= mapTagManageService.addMapTagInfo(params1);
            }
        }catch(Exception e){
            logger.error(">>>>>>>>>>导出excel 异常，原因为：" + e.getMessage());
        }
        JMap result = new JsonMap();
        if(num>0){

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

@@ -45,15 +45,7 @@ public class UserManageController {
        return result;
    }
    /**
     * 导出用户信息到excel
     */
    @ResponseBody
    @RequestMapping("/exportUserInfoToExcel")
    public ResponseEntity<byte[]> exportUserInfoToExcel(JMap params, HttpServletRequest request, HttpServletResponse response) throws Exception {
        return exportService.exportExcel(request,response,params);
    }
    /**
     * 编辑用户信息、新增用户信息

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

@@ -26,21 +26,27 @@ public class MapTagManageDaoImpl implements MapTagManageDao {
    private String connName = "ebc";
    private String JdbcConnName = "JDBC";
    private String tableName = "ebc_map_tag";
    private String tableNameXy = "ebc_map_tag_xy";
    @Override
    public PageInfo queryMapTagInfo(JMap params) throws Exception {
        JMap params1 = params.getJMap("params");
        PageHelper.startPage(params1.getInt("pageNum"),params1.getInt("pageSize"));
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        List<Map<String, Object>> mapTagList = dao.selectByCond(tableName, params1);
        ISqlMgmtDao dao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
        List<Map<String, Object>> mapTagList= dao.executeSelect("ipu.MapTagManageDao", "queryMapTagInfo", params1);
      /*  CommonTableDao dao1 = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        List<Map<String, Object>> mapTagList1 = dao1.selectByCond(tableName, params1);*/
        PageInfo pageInfo = new PageInfo(mapTagList);
        return pageInfo;
    }
    @Override
    public int modifyMapTagInfo (JMap params) throws Exception {
        deleteMapTagXyInfo(params);
        //将新数据插入
        int num = addMapTagInfo(params);
@@ -72,6 +78,14 @@ public class MapTagManageDaoImpl implements MapTagManageDao {
    @Override
    public boolean deleteMapTagXyInfo(JMap params) throws Exception {
 /*       //先删除子表在删除父表
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        dao.deleteByCond(tableNameXy,params);
        int num = dao.delete(tableName, params);
        if(num>0){
            return true;
        }*/
        ISqlMgmtDao dao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
        //先删除子表在删除父表
        dao.executeDelete( "ipu.MapTagManageDao", "deleteMapTagXyInfo", params);
@@ -82,6 +96,15 @@ public class MapTagManageDaoImpl implements MapTagManageDao {
        return false;
    }
    @Override
    public Map<String, Object> queryMapTagforModifyInfo  (JMap params) throws Exception{
        JMap params1 = params.getJMap("params");
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        Map<String, Object> mapTagMap = dao.select(tableName, params1);
        List<Map<String, Object>> mapTagXyList = dao.selectByCond(tableNameXy, params1);
        mapTagMap.put("mapTagXyList", mapTagXyList);
        return mapTagMap;
    }
}

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

@@ -16,4 +16,6 @@ public interface MapTagManageDao {
    int addMapTagInfo(JMap params) throws Exception;
    boolean deleteMapTagXyInfo(JMap params) throws Exception;
    Map<String, Object> queryMapTagforModifyInfo (JMap params)  throws Exception ;
}

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

@@ -12,6 +12,7 @@ import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -23,16 +24,13 @@ import java.util.Map;
@Service
public class ExportToExcelServiceImpl implements ExportService {
    @Autowired
    MapTagManageService mapTagManageService;
    /**
     * slf4j 日志 logger
     */
    Logger logger = LoggerFactory.getLogger(ExportToExcelServiceImpl.class);
    @Override
    public ResponseEntity<byte[]> exportExcel(HttpServletRequest request, HttpServletResponse response, Object object) {
        return null;
    }
    /**
     * 导出地图管理信息到excel
@@ -50,7 +48,7 @@ public class ExportToExcelServiceImpl implements ExportService {
            PageInfo pageInfo = mapTagManageService.queryMapTagInfo(object1);
            List<JMap> mapTagList = pageInfo.getList();
            //设置表格名字
            String strName="终端导出表.xls";
            String strName="地图标记导出表.xls";
            logger.info(">>>>>>>>>>>>>>>>>>>>开始进入导出方法>>>>>>>>>>");

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

@@ -9,6 +9,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class MapTagManageServiceImpl implements MapTagManageService {
@@ -37,4 +40,9 @@ public class MapTagManageServiceImpl implements MapTagManageService {
    public boolean deleteMapTagXyInfo(JMap params) throws Exception{
        return mapTagManageDao.deleteMapTagXyInfo(params);
    }
    @Override
    public Map<String, Object> queryMapTagforModifyInfo (JMap params)  throws Exception {
        return mapTagManageDao.queryMapTagforModifyInfo(params);
    }
}

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

@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public interface ExportService {
    ResponseEntity<byte[]> exportExcel(HttpServletRequest request, HttpServletResponse response,Object object);
    ResponseEntity<byte[]> exportMapTagInfoToExcel(HttpServletRequest request, HttpServletResponse response, Object object);
}

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

@@ -16,4 +16,6 @@ public interface MapTagManageService {
    int addMapTagInfo(JMap params) throws Exception;
    boolean deleteMapTagXyInfo (JMap params) throws Exception;
    Map<String, Object> queryMapTagforModifyInfo(JMap params)  throws Exception ;
}