Merge remote-tracking branch 'origin/xinghong-dev'

java110

2021-04-01 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387

 service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffRepairsListener.java

@@ -5,9 +5,10 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.dto.repair.RepairDto;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -19,7 +20,6 @@
import java.util.ArrayList;
import java.util.List;


/**
 * 查询小区侦听类
 */
@@ -29,9 +29,8 @@
    @Autowired
    private IRepairInnerServiceSMO repairInnerServiceSMOImpl;


    @Autowired
    private IRepairUserInnerServiceSMO repairUserInnerServiceSMOImpl;
    private IUserInnerServiceSMO userInnerServiceSMO;

    @Override
    public String getServiceCode() {
@@ -43,12 +42,10 @@
        return HttpMethod.GET;
    }


    @Override
    public int getOrder() {
        return DEFAULT_ORDER;
    }


    public IRepairInnerServiceSMO getRepairInnerServiceSMOImpl() {
        return repairInnerServiceSMOImpl;
@@ -63,56 +60,29 @@
        super.validatePageInfo(reqJson);
        Assert.hasKeyAndValue(reqJson, "communityId", "请求中未包含小区ID");
        Assert.hasKeyAndValue(reqJson, "userId", "请求中未包含员工信息");

    }

    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {

        RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
        ownerRepairDto.setStaffId(reqJson.getString("userId"));

        //获取用户id
        String userId = reqJson.getString("userId");
        UserDto userDto = new UserDto();
        userDto.setUserId(userId);
        //查询用户信息
        List<UserDto> users = userInnerServiceSMO.getUsers(userDto);
        Assert.listOnlyOne(users, "数据异常未找到用户信息");
        if (!users.get(0).getLevelCd().equals("00")) {  //当前用户不是管理员时放入staffId的值
            ownerRepairDto.setStaffId(reqJson.getString("userId"));
        }
        int count = repairInnerServiceSMOImpl.queryStaffRepairsCount(ownerRepairDto);


        List<RepairDto> ownerRepairs = null;
        if (count > 0) {
            ownerRepairs = repairInnerServiceSMOImpl.queryStaffRepairs(ownerRepairDto);

            //refreshStaffName(ownerRepairs);
        } else {
            ownerRepairs = new ArrayList<>();
        }

        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerRepairs);


        context.setResponseEntity(responseEntity);

    }
//
//    private void refreshStaffName(List<RepairDto> ownerRepairs) {
//
//        List<String> repairIds = new ArrayList<>();
//        for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
//            repairIds.add(apiOwnerRepairDataVo.getRepairId());
//        }
//
//        if (repairIds.size() < 1) {
//            return;
//        }
//        RepairUserDto repairUserDto = new RepairUserDto();
//        repairUserDto.setRepairIds(repairIds.toArray(new String[repairIds.size()]));
//        List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
//
//        for (RepairUserDto tmpRepairUserDto : repairUserDtos) {
//            for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
//                if (tmpRepairUserDto.getRepairId().equals(apiOwnerRepairDataVo.getRepairId())) {
//                    apiOwnerRepairDataVo.setStaffId(tmpRepairUserDto.getUserId());
//                    //apiOwnerRepairDataVo.setStatmpRepairUserDto.getUserName());
//                }
//            }
//        }
//
//    }
}