更新摄像头接口

master
Coolkid 2024-01-25 10:28:20 +08:00
parent f1d4ba12de
commit c08fec77f5
4 changed files with 63 additions and 31 deletions

View File

@ -9,6 +9,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data; import lombok.Data;
/** /**
@ -22,7 +26,7 @@ public class StCameraB implements Serializable {
* id * id
*/ */
@TableId(value = "CAM_ID", type = IdType.INPUT) @TableId(value = "CAM_ID", type = IdType.INPUT)
@Schema(description="视频点id") @Schema(description="视频点id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long camId; private Long camId;
/** /**
@ -30,6 +34,8 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "CAM_NM") @TableField(value = "CAM_NM")
@Schema(description="视频点名称") @Schema(description="视频点名称")
@NotBlank
@Size(max = 200)
private String camNm; private String camNm;
/** /**
@ -37,13 +43,14 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "CAM_TYPE") @TableField(value = "CAM_TYPE")
@Schema(description="监控点类型") @Schema(description="监控点类型")
@NotNull
private Long camType; private Long camType;
/** /**
* *
*/ */
@TableField(value = "CAM_CH") @TableField(value = "CAM_CH")
@Schema(description="通道号") @Schema(description="通道号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Integer camCh; private Integer camCh;
/** /**
@ -51,6 +58,7 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "CAM_AR_ID") @TableField(value = "CAM_AR_ID")
@Schema(description="所在区域") @Schema(description="所在区域")
@NotNull
private Long camArId; private Long camArId;
/** /**
@ -58,6 +66,8 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "CAM_URL") @TableField(value = "CAM_URL")
@Schema(description="摄像头连接地址 IP和端口") @Schema(description="摄像头连接地址 IP和端口")
@NotNull
@Size(max = 200)
private String camUrl; private String camUrl;
/** /**
@ -65,6 +75,7 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "CAM_SN") @TableField(value = "CAM_SN")
@Schema(description="视频序列号") @Schema(description="视频序列号")
@NotBlank
private String camSn; private String camSn;
/** /**
@ -72,6 +83,7 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "LGTD") @TableField(value = "LGTD")
@Schema(description="经度") @Schema(description="经度")
@NotNull
private BigDecimal lgtd; private BigDecimal lgtd;
/** /**
@ -79,27 +91,29 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "LTTD") @TableField(value = "LTTD")
@Schema(description="纬度") @Schema(description="纬度")
@NotNull
private BigDecimal lttd; private BigDecimal lttd;
/** /**
* *
*/ */
@TableField(value = "COMMENTS") @TableField(value = "COMMENTS")
@Schema(description="备注") @Schema(description="备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Size(max = 200)
private String comments; private String comments;
/** /**
* *
*/ */
@TableField(value = "CREATE_TM") @TableField(value = "CREATE_TM")
@Schema(description="新建时间") @Schema(description="新建时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date createTm; private Date createTm;
/** /**
* *
*/ */
@TableField(value = "TM") @TableField(value = "TM")
@Schema(description="修改时间") @Schema(description="修改时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date tm; private Date tm;
/** /**
@ -107,8 +121,10 @@ public class StCameraB implements Serializable {
*/ */
@TableField(value = "[STATUS]") @TableField(value = "[STATUS]")
@Schema(description="状态 1启用 0禁用") @Schema(description="状态 1启用 0禁用")
@NotNull
private Integer status; private Integer status;
public static final String COL_CAM_ID = "CAM_ID"; public static final String COL_CAM_ID = "CAM_ID";
public static final String COL_CAM_NM = "CAM_NM"; public static final String COL_CAM_NM = "CAM_NM";

View File

@ -3,34 +3,18 @@ package com.gunshi.project.xyt.service;
import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.gunshi.core.result.BusinessResult;
import com.gunshi.core.result.exception.BusinessException;
import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo; import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo;
import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo; import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo;
import com.gunshi.project.xyt.mapper.StCameraAreaBMapper; import com.gunshi.project.xyt.mapper.StCameraAreaBMapper;
import com.gunshi.project.xyt.model.StCameraAreaB; import com.gunshi.project.xyt.model.StCameraAreaB;
import com.gunshi.util.common.tree.TreeUtil; import com.gunshi.util.common.tree.TreeUtil;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.MethodArgumentNotValidException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
/** /**
* @author Sun Lejun * @author Sun Lejun
@ -42,7 +26,7 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
@DSTransactional(rollbackFor = Exception.class) @DSTransactional(rollbackFor = Exception.class)
@Data @Data
public class BaseDataService { public class StCameraAreaService {
private final StCameraAreaBMapper stCameraAreaBMapper; private final StCameraAreaBMapper stCameraAreaBMapper;
/** /**

View File

@ -0,0 +1,32 @@
package com.gunshi.project.xyt.service;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.gunshi.db.dao.BaseDao;
import com.gunshi.project.xyt.mapper.StCameraBMapper;
import com.gunshi.project.xyt.model.StCameraB;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author Sun Lejun
* @version 1.0
* @date 2024/1/25
*/
@Service
@Slf4j
@DSTransactional(rollbackFor = Exception.class)
@Data
public class StCameraService {
private final StCameraBMapper stCameraBMapper;
/**
*
* @param stCameraB
*/
public void insert(StCameraB stCameraB) {
stCameraBMapper.insert(stCameraB);
}
}

View File

@ -15,15 +15,15 @@ import java.util.List;
@SpringBootTest @SpringBootTest
@ContextConfiguration(classes = Main.class) @ContextConfiguration(classes = Main.class)
@Slf4j @Slf4j
class BaseDataServiceTest { class StCameraAreaServiceTest {
@Autowired @Autowired
private BaseDataService baseDataService; private StCameraAreaService stCameraAreaService;
@Test @Test
void queryStCameraAreaBList() { void queryStCameraAreaBList() {
List<StCameraAreaVo> list1 = baseDataService.queryStCameraAreaBList("公路"); List<StCameraAreaVo> list1 = stCameraAreaService.queryStCameraAreaBList("公路");
log.info("{}", list1); log.info("{}", list1);
List<StCameraAreaVo> list2 = baseDataService.queryStCameraAreaBList(""); List<StCameraAreaVo> list2 = stCameraAreaService.queryStCameraAreaBList("");
log.info("{}", list2); log.info("{}", list2);
} }
@ -34,7 +34,7 @@ class BaseDataServiceTest {
stCameraAreaB.setPid(0L); stCameraAreaB.setPid(0L);
stCameraAreaB.setStatus(1); stCameraAreaB.setStatus(1);
stCameraAreaB.setComments("备注2"); stCameraAreaB.setComments("备注2");
baseDataService.insertStCameraAreaB(stCameraAreaB); stCameraAreaService.insertStCameraAreaB(stCameraAreaB);
} }
@Test @Test
@ -44,19 +44,19 @@ class BaseDataServiceTest {
stCameraAreaB.setPid(1750075892207497218L); stCameraAreaB.setPid(1750075892207497218L);
stCameraAreaB.setStatus(1); stCameraAreaB.setStatus(1);
stCameraAreaB.setComments("备注"); stCameraAreaB.setComments("备注");
baseDataService.insertStCameraAreaB(stCameraAreaB); stCameraAreaService.insertStCameraAreaB(stCameraAreaB);
} }
@Test @Test
void updateStCameraAreaB() { void updateStCameraAreaB() {
StCameraAreaB stCameraAreaB = baseDataService.queryStCameraAreaBById(1750077729811742721L); StCameraAreaB stCameraAreaB = stCameraAreaService.queryStCameraAreaBById(1750077729811742721L);
stCameraAreaB.setComments("1234557"); stCameraAreaB.setComments("1234557");
baseDataService.updateStCameraAreaB(stCameraAreaB); stCameraAreaService.updateStCameraAreaB(stCameraAreaB);
} }
@Test @Test
void queryStCameraAreaBTree() { void queryStCameraAreaBTree() {
List<StCameraAreaTreeVo> list = baseDataService.queryStCameraAreaBTree(); List<StCameraAreaTreeVo> list = stCameraAreaService.queryStCameraAreaBTree();
log.info("{}", list); log.info("{}", list);
} }
} }