修改人员定位功能

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

@@ -1,12 +1,5 @@
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.AreaInOutRecordService;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.NorthboundInterfaceUtil;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +7,8 @@ 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.server.service.interfaces.AreaInOutRecordService;
/**
 * 考勤管理
@@ -29,36 +22,58 @@ public class AreaInOutRecordManageController {
	AreaInOutRecordService areaInOutRecordService;
	/**
	 * 分页查询作业考勤信息
	 * 分页查询考勤统计分析
	 */
	@ResponseBody
	@RequestMapping("/queryPageAreaInOutRecordInfo")
	public JMap queryPageAreaInOutRecordInfo(JMap params) throws Exception {
	@RequestMapping("/queryPageAttendanceCount")
	public JMap queryPageAttendanceCount(JMap params) throws Exception {
		// 当前页数
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
		PageInfo equipmentList = areaInOutRecordService.queryPageAreaInOutRecordInfo(params, pageNum, pageSize);
		JMap result = new JsonMap();
		result.put("result", equipmentList);
		JMap result = areaInOutRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		return result;
	}
	/**
	 * 分页查询作业考勤信息详情
	 */
	@ResponseBody
	@RequestMapping("/queryPageAreaInOutRecordInfoDetaile")
	public JMap queryPageDeviceInfo(JMap params) throws Exception {
	@RequestMapping("/queryPageAttendanceRecordDetaile")
	public JMap queryPageAttendanceRecordDetaile(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 = areaInOutRecordService.queryPageAttendanceRecordDetaile(params, pageNum, pageSize);
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		return result;
	}
	/**
	 * 分页查询进出围栏日志
	 */
	@ResponseBody
	@RequestMapping("/queryPageAreaInOutRecord")
	public JMap queryPageAreaInOutRecord(JMap params) throws Exception {
		// 当前页数
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
		PageInfo equipmentList = areaInOutRecordService.queryPageAreaInOutRecordInfoDetaile(params, pageNum, pageSize);
		JMap result = new JsonMap();
		result.put("result", equipmentList);
		JMap result = areaInOutRecordService.queryPageAreaInOutRecord(params, pageNum, pageSize);
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		return result;
	}

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

@@ -49,7 +49,7 @@ public class ReceiveSubscribeController {
		dataMap.put("longitude",detailInfo.getJSONObject("longitude").getString("value"));//经度
		dataMap.put("latitude",detailInfo.getJSONObject("latitude").getString("value"));//纬度
		dataMap.put("newDate",detailInfo.getJSONObject("msgDate").getString("value"));//最新定位时间
		dataMap.put("locationStatus ",EbcConstant.location_status_normal);//定位状态
		dataMap.put("locationStatus",EbcConstant.location_status_normal);//定位状态
		
		//分析并推送定位数据
		receiveSubscribeService.receiveIotLocationData(dataMap);

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

@@ -1,51 +0,0 @@
package com.ai.ipu.server.controller;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.ipu.server.service.interfaces.AreaInOutRecordService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.HashMap;
@Controller
@RequestMapping("/areaInOutRecord")
public class TestController {
	Logger logger = LoggerFactory.getLogger(TestController.class);
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	/**
	 * 分页查询作业考勤信息
	 */
	@ResponseBody
	@RequestMapping("/testInsert")
	public JMap testInsert() throws Exception {
		HashMap<String, Object> dataMap = new HashMap<>();
		ArrayList<Object> dataList = new ArrayList<>();
		for(int j = 0; j<10 ; j++){
			HashMap<String, Object> paramsMap = new HashMap<>();
			paramsMap.put("mapTagId",j);
			paramsMap.put("employeeId",j);
			paramsMap.put("deviceId",j);
			dataList.add(paramsMap);
		}
		dataMap.put("dataList",dataList );
		int i = areaInOutRecordDao.testInsert(dataMap);
		JMap result = new JsonMap();
		result.put("result", i);
		return result;
	}
}

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

@@ -6,7 +6,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.github.pagehelper.PageInfo;
import org.springframework.stereotype.Component;
import com.ai.ipu.common.date.TimeUtil;
@@ -32,43 +31,43 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
	}
	@Override
	public JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
	public JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		// TODO Auto-generated method stub
		return null;
	}
	@Override
	public JMap queryPageAttendanceRecord(JMap params, int pageNum, int pageSize) throws Exception {
	public JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
		// TODO Auto-generated method stub
		return null;
	}
	@Override
	public List<Map<String, Object>> getBeforeAreaInfo(JMap params) throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		
		StringBuilder sql=new StringBuilder();
		Map<String, Object> dataMap = new HashMap<String, Object>();
		StringBuilder sql = new StringBuilder();
		sql.append(" SELECT a.RECORD_ID,a.MAP_TAG_ID,a.IN_DATE, ");
		sql.append(" m.MAP_TAG_NAME,m.MAP_TAG_TYPE,m.RESIDENCE_TIME_LENGTH ");
		sql.append(" FROM LR_AREA_IN_OUT_RECORD a ");
		sql.append(" LEFT JOIN LR_MAP_TAG m ON m.MAP_TAG_ID=a.MAP_TAG_ID ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND a.OUT_DATE IS NULL ");
		
		sql.append(" AND a.DEVICE_ID = #{deviceId} ");
		dataMap.put("deviceId", params.get("deviceId"));
		
		return dao.executeSelect(sql.toString(), dataMap);
	}
	
	@Override
	public boolean addSameInTimeAreaInRecord(JMap params,List<Map<String, String>> mapTagInfoList) throws Exception {
	public boolean addSameInTimeAreaInRecord(JMap params, List<Map<String, String>> mapTagInfoList) throws Exception {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		ArrayList<Object> dataList = new ArrayList<>();
		for(Map mapTagInfo: mapTagInfoList ){
			HashMap<String, Object> paramsMap = new HashMap<>();
			paramsMap.put("mapTagId",mapTagInfo.get("mapTagId"));
			paramsMap.put("recordLocation",mapTagInfo.get("recordLocation"));
		List<Object> dataList = new ArrayList<>();
		for (Map mapTagInfo : mapTagInfoList) {
			Map<String, Object> paramsMap = new HashMap<String, Object>();
			paramsMap.put("mapTagId", mapTagInfo.get("mapTagId"));
			paramsMap.put("recordLocation", mapTagInfo.get("recordLocation"));
			paramsMap.put("employeeId", 0);// TODO 人员ID
			paramsMap.put("deviceId", params.get("deviceId"));
			paramsMap.put("longitude", params.get("longitude"));
@@ -77,7 +76,7 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
			paramsMap.put("remarks", params.get("remarks"));
			paramsMap.put("dataStatus", "1");
			//TODO 创建人和操作人的编号和部门
			// TODO 创建人和操作人的编号和部门
			paramsMap.put("createDate", TimeUtil.getSysTime());
			paramsMap.put("createOpId", "");
			paramsMap.put("createOrgId", "");
@@ -86,52 +85,33 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
			paramsMap.put("orgId", "");
			dataList.add(paramsMap);
		}
		dataMap.put("dataList",dataList );
		
		dataMap.put("dataList", dataList);
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		int num = mgmtDao.executeInsert("ipu.AreaInOutRecordDao", "addSameInTimeRecordDao", dataMap);
		return num > 0;
	}
	@Override
	public boolean updateAreaOutRecord(Map<String, Object> dataMap) throws Exception {
		return false;
	}
	@Override
	public boolean updateSameOutTimeAreaOutRecord(String outDate,List<String> recordIdList) throws Exception {
	public boolean updateSameOutTimeAreaOutRecord(String outDate, List<String> recordIdList) throws Exception {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("recordId", recordIdList);// 进入围栏记录ID
		dataMap.put("outDate", outDate); // 离开围栏时间
		
		//TODO 操作人的编号和部门
		dataMap.put("doneDate", TimeUtil.getSysTime());
		dataMap.put("opId", "");
		dataMap.put("orgId", "");
		
		ArrayList<Object> dataList = new ArrayList<>();
		for (String recordId : recordIdList) {
			Map<String, Object> paramsMap = new HashMap<String, Object>();
			paramsMap.put("recordId", recordId);// 进入围栏记录ID
			paramsMap.put("outDate", outDate); // 离开围栏时间
			// TODO 操作人的编号和部门
			paramsMap.put("doneDate", TimeUtil.getSysTime());
			paramsMap.put("opId", "");
			paramsMap.put("orgId", "");
			dataList.add(paramsMap);
		}
		dataMap.put("dataList", dataList);
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		int num = mgmtDao.executeUpdate("ipu.AreaInOutRecordDao", "updateSameOutTimeRecordDao", dataMap);
		return num > 0;
	}
	@Override
	public int testInsert(Map params)  throws Exception{
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		int num = mgmtDao.executeInsert("ipu.AreaInOutRecordDao", "testInsert", params);
		return num;
	}
	@Override
	public PageInfo queryPageAreaInOutRecordInfo(JMap params, int pageNum, int pageSize) throws Exception {
		return null;
	}
	@Override
	public PageInfo queryPageAreaInOutRecordInfoDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		return null;
	}
}

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

@@ -196,24 +196,74 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		List<Map<String, Object>> list=new ArrayList<Map<String, Object>>();
		Map<String, Object> map1=new HashMap<String, Object>();
		map1.put("PARTY_NAME", "张三");//人员姓名
		map1.put("LOCATION_STATUS", EbcConstant.location_status_normal);//状态: 0定位
		map1.put("DEVICE_ID", "23128");//终端ID
		map1.put("DEVICE_NO", "23128");//终端编号
		map1.put("LONGITUDE", "123.7709438548");//经度
		map1.put("LATITUDE", "31.58477450849");//纬度
		map1.put("LOCATION_DATE", "2020-10-26 10:12:24");//最新定位时间
		map1.put("userName", "张三");//人员姓名
		map1.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map1.put("deviceId", "999571");//终端ID
		map1.put("deviceNo", "999571");//终端编号
		map1.put("longitude", "123.7709438548");//经度
		map1.put("latitude", "31.58477450849");//纬度
		map1.put("newDate", "2020-10-26 10:12:24");//最新定位时间
		list.add(map1);
		Map<String, Object> map2=new HashMap<String, Object>();
		map2.put("PARTY_NAME", "李四");//人员姓名
		map2.put("LOCATION_STATUS", EbcConstant.location_status_autosos);//状态:4自动报警
		map2.put("DEVICE_ID", "23125");//终端ID
		map2.put("DEVICE_NO", "23125");//终端编号
		map2.put("LONGITUDE", "126.422192652");//经度
		map2.put("LATITUDE", "32.045333123");//纬度
		map2.put("LOCATION_DATE", "2020-10-26 11:22:33");//最新定位时间
		map2.put("userName", "李四");//人员姓名
		map2.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map2.put("deviceId", "981489");//终端ID
		map2.put("deviceNo", "981489");//终端编号
		map2.put("longitude", "126.422192652");//经度
		map2.put("latitude", "32.045333123");//纬度
		map2.put("newDate", "2020-10-26 11:22:33");//最新定位时间
		list.add(map2);
		
		Map<String, Object> map3=new HashMap<String, Object>();
		map3.put("userName", "王五");//人员姓名
		map3.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map3.put("deviceId", "981453");//终端ID
		map3.put("deviceNo", "981453");//终端编号
		map3.put("longitude", "127.422192652");//经度
		map3.put("latitude", "34.045333123");//纬度
		map3.put("newDate", "2020-10-27 12:31:45");//最新定位时间
		list.add(map3);
		
		Map<String, Object> map4=new HashMap<String, Object>();
		map4.put("userName", "赵六");//人员姓名
		map4.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map4.put("deviceId", "23125");//终端ID
		map4.put("deviceNo", "23125");//终端编号
		map4.put("longitude", "125.822192652");//经度
		map4.put("latitude", "33.345333123");//纬度
		map4.put("newDate", "2020-10-27 09:18:13");//最新定位时间
		list.add(map4);
		
		Map<String, Object> map5=new HashMap<String, Object>();
		map5.put("userName", "田七");//人员姓名
		map5.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map5.put("deviceId", "23126");//终端ID
		map5.put("deviceNo", "23126");//终端编号
		map5.put("longitude", "126.922192652");//经度
		map5.put("latitude", "32.945333123");//纬度
		map5.put("newDate", "2020-10-27 18:20:30");//最新定位时间
		list.add(map5);
		
		Map<String, Object> map6=new HashMap<String, Object>();
		map6.put("userName", "周八");//人员姓名
		map6.put("locationStatus", EbcConstant.location_status_exclusion);//状态:3违规(禁区)
		map6.put("deviceId", "23128");//终端ID
		map6.put("deviceNo", "23128");//终端编号
		map6.put("longitude", "127.422192652");//经度
		map6.put("latitude", "33.045333123");//纬度
		map6.put("newDate", "2020-10-25 14:28:38");//最新定位时间
		list.add(map6);
		
		Map<String, Object> map7=new HashMap<String, Object>();
		map7.put("userName", "吴九");//人员姓名
		map7.put("locationStatus", EbcConstant.location_status_offline);//状态:1离线
		map7.put("deviceId", "23129");//终端ID
		map7.put("deviceNo", "23129");//终端编号
		map7.put("longitude", "121.422192652");//经度
		map7.put("latitude", "31.045333123");//纬度
		map7.put("newDate", "2020-10-27 14:15:22");//最新定位时间
		list.add(map7);
		return list;
	}

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

@@ -4,12 +4,11 @@ import java.util.List;
import java.util.Map;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
public interface AreaInOutRecordDao {
	/**
	 * 分页查询进出围栏日志
	 * 分页查询考勤统计分析
	 * 
	 * @param params
	 * @param pageNum 当前页数
@@ -17,10 +16,10 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
	JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询考勤统计分析
	 * 分页查询作业考勤信息详情
	 * 
	 * @param params
	 * @param pageNum 当前页数
@@ -28,10 +27,10 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
	JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询考勤日志
	 * 分页查询进出围栏日志
	 * 
	 * @param params
	 * @param pageNum 当前页数
@@ -39,7 +38,7 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAttendanceRecord(JMap params, int pageNum, int pageSize) throws Exception;
	JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 查询之前所在围栏的信息
@@ -56,8 +55,8 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	boolean addSameInTimeAreaInRecord(JMap params,List<Map<String, String>> mapTagInfoList) throws Exception;
	
	boolean addSameInTimeAreaInRecord(JMap params, List<Map<String, String>> mapTagInfoList) throws Exception;
	/**
	 * 修改出围栏的日志
	 * @param outDate 离开时间
@@ -65,12 +64,6 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	boolean updateAreaOutRecord(Map<String, Object> dataMap) throws Exception;
    PageInfo queryPageAreaInOutRecordInfo(JMap params, int pageNum, int pageSize) throws Exception;
	PageInfo queryPageAreaInOutRecordInfoDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	boolean updateSameOutTimeAreaOutRecord(String outDate,List<String> recordIdList) throws Exception;
	boolean updateSameOutTimeAreaOutRecord(String outDate, List<String> recordIdList) throws Exception;
	int testInsert(Map params)  throws Exception;
}

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

@@ -1,8 +1,5 @@
package com.ai.ipu.server.service.impl;
import java.util.Map;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,7 +13,7 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	
	@Autowired
	MapTagManageDao mapTagManageDao;
@@ -26,22 +23,13 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
	}
	@Override
	public JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
	public JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		return areaInOutRecordDao.queryPageAttendanceCount(params, pageNum, pageSize);
	}
	@Override
	public JMap queryPageAttendanceRecord(JMap params, int pageNum, int pageSize) throws Exception {
		return areaInOutRecordDao.queryPageAttendanceRecord(params, pageNum, pageSize);
	}
	@Override
	public PageInfo queryPageAreaInOutRecordInfo(JMap params, int pageNum, int pageSize) throws Exception {
		return areaInOutRecordDao.queryPageAreaInOutRecordInfo(params,pageNum,pageSize);
	public JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
		return areaInOutRecordDao.queryPageAttendanceCount(params, pageNum, pageSize);
	}
	@Override
	public PageInfo queryPageAreaInOutRecordInfoDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		return areaInOutRecordDao.queryPageAreaInOutRecordInfoDetaile(params,pageNum,pageSize);
	}
}

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

@@ -42,28 +42,32 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	private ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
	//private ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
	@Override
	public void receiveIotLocationData(JMap dataMap) {
		cachedThreadPool.execute(new Runnable() {
		executeReceiveIotLocationData(dataMap);
		
		/*cachedThreadPool.execute(new Runnable() {
			@Override
			public void run() {
				logger.debug("启动定位信息新线程：" + Thread.currentThread().getName());
				executeReceiveIotLocationData(dataMap);
			}
		});
		});*/
	}
	@Override
	public void receiveIotAlarmData(JMap dataMap) {
		cachedThreadPool.execute(new Runnable() {
		executeReceiveIotAlarmData(dataMap);
		
		/*cachedThreadPool.execute(new Runnable() {
			@Override
			public void run() {
				logger.debug("启动报警信息新线程：" + Thread.currentThread().getName());
				executeReceiveIotAlarmData(dataMap);
			}
		});
		});*/
	}
	/**

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

@@ -1,7 +1,6 @@
package com.ai.ipu.server.service.interfaces;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 考勤管理
@@ -11,7 +10,7 @@ import com.github.pagehelper.PageInfo;
public interface AreaInOutRecordService {
	/**
	 * 分页查询进出围栏日志
	 * 分页查询考勤统计分析
	 * 
	 * @param params
	 * @param pageNum 当前页数
@@ -19,10 +18,10 @@ public interface AreaInOutRecordService {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
	JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询考勤统计分析
	 * 分页查询考勤详细日志
	 * 
	 * @param params
	 * @param pageNum 当前页数
@@ -30,10 +29,10 @@ public interface AreaInOutRecordService {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
	
	JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询考勤日志
	 * 分页查询进出围栏日志
	 * 
	 * @param params
	 * @param pageNum 当前页数
@@ -41,9 +40,5 @@ public interface AreaInOutRecordService {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAttendanceRecord(JMap params, int pageNum, int pageSize) throws Exception;
	
    PageInfo queryPageAreaInOutRecordInfo(JMap params, int pageNum, int pageSize) throws Exception;
	PageInfo queryPageAreaInOutRecordInfoDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
}

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

@@ -4,7 +4,15 @@ import com.ai.ipu.data.JMap;
public interface ReceiveSubscribeService {
	
	/**
	 * 分析处理定位数据
	 * @param dataMap
	 */
	void receiveIotLocationData(JMap dataMap);
	
	/**
	 * 分析处理报警数据
	 * @param dataMap
	 */
	void receiveIotAlarmData(JMap dataMap);
}

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

@@ -2,7 +2,7 @@
<sqls>
	<sql name="addSameInTimeRecordDao">
		<![CDATA[
			<insert id="addSameInTimeRecordDao" parameterType="ai.ipu.data.Map" useGeneratedKeys="true" keyProperty="RECORD_ID">
			<insert id="addSameInTimeRecordDao" parameterType="ai.ipu.data.JMap" useGeneratedKeys="true" keyProperty="RECORD_ID">
			
	      	INSERT INTO LR_AREA_IN_OUT_RECORD (
			MAP_TAG_ID,EMPLOYEE_ID,DEVICE_ID,LONGITUDE,LATITUDE,RECORD_LOCATION,IN_DATE,REMARKS,
@@ -33,44 +33,28 @@
	    	</insert>
		]]>
	</sql>
	
	
	<sql name="updateSameOutTimeRecordDao">
		<![CDATA[
		<update id="updateSameOutTimeRecordDao" parameterType="ai.ipu.data.Map">
		<update id="updateSameOutTimeRecordDao" parameterType="ai.ipu.data.JMap">
		UPDATE LR_AREA_IN_OUT_RECORD
			<set>
				OUT_DATE = #{outDate},
				DONE_DATE = #{doneDate},
				OP_ID = #{opId},
				ORG_ID = #{orgId}
				<foreach collection="dataList" item="item" separator=",">
					OUT_DATE = #{item.outDate},
					DONE_DATE = #{item.doneDate},
					OP_ID = #{item.opId},
					ORG_ID = #{item.orgId}
				</foreach>
			</set>
			
			WHERE RECORD_ID IN
    		<foreach collection="recordIdList" index="index" item="item" separator="," open="(" close=")">
        		#{item,jdbcType=BIGINT}
			
    		<foreach collection="dataList" item="item" separator="," open="(" close=")">
        		#{item.recordId}
    		</foreach>
		</update>
		]]>
	</sql>
	<sql name="testInsert">
		<![CDATA[
			<insert id="testInsert" parameterType="java.util.Map" useGeneratedKeys="true" keyProperty="RECORD_ID">
	      	INSERT INTO LR_AREA_IN_OUT_RECORD (
			MAP_TAG_ID,EMPLOYEE_ID,DEVICE_ID
			) VALUES
	      	<foreach collection="dataList" item="item" separator=",">
	          (
	          	#{item.mapTagId},
	          	#{item.employeeId},
	          	#{item.deviceId}
	          )
	      	</foreach>
	    	</insert>
		]]>
	</sql>
</sqls>