uspa 异常考勤图片详情 设备删除修改

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

@@ -3,6 +3,7 @@ package com.ai.bss.location.rescue;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.scheduling.annotation.EnableAsync;

location-rescue-service/src/main/java/com/ai/bss/location/rescue/config/MyCorsFilter.java

@@ -12,6 +12,8 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import com.ai.sso.filter.SessionUserFilter;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
 * 解决接口跨域问题
@@ -51,7 +53,7 @@ public class MyCorsFilter {
    public FilterRegistrationBean mySessionUserFilter(){
        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
        registrationBean.setFilter(new SessionUserFilter());
        registrationBean.setUrlPatterns(Arrays.asList("/mySessionUserFilter"));
        registrationBean.setUrlPatterns(Arrays.asList("/*"));
        Map<String, String> initParameters = new HashMap<String,String>();
        initParameters.put("impl-classname","com.ai.sso.external.DefaultPopedomImpl");
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;");

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

@@ -57,6 +57,7 @@ public class LoginController {
                response.addCookie(userCookie3);
            }
        }
        login.put("success", true);
        return login;
    }
@@ -72,6 +73,7 @@ public class LoginController {
    public Map<String, Object> findMenus(@RequestBody User user, HttpServletRequest request){
        Map<String, Object> menus = loginService.findMenus(user,request);
        menus.put("success", true);
        return menus;
    }

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

@@ -4,9 +4,13 @@ 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.components.minio.config.MinioConfig;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.worker.service.api.AttendanceStatusQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +37,18 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
    @Autowired
    AttendanceStatusQuery attendanceStatusQuery;
    @Autowired
    EmployeeService employeeService;
    @Autowired
    UploadFileService uploadFileService;
    @Autowired
    MinioConfig minioConfig;
    @Override
    public CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize) {
@@ -345,15 +361,27 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
            HashMap<String, Object> attendanceReportMap = new HashMap<>();
            //根据id查人脸底库图片
            EmployeeDto employeeDto = new EmployeeDto();
            String userId = (String) params.get("id");
            employeeDto.setId((Long.parseLong(userId)));
            CommonRequest<EmployeeDto> request = new CommonRequest<EmployeeDto>(employeeDto);
            CommonResponse<EmployeeDto> response = employeeService.queryEmployee(request);
            if (response == null || response.getData() == null) {
                return CommonResponse.fail("504", "员工信息不存在");
            }
            attendanceReportMap.put("userId",params.get("id"));
            attendanceReportMap.put("avatar",null);
            attendanceReportMap.put("avatar",uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
            attendanceReportMap.put("detail",attendanceReportResponse.getData());
            if(attendanceReportResponse.isSuccess()){
                CommonResponse<HashMap<String, Object>> ok1 = CommonResponse.ok(attendanceReportMap);
                return ok1;
            }
        } catch (ParseException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }

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

@@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,6 +48,10 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Autowired
	private AiTaskQuery aiTaskQuery;
	@Autowired
	private MonitorSceneCommand monitorSceneCommand;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(HashMap<String, Object> params,
			int pageNumber, int pageSize) throws Exception {
@@ -178,14 +183,23 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Override
	public CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) throws Exception  {
		//修改设备表
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		//修改ai任务设备表
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
	}
	@Override
	public CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) throws Exception  {
		CommonRequest<List<String>> request = new CommonRequest<List<String>>(resourceToolIds);
		//删除设备表里数据
		CommonResponse<ResourceTool> response = resourceToolCommand.deleteWorkTool(request);
		//删除关联数据 关联场景
		CommonResponse deleteResult = monitorSceneCommand.deleteMonitorSceneTerminalRelByWorkToolId(
					new CommonRequest<>(resourceToolIds));
		//删除ai任务执行设备 se_ai_task_device表
		if (response.isSuccess()) {
			return CommonResponse.ok(null);