代码规范修改

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;
+
 
 }

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;
+
 }

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<PersonnelControlVo> list  = service.PersonnelHistoricalCoordinates(dto);
+            return AjaxResult.success(list);
+        } catch (Exception e) {
+            return AjaxResult.error();
+        }
+    }
+
 
 }

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<PersonnelControlVo> personnelCoordinatePoint(PersonnelControlDto dto);
+
+    /**
+     * 人员管控-人员历史坐标点
+     *
+     * @param dto
+     * @return AjaxResult
+     * @description
+     * @author jjLV
+     * @date 2024/3/27 17:23
+     */
+    List<PersonnelControlVo> PersonnelHistoricalCoordinates(PersonnelControlDto dto);
 }

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<PersonnelControlVo> personnelCoordinatePoint(PersonnelControlDto dto);
+
+    /**
+     * 人员管控-人员历史坐标点
+     *
+     * @param dto
+     * @return AjaxResult
+     * @description
+     * @author jjLV
+     * @date 2024/3/27 17:23
+     */
+    List<PersonnelControlVo> PersonnelHistoricalCoordinates(PersonnelControlDto dto);
 }

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<PersonnelControlVo> personnelCoordinatePoint(PersonnelControlDto dto) {
         return mapper.personnelCoordinatePoint(dto);
     }
+
+    /**
+     * 人员管控-人员历史坐标点
+     *
+     * @param dto
+     * @return AjaxResult
+     * @description
+     * @author jjLV
+     * @date 2024/3/27 17:23
+     */
+    @Override
+    public List<PersonnelControlVo> PersonnelHistoricalCoordinates(PersonnelControlDto dto) {
+        return mapper.PersonnelHistoricalCoordinates(dto);
+    }
 }

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml

@@ -127,4 +127,22 @@
         GROUP BY
             tbd.device_id
     </select>
+
+    <select id="PersonnelHistoricalCoordinates"
+            resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
+        SELECT
+        his.val as val,
+        GROUP_CONCAT(his2.val) aslatLon,
+        his.source_type as sourceType
+        from tb_his_device_value his
+        left join  tb_his_device_value his2 on his.source_type=his2.source_type AND  his.id!=his2.id
+        left join tb_device_detail tdd ON his.attribute_id = tdd.id
+        left join  tb_bd_device tbd ON tbd.device_id = tdd.device_id
+        LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
+        where his.val=#{bindUser} and tpb.bid_code = #{bidCode}
+        <if test="month != null and month != ''">
+            AND DATE_FORMAT(his.create_time,'%Y-%m-%d') = #{month}
+        </if>
+        GROUP BY his.source_type
+    </select>
 </mapper>