admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-12-14 10:39:21 +08:00
parent e6f714a184
commit 75f91cbc5b
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevApiController.java
View File

@ -25,7 +25,7 @@ public class UfaceDevApiController {
@ApiOperation(value = "下载白名单（拉取允许通行人员信息）", notes = "下载白名单（拉取允许通行人员信息）", httpMethod = "GET")
@GetMapping(value = "/service-address/workers")
public Result<GetWorkerInfoByDevVo> getWorkerInfoByDev(@RequestBody GetWorkerInfoByDevDto dto) {
public Result<GetWorkerInfoByDevVo> getWorkerInfoByDev(GetWorkerInfoByDevDto dto) {
return Result.success(workerInfoService.getWorkerInfoByDev(dto));
}

5
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoDeleteMapper.java
View File

@ -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<WorkerInfoDelete> {
List<WorkerInfo> getDeleteWorkerInfo(String projectSn);
List<WorkerInfo> getDeleteWorkerInfo(HashMap<String, Object> paramMap);
}

3
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoDeleteMapper.xml
View File

@ -4,5 +4,8 @@
<select id="getDeleteWorkerInfo" resultType="com.zhgd.xmgl.modules.worker.entity.WorkerInfo">
select * from worker_info_delete
where project_sn=#{projectSn}
<if test="updateTime != null and updateTime != ''">
and update_time >= #{updateTime}
</if>
</select>
</mapper>

11
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -1883,10 +1883,15 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
if (dev == null) {
throw new OpenAlertException("设备编号不存在");
}
String update = null;
if (StringUtils.isNotBlank(dto.getUpdate())) {
update = DateUtil.formatDateTime(new Date(Long.valueOf(dto.getUpdate())));
}
String projectSn = dev.getProjectSn();
List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
.eq(WorkerInfo::getProjectSn, projectSn)
.eq(WorkerInfo::getInserviceType, 1)
.ge(update != null, WorkerInfo::getUpdateTime, update)
);
//添加人员
@ -1897,9 +1902,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
List<WorkerInfo> exitWorkerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
.eq(WorkerInfo::getProjectSn, projectSn)
.eq(WorkerInfo::getInserviceType, 2)
.ge(update != null, WorkerInfo::getUpdateTime, update)
);
addDatas(exitWorkerInfos, "1", datas);
List<WorkerInfo> deleteWorkerInfos = workerInfoDeleteMapper.getDeleteWorkerInfo(projectSn);
HashMap<String, Object> map = new HashMap<String, Object>();
map.put("projectSn", projectSn);
map.put("updateTime", update);
List<WorkerInfo> deleteWorkerInfos = workerInfoDeleteMapper.getDeleteWorkerInfo(map);
addDatas(deleteWorkerInfos, "1", datas);

2
src/main/resources/application.properties
View File

@ -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