From f11a48e1d0947a546ebd073f1e34156e8bd9757b Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Sat, 18 Mar 2023 18:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=AF=B7=E6=B1=82url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/interceptor/LogInterceptor.java | 29 ++++++++++++ .../config/MyWebMvcConfigurerAdapter.java | 2 + .../xmgl/modules/project/entity/Project.java | 9 ++++ .../xmgl/modules/video/entity/VideoItem.java | 11 ++++- .../ProjectWorkerApiController.java | 44 +++++++++++-------- .../impl/WorkerAttendanceServiceImpl.java | 6 +++ 6 files changed, 81 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/zhgd/interceptor/LogInterceptor.java diff --git a/src/main/java/com/zhgd/interceptor/LogInterceptor.java b/src/main/java/com/zhgd/interceptor/LogInterceptor.java new file mode 100644 index 000000000..9445cfab8 --- /dev/null +++ b/src/main/java/com/zhgd/interceptor/LogInterceptor.java @@ -0,0 +1,29 @@ +package com.zhgd.interceptor; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * 日志拦截器 + */ +@Slf4j +public class LogInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + log.info("--------------------------------请求url：{}--------------------------------", request.getRequestURL()); + return true; + } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + } +} \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java b/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java index 45547f9a8..8272de34f 100644 --- a/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java +++ b/src/main/java/com/zhgd/xmgl/config/MyWebMvcConfigurerAdapter.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.config; import com.license.entity.dto.LicenseCheckInterceptor; +import com.zhgd.interceptor.LogInterceptor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -48,6 +49,7 @@ class MyWebMvcConfigurerAdapter implements WebMvcConfigurer { */ @Override public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(new LogInterceptor()).addPathPatterns("/**"); registry.addInterceptor(new LicenseCheckInterceptor()).addPathPatterns("/xmgl/base/login"); registry.addInterceptor(new LicenseCheckInterceptor()).addPathPatterns("/account/user/login"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java index 3d2bf8987..9962ba25a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java @@ -241,4 +241,13 @@ public class Project implements Serializable { @ApiModelProperty(value = "项目进度") private Integer projectProgress; + + @ApiModelProperty(value = "云联万物-工程所在街（乡）镇") + private String streetTownshipTown; + + @ApiModelProperty(value = "云联万物-工程所在街（乡）镇机构编码") + private String streetTownshipTownCode; + + @ApiModelProperty(value = "云联万物-区组织机构代码") + private String districtOrganizationCode; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java index eb652d828..97ae22b23 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -174,4 +172,13 @@ public class VideoItem implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "报警总数") private java.lang.Integer alarmCount; + + @ApiModelProperty(value = "云联万物-监控点编号") + private java.lang.String monitoringPointCode; + + @ApiModelProperty(value = "云联万物-监控点位置（JKDWZ001：作业面，JKDWZ002：料场，JKDWZ003：车辆出入口，JKDWZ004：人员出入口，JKDWZ005：洗轮机，JKDWZ006：围墙，JKDWZ007：塔吊，JKDWZ008：其他）") + private java.lang.String monitoringPointLocation; + + @ApiModelProperty(value = "云联万物-经纬坐标") + private java.lang.String latAndLng; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java index eeb0b70b0..5352ec050 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.worker.controller; import cn.xuyanwu.spring.file.storage.FileInfo; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhgd.xmgl.base.CompanyVo; import com.zhgd.xmgl.base.UfaceDevVo; @@ -130,6 +131,7 @@ public class ProjectWorkerApiController { @ApiOperation(value = "保存或修改人员数据", notes = "保存或修改人员数据") @PostMapping(value = "/modWorker") public Map modWorker(@RequestBody WorkerVo workerVo) { + log.info("modWorker：{}", JSON.toJSONString(workerVo)); Map resultMap = new HashMap<>(); try { if (StringUtils.isEmpty(workerVo.getName()) || StringUtils.isEmpty(workerVo.getIdCard()) || @@ -153,12 +155,14 @@ public class ProjectWorkerApiController { .eq(DepartmentInfo::getProjectSn, workerVo.getProjectCode()); DepartmentInfo departmentInfo = departmentInfoService.getOne(queryWrapper); if (departmentInfo == null) { - DepartmentInfo newDepartmentInfo = new DepartmentInfo(); - newDepartmentInfo.setProjectSn(workerVo.getProjectCode()); - newDepartmentInfo.setDepartmentName(workerVo.getGroupName()); - newDepartmentInfo.setEnterpriseId(enterpriseInfo.getId()); - departmentInfoService.save(newDepartmentInfo); - workerInfo.setDepartmentId(newDepartmentInfo.getId()); + if (StringUtils.isNotBlank(workerVo.getGroupName())) { + DepartmentInfo newDepartmentInfo = new DepartmentInfo(); + newDepartmentInfo.setProjectSn(workerVo.getProjectCode()); + newDepartmentInfo.setDepartmentName(workerVo.getGroupName()); + newDepartmentInfo.setEnterpriseId(enterpriseInfo.getId()); + departmentInfoService.save(newDepartmentInfo); + workerInfo.setDepartmentId(newDepartmentInfo.getId()); + } } else { workerInfo.setDepartmentId(departmentInfo.getId()); } @@ -179,19 +183,23 @@ public class ProjectWorkerApiController { if (oldWorkerType != null) { teamInfo.setWorkerTypeId(oldWorkerType.getId()); } else { - WorkerType workerType = new WorkerType(); - workerType.setProjectSn(workerVo.getProjectCode()); - workerType.setTypeName(workerVo.getWorkerTypeName()); - workerTypeService.save(workerType); - teamInfo.setWorkerTypeId(workerType.getId()); + if (StringUtils.isNotBlank(workerVo.getWorkerTypeName())) { + WorkerType workerType = new WorkerType(); + workerType.setProjectSn(workerVo.getProjectCode()); + workerType.setTypeName(workerVo.getWorkerTypeName()); + workerTypeService.save(workerType); + teamInfo.setWorkerTypeId(workerType.getId()); + } + } + if (StringUtils.isNotBlank(workerVo.getGroupName())) { + teamInfo.setTeamName(workerVo.getGroupName()); + teamInfo.setProjectSn(workerVo.getProjectCode()); + teamInfo.setEnterpriseId(enterpriseInfo.getId()); + String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); + teamInfo.setTeamSn(uuid); + teamInfoService.save(teamInfo); + workerInfo.setTeamId(teamInfo.getId()); } - teamInfo.setTeamName(workerVo.getGroupName()); - teamInfo.setProjectSn(workerVo.getProjectCode()); - teamInfo.setEnterpriseId(enterpriseInfo.getId()); - String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); - teamInfo.setTeamSn(uuid); - teamInfoService.save(teamInfo); - workerInfo.setTeamId(teamInfo.getId()); } } workerInfo.setWorkerName(workerVo.getName()); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 5b8c6655d..2eacb9d54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -921,6 +921,12 @@ idCard 通行人员身份证号码 string msg 错误信息 String status 状态码 String 1表示成功；其余表示失败 */ + if (dto.getPageIndex() == null) { + dto.setPageIndex(1); + } + if (dto.getPageSize() == null) { + dto.setPageSize(10); + } Page page = new Page(dto.getPageIndex(), dto.getPageSize()); IPage list = workerAttendanceMapper.getPassRecord(dto, page); Map resultMap = new HashMap<>();