统一用户管理返回值

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/WorkEmployeeController.java

@@ -2,6 +2,7 @@ package com.ai.bss.location.rescue.controller;
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.constant.CommonConstant;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.WorkEmployeeService;
@@ -75,8 +76,8 @@ public class WorkEmployeeController {
     */
    @ResponseBody
    @RequestMapping("/queryJobPositionList")
    public CommonResponse<List<Map<String, String>>> queryJobPositionList() throws Exception {
        List<Map<String, String>> resultList = userManageService.queryJobPositionList();
    public CommonResponse<List<CharacteristicSpecValue>> queryJobPositionList() throws Exception {
        List<CharacteristicSpecValue> resultList = userManageService.queryJobPositionList();
        return CommonResponse.ok(resultList);
    }
@@ -85,30 +86,35 @@ public class WorkEmployeeController {
     */
    @ResponseBody
    @RequestMapping("/createWorkEmployee")
    public boolean createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        boolean result = userManageService.createWorkEmployee(employeeDto);
        return result;
    public CommonResponse<Void> createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        return userManageService.createWorkEmployee(employeeDto);
    }
	/**
	 * 删除用户信息
	 */
	@ResponseBody
	@RequestMapping("/deleteWorkEmployee")
	public boolean deleteWorkEmployee(@RequestBody Map<String, String> params) throws Exception {
		boolean result = userManageService.deleteWorkEmployee(params);
		return result;
	}
	/**
	 * 修改用户信息
	 */
	@ResponseBody
	@RequestMapping("/modifyWorkEmployee")
	public boolean modifyWorkEmployee(@RequestBody EmployeeDto employeeDto ) throws Exception {
		boolean result = userManageService.modifyWorkEmployee(employeeDto);
		return result;
	}
    /**
     * 删除用户信息
     */
    @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", "删除失败");
        }
        return userManageService.deleteWorkEmployee(params);
    }
    /**
     * 修改用户信息
     */
    @ResponseBody
    @RequestMapping("/modifyWorkEmployee")
    public CommonResponse<Void> modifyWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        if (employeeDto == null || employeeDto.getId() == null || "".equals(employeeDto.getId())) {
            return CommonResponse.fail("500", "修改失败");
        }
        return userManageService.modifyWorkEmployee(employeeDto);
    }
    /**
     * 获取已绑定终端的人员列表

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/WorkEmployeeServiceImpl.java

@@ -39,9 +39,9 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
    @Autowired
    private EmployeeService employeeService;
    
	@Autowired
	CharacteristicSpecService characteristicSpecService;
    @Autowired
    CharacteristicSpecService characteristicSpecService;
    @Autowired
    EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
@@ -59,61 +59,45 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
    }
    @Override
    public List<Map<String,String>> queryJobPositionList() {
    public List<CharacteristicSpecValue> queryJobPositionList() {
        CharacteristicSpec characteristicSpec = characteristicSpecService
                .findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_EMPLOYEE_POSITION);
        if (characteristicSpec == null) {
            return new ArrayList<Map<String,String>>();
        }
        List<Map<String,String>> resultList=new ArrayList<Map<String,String>>();
        for (CharacteristicSpecValue characteristicSpecValue:characteristicSpec.getCharacteristicSpecValues()) {
            Map<String,String> map=new HashMap<String,String>();
            map.put("jobPositionId",characteristicSpecValue.getCode());
            map.put("jobPositionName",characteristicSpecValue.getValue());
            resultList.add(map);
        }
        return resultList;
        return characteristicSpec.getCharacteristicSpecValues();
    }
    
    @Override
    public boolean createWorkEmployee(EmployeeDto employeeDto) throws Exception {
    public CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception {
        CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
        CommonResponse<Void> response = employeeService.createWorkEmployee(request);
        if(response==null){
            System.out.println(response);
        }
        boolean success = response.isSuccess();
        return success;
        return employeeService.createWorkEmployee(request);
    }
    @Override
    public boolean deleteWorkEmployee(Map<String, String> params) {
        boolean success = false;
        if (params.get("ids")!=null&&!"".equals(params.get("ids"))) {
            String ids = params.get("ids");
            String[] idsArray = ids.split(",");
            EmployeeDto employeeDto=new EmployeeDto();
            for(String id: idsArray){
                long lid = Long.parseLong(id);
                employeeDto.setId(lid);
                CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
                CommonResponse<Void> response = employeeService.deleteWorkEmployee(request);
                success = response.isSuccess();
            }
            return success;
        }else {
            return success;
    public CommonResponse<Void> deleteWorkEmployee(Map<String, String> params) {
        boolean success = true;
        String ids = params.get("ids");
        String[] idsArray = ids.split(",");
        EmployeeDto employeeDto = new EmployeeDto();
        for (String id : idsArray) {
            long lid = Long.parseLong(id);
            employeeDto.setId(lid);
            CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
            CommonResponse<Void> response = employeeService.deleteWorkEmployee(request);
            success = success && response.isSuccess();
        }
        if (success) {
            return CommonResponse.ok(null);
        } else {
            return CommonResponse.fail("504", "删除失败");
        }
    }
    @Override
    public boolean modifyWorkEmployee(EmployeeDto employeeDto) {
    public CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto) {
        CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
        CommonResponse<Void> response = employeeService.modifyEmployee(request);
        boolean success = response.isSuccess();
        return success;
        return employeeService.modifyEmployee(request);
    }
    @Override

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/WorkEmployeeService.java

@@ -5,6 +5,7 @@ import java.util.Map;
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.Individual;
import com.ai.bss.person.model.Organization;
@@ -30,13 +31,29 @@ public interface WorkEmployeeService {
	 * 获取职务下拉列表
	 * @return
	 */
	List<Map<String,String>> queryJobPositionList() throws Exception;
	List<CharacteristicSpecValue> queryJobPositionList() throws Exception;
	boolean createWorkEmployee(EmployeeDto employeeDto) throws Exception;
	/**
	 * 创建人员
	 * @param employeeDto
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception;
	boolean deleteWorkEmployee(Map<String, String> params);
	/**
	 * 删除人员
	 * @param params
	 * @return
	 */
	CommonResponse<Void> deleteWorkEmployee(Map<String, String> params);
	boolean modifyWorkEmployee(EmployeeDto employeeDto);
	/**
	 * 修改人员
	 * @param employeeDto
	 * @return
	 */
	CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto);
	/**
	 * 获取已绑定终端的人员列表