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

增加区域管理

Browse Source
This commit is contained in:
pengjie 2024-10-11 19:03:06 +08:00
parent 5b8d1d0091
commit e4c5f753db
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
View File

@ -123,7 +123,7 @@ public class QualityRegionController {
@ApiOperation(value = "查询区域人数", notes = "查询区域人数", httpMethod = "POST") @ApiOperation(value = "查询区域人数", notes = "查询区域人数", httpMethod = "POST")
@PostMapping(value = "/queryRegionWorker") @PostMapping(value = "/queryRegionWorker")
public Result<Object> queryRegionWorker(QualityRegion qualityRegion) { public Result<Object> queryRegionWorker(QualityRegion qualityRegion) {
return Result.success(qualityRegionService.queryRegionWorker(qualityRegion)); return Result.success(qualityRegionService.queryRegionWorker(qualityRegion.getId().toString()).size());
} }
} }

2
src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
View File

@ -65,5 +65,5 @@ public interface IQualityRegionService extends IService<QualityRegion> {
*/ */
QualityRegion queryBindRegion(); QualityRegion queryBindRegion();
int queryRegionWorker(QualityRegion qualityRegion); List<Long> queryRegionWorker(String id);
} }

10
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
View File

@ -301,10 +301,10 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
} }
@Override @Override
public int queryRegionWorker(QualityRegion qualityRegion) { public List<Long> queryRegionWorker(String id) {
QualityRegion byId = this.getById(qualityRegion.getId()); QualityRegion byId = this.getById(id);
List<SafetyHatData> dataList = safetyHatDataMapper.getNewestDataGroupByProjectSn(byId.getProjectSn()); List<SafetyHatData> dataList = safetyHatDataMapper.getNewestDataGroupByProjectSn(byId.getProjectSn());
int workerNum = 0; List<Long> workerIds = new ArrayList<>();
if (CollUtil.isNotEmpty(dataList)) { if (CollUtil.isNotEmpty(dataList)) {
for (SafetyHatData d : dataList) { for (SafetyHatData d : dataList) {
boolean inFence = false; boolean inFence = false;
@ -322,11 +322,11 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
inFence = RegionUtil.isInPolygon(d.getLongitude(), d.getLatitude(), lon, lat); inFence = RegionUtil.isInPolygon(d.getLongitude(), d.getLatitude(), lon, lat);
} }
if (inFence) { if (inFence) {
workerNum++; workerIds.add(d.getWorkerInfoId());
} }
} }
} }
return workerNum; return workerIds;
} }
private void deleteRegion(Long id) { private void deleteRegion(Long id) {

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

@ -55,6 +55,7 @@ import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo;
import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService; import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService;
import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper; import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService; import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
@ -269,7 +270,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
@Autowired @Autowired
private IExamTrainRecordService examTrainRecordService; private IExamTrainRecordService examTrainRecordService;
@Autowired @Autowired
private ISafetyHatFenceService safetyHatFenceService; private IQualityRegionService qualityRegionService;
/** /**
* 人员管理分页 * 人员管理分页
* *
@ -281,9 +282,10 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
// 区域人员 // 区域人员
String qualityRegionId = MapUtils.getString(map, "qualityRegionId"); String qualityRegionId = MapUtils.getString(map, "qualityRegionId");
if (StringUtils.isNotEmpty(qualityRegionId)) { if (StringUtils.isNotEmpty(qualityRegionId)) {
String workerInFence = safetyHatFenceService.getWorkerInFence(qualityRegionId); List<Long> workerIds = qualityRegionService.queryRegionWorker(qualityRegionId);
if (StringUtils.isNotEmpty(workerInFence)) { if (workerIds.size() > 0) {
map.put("workerInfos", workerInFence); String collect = workerIds.stream().map(String::valueOf).collect(Collectors.joining(","));
map.put("workerInfos", collect);
} }
} }
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());