封装考勤规则管理接口

security-protection-service/pom.xml

@@ -44,6 +44,65 @@
                        spring-boot-starter-security
                    </artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>
                        spring-boot-starter-test
                    </artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.hibernate</groupId>
                    <artifactId>
                        hibernate-envers
                    </artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>system-user-service-api</artifactId>
            <version>2.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-attendance-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>work-attendance-service-api</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-service-api</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-service</artifactId>
            <version>2.1.5-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>
                        spring-boot-starter-security
                    </artifactId>
                </exclusion>
            </exclusions>
        </dependency>
    </dependencies>
@@ -69,4 +128,102 @@
            </snapshots>
        </pluginRepository>
    </pluginRepositories>
    <build>
        <resources>
            <resource>
                <directory>src/main/resources</directory>
            </resource>
        </resources>
        <plugins>
            <!-- The configuration of maven-jar-plugin -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>2.4</version>
                <!-- The configuration of the plugin -->
                <configuration>
                    <!-- Configuration of the archiver -->
                    <archive>
                        <!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
                        <addMavenDescriptor>false</addMavenDescriptor>
                        <!-- Manifest specific configuration -->
                        <manifest>
                            <!--是否要把第三方jar放到manifest的classpath中-->
                            <addClasspath>true</addClasspath>
                            <!--生成的manifest中classpath的前缀，因为要把第三方jar放到lib目录下，所以classpath的前缀是lib/-->
                            <classpathPrefix>lib/</classpathPrefix>
                            <!--应用的main class-->
                            <mainClass>com.ai.bss.security.protection.SecurityProtectionApp</mainClass>
                        </manifest>
                        <manifestEntries>
                            <Class-Path>./config/</Class-Path>
                        </manifestEntries>
                    </archive>
                    <!--过滤掉不希望包含在jar中的文件-->
                    <excludes>
                        <exclude>**/*.properties</exclude>
                        <exclude>**/*.xml</exclude>
                    </excludes>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>copy-dependencies</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                        <configuration>
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <outputAbsoluteArtifactFilename></outputAbsoluteArtifactFilename>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <!-- The configuration of maven-assembly-plugin -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-assembly-plugin</artifactId>
                <version>2.4</version>
                <!-- The configuration of the plugin -->
                <configuration>
                    <!-- Specifies the configuration file of the assembly plugin -->
                    <descriptors>
                        <descriptor>src/main/assembly/package.xml</descriptor>
                    </descriptors>
                </configuration>
                <executions>
                    <execution>
                        <id>make-assembly</id>
                        <phase>package</phase>
                        <goals>
                            <goal>single</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>
        </plugins>
    </build>
</project>

security-protection-service/src/main/assembly/package.xml

@@ -0,0 +1,61 @@
<assembly>
    <id>bin</id>
    <!-- 最终打包成一个用于发布的zip文件 -->
    <formats>
        <format>zip</format>
    </formats>
    <!-- Adds dependencies to zip package under lib directory -->
    <dependencySets>
        <dependencySet>
            <!-- 不使用项目的artifact，第三方jar不要解压，打包进zip文件的lib目录 -->
            <useProjectArtifact>false</useProjectArtifact>
            <outputDirectory>lib</outputDirectory>
            <unpack>false</unpack>
            <scope>runtime</scope>
        </dependencySet>
    </dependencySets>
    <fileSets>
        <!-- 把项目相关的说明文件，打包进zip文件的根目录 -->
        <fileSet>
            <directory>${project.basedir}</directory>
            <outputDirectory>/</outputDirectory>
        <includes>
            <include>README*</include>
            <include>LICENSE*</include>
            <include>NOTICE*</include>
        </includes>
    </fileSet>
        <!-- 把项目的配置文件，打包进zip文件的config目录 -->
        <fileSet>
            <directory>src/main/resources</directory>
            <outputDirectory>/config</outputDirectory>
            <includes>
                <include>**/*.properties</include>
                <include>**/*.xml</include>
            </includes>
        </fileSet>
        <!-- 把项目的脚本文件目录（ src/main/scripts ）中的启动脚本文件，打包进zip文件的跟目录 -->
        <fileSet>
            <directory>${project.build.scriptSourceDirectory}</directory>
            <outputDirectory></outputDirectory>
            <includes>
                <include>startup.*</include>
            </includes>
        </fileSet>
        <!-- 把项目自己编译出来的jar文件，打包进zip文件的根目录 -->
        <fileSet>
            <directory>${project.build.directory}</directory>
            <outputDirectory></outputDirectory>
            <includes>
                <include>*.jar</include>
            </includes>
        </fileSet>
    </fileSets>
</assembly>

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

@@ -6,10 +6,12 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
 * @author zhangfeng
 */
@EnableJpaRepositories(basePackages = "com.ai.bss")
@EntityScan(basePackages = {"com.ai.bss","com.ai.abc"})
@ComponentScan(basePackages = {"com.ai.bss","com.ai.abc"})

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

@@ -0,0 +1,84 @@
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.person.model.Organization;
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
import com.ai.bss.user.dto.UserDto;
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.List;
import java.util.Map;
/**
 * 公共服务，包括部门、用户
 * @Auth wangdong
 */
@Controller
@RequestMapping("/workEmployee")
public class AttendanceCommonController {
    @Autowired
    AttendanceCommonService attendanceCommonService;
    /**
     * 查询部门列表
     */
    @ResponseBody
    @RequestMapping("/queryAllOrganize")
    public CommonResponse<List<Organization>> queryAllOrganize(@RequestBody Map<String, Object> params)  {
        return attendanceCommonService.queryAllOrganize(params);
    }
//    /**
//     * 分页查询所有员工信息
//     */
//    @ResponseBody
//    @RequestMapping("/queryWorkEmployee")
//    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody(required = false) Map<String, Object> params)  {
//
//        return attendanceCommonService.queryWorkEmployee(params);
//    }
    /**
     * 分页查询用户信息
     */
    @ResponseBody
    @RequestMapping("/queryWorkEmployee")
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
		/*UserDto userDto = new UserDto();
		userDto.setOrgId(params.get("orgId"));
		userDto.setCode(params.get("code"));
		userDto.setName(params.get("name"));
		// TODO 组织编码
		userDto.setOrgCode("0000");
		// 当前页数
		int pageNumber  = Integer.parseInt(params.get("pageNumber"));
		// 每页条数
		int pageSize = Integer.parseInt(params.get("pageSize"));
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto, pageNumber, pageSize);
*/
        //CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
        return attendanceCommonService.queryWorkEmployee(request);
    }
    /**
     * 查询部门下员工
     */
    @ResponseBody
    @RequestMapping("/queryEmployeeByOrg")
    public CommonResponse<List<UserDto>> queryEmployeeByOrg(@RequestBody Map<String, Object> params)  {
        return attendanceCommonService.queryEmployeeByOrg(params);
    }
}

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

@@ -1,11 +1,15 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
import com.ai.bss.security.protection.service.interfaces.AttendanceRulesService;
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
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;
@@ -14,15 +18,18 @@ import java.util.Map;
/**
 * 考勤规则
 * @Auth wangdong
 */
@Controller
@RequestMapping("/attendanceRules")
public class attendanceRulesController {
	Logger logger = LoggerFactory.getLogger(attendanceRulesController.class);
public class AttendanceRulesController {
	@Autowired
	AreaInRecordService areaInRecordService;
	@Autowired
	AttendanceRulesService attendanceRulesService;
	/**
	 * 分页查询考勤统计分析
	 */
@@ -39,8 +46,20 @@ public class attendanceRulesController {
		}
		PageInfo pageInfo = areaInRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
		return pageInfo;
	}
	/**
	 * 创建考勤规则
	 * @param attendanceRuleParams
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/createAttendanceRule")
	public CommonResponse createAttendanceRule(@RequestBody AttendanceRuleParams attendanceRuleParams) throws Exception {
		return attendanceRulesService.createAttendanceRule(attendanceRuleParams);
	}
}

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

@@ -0,0 +1,75 @@
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.security.protection.service.interfaces.WorkShiftService;
import com.ai.bss.work.task.model.common.WorkShift;
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.Map;
@Controller
@RequestMapping("/workShift")
public class WorkShiftController {
    @Autowired
    private WorkShiftService workShiftService;
    /**
     * 创建班次
     * @param workShift
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/createWorkShift")
    public CommonResponse createWorkShift(@RequestBody WorkShift workShift) throws Exception {
         workShiftService.createWorkShift(workShift);
        return CommonResponse.OK_VOID;
    }
    /**
     * 修改班次
     * @param workShift
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/modifyWorkShift")
    public CommonResponse modifyWorkShift(@RequestBody WorkShift workShift) throws Exception {
        return workShiftService.modifyWorkShift(workShift);
    }
    /**
     * 删除班次
     * @param workShift
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/deleteWorkShift")
    public CommonResponse deleteWorkShift(@RequestBody WorkShift workShift) throws Exception {
        return workShiftService.deleteWorkShift(workShift);
    }
    /**
     * 查询班次列表
     * @param conditionMapRequest
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/queryWorkShiftForPage")
    public CommonResponse queryWorkShiftForPage(@RequestBody CommonRequest<Map<String, Object>> conditionMapRequest) throws Exception {
        return workShiftService.queryWorkShiftForPage(conditionMapRequest);
    }
}

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

@@ -0,0 +1,90 @@
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.constant.CommonConstant;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.person.model.Organization;
import com.ai.bss.person.service.api.OrganizationQuery;
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.user.service.api.UserDtoQuery;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class AttendanceCommonServiceImpl implements AttendanceCommonService {
    @Autowired
    private UserDtoQuery userDtoQuery;
    @Autowired
    private OrganizationQuery organizationQuery;
    @Autowired
    private EmployeeService employeeService;
    @Override
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(Map<String, Object> params)  {
        String orgCode = (!(params.get("orgCode") == null || "".equals(params.get("orgCode")))) ? (String) params.get("orgCode") : null;
        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
        String employeeId = (!(params.get("employeeId") == null || "".equals(params.get("employeeId")))) ? (String) params.get("employeeId") : null;
        String employeeName = (!(params.get("employeeName") == null || "".equals(params.get("employeeName")))) ? (String) params.get("employeeName") : null;
        String employeeCode = (!(params.get("employeeCode") == null || "".equals(params.get("employeeCode")))) ? (String) params.get("employeeCode") : null;
        UserDto userDto = new UserDto();
        userDto.setOrgCode(orgCode);
        userDto.setOrgId(orgId);
        userDto.setId(employeeId);
        userDto.setName(employeeName);
        userDto.setCode(employeeCode);
        CommonRequest<UserDto> request2=new CommonRequest<UserDto>(userDto);
        return userDtoQuery.queryWorkEmployee(request2);
    }
    @Override
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
        // TODO 组织编码
        //request.getData().setOrgCode("0000");
        return userDtoQuery.queryWorkEmployee(request);
    }
    @Override
    public CommonResponse<List<Organization>> queryAllOrganize(Map<String, Object> params) {
        Organization organize = new Organization();
        //1：只查有效的；0：查全部的
        organize.setDataStatus(CommonConstant.STATUS_NORMAL_STR);
        String orgName = (!(params.get("name") == null || "".equals(params.get("name")))) ? (String) params.get("name") : null;
        organize.setName(orgName);
        CommonRequest<Organization> commonRequest = CommonRequest.<Organization>builder().data(organize).build();
        return organizationQuery.queryAllOrganize(commonRequest);
    }
    @Override
    public CommonResponse<List<UserDto>> queryEmployeeByOrg(Map<String, Object> params)  {
        UserDto userDto = new UserDto();
        String username = (!(params.get("name") == null || "".equals(params.get("name")))) ? (String) params.get("name") : null;
        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
        String orgCode = (!(params.get("orgCode") == null || "".equals(params.get("orgCode")))) ? (String) params.get("orgCode") : null;
//        int pageNumber = (!(params.get("pageNumber") == null || "".equals(params.get("pageNumber")))) ? (Integer) params.get("pageNumber") : 1;
//        int pageSize = (!(params.get("pageSize") == null || "".equals(params.get("pageSize")))) ? (Integer) params.get("pageSize") : 10;
        userDto.setName(username);
        userDto.setOrgId(orgId);
        userDto.setOrgCode(orgCode);
//        CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNumber).pageSize(pageSize).build();
        CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).build();
        return userDtoQuery.queryWorkEmployeeByOrg(request);
    }
}

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

@@ -0,0 +1,55 @@
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.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.AttendanceRulesService;
import com.ai.bss.work.attendance.service.api.AttendanceCommand;
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class AttendanceRulesServiceImpl implements AttendanceRulesService {
    @Autowired
    AttendanceCommand attendanceCommand;
    @Override
    public CommonResponse createAttendanceRule(AttendanceRuleParams attendanceRuleParams) throws Exception {
//        AttendanceRuleParams
//        "attendanceTaskSpec":{
//            "goToWorkAheadMinutes": 60,
//                    "goToWorkPostponeMinutes": 20,
//                    "goToWorkDeadLine": 60,
//                    "goOffWorkAheadMinutes": 60,
//                    "goOffWorkPostponeMinutes": 10,
//                    "g0OffWorkDeadLine": 30,
//                    "allowFieldClocking": "0",
//                    "lateAlarmThreshold": 5,
//                    "earlyExitAlarmThreshold": 5,
//                    "absentAlarmThreshold": 3,
//                    "workTaskSpecId": "",
//                    "workTaskSpecTypeId": "CLOCKING",
//                    "name": "打卡",
//                    "charValueSet": "{}"
//        },
//        "workTaskSpecPlan":{
//            "workOrgRoleId": "1",
//            "planMemo": "测试计划",
//            "planCycleType": "NAT_MON",
//            "workShiftId": 0
//        }
        CommonResponse runningResult =  attendanceCommand.createAttendanceRule(new CommonRequest<>(attendanceRuleParams));
//        return runningResult;
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
        return runningResult;
    }
}

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

@@ -0,0 +1,92 @@
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.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.WorkShiftService;
import com.ai.bss.work.service.api.WorkShiftCommand;
import com.ai.bss.work.service.api.WorkShiftQuery;
import com.ai.bss.work.task.model.common.WorkShift;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class WorkShiftServiceImpl implements WorkShiftService {
//    @Autowired
//    AttendanceCommand attendanceCommand;
    @Autowired
    WorkShiftCommand workShiftCommand;
    @Autowired
    WorkShiftQuery workShiftQuery;
    @Override
    public CommonResponse createWorkShift(WorkShift workShift) throws Exception {
        CommonRequest<WorkShift> requestWorkShift = new CommonRequest(workShift);
        log.info("requestWorkShift: \n{}", JSON.toJSONString(requestWorkShift, true));
        CommonResponse runningResult = workShiftCommand.createWorkShift(requestWorkShift);
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
        return runningResult;
    }
    @Override
    public CommonResponse modifyWorkShift(WorkShift workShift) throws Exception {
        CommonRequest<WorkShift> requestWorkShift = new CommonRequest(workShift);
        log.info("requestWorkShift: \n{}", JSON.toJSONString(requestWorkShift, true));
        CommonResponse runningResult = workShiftCommand.modifyWorkShift(requestWorkShift);
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
        return runningResult;
    }
    @Override
    public CommonResponse deleteWorkShift(WorkShift workShift) throws Exception {
        if(workShift == null || workShift.getWorkShiftId()==null){
            throw new Exception("WorkShiftId be not null!");
        }
        List<Long> WorkShiftIdList = new ArrayList<>();
        WorkShiftIdList.add(workShift.getWorkShiftId());
        CommonRequest<List<Long>> workShiftRequest = new CommonRequest(WorkShiftIdList);
        log.info("requestWorkShift: \n{}", JSON.toJSONString(workShiftRequest, true));
        CommonResponse runningResult = workShiftCommand.deleteWorkShift(workShiftRequest);
        log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
        return runningResult;
    }
    @Override
    public CommonResponse<List<WorkShift>> queryWorkShiftForPage(CommonRequest<Map<String, Object>> conditionMapRequest) {
//        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
        log.info("requestWorkShift: \n{}", JSON.toJSONString(conditionMapRequest, true));
        return null;// workShiftQuery.queryWorkShift(new CommonRequest<>(null));
    }
    public static String toJSONStringByDateFormat(Object object, boolean perttyFormat) {
        JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
        if (perttyFormat) {
            return JSON.toJSONString(object, SerializerFeature.WriteDateUseDateFormat, SerializerFeature.PrettyFormat);
        } else {
            return JSON.toJSONString(object, SerializerFeature.WriteDateUseDateFormat);
        }
    }
}

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

@@ -0,0 +1,44 @@
package com.ai.bss.security.protection.service.interfaces;
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.person.model.Organization;
import com.ai.bss.user.dto.UserDto;
import java.util.List;
import java.util.Map;
public interface AttendanceCommonService {
    /**
     * 人员列表分页查询
     * @param request
     * @return
     * @throws Exception
     */
    CommonResponse<PageBean<UserDto>> queryWorkEmployee(Map<String, Object> params) ;
    /**
     * 人员列表分页查询
     * @param request
     * @return
     * @throws Exception
     */
    CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
    /**
     * 查询所有部门（课通过name过滤）
     * @param params{"name":""}
     * @return
     */
    CommonResponse<List<Organization>> queryAllOrganize(Map<String, Object> params);
    /**
     * 根据orgId查询该部门下员工(可同时支持员工姓名过滤)
     * @param params{"orgId":"","name":""}
     * @return
     */
    CommonResponse<List<UserDto>> queryEmployeeByOrg(Map<String, Object> params);
}

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

@@ -0,0 +1,9 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
public interface AttendanceRulesService {
    CommonResponse createAttendanceRule(AttendanceRuleParams attendanceRuleParams) throws Exception;
}

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

@@ -0,0 +1,44 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
import com.ai.bss.work.task.model.common.WorkShift;
import java.util.List;
import java.util.Map;
public interface WorkShiftService {
    /**
     * 创建班次
     * @param workShift
     * @return
     * @throws Exception
     */
    CommonResponse createWorkShift(WorkShift workShift) throws Exception;
    /**
     * 修改班次
     * @param workShift
     * @return
     * @throws Exception
     */
    CommonResponse modifyWorkShift(WorkShift workShift) throws Exception;
    /**
     * 删除班次
     * @param workShift
     * @return
     * @throws Exception
     */
    CommonResponse deleteWorkShift(WorkShift workShift) throws Exception;
    /**
     * 查询班次信息
     * @param conditionMapRequest
     * @return
     */
    CommonResponse<List<WorkShift>> queryWorkShiftForPage(CommonRequest<Map<String, Object>> conditionMapRequest);
}

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/SecurityConfigSEVEN.java

@@ -0,0 +1,19 @@
//package com.ai.bss.security.protection.utils;
//
//import org.springframework.context.annotation.Configuration;
//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
//
//@Configuration
//@EnableWebSecurity
//public class SecurityConfigSEVEN extends WebSecurityConfigurerAdapter {
//
//    @Override
//    protected void configure(HttpSecurity http) throws Exception {
//        //super.configure(http);
//        //配置不需要登陆验证
//        http.authorizeRequests().anyRequest().permitAll().and().logout().permitAll();
//    }
//}
//

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

@@ -1,12 +1,14 @@
spring.application.name=WorkTaskSpec
server.port=8086
server.port=8018
server.servlet.context-path=/sp
# 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.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,10 +19,36 @@ 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:2182
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
#kafka.topic.alarm=Topic_IoT_IndividualAlarm
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=3100
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
# LOGGING
logging.level.com.ai=info
logging.level.org.springframework.data=info
logging.level.com.ai=debug
logging.level.org.springframework.data=debug
# \u5f15\u5165gis\u548ciot\u7684\u914d\u7f6e\u6587\u4ef6
spring.profiles.active=iot,gis