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

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
pengjie 2024-06-05 20:55:00 +08:00
commit c969bc7ecd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/car/entity/ProjectCarCameraConfig.java
View File

@ -41,9 +41,9 @@ public class ProjectCarCameraConfig implements Serializable {
@NotBlank(message = "projectSn不能为空") @NotBlank(message = "projectSn不能为空")
private java.lang.String projectSn; private java.lang.String projectSn;
/** /**
* 1海康isc、2其他 * 9、海康门禁isc
*/ */
@Excel(name = "1海康isc、2其他", width = 15) @Excel(name = "9、海康门禁isc", width = 15)
@ApiModelProperty(value = "1海康isc、2其他") @ApiModelProperty(value = "9、海康门禁isc")
private java.lang.Integer supplierType; private java.lang.Integer supplierType;
} }

2
src/main/java/com/zhgd/xmgl/modules/car/service/impl/ProjectCarCameraConfigServiceImpl.java
View File

@ -105,7 +105,7 @@ public class ProjectCarCameraConfigServiceImpl extends ServiceImpl<ProjectCarCam
public boolean isHikvisionConfig(String projectSn) { public boolean isHikvisionConfig(String projectSn) {
Integer c = projectCarCameraConfigMapper.selectCount(new LambdaQueryWrapper<ProjectCarCameraConfig>() Integer c = projectCarCameraConfigMapper.selectCount(new LambdaQueryWrapper<ProjectCarCameraConfig>()
.eq(ProjectCarCameraConfig::getProjectSn, projectSn) .eq(ProjectCarCameraConfig::getProjectSn, projectSn)
.eq(ProjectCarCameraConfig::getSupplierType, 1) .eq(ProjectCarCameraConfig::getSupplierType, 9)
); );
return c > 0; return c > 0;
} }