新增工单管理的查询接口

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

@@ -0,0 +1,158 @@
package com.ai.bss.security.protection.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementService;
import com.ai.bss.security.protection.util.EbcConstant;
/**
 * 工单管理
 */
@Controller
@RequestMapping("/workOrderManagement")
public class WorkOrderManagementController {
	Logger logger = LoggerFactory.getLogger(WorkOrderManagementController.class);
	@Autowired
	private WorkOrderManagementService workOrderManagementService;
	/**
	 * 分页查询工单信息
	 * @param pageNumber  当前页数
	 * @param pageSize 每页条数
	 * @param status 工作状态(默认END)  RUN:待审批， END:完成
	 * @param appovalSubType 工单类型  小类
	 * @param startTime 开始时间
	 * @param endTime 结束时间
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageWorkOrder")
	public CommonResponse<PageBean<Map<String, Object>>> queryPageWorkOrder(
			@RequestParam(required = false) int pageNumber, @RequestParam(required = false) int pageSize,
			@RequestParam(defaultValue = "END") String status, @RequestParam(required = false) String appovalSubType,
			@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime)
			throws Exception {
		pageNumber = pageNumber < 1 ? 1 : pageNumber;
		pageSize = pageSize < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : pageSize;
		Map<String, String> params = new HashMap<String, String>();
		params.put("status", status);
		params.put("appovalSubType", appovalSubType);
		params.put("startTime", startTime);
		params.put("endTime", endTime);
		return workOrderManagementService.queryPageWorkOrder(params, pageNumber, pageSize);
	}
	/**
	 * 获取所有工单类型
	 *
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryWorkOrderTypeList")
	public  CommonResponse<Map<String, List<Map<String, String>>>> queryWorkOrderTypeList() {
		return workOrderManagementService.queryWorkOrderTypeList();
	}
	/**
	 * 查询单个工单信息
	 *
	 * @param workOrderId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneWorkOrder")
	public CommonResponse<Map<String, Object>> queryOneWorkOrder(@RequestParam String workOrderId)
			throws Exception {
		if (StringUtils.isEmpty(workOrderId)) {
			return CommonResponse.fail("500", "操作失败");
		}
		Map<String,String> params = new HashMap<String, String>();
		params.put("workOrderId", workOrderId);
		
		return workOrderManagementService.queryOneWorkOrder(params);
	}
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	/**
	 * 工单申请
	 *
	 * @param mapTagInfoDto
	 * @return
	 * @throws Exception
	 */
	/*@ResponseBody
	@RequestMapping("/addAlppyVacationInfo")
	public CommonResponse<Void> addAlppyVacationInfo(@RequestBody WorkEvent mapTagInfoDto) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		*//*if (mapTagInfoDto == null || mapTagInfoDto.getMapAreaName() == null
				|| mapTagInfoDto.getMapAreaContent() == null) {
			return CommonResponse.fail("500", "添加失败");
		}
		
		mapTagInfoDto.setMapAreaSetId(0L); // TODO 固定值 所属地图工单集合标识
		mapTagInfoDto.setPriority("10"); // 优先级
		mapTagInfoDto.setMapType(MapArea.MAP_TYPE_GEOMETRY);*//* // 工单形状,GEO多边形, RAD 圆形
		return workOrderManagementService.addAlppyVacationInfo(mapTagInfoDto);
	}*/
	/**
	 * 工单审核
	 *
	 * @param mapTagInfoDto
	 * @return
	 * @throws Exception
	 */
	/*@ResponseBody
	@RequestMapping("/checkAlppyVacationInfo")
	public CommonResponse<Void> checkAlppyVacationInfo(@RequestBody MapTagInfoDto mapTagInfoDto) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		*//*if (mapTagInfoDto == null || mapTagInfoDto.getMapAreaName() == null || mapTagInfoDto.getMapAreaId() == null
				|| mapTagInfoDto.getMapAreaContent() == null) {
			return CommonResponse.fail("500", "修改失败");
		}
		
		mapTagInfoDto.setMapAreaSetId(0L); // TODO 固定值 所属地图工单集合标识
		mapTagInfoDto.setPriority("10"); // 优先级
		mapTagInfoDto.setMapType(MapArea.MAP_TYPE_GEOMETRY);*//* // 工单形状,GEO多边形, RAD 圆形
		return workOrderManagementService.checkAlppyVacationInfo(mapTagInfoDto);
	}*/
}

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

@@ -0,0 +1,80 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecValueService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ailk.org.apache.commons.lang3.StringUtils;
@Service
public class CharSpecServiceImpl implements CharSpecService {
	@Autowired
	private CharacteristicSpecService characteristicSpecService;
	@Autowired
	private CharacteristicSpecValueService characteristicSpecValueService;
	@Override
	public List<CharacteristicSpecValue> getCharSpecList(String charSpecCode) {
		if (StringUtils.isEmpty(charSpecCode)) {
			return new ArrayList<CharacteristicSpecValue>();
		}
		CharacteristicSpec characteristicSpec = characteristicSpecService.findBusinessSpecByCharSpecCode(charSpecCode);
		List<CharacteristicSpecValue> list = characteristicSpec.getCharacteristicSpecValues();
		if (CollectionUtils.isEmpty(list)) {
			return new ArrayList<CharacteristicSpecValue>();
		}
		return list;
	}
	@Override
	public Map<String, String> getCharSpecMap(String charSpecCode) {
		List<CharacteristicSpecValue> list = getCharSpecList(charSpecCode);
		Map<String, String> resultMap = new HashMap<String, String>();
		for (CharacteristicSpecValue characteristicSpecValue : list) {
			resultMap.put(characteristicSpecValue.getCode(), characteristicSpecValue.getValue());
		}
		return resultMap;
	}
	@Override
	public boolean saveCharSpecList(String charSpecCode, Map<String, String> dataMap) {
		List<CharacteristicSpecValue> characteristicSpecList = getCharSpecList(charSpecCode);
		if (CollectionUtils.isEmpty(dataMap) || CollectionUtils.isEmpty(characteristicSpecList)) {
			return false;
		}
		for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecList) {
			Iterator<Map.Entry<String, String>> iter = dataMap.entrySet().iterator();
			while (iter.hasNext()) {
				Map.Entry<String, String> entry = iter.next();
				if (characteristicSpecValue.getCode().equals(entry.getKey())) {
					characteristicSpecValue.setValue(entry.getValue());
					break;
				}
			}
		}
		List<CharacteristicSpecValue> resultList = characteristicSpecValueService
				.saveCharacteristicSpecValue(characteristicSpecList);
		return resultList.size() > 0;
	}
}

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

@@ -0,0 +1,139 @@
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.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementService;
import com.ai.bss.security.protection.util.EbcConstant;
import com.ai.bss.work.attendance.service.api.ApprovalTaskQuery;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class WorkOrderManagementServiceImpl implements WorkOrderManagementService {
    @Autowired
    private ApprovalTaskQuery approvalTaskQuery;
    @Autowired
    private CharSpecService charSpecService;
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryPageWorkOrder(Map<String, String> params, int pageNumber,
                                                                            int pageSize) throws Exception {
        CommonRequest<Map<String, String>> request = new CommonRequest<Map<String, String>>(params, pageNumber,
                pageSize);
        CommonResponse<PageBean<Map<String, Object>>> response = approvalTaskQuery.queryApprovalTaskByConditions(request);
        List<Map<String, Object>> list = response.getData().getData();
        if (CollectionUtils.isEmpty(list)) {
            return response;
        }
        for (Map<String, Object> map : list) {
            JSONObject charValueJsonObj = JSONObject.parseObject(map.get("charValueSet").toString());
            map.put("applyBeginTime", charValueJsonObj.getString("beginTime"));
            map.put("applyEndTime", charValueJsonObj.getString("endTime"));
            map.put("applyDuration", charValueJsonObj.getString("duration"));
            map.put("charValueSet", null);
        }
        return response;
    }
    @Override
    public CommonResponse<Map<String, List<Map<String, String>>>> queryWorkOrderTypeList() {
        Map<String, List<Map<String, String>>> resultMap = new HashMap<String, List<Map<String, String>>>();
        List<CharacteristicSpecValue> allList = charSpecService
                .getCharSpecList(EbcConstant.BUSINESS_SPEC_WORK_ORDER_TYPE);
        List<Map<String, String>> allType = new ArrayList<Map<String, String>>(); // 所有工单小类
        List<Map<String, String>> askLeaveType = new ArrayList<Map<String, String>>(); // 请假
        List<Map<String, String>> fieldWorkType = new ArrayList<Map<String, String>>(); // 外勤
        List<Map<String, String>> recloType = new ArrayList<Map<String, String>>(); // 补卡
        List<Map<String, String>> overtimeType = new ArrayList<Map<String, String>>(); // 加班
        for (CharacteristicSpecValue charValue : allList) {
            Map<String, String> map = new HashMap<String, String>();
            String code = charValue.getCode();
            map.put("approvalType", code);
            map.put("approvalTypeName", charValue.getValue());
            allType.add(map);
            if (code.startsWith(EbcConstant.WORK_ORDER_TYPE_ASK_LEAVE)) {
                askLeaveType.add(map);
            } else if (code.startsWith(EbcConstant.WORK_ORDER_TYPE_FIELD_WORK)) {
                fieldWorkType.add(map);
            } else if (code.startsWith(EbcConstant.WORK_ORDER_TYPE_RECLOCK)) {
                recloType.add(map);
            } else if (code.startsWith(EbcConstant.WORK_ORDER_TYPE_OVERTIME)) {
                overtimeType.add(map);
            }
        }
        resultMap.put("allType", allType);
        resultMap.put("askLeaveType", askLeaveType);
        resultMap.put("fieldWorkType", fieldWorkType);
        resultMap.put("recloType", recloType);
        resultMap.put("overtimeType", overtimeType);
        return CommonResponse.ok(resultMap);
    }
    @Override
    public CommonResponse<Map<String, Object>> queryOneWorkOrder(Map<String, String> params) throws Exception {
        CommonRequest<Map<String, String>> conditionMapRequest = CommonRequest.<Map<String, String>>builder().data(params).build();
        CommonResponse<Map<String, Object>> response = approvalTaskQuery.queryApprovalTaskByWorkOrderId(conditionMapRequest);
        Map<String, Object> map = response.getData();
        if (CollectionUtils.isEmpty(map)) {
            return response;
        }
        JSONObject charValueJsonObj = JSONObject.parseObject(map.get("charValueSet").toString());
        map.put("applyBeginTime", charValueJsonObj.getString("beginTime"));
        map.put("applyEndTime", charValueJsonObj.getString("endTime"));
        map.put("applyDuration", charValueJsonObj.getString("duration"));
        map.put("charValueSet", null);
        return response;
    }
	
	
	
	
	
	
	
	
	
	
	
	/*@Override
	public CommonResponse<Void> addAlppyVacationInfo(WorkEvent workEvent) throws Throwable {
		CommonRequest<WorkEvent> eventRequest = new CommonRequest<WorkEvent>(workEvent);
		return eventHandleCommand.handleEvent(eventRequest);
	}
	@Override
	public CommonResponse<Void> checkAlppyVacationInfo(WorkEvent mapTagInfoDto) throws Exception {
		CommonResponse<WorkTask> resultProcessResult = workOrderCommand.reportWorkOrderResult(workOrderRequest);
		CommonRequest<MapTagInfoDto> param = new CommonRequest<MapTagInfoDto>(mapTagInfoDto);
		return mapAreaTagCommand.modifyMapAreaTag(param);
	}*/
}

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

@@ -0,0 +1,33 @@
package com.ai.bss.security.protection.service.interfaces;
import java.util.List;
import java.util.Map;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
public interface CharSpecService {
	/**
	 * 根据特征属性编码获取对应的属性值
	 * @param charSpecCode 特征属性编码
	 * @return
	 * @throws Exception
	 */
	List<CharacteristicSpecValue> getCharSpecList(String charSpecCode);
	/**
	 * 根据特征属性编码获取对应的属性值，并以code—>value的形式存放到Map中
	 * @param charSpecCode 特征属性编码
	 * @return
	 * @throws Exception
	 */
	Map<String, String> getCharSpecMap(String charSpecCode);
	/**
	 * 批量修改属性值
	 * @param charSpecCode 特征属性编码
	 * @param dataMap 需修改的数据(code—>value)
	 * @return
	 */
	boolean saveCharSpecList(String charSpecCode, Map<String, String> dataMap);
}

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

@@ -0,0 +1,67 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import java.util.List;
import java.util.Map;
public interface WorkOrderManagementService {
	/**
	 * 分页查询工单信息
	 * @param params
	 * @param pageNumber 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<Map<String, Object>>> queryPageWorkOrder(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	/**
	 * 获取所有工单类型
	 * 
	 * @return
	 */
	 CommonResponse<Map<String, List<Map<String, String>>>> queryWorkOrderTypeList();
	
	/**
	 * 获取单个工单信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	 CommonResponse<Map<String, Object>> queryOneWorkOrder(Map<String,String> params) throws Exception;
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	/**
	 * 工单申请
	 * @param mapTagInfoDto
	 * @return
	 * @throws Exception
	 */
	//CommonResponse<Void> addAlppyVacationInfo(WorkEvent mapTagInfoDto) throws Throwable;
	/**
	 * 工单审核
	 * @param mapTagInfoDto
	 * @return
	 * @throws Exception
	 */
	//CommonResponse<Void> checkAlppyVacationInfo(WorkEvent mapTagInfoDto) throws Exception;
}

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

@@ -22,7 +22,7 @@ public class EbcConstant {
	// 轨迹回放单次查询条数
	public static final int TRACK_PLAYBACK_SIZE = 100;
	
	// 考勤查询：日
	public static final String AREA_IN_OUT_RECORD_DAY = "day";
@@ -33,5 +33,19 @@ public class EbcConstant {
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
	
	//静态常量: 工单类型
	public static final String BUSINESS_SPEC_WORK_ORDER_TYPE="WORK_ORDER_TYPE";
	
	//工单类型：请假
	public static final String WORK_ORDER_TYPE_ASK_LEAVE="ASK_LEAVE";
	
	//工单类型：外勤
	public static final String WORK_ORDER_TYPE_FIELD_WORK="FIELD_WORK";
	
	//工单类型：补卡
	public static final String WORK_ORDER_TYPE_RECLOCK="RECLO";
	
	//工单类型：加班
	public static final String WORK_ORDER_TYPE_OVERTIME="OVERTIME";
	
}