修改用户管理

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

@@ -1,43 +1,82 @@
package com.ai.bss.location.rescue.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.constant.CommonConstant;
import com.ai.bss.person.model.Individual;
import com.ai.bss.person.model.Organization;
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 com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonRequest.CommonRequestBuilder;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.UserManageService;
import com.ai.bss.location.rescue.service.interfaces.WorkEmployeeService;
import com.ai.bss.user.dto.UserDto;
/**
 * 用户信息
 */
@Controller
@RequestMapping("/user")
public class UserManageController {
    @Autowired
    UserManageService userManageService;
    Logger logger = LoggerFactory.getLogger(UserManageController.class);
    /**
     * 查询用户信息
     */
    @ResponseBody
    @RequestMapping("/queryUserInfo")
    public Map<String,Object> queryUserInfo(Map<String,Object> params) throws Exception {
        PageBean<UserDto> userList=  userManageService.queryUserInfo(params);
        Map<String,Object> result = new HashMap<String,Object>();
        result.put("result", userList);
        return result;
    }
    
}
@RequestMapping("/workEmployee")
public class WorkEmployeeController {
	@Autowired
	WorkEmployeeService userManageService;
	/**
	 * 查询用户信息
	 */
	@ResponseBody
	@RequestMapping("/queryWorkEmployee")
	public 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();
		// TODO 组织编码
		request.getData().setOrgCode("0000");
		PageBean<UserDto> userList = userManageService.queryWorkEmployee(request);
		return userList;
	}
	@ResponseBody
	@RequestMapping("/queryAllOrganize")
	public List<Organization> queryAllOrganize() throws Exception {
		Organization organize = new Organization();
		//1：只查有效的；0：查全部的
		organize.setDataStatus(CommonConstant.STATUS_NORMAL_STR);
		CommonRequest<Organization> params = CommonRequest.<Organization>builder().data(organize).build();
		List<Organization> allOrgList=userManageService.queryAllOrganize(params);
		return allOrgList;
	}
	@ResponseBody
	@RequestMapping("/createWorkEmployee")
	public String createWorkEmployee(@RequestBody Individual request) throws Exception {
		userManageService.createWorkEmployee(request);
		return "true";
	}
	}

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

@@ -1,54 +1,54 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.location.rescue.dao.interfaces.UserManageDao;
import com.ai.bss.location.rescue.service.interfaces.UserManageService;
import com.ai.bss.location.rescue.service.interfaces.WorkEmployeeService;
import com.ai.bss.person.model.Individual;
import com.ai.bss.person.model.Organization;
import com.ai.bss.person.service.api.IndividualService;
import com.ai.bss.person.service.api.OrganizationQuery;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.UserDtoQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class UserManageServiceImpl implements UserManageService {
    Logger logger = LoggerFactory.getLogger(UserManageServiceImpl.class);
public class WorkEmployeeServiceImpl implements WorkEmployeeService {
    Logger logger = LoggerFactory.getLogger(WorkEmployeeServiceImpl.class);
    @Autowired
    UserManageDao userManageDao;
    UserDtoQuery userDtoQuery;
    @Autowired
    UserDtoQuery userDtoQuery;
    private OrganizationQuery organizationQuery;
    @Autowired
    private IndividualService individualService;
    @Override
    public PageBean<UserDto> queryUserInfo(Map<String,Object> params) throws Exception {
        UserDto userDto = new UserDto();
        userDto.setOrgCode("0000");
        CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(1).pageSize(2).build();
    public PageBean<UserDto> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
        CommonResponse<PageBean<UserDto>>  aa = userDtoQuery.queryWorkEmployee(request);
        CommonResponse<PageBean<UserDto>> result = userDtoQuery.queryWorkEmployee(request);
        return aa.getData();
        return result.getData();
    }
    @Override
    public int modifyUserInfo(Map<String,Object> params) throws Exception{
        //將原來数据删除，然后在从新插入
        return userManageDao.modifyUserInfo(params);
    public List<Organization> queryAllOrganize(CommonRequest<Organization> params) throws Exception {
        CommonResponse<List<Organization>> result = organizationQuery.queryAllOrganize(params);
        return result.getData();
    }
    @Override
    public int addUserInfo(Map<String,Object> params) throws Exception{
        return userManageDao.addUserInfo(params);
    public Long createWorkEmployee(Individual params) throws Exception {
        CommonResponse<Individual> result = individualService.createIndividual(CommonRequest.<Individual>builder().data(params).build());
       return result.getData().getId();
    }
    @Override
    public boolean deleteUserXyInfo(Map<String,Object> params) throws Exception{
        return userManageDao.deleteUserXyInfo(params);
    }
}

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

@@ -1,17 +1,19 @@
package com.ai.bss.location.rescue.service.interfaces;
import java.util.Map;
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.Individual;
import com.ai.bss.person.model.Organization;
import com.ai.bss.user.dto.UserDto;
public interface UserManageService {
import java.util.List;
    PageBean<UserDto> queryUserInfo(Map<String,Object> params) throws Exception;
public interface WorkEmployeeService {
    int modifyUserInfo(Map<String,Object> params) throws Exception;
	PageBean<UserDto> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
    int addUserInfo(Map<String,Object> params) throws Exception;
	List<Organization> queryAllOrganize(CommonRequest<Organization> params) throws Exception;
    boolean deleteUserXyInfo(Map<String,Object> params) throws Exception;
	Long createWorkEmployee(Individual params) throws Exception;
}