diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java index 36c18aa..bd463ad 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/PersonnelControlDto.java @@ -55,5 +55,11 @@ public class PersonnelControlDto extends ScreenParamDto { @ApiModelProperty(value = "围栏ID") private String id; + @ApiModelProperty(value = "人员ID") + private String bindUser; + + @ApiModelProperty(value = "时间") + private String month; + } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java index 330c56a..b57b2a6 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java @@ -82,4 +82,10 @@ public class PersonnelControlVo { @ApiModelProperty("组织机构") private String orgName; + @ApiModelProperty("经纬度") + private String aslatLon; + + @ApiModelProperty("围栏ID") + private String sourceType; + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java index 2771815..641fe4a 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/PersonnelControlController.java @@ -129,5 +129,16 @@ public class PersonnelControlController extends BaseController { } } + @RequestMapping(value = "/PersonnelHistoricalCoordinates", method = RequestMethod.POST) + @ApiOperation(value = "人员管控-人员坐标点") + public AjaxResult PersonnelHistoricalCoordinates(@RequestBody PersonnelControlDto dto) { + try { + List list = service.PersonnelHistoricalCoordinates(dto); + return AjaxResult.success(list); + } catch (Exception e) { + return AjaxResult.error(); + } + } + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java index 5ec336f..d6f5993 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/PersonnelControlMapper.java @@ -121,4 +121,15 @@ public interface PersonnelControlMapper { * @date 2024/3/27 17:23 */ List personnelCoordinatePoint(PersonnelControlDto dto); + + /** + * 人员管控-人员历史坐标点 + * + * @param dto + * @return AjaxResult + * @description + * @author jjLV + * @date 2024/3/27 17:23 + */ + List PersonnelHistoricalCoordinates(PersonnelControlDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java index 8734d81..111fc20 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/PersonnelControlService.java @@ -111,4 +111,15 @@ public interface PersonnelControlService { * @date 2024/3/27 17:23 */ List personnelCoordinatePoint(PersonnelControlDto dto); + + /** + * 人员管控-人员历史坐标点 + * + * @param dto + * @return AjaxResult + * @description + * @author jjLV + * @date 2024/3/27 17:23 + */ + List PersonnelHistoricalCoordinates(PersonnelControlDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java index 36d0ad2..9001301 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/PersonnelControlImpl.java @@ -176,4 +176,18 @@ public class PersonnelControlImpl implements PersonnelControlService { public List personnelCoordinatePoint(PersonnelControlDto dto) { return mapper.personnelCoordinatePoint(dto); } + + /** + * 人员管控-人员历史坐标点 + * + * @param dto + * @return AjaxResult + * @description + * @author jjLV + * @date 2024/3/27 17:23 + */ + @Override + public List PersonnelHistoricalCoordinates(PersonnelControlDto dto) { + return mapper.PersonnelHistoricalCoordinates(dto); + } } \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml index 68c7439..06f6c54 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml @@ -127,4 +127,22 @@ GROUP BY tbd.device_id + + \ No newline at end of file