diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevApiController.java index 3dadeb407..4b34ec7fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevApiController.java @@ -25,7 +25,7 @@ public class UfaceDevApiController { @ApiOperation(value = "下载白名单(拉取允许通行人员信息)", notes = "下载白名单(拉取允许通行人员信息)", httpMethod = "GET") @GetMapping(value = "/service-address/workers") - public Result getWorkerInfoByDev(@RequestBody GetWorkerInfoByDevDto dto) { + public Result getWorkerInfoByDev(GetWorkerInfoByDevDto dto) { return Result.success(workerInfoService.getWorkerInfoByDev(dto)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoDeleteMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoDeleteMapper.java index ea21cad06..dfe62a3a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoDeleteMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoDeleteMapper.java @@ -4,7 +4,10 @@ import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfoDelete; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.web.bind.annotation.RequestBody; +import springfox.documentation.annotations.ApiIgnore; +import java.util.HashMap; import java.util.List; /** @@ -16,5 +19,5 @@ import java.util.List; @Mapper public interface WorkerInfoDeleteMapper extends BaseMapper { - List getDeleteWorkerInfo(String projectSn); + List getDeleteWorkerInfo(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoDeleteMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoDeleteMapper.xml index 5d590c6b6..d536ede09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoDeleteMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoDeleteMapper.xml @@ -4,5 +4,8 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 12dfa345c..4215ec21a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -1883,10 +1883,15 @@ public class WorkerInfoServiceImpl extends ServiceImpl workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper() .eq(WorkerInfo::getProjectSn, projectSn) .eq(WorkerInfo::getInserviceType, 1) + .ge(update != null, WorkerInfo::getUpdateTime, update) ); //添加人员 @@ -1897,9 +1902,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl exitWorkerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper() .eq(WorkerInfo::getProjectSn, projectSn) .eq(WorkerInfo::getInserviceType, 2) + .ge(update != null, WorkerInfo::getUpdateTime, update) ); addDatas(exitWorkerInfos, "1", datas); - List deleteWorkerInfos = workerInfoDeleteMapper.getDeleteWorkerInfo(projectSn); + HashMap map = new HashMap(); + map.put("projectSn", projectSn); + map.put("updateTime", update); + List deleteWorkerInfos = workerInfoDeleteMapper.getDeleteWorkerInfo(map); addDatas(deleteWorkerInfos, "1", datas); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ddf6007c8..96c154154 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -155,3 +155,5 @@ koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s is-license=false #天气url tianqiUrl=http://v1.yiketianqi.com/free/week +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss +spring.jackson.time-zone=GMT+8