Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc

ebc-middle-platform/src/modules/attendance/track.vue

@@ -31,7 +31,7 @@
        <t-table-column prop="entityName" label="姓名"></t-table-column>
        <t-table-column prop="entityPosition" label="职务"></t-table-column>
        <t-table-column prop="mapAreaName" label="位置区域"></t-table-column>
        <t-table-column prop="durationTime" label="停留时长（h）"></t-table-column>
        <t-table-column prop="durationTime" label="停留时长"></t-table-column>
        <t-table-column prop="inTime" :formatter="timestampToTime" label="进入时间"></t-table-column>
        <t-table-column prop="outTime" :formatter="timestampToTime" label="离开时间"></t-table-column>
      </t-table>

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

@@ -4,17 +4,20 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
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.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.EmployeeManagementService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.user.dto.EmployeeDto;
@@ -32,63 +35,127 @@ public class EmployeeManagementController {
	/**
	 * 分页查询用户信息
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryWorkEmployee")
	public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request)
	@RequestMapping("/queryEmployeeList")
	public CommonResponse<PageBean<UserDto>> queryEmployeeList(@ModelAttribute AttendanceReport attendanceReport)
			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 pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		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();
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE
				: attendanceReport.getPageSize();
		UserDto userDto = new UserDto();
		if (StringUtils.isNotEmpty(attendanceReport.getOrgId())) {
			userDto.setOrgId(attendanceReport.getOrgId());
		}
		return employeeManagementService.queryWorkEmployee(request);
		return employeeManagementService.queryEmployeeList(userDto, pageNumber, pageSize);
	}
	/**
	 * 增加用户信息
	 * 查询单个用户信息
	 * @param employeeId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/createWorkEmployee")
	public CommonResponse<Void> createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		return employeeManagementService.createWorkEmployee(employeeDto);
	@RequestMapping("/queryOneEmployee")
	public CommonResponse<EmployeeDto> queryOneEmployee(@RequestParam Long employeeId) throws Exception {
		if (employeeId == null) {
			return CommonResponse.fail("500", "操作失败");
		}
		return employeeManagementService.queryOneEmployee(employeeId);
	}
	/**
	 * 删除用户信息
	 * 新增用户信息
	 * @param employeeDto
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/deleteWorkEmployee")
	public CommonResponse<Void> deleteWorkEmployee(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("ids") == null || "".equals(params.get("ids"))) {
			return CommonResponse.fail("500", "删除失败");
	@RequestMapping("/createEmployee")
	public CommonResponse<Void> createEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto == null || StringUtils.isEmpty(employeeDto.getName())) {
			return CommonResponse.fail("500", "新增失败");
		}
		return employeeManagementService.deleteWorkEmployee(params);
		return employeeManagementService.createEmployee(employeeDto);
	}
	/**
	 * 修改用户信息
	 * @param employeeDto
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/modifyWorkEmployee")
	public CommonResponse<Void> modifyWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto == null || employeeDto.getId() == null || "".equals(employeeDto.getId())) {
	@RequestMapping("/modifyEmployee")
	public CommonResponse<Void> modifyEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto == null || employeeDto.getId() == null || StringUtils.isEmpty(employeeDto.getName())) {
			return CommonResponse.fail("500", "修改失败");
		}
		return employeeManagementService.modifyWorkEmployee(employeeDto);
		return employeeManagementService.modifyEmployee(employeeDto);
	}
	/**
	 * 删除用户信息
	 * @param employeeId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/deleteEmployee")
	public CommonResponse<Void> deleteEmployee(@RequestParam String employeeId) throws Exception {
		if (StringUtils.isEmpty(employeeId)) {
			return CommonResponse.fail("500", "删除失败");
		}
		return employeeManagementService.deleteEmployee(employeeId);
	}
	/**
	 * 上传用户照片
	 * @param meFile
	 * @param pictureUrl
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/uploadEmployeePicture")
	public CommonResponse<Map<String, String>> uploadEmployeePicture(
			@RequestParam(value = "picture") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			throws Exception {
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
			return CommonResponse.fail("500", "上传失败");
		}
		Map<String, String> resultMap = employeeManagementService.uploadEmployeePicture(meFile, pictureUrl);
		return CommonResponse.ok(resultMap);
	}
	/**
	 * 审核用户照片
	 * @param employeeId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/auditEmployeePicture")
	public CommonResponse<Void> auditEmployeePicture(@RequestParam String employeeId) throws Exception {
		if (StringUtils.isEmpty(employeeId)) {
			return CommonResponse.fail("500", "审核失败");
		}
		return employeeManagementService.auditEmployeePicture(employeeId);
	}
	/**

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

@@ -1,5 +1,6 @@
package com.ai.bss.security.protection.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -7,21 +8,21 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.minio.config.MinioConfig;
import com.ai.bss.person.model.Organization;
import com.ai.bss.person.service.api.OrganizationQuery;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.EmployeeManagementService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.user.service.api.UserDtoQuery;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
@Service
public class EmployeeManagementServiceImpl implements EmployeeManagementService {
@@ -35,26 +36,45 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	@Autowired
	private EmployeeService employeeService;
	
	@Autowired
	private UploadFileService uploadFileService;
	@Autowired
	private MinioConfig minioConfig;
	@Autowired
	private CharSpecService charSpecService;
	@Override
	public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
		// TODO 组织编码
		// request.getData().setOrgCode("0000");
	public CommonResponse<PageBean<UserDto>> queryEmployeeList(UserDto userDto,int pageNumber,int pageSize) throws Exception {
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto,pageNumber, pageSize);
		return userDtoQuery.queryWorkEmployee(request);
	}
	@Override
	public CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception {
	public CommonResponse<EmployeeDto> queryOneEmployee(Long employeeId) throws Exception{
		// TODO Auto-generated method stub
		return null;
	}
	
	@Override
	public CommonResponse<Void> createEmployee(EmployeeDto employeeDto) throws Exception {
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.createWorkEmployee(request);
	}
	@Override
	public CommonResponse<Void> deleteWorkEmployee(Map<String, String> params) {
	public CommonResponse<Void> modifyEmployee(EmployeeDto employeeDto) {
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.modifyEmployee(request);
	}
	
	@Override
	public CommonResponse<Void> deleteEmployee(String employeeId) {
		boolean success = true;
		String ids = params.get("ids");
		String[] idsArray = ids.split(",");
		String[] idsArray = employeeId.split(",");
		EmployeeDto employeeDto = new EmployeeDto();
		for (String id : idsArray) {
			long lid = Long.parseLong(id);
@@ -72,12 +92,32 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	}
	@Override
	public CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto) {
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.modifyEmployee(request);
	public Map<String, String> uploadEmployeePicture(MultipartFile meFile, String pictureUrl) throws Exception {
		/*if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
	 	//删除照片
		uploadFileService.removeFile(pictureUrl, minioConfig.getBucketToolImage());
	}*/
	// 上传
	String minioFileName = uploadFileService.uploadFile(meFile, minioConfig.getBucketHeaderImage());
	// 获取照片的url地址
	String toolPictureUrl = uploadFileService.getFileUrl(minioFileName, minioConfig.getBucketHeaderImage());
	// 返回信息
	Map<String, String> resultMap = new HashMap<String, String>();
	resultMap.put("pictureUrl", minioFileName);
	resultMap.put("toolPictureUrl", toolPictureUrl);
	return resultMap;
	}
	@Override
	public CommonResponse<Void> auditEmployeePicture(String employeeId) throws Exception {
		// TODO Auto-generated method stub
		return null;
	}
	
	@Override
	public CommonResponse<List<Organization>> queryChildOrgById(Long orgId) {
		CommonRequest<Long> organize=new CommonRequest<Long>(orgId);
		return organizationQuery.querySubOrgByOrgId(organize);

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

@@ -3,48 +3,74 @@ package com.ai.bss.security.protection.service.interfaces;
import java.util.List;
import java.util.Map;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.person.model.Organization;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
public interface EmployeeManagementService {
	/**
	 * 人员列表分页查询
	 * @param request
	 * 分页查询用户信息
	 * @param userDto
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
	CommonResponse<PageBean<UserDto>> queryEmployeeList(UserDto userDto, int pageNumber, int pageSize) throws Exception;
	/**
	 * 创建人员
	 * @param employeeDto
	 * 查询单个用户信息
	 * @param employeeId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception;
	CommonResponse<EmployeeDto> queryOneEmployee(Long employeeId) throws Exception;
	/**
	 * 删除人员
	 * @param params
	 * 新增用户信息
	 * @param employeeDto
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> deleteWorkEmployee(Map<String, String> params);
	CommonResponse<Void> createEmployee(EmployeeDto employeeDto) throws Exception;
	/**
	 * 修改人员
	 * 修改用户信息
	 * @param employeeDto
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto);
	CommonResponse<Void> modifyEmployee(EmployeeDto employeeDto) throws Exception;
	/**
	 * 删除用户信息
	 * @param employeeId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> deleteEmployee(String employeeId) throws Exception;
	/**
	 * 上传用户照片
	 * @param meFile
	 * @param pictureUrl
	 * @return
	 * @throws Exception
	 */
	Map<String, String> uploadEmployeePicture(MultipartFile meFile, String pictureUrl) throws Exception;
	/**
	 * 审核用户照片
	 * @param employeeId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> auditEmployeePicture(String employeeId) throws Exception;
	/**
	 * 根据部门ID查询子部门列表
@@ -52,13 +78,12 @@ public interface EmployeeManagementService {
	 * @return
	 */
	CommonResponse<List<Organization>> queryChildOrgById(Long orgId);
	
	/**
	 * 根据部门ID查询下级及下下级部门列表
	 * @param orgId
	 * @return
	 */
	CommonResponse<List<Organization>> queryCycleChildOrg(Long orgId);
	
	
}