海上定位uspa的修改

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

@@ -7,6 +7,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -59,12 +61,12 @@ public class AlarmManagementController {
    @RequestMapping("/loadMapAreaTool")
    public CommonResponse<Map<String, Object>> loadMapAreaTool(HttpServletRequest request) throws Exception {
        HashMap<String, Object> dataMap = new HashMap<String, Object>();
        // TODO 组织ID 权限控制
        // JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        // dataMap.put("entityId", userInfo.get("USER_ORG_ID").toString());
        // dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
        dataMap.put("entityId", "1");
        dataMap.put("workOrgId", "0000");
        // 组织ID 权限控制 调用uspa获取
         JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
         dataMap.put("entityId", userInfo.get("USER_ORG_ID").toString());
         dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
     /*   dataMap.put("entityId", "1");
        dataMap.put("workOrgId", "0000");*/
        dataMap.put("isAllowBindTerminal", EbcConstant.TOOL_BIND_REJECT);
        return alarmManagementService.loadMapAreaTool(dataMap);
    }

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

@@ -5,12 +5,15 @@ import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.AttendanceManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
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 javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,7 +45,7 @@ public class AttendanceManageController {
     */
    @ResponseBody
    @RequestMapping("/queryAttendanceInfo")
    public CommonResponse<PageBean<Map<String, Object>>> queryAttendanceInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap){
    public CommonResponse<PageBean<Map<String, Object>>> queryAttendanceInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap, HttpServletRequest request){
        // 当前页数
        int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
@@ -51,7 +54,10 @@ public class AttendanceManageController {
        conditionMap.setPageSize(pageSize);
        conditionMap.setPageNumber(pageNumber);
        conditionMap.getData().put("orgId", "0000");
        // 组织ID 权限控制 调用uspa获取
        JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        conditionMap.getData().put("orgId",userInfo.get("USER_ORG_ID").toString());
        return attendanceManageService.queryAttendanceInfo(conditionMap);
    }
@@ -62,7 +68,7 @@ public class AttendanceManageController {
     */
    @ResponseBody
    @RequestMapping("/queryAttendanceDetailsInfo")
    public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailsInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
    public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailsInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap, HttpServletRequest request) throws Exception {
        // 当前页数
        int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
@@ -70,7 +76,9 @@ public class AttendanceManageController {
        int pageSize = conditionMap.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : conditionMap.getPageSize();
        conditionMap.setPageSize(pageSize);
        conditionMap.setPageNumber(pageNumber);
        conditionMap.getData().put("orgId", "0000");
        // 组织ID 权限控制 调用uspa获取
        JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        conditionMap.getData().put("orgId", userInfo.get("USER_ORG_ID").toString());
        return attendanceManageService.queryAttendanceDetailsInfo(conditionMap);
    }
}

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

@@ -17,6 +17,8 @@ import com.ai.bss.location.rescue.service.interfaces.DeviceManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.location.rescue.util.NorthboundInterfaceConstant;
import javax.servlet.http.HttpServletRequest;
/**
 * 终端管理
 */
@@ -185,8 +187,8 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public CommonResponse<List<? extends Object>> queryAssociatInfo(@RequestBody Map<String, Object> params) throws Exception {
		List<? extends Object> resultList =  deviceManageService.queryAssociatInfo(params);
	public CommonResponse<List<? extends Object>> queryAssociatInfo(@RequestBody Map<String, Object> params, HttpServletRequest request) throws Exception {
		List<? extends Object> resultList =  deviceManageService.queryAssociatInfo(params,request);
		return CommonResponse.ok(resultList);
	}
	

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

@@ -10,6 +10,8 @@ import javax.servlet.http.HttpServletRequest;
import com.ai.bss.location.rescue.util.ImportExcelUtil;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
@@ -51,7 +53,7 @@ public class EquipmentManageController {
     */
    @ResponseBody
    @RequestMapping("/queryEquipmentInfo")
    public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
    public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap, HttpServletRequest request) throws Exception {
        // 当前页数
        int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
@@ -59,7 +61,10 @@ public class EquipmentManageController {
        int pageSize = conditionMap.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : conditionMap.getPageSize();
        conditionMap.setPageSize(pageSize);
        conditionMap.setPageNumber(pageNumber);
        conditionMap.getData().put("workOrgId", "0000");
        // 组织ID 权限控制 调用uspa获取
        JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        conditionMap.getData().put("workOrgId", userInfo.get("USER_ORG_ID").toString());
        return equipmentManageService.queryEquipmentInfo(conditionMap);
    }
@@ -68,8 +73,10 @@ public class EquipmentManageController {
     */
    @ResponseBody
    @RequestMapping("/modifyEquipmentInfo")
    public CommonResponse<ResourceTool> modifyEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
        resourceToolCommonRequest.getData().setWorkOrgId("0000");
    public CommonResponse<ResourceTool> modifyEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest, HttpServletRequest request) throws Exception {
        //组织ID 权限控制  调用uspa获取
        JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        resourceToolCommonRequest.getData().setWorkOrgId( userInfo.get("USER_ORG_ID").toString());
        return equipmentManageService.modifyEquipmentInfo(resourceToolCommonRequest);
    }
@@ -79,8 +86,10 @@ public class EquipmentManageController {
     */
    @ResponseBody
    @RequestMapping("/createEquipmentInfo")
    public CommonResponse<ResourceTool> createEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
        resourceToolCommonRequest.getData().setWorkOrgId("0000");
    public CommonResponse<ResourceTool> createEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest, HttpServletRequest request) throws Exception {
        //组织ID 权限控制  调用uspa获取
        JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        resourceToolCommonRequest.getData().setWorkOrgId( userInfo.get("USER_ORG_ID").toString());
        CommonResponse<ResourceTool> commonResponse = equipmentManageService.createEquipmentInfo(resourceToolCommonRequest);
        return commonResponse;
    }
@@ -112,10 +121,10 @@ public class EquipmentManageController {
    @RequestMapping("/queryAllEquipmentNotBind")
    public CommonResponse<List<Map<String, Object>>> queryAllEquipmentNotBind(HttpServletRequest request) throws Exception {
        HashMap<String, Object> dataMap = new HashMap<String, Object>();
        //TODO 组织ID 权限控制
        //JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        //dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
        dataMap.put("workOrgId", "0000");
        //组织ID 权限控制  调用uspa获取
        JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
        dataMap.put("isAllowBindTerminal", EbcConstant.TOOL_BIND_REJECT);
        return equipmentManageService.queryAllEquipmentNotBind(dataMap);
    }

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

@@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.sso.util.LoginUserInfoUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@ import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
    Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
@@ -387,7 +390,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    }
    @Override
    public List<? extends Object> queryAssociatInfo(Map<String, Object> params) throws Exception {
    public List<? extends Object> queryAssociatInfo(Map<String, Object> params, HttpServletRequest request) throws Exception {
        if (EbcConstant.BIND_DEVICE_TYPE_USER.equals(params.get("bindType"))) {
            // 类型是用户，查询用户列表,模糊查询
@@ -397,16 +400,23 @@ public class DeviceManageServiceImpl implements DeviceManageService {
            UserDto userDto = new UserDto();
            String username = (params.get("name") != null || !"".equals(params.get("name"))) ? (String) params.get("name") : null;
            userDto.setName(username);
            userDto.setOrgCode("0000");
            CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(1).pageSize(15).build();
            CommonResponse<List<UserDto>> listCommonResponse = userDtoQuery.queryWorkEmployeeByOrg(request);
            // 组织ID 权限控制 调用uspa获取
            JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
            userDto.setOrgCode(userInfo.get("USER_ORG_ID").toString());
            CommonRequest<UserDto> request1 = CommonRequest.<UserDto>builder().data(userDto).pageNumber(1).pageSize(15).build();
            CommonResponse<List<UserDto>> listCommonResponse = userDtoQuery.queryWorkEmployeeByOrg(request1);
            List<UserDto> userDtoList = listCommonResponse.getData();
            return userDtoList;
        } else if (EbcConstant.BIND_DEVICE_TYPE_SHIP.equals(params.get("bindType"))) {
            // 类型是船舶，查询船舶列表，模糊查询
            // "workOrgId" : 组织ID
            //  "isAllowBindTerminal" : 该工具是否可绑定,'0'--不可绑定，'1' -- 可绑定
            params.put("workOrgId", "0000");
            // 组织ID 权限控制 调用uspa获取
            JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
            params.put("workOrgId",  userInfo.get("USER_ORG_ID").toString());
            params.put("isAllowBindTerminal", "1");
            String username = (params.get("name") != null || !"".equals(params.get("name"))) ? (String) params.get("name") : null;
            params.put("resourceToolName", username);

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

@@ -6,6 +6,8 @@ import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageInfo;
import javax.servlet.http.HttpServletRequest;
public interface DeviceManageService {
	/**
@@ -90,6 +92,6 @@ public interface DeviceManageService {
	* @return
	* @throws Exception
	*/
	List<? extends Object> queryAssociatInfo(Map<String, Object> params) throws Exception;
	List<? extends Object> queryAssociatInfo(Map<String, Object> params, HttpServletRequest request) throws Exception;
}

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

@@ -326,7 +326,7 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
	public CommonResponse importAskLeaveOrder(MultipartFile file) {
//        List<String> listTerminal = getFileData(file);
		String orgCode = "0000";
		//String orgCode = "0000";
		CommonRequest<String> request = CommonRequest.<String>builder().data(Strings.EMPTY).build();
		CommonResponse<Map<String, Map<String, Object>>> userMapresult = userDtoQuery.queryUserCodeWithId(request);
		log.info(JSON.toJSONString(userMapresult));