Merge branch 'refs/heads/feature-20250711-xwj' into test

src/main/java/com/fdkankan/openApi/controller/www/TrajectoryController.java

@@ -0,0 +1,51 @@
+package com.fdkankan.openApi.controller.www;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.openApi.aop.ValidateApi;
+import com.fdkankan.openApi.entity.www.Trajectory;
+import com.fdkankan.openApi.service.www.ITrajectoryService;
+import com.fdkankan.openApi.vo.www.TrajectoryParamVO;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * @author Xiewj
+ * @date 2025/7/11
+ */
+@RestController
+@RequestMapping("/trajectory")
+public class TrajectoryController {
+    @Autowired
+    private ITrajectoryService trajectoryService;
+    /**
+     * 设备轨迹数据保存
+     * @param param
+     * @return
+     */
+    @SaIgnore
+    @PostMapping("/save")
+    @ValidateApi(method = "trajectory:save")
+    public ResultData save(@RequestBody @Valid TrajectoryParamVO param) throws IOException {
+        if(StrUtil.isNotEmpty(param.getContent())){
+            String[] split = param.getContent().split(",");
+            if (split.length!=4){
+                throw new BusinessException(-1,"数据长度不为4");
+            }
+        }
+        Trajectory trajectory = new Trajectory();
+        BeanUtil.copyProperties(param, trajectory);
+        trajectory.setCreateTime(new Date());
+        return ResultData.ok(trajectoryService.save(trajectory));
+    }
+}

src/main/java/com/fdkankan/openApi/entity/www/Trajectory.java

@@ -0,0 +1,59 @@
+package com.fdkankan.openApi.entity.www;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 轨迹主表
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-04
+ */
+@Getter
+@Setter
+@TableName("t_trajectory")
+public class Trajectory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @NotBlank(message = "设备id")
+    @TableField("device_id")
+    private String deviceId;
+
+    @NotBlank(message = "轨迹数据")
+    @TableField("position")
+    private String position;
+
+    @NotBlank(message = "唯一标识")
+    @TableField("uuid")
+    private String uuid;
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * A-有效，I-无效
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+}

src/main/java/com/fdkankan/openApi/mapper/www/ITrajectoryMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.openApi.entity.www.Trajectory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 相机子表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@Mapper
+public interface ITrajectoryMapper extends BaseMapper<Trajectory> {
+
+}

src/main/java/com/fdkankan/openApi/service/www/ITrajectoryService.java

@@ -0,0 +1,8 @@
+package com.fdkankan.openApi.service.www;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.openApi.entity.www.Trajectory;
+
+public interface ITrajectoryService extends IService<Trajectory> {
+
+}

src/main/java/com/fdkankan/openApi/service/www/impl/TrajectoryServiceImpl.java

@@ -0,0 +1,14 @@
+package com.fdkankan.openApi.service.www.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.openApi.entity.www.Trajectory;
+import com.fdkankan.openApi.mapper.www.ITrajectoryMapper;
+import com.fdkankan.openApi.service.www.ITrajectoryService;
+import org.springframework.stereotype.Service;
+
+@DS("www")
+@Service
+public class TrajectoryServiceImpl extends ServiceImpl<ITrajectoryMapper, Trajectory> implements ITrajectoryService {
+
+}

src/main/java/com/fdkankan/openApi/vo/www/TrajectoryParamVO.java

@@ -0,0 +1,19 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class TrajectoryParamVO {
+
+    @NotBlank(message = "设备id")
+    private String deviceId;
+
+    @NotBlank(message = "规矩数据")
+    private String position;
+
+    @NotBlank(message = "唯一标识")
+    private String uuid;
+
+}