考勤日报、月报、详情、异常等

security-protection-service/pom.xml

@@ -11,8 +11,9 @@
    <parent>
        <artifactId>components</artifactId>
        <groupId>com.ai.bss</groupId>
        <version>2.1-SNAPSHOT</version>
        <version>2.1.5-SNAPSHOT</version>
    </parent>
    <dependencies>
        <dependency>
            <groupId>com.github.pagehelper</groupId>
@@ -35,8 +36,48 @@
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-tool-service-api</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-tool-service</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>worker-service</artifactId>
            <version>2.1.5-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>
                        spring-boot-starter-security
                    </artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>characteristic-spec-service</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-attendance-service-api</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>system-user-service</artifactId>
            <version>2.1-SNAPSHOT</version>
            <version>2.1.5-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
@@ -46,6 +87,62 @@
                </exclusion>
            </exclusions>
        </dependency>
        <!-- uspa登录拦截效验-->
        <!--   <dependency>
                    <groupId>com.ai.bss</groupId>
                    <artifactId>sso-util</artifactId>
                    <version>1.0.0-RELEASE</version>
                </dependency>-->
        <dependency>
            <groupId>com.wframe</groupId>
            <artifactId>sso-util</artifactId>
            <version>1.2</version>
        </dependency>
        <!--	<dependency>
                     <groupId>com.ai.ipu</groupId>
                     <artifactId>ipu-data</artifactId>
                     <version>3.1-SNAPSHOT</version>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>com.ai.ipu</groupId>
                     <artifactId>ipu-basic</artifactId>
                     <version>3.1-SNAPSHOT</version>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>com.ai.wade</groupId>
                     <artifactId>wade-common</artifactId>
                     <version>1.0</version>
                     <scope>compile</scope>
                 </dependency>
                <dependency>
                    <groupId>com.ai.ipu</groupId>
                    <artifactId>ipu-common</artifactId>
                    <version>3.1-SNAPSHOT</version>
                    <scope>compile</scope>
                </dependency>
                <dependency>
                    <groupId>org.apache.poi</groupId>
                    <artifactId>poi-ooxml</artifactId>
                    <version>3.14</version>
                    <scope>compile</scope>
                </dependency>-->
        <!-- 缓存 -->
        <dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-cache</artifactId>
            <version>3.1-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.logging.log4j</groupId>
                    <artifactId>log4j-slf4j-impl</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
    </dependencies>
    <repositories>

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceReportController.java

@@ -0,0 +1,120 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.util.EbcConstant;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 考勤报表
 */
@Controller
@RequestMapping("/attendanceReport")
public class AttendanceReportController {
	Logger logger = LoggerFactory.getLogger(AttendanceReportController.class);
	@Autowired
	AttendanceReportService attendanceReportService;
	/**
	 * 分页查询考勤报表日报
	 * @param request 组合条件
	 *                                workDay : 日报日期 (yyyy-MM-dd格式)，必选
	 *                                orgId：所属组织ID
	 *                                id：个人编码（员工编码）
	 *                                nameAsLike：姓名（模糊匹配）
	 *                                mainJobPositionId: 职位
	 */
	@ResponseBody
	@RequestMapping("/queryDailyAttendanceReport")
	public CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		CommonResponse<PageBean<Map<String,Object>>> commonResponse = attendanceReportService.queryDailyAttendanceReport(params, pageNumber, pageSize);
		return commonResponse;
	}
	/**
	 * 分页查询考勤报表月报
	 *  							month ：月份 (yyyy-MM格式)，必选
	 *                              orgId：所属组织ID，必选
	 *                              id：个人编码（员工编码）
	 *                              nameAsLike：姓名（模糊匹配）
	 *                              mainJobPositionId: 职位
	 */
	@ResponseBody
	@RequestMapping("/queryMonthlyAttendanceReport")
	public CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		CommonResponse<PageBean<Map<String,Object>>> commonResponse= attendanceReportService.queryMonthlyAttendanceReport(params, pageNumber, pageSize);
		return commonResponse;
	}
	/**
	 * 分页查询异常考勤
	 */
	@ResponseBody
	@RequestMapping("/queryPageAbnormalAttendance")
	public CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		CommonResponse<PageBean<Map<String,Object>>> commonResponse= attendanceReportService.queryPageAbnormalAttendance(params, pageNumber, pageSize);
		return commonResponse;
	}
	/**
	 * 查询考勤详情
	 *  						id：个人编码（员工编码）
	 *                          beginDay：开始日期
	 *                          endDay: 结束日期
	 */
	@ResponseBody
	@RequestMapping("/queryAttendanceDetailReport")
	public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		CommonResponse<List<Map<String, Object>>> commonResponse = attendanceReportService.queryAttendanceDetailReport(params);
		return commonResponse;
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/abnormalAttendanceController.java

@@ -1,46 +0,0 @@
package com.ai.bss.security.protection.controller;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
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.Date;
import java.util.Map;
/**
 * 异常考勤
 */
@Controller
@RequestMapping("/abnormalAttendance")
public class abnormalAttendanceController {
	Logger logger = LoggerFactory.getLogger(abnormalAttendanceController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析
	 */
	@ResponseBody
	@RequestMapping("/queryPageAttendanceCount")
	public PageInfo queryPageAttendanceCount(Map params) throws Exception {
		// 当前页数
		int pageNum = (int)params.get("pageNum") < 1 ? 1 : (int)params.get("pageNum");
		// 每页条数
		int pageSize = (int)params.get("pageSize") < 1 ? 1: (int)params.get("pageSize");
		if(params.get("currentDate")==null|| params.get("currentDate").equals("")){
			params.put("currentDate",new Date());
		}
		PageInfo pageInfo = areaInRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
		return pageInfo;
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AreaInOutRecordController.java

@@ -13,12 +13,12 @@ import java.util.Date;
import java.util.Map;
/**
 * 考勤管理
 * 进出记录
 */
@Controller
@RequestMapping("/areaInOutRecordManage")
public class AreaInOutRecordController {
	Logger logger = LoggerFactory.getLogger(AreaInOutRecordController.class);
public class areaInOutRecordController {
	Logger logger = LoggerFactory.getLogger(areaInOutRecordController.class);
	@Autowired
	AreaInRecordService areaInRecordService;

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/attendanceReportController.java

@@ -1,46 +0,0 @@
package com.ai.bss.security.protection.controller;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
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.Date;
import java.util.Map;
/**
 * 考勤报表
 */
@Controller
@RequestMapping("/attendanceReport")
public class attendanceReportController {
	Logger logger = LoggerFactory.getLogger(attendanceReportController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析
	 */
	@ResponseBody
	@RequestMapping("/queryPageAttendanceCount")
	public PageInfo queryPageAttendanceCount(Map params) throws Exception {
		// 当前页数
		int pageNum = (int)params.get("pageNum") < 1 ? 1 : (int)params.get("pageNum");
		// 每页条数
		int pageSize = (int)params.get("pageSize") < 1 ? 1: (int)params.get("pageSize");
		if(params.get("currentDate")==null|| params.get("currentDate").equals("")){
			params.put("currentDate",new Date());
		}
		PageInfo pageInfo = areaInRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
		return pageInfo;
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

@@ -0,0 +1,75 @@
package com.ai.bss.security.protection.service.impl;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.util.EbcConstant;
import com.ai.bss.worker.service.api.AttendanceStatusQuery;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
/**
 * @Auther: 王超
 * @Date: 2020/11/30 10:58
 * @Description:
 */
@Service
public class AttendanceReportServiceImpl implements AttendanceReportService {
    @Autowired
    AttendanceStatusQuery attendanceStatusQuery;
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize) {
        CommonResponse<PageBean<Map<String,Object>>>  attendanceReport = null;
        try {
            attendanceReport = attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return attendanceReport;
    }
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(Map<String, Object> params, int pageNumber, int pageSize) {
        params.put("statusType", EbcConstant.ATTENDANCE_STATUSTYPE_ABNORMAL);
        CommonResponse<PageBean<Map<String,Object>>>  attendanceReport = null;
        try {
            attendanceReport = attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return attendanceReport;
    }
    @Override
    public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(Map<String, Object> params) {
        CommonResponse<List<Map<String, Object>>> attendanceReportResponse =  null;
        try {
            attendanceReportResponse = attendanceStatusQuery.queryAttendanceDetailReport(new CommonRequest<>(params,1,10));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return attendanceReportResponse;
    }
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize) {
        CommonResponse<PageBean<Map<String,Object>>>  attendanceReport = null;
        try {
            attendanceReport = attendanceStatusQuery.queryDailyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return attendanceReport;
    }
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceReportService.java

@@ -0,0 +1,18 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
public interface AttendanceReportService {
    CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize);
    CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(Map<String, Object> params, int pageNumber, int pageSize);
    CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(Map<String, Object> params);
    CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize);
}

security-protection-service/src/main/java/com/ai/bss/security/protection/util/EbcConstant.java

@@ -0,0 +1,37 @@
package com.ai.bss.security.protection.util;
/**
 * 业务常量
 * @author konghl@asiainfo.com
 * 2020-10-20
 */
public class EbcConstant {
	// 下拉列表最大查询条数
	public static final int COMBOBOX_MAXNUM = 30;
	// 每页默认查询条数
	public static final int DEFAULT_PAGE_SIZE = 20;
	// 异常考勤查询常量异常取值 abnormal，
	public static final String ATTENDANCE_STATUSTYPE_ABNORMAL = "ABNORMAL";
	// 异常考勤查询常量正常取值normal
	public static final String ATTENDANCE_STATUSTYPE_NORMAL = "NORMAL";
	// 轨迹回放单次查询条数
	public static final int TRACK_PLAYBACK_SIZE = 100;
	// 考勤查询：日
	public static final String AREA_IN_OUT_RECORD_DAY = "day";
	// 考勤查询：周
	public static final String AREA_IN_OUT_RECORD_WEEK = "week";
	// 考勤查询：月
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
	
	
}

security-protection-service/src/main/resources/application.properties

@@ -1,12 +1,19 @@
spring.application.name=WorkTaskSpec
server.port=8086
server.port=8087
#server.servlet.context-path=/ipu
server.servlet.context-path=/
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
spring.datasource.url=jdbc:mysql://10.11.20.120:3306/common_frm?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
#spring.datasource.url=jdbc:mysql://10.11.20.120:3306/common_frm?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=comon_frm
#spring.datasource.password=1qaz@WSX
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=comon_frm
spring.datasource.password=1qaz@WSX
spring.datasource.username=ebc
spring.datasource.password=ebc@123
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -17,6 +24,28 @@ spring.jpa.properties.hibernate.format_sql=true
spring.jpa.properties.hibernate.generate_statistics=false
spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation_111
kafka.topic.alarm=Topic_IoT_IndividualAlarm_111
#kafka.topic.deviceLocation=DeviceLocationA
#kafka.topic.alarm=IndividualAlarmA
kafka.producer.batch-size=16785
kafka.producer.retries=1
kafka.producer.buffer-memory=33554432
kafka.producer.linger=1
kafka.consumer.auto-offset-reset=latest
kafka.consumer.max-poll-records=20
kafka.consumer.enable-auto-commit=false
kafka.consumer.auto-commit-interval=1000
kafka.consumer.session-timeout=20000
kafka.consumer.max-poll-interval=15000
kafka.consumer.max-partition-fetch-bytes=15728640
kafka.listener.batch-listener=false
kafka.listener.concurrencys=3,6
kafka.listener.poll-timeout=1500
# CACHE
#spring.cache.type=ehcache
#spring.cache.ehcache.config=ehcache.xml