Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-19 37f41a7c17d81a60092e9d69363905f21d9b1a49

Merge remote-tracking branch 'origin/master'

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java

@@ -48,5 +48,9 @@
    @TableField("check_time")
    private LocalDateTime checkTime;

    @ApiModelProperty("是否发布")
    @TableField("publish")
    private Integer publish;


}

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java

@@ -8,6 +8,8 @@
import lombok.Data;
import lombok.experimental.Accessors;

import java.util.Date;

/**
 * 考核规则
 *
@@ -45,4 +47,17 @@
    @ApiModelProperty("运维类别")
    @TableField("category")
    private Integer category;

    @ApiModelProperty("审核状态")
    @TableField("audit_state")
    private Integer auditState;
    @ApiModelProperty("审核人")
    @TableField("audit_user")
    private String auditUser;
    @ApiModelProperty("审核时间")
    @TableField("audit_time")
    private Date auditTime;
    @ApiModelProperty("审核意见")
    @TableField("audit_description")
    private String auditDescription;
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java

@@ -9,6 +9,7 @@
import lombok.experimental.Accessors;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 考核模板
@@ -47,4 +48,6 @@
    @ApiModelProperty("单位id")
    @TableField("unit_id")
    private Integer unitId;


}

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java

@@ -1,11 +1,14 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 考核发布对象 t_check_publish
@@ -13,6 +16,7 @@
 * @author ruoyi
 * @date 2024-03-07
 */
@Data
public class TCheckPublish extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -53,10 +57,40 @@
    private Long updateUser;
    /** 审核状态 */
    private Short auditState;

    @Excel(name = "审核人")
    private String auditUser;
    @Excel(name = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditTime;
    @Excel(name  = "审核意见")
    private String auditDescription;
    /** 描述 */
    @Excel(name = "描述")
    private String description;

    public String getAuditUser() {
        return auditUser;
    }

    public void setAuditUser(String auditUser) {
        this.auditUser = auditUser;
    }

    public Date getAuditTime() {
        return auditTime;
    }

    public void setAuditTime(Date auditTime) {
        this.auditTime = auditTime;
    }

    public String getAuditDescription() {
        return auditDescription;
    }

    public void setAuditDescription(String auditDescription) {
        this.auditDescription = auditDescription;
    }

    public Short getAuditState() {
        return auditState;
@@ -186,6 +220,9 @@
                ", updateUserName='" + updateUserName + '\'' +
                ", updateUser=" + updateUser +
                ", auditState=" + auditState +
                ", auditUser='" + auditUser + '\'' +
                ", auditTime=" + auditTime +
                ", auditDescription='" + auditDescription + '\'' +
                ", description='" + description + '\'' +
                '}';
    }

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitorVideo.java

New file
@@ -0,0 +1,350 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import java.util.Date;

/**
 * 设备资产对象 t_monitor_video
 * 
 * @author ruoyi
 * @date 2024-03-19
 */
public class TMonitorVideo extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    private Long id;

    /** 设备编码 */
    @Excel(name = "设备编码")
    private String serialNumber;

    /** 设备名称 */
    @Excel(name = "设备名称")
    private String name;

    /** 摄像机Mac地址 */
    @Excel(name = "摄像机Mac地址")
    private String macAddr;

    /** 摄像机IPV4或IPV6地址 */
    @Excel(name = "摄像机IPV4或IPV6地址")
    private String ip;

    /** 设备经度，至少保留六位小数 */
    @Excel(name = "设备经度，至少保留六位小数")
    private String longitude;

    /** 设备维度，至少保留六位小数 */
    @Excel(name = "设备维度，至少保留六位小数")
    private String latitude;

    /** 设备状态 1/2 可用/不可用 */
    @Excel(name = "设备状态 1/2 可用/不可用")
    private Long onState;

    /** 行政区域 */
    @Excel(name = "行政区域")
    private String civilCode;

    /** 安装地址 */
    @Excel(name = "安装地址")
    private String address;

    /** 安装时间 yyyy-MM-dd HH:mm:ss */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "安装时间 yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
    private Date installedTime;

    /** 管理单位 */
    @Excel(name = "管理单位")
    private String managementUnit;

    /** 管理单位联系方式 */
    @Excel(name = "管理单位联系方式")
    private String muContactInfo;

    /** 录象保存天数 0 - 2147483647 */
    @Excel(name = "录象保存天数 0 - 2147483647")
    private Long storageDays;

    /** 异常原因 */
    @Excel(name = "异常原因")
    private String reason;

    /** 是否生成异常工单 */
    @Excel(name = "是否生成异常工单")
    private Long defaultOrder;

    /** 异常恢复标识  */
    @Excel(name = "异常恢复标识 ")
    private Long recovery;

    /** 异常恢复时间 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "异常恢复时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date recoveryTime;

    /** 考核标签 */
    @Excel(name = "考核标签")
    private String tag;

    /** 区域 */
    @Excel(name = "区域")
    private String region;

    /** 信令时延 */
    @Excel(name = "信令时延")
    private Long sipDelay;

    /** 视频时延 */
    @Excel(name = "视频时延")
    private Long videoDelay;

    /** 关键帧时延 */
    @Excel(name = "关键帧时延")
    private Long iframeDelay;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setSerialNumber(String serialNumber) 
    {
        this.serialNumber = serialNumber;
    }

    public String getSerialNumber() 
    {
        return serialNumber;
    }
    public void setName(String name) 
    {
        this.name = name;
    }

    public String getName() 
    {
        return name;
    }
    public void setMacAddr(String macAddr) 
    {
        this.macAddr = macAddr;
    }

    public String getMacAddr() 
    {
        return macAddr;
    }
    public void setIp(String ip) 
    {
        this.ip = ip;
    }

    public String getIp() 
    {
        return ip;
    }
    public void setLongitude(String longitude) 
    {
        this.longitude = longitude;
    }

    public String getLongitude() 
    {
        return longitude;
    }
    public void setLatitude(String latitude) 
    {
        this.latitude = latitude;
    }

    public String getLatitude() 
    {
        return latitude;
    }
    public void setOnState(Long onState) 
    {
        this.onState = onState;
    }

    public Long getOnState() 
    {
        return onState;
    }
    public void setCivilCode(String civilCode) 
    {
        this.civilCode = civilCode;
    }

    public String getCivilCode() 
    {
        return civilCode;
    }
    public void setAddress(String address) 
    {
        this.address = address;
    }

    public String getAddress() 
    {
        return address;
    }
    public void setInstalledTime(Date installedTime) 
    {
        this.installedTime = installedTime;
    }

    public Date getInstalledTime() 
    {
        return installedTime;
    }
    public void setManagementUnit(String managementUnit) 
    {
        this.managementUnit = managementUnit;
    }

    public String getManagementUnit() 
    {
        return managementUnit;
    }
    public void setMuContactInfo(String muContactInfo) 
    {
        this.muContactInfo = muContactInfo;
    }

    public String getMuContactInfo() 
    {
        return muContactInfo;
    }
    public void setStorageDays(Long storageDays) 
    {
        this.storageDays = storageDays;
    }

    public Long getStorageDays() 
    {
        return storageDays;
    }
    public void setReason(String reason) 
    {
        this.reason = reason;
    }

    public String getReason() 
    {
        return reason;
    }
    public void setDefaultOrder(Long defaultOrder) 
    {
        this.defaultOrder = defaultOrder;
    }

    public Long getDefaultOrder() 
    {
        return defaultOrder;
    }
    public void setRecovery(Long recovery) 
    {
        this.recovery = recovery;
    }

    public Long getRecovery() 
    {
        return recovery;
    }
    public void setRecoveryTime(Date recoveryTime) 
    {
        this.recoveryTime = recoveryTime;
    }

    public Date getRecoveryTime() 
    {
        return recoveryTime;
    }

    public void setRegion(String region) 
    {
        this.region = region;
    }

    public String getRegion() 
    {
        return region;
    }
    public void setSipDelay(Long sipDelay) 
    {
        this.sipDelay = sipDelay;
    }

    public Long getSipDelay() 
    {
        return sipDelay;
    }
    public void setVideoDelay(Long videoDelay) 
    {
        this.videoDelay = videoDelay;
    }

    public Long getVideoDelay() 
    {
        return videoDelay;
    }
    public void setIframeDelay(Long iframeDelay) 
    {
        this.iframeDelay = iframeDelay;
    }

    public Long getIframeDelay() 
    {
        return iframeDelay;
    }

    public String getTag() {
        return tag;
    }

    public void setTag(String tag) {
        this.tag = tag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("serialNumber", getSerialNumber())
            .append("name", getName())
            .append("macAddr", getMacAddr())
            .append("ip", getIp())
            .append("longitude", getLongitude())
            .append("latitude", getLatitude())
            .append("onState", getOnState())
            .append("civilCode", getCivilCode())
            .append("address", getAddress())
            .append("installedTime", getInstalledTime())
            .append("managementUnit", getManagementUnit())
            .append("muContactInfo", getMuContactInfo())
            .append("storageDays", getStorageDays())
            .append("reason", getReason())
            .append("defaultOrder", getDefaultOrder())
            .append("recovery", getRecovery())
            .append("recoveryTime", getRecoveryTime())
            .append("tag", getTag())
            .append("region", getRegion())
            .append("sipDelay", getSipDelay())
            .append("videoDelay", getVideoDelay())
            .append("iframeDelay", getIframeDelay())
            .toString();
    }
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java

New file
@@ -0,0 +1,143 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

/**
 * 卡口过车数据一致性对象 t_vehicle_data_monitor
 *
 * @author gonghl
 * @date 2024-03-19
 */
public class VehicleDataMonitor extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    private Integer id;

    /**
     * 地区编码
     */
    private String regionCode;

    /**
     * 卡口名称
     */
    @Excel(name = "卡口名称")
    private String bayonetName;

    /**
     * 卡口编号
     */
    @Excel(name = "卡口编号")
    private String bayonetNumber;

    /**
     * 过车数据量
     */
    @Excel(name = "过车数据量")
    private Integer vehicleDataNumber;

    /**
     * 不唯一数据
     */
    @Excel(name = "不唯一数据 ")
    private Integer notUniqueData;

    /**
     * 不唯一数据量
     */
    @Excel(name = "不唯一数据量")
    private Integer notUniqueDataNumber;

    /**
     * 逻辑删除
     */
    @TableLogic
    private String deleted;

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getId() {
        return id;
    }

    public void setRegionCode(String regionCode) {
        this.regionCode = regionCode;
    }

    public String getRegionCode() {
        return regionCode;
    }

    public void setBayonetName(String bayonetName) {
        this.bayonetName = bayonetName;
    }

    public String getBayonetName() {
        return bayonetName;
    }

    public void setBayonetNumber(String bayonetNumber) {
        this.bayonetNumber = bayonetNumber;
    }

    public String getBayonetNumber() {
        return bayonetNumber;
    }

    public void setVehicleDataNumber(Integer vehicleDataNumber) {
        this.vehicleDataNumber = vehicleDataNumber;
    }

    public Integer getVehicleDataNumber() {
        return vehicleDataNumber;
    }

    public void setNotUniqueData(Integer notUniqueData) {
        this.notUniqueData = notUniqueData;
    }

    public Integer getNotUniqueData() {
        return notUniqueData;
    }

    public void setNotUniqueDataNumber(Integer notUniqueDataNumber) {
        this.notUniqueDataNumber = notUniqueDataNumber;
    }

    public Integer getNotUniqueDataNumber() {
        return notUniqueDataNumber;
    }

    public void setDeleted(String deleted) {
        this.deleted = deleted;
    }

    public String getDeleted() {
        return deleted;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("regionCode", getRegionCode())
                .append("bayonetName", getBayonetName())
                .append("bayonetNumber", getBayonetNumber())
                .append("vehicleDataNumber", getVehicleDataNumber())
                .append("notUniqueData", getNotUniqueData())
                .append("notUniqueDataNumber", getNotUniqueDataNumber())
                .append("createTime", getCreateTime())
                .append("updateTime", getUpdateTime())
                .append("deleted", getDeleted())
                .toString();
    }
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java

@@ -51,6 +51,9 @@
    @ApiModelProperty("考核时间")
    private LocalDateTime checkTime;

    @ApiModelProperty("是否发布")
    private Integer publish;

    public static CheckResult getEntityByForm(@NonNull CheckResultForm form, CheckResult entity) {
        if(entity == null) {
          entity = new CheckResult();

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java

@@ -40,5 +40,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date end;

    /** 审核状态 */
    private Integer auditState;
}


 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java

@@ -50,6 +50,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime checkTime;

    /** 是否发布 */
    private Integer publish;

    public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) {
        if(vo == null) {
            vo = new CheckResultVO();

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java

@@ -1,7 +1,11 @@
package com.ycl.platform.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckRule;

import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
@@ -37,7 +41,15 @@
    private Integer faceChceckpointNum;

    private Integer category;

    /** 审核状态 */
    private Integer auditState;
    /** 审核人 */
    private String auditUser;
    /** 审核时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditTime;
    /** 审核意见 */
    private String auditDescription;
    public static CheckRuleVO getVoByEntity(@NonNull CheckRule entity, CheckRuleVO vo) {
        if(vo == null) {
            vo = new CheckRuleVO();

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java

@@ -1,9 +1,11 @@
package com.ycl.platform.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckTemplate;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;

@@ -41,6 +43,7 @@
    private List<RuleItemVO> ruleFormList;
    /** 单位名 */
    private String unitName;

    public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) {
        if(vo == null) {
            vo = new CheckTemplateVO();

 ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java

@@ -50,6 +50,12 @@
        return checkResultService.removeById(id);
    }

    @PutMapping("/publish/{id}")
    @ApiOperation(value = "ID发布", notes = "ID发布")
    public Result publishById(@PathVariable("id") String id) {
        return checkResultService.publishById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {

 ycl-server/src/main/java/com/ycl/platform/controller/TMonitorVideoController.java

New file
@@ -0,0 +1,98 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.TMonitorVideo;
import com.ycl.platform.service.ITMonitorVideoService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 设备资产Controller
 *
 * @author ruoyi
 * @date 2024-03-19
 */
@RestController
@RequestMapping("/system/video")
public class TMonitorVideoController extends BaseController
{
    @Autowired
    private ITMonitorVideoService tMonitorVideoService;

    /**
     * 查询设备资产列表
     */
    @PreAuthorize("@ss.hasPermi('system:video:list')")
    @GetMapping("/list")
    public TableDataInfo list(TMonitorVideo tMonitorVideo)
    {
        startPage();
        List<TMonitorVideo> list = tMonitorVideoService.selectTMonitorVideoList(tMonitorVideo);
        return getDataTable(list);
    }

    /**
     * 导出设备资产列表
     */
    @PreAuthorize("@ss.hasPermi('system:video:export')")
    @Log(title = "设备资产", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TMonitorVideo tMonitorVideo)
    {
        List<TMonitorVideo> list = tMonitorVideoService.selectTMonitorVideoList(tMonitorVideo);
        ExcelUtil<TMonitorVideo> util = new ExcelUtil<TMonitorVideo>(TMonitorVideo.class);
        util.exportExcel(response, list, "设备资产数据");
    }

    /**
     * 获取设备资产详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:video:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(tMonitorVideoService.selectTMonitorVideoById(id));
    }

    /**
     * 新增设备资产
     */
    @PreAuthorize("@ss.hasPermi('system:video:add')")
    @Log(title = "设备资产", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TMonitorVideo tMonitorVideo)
    {
        return toAjax(tMonitorVideoService.insertTMonitorVideo(tMonitorVideo));
    }

    /**
     * 修改设备资产
     */
    @PreAuthorize("@ss.hasPermi('system:video:edit')")
    @Log(title = "设备资产", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TMonitorVideo tMonitorVideo)
    {
        return toAjax(tMonitorVideoService.updateTMonitorVideo(tMonitorVideo));
    }

    /**
     * 删除设备资产
     */
    @PreAuthorize("@ss.hasPermi('system:video:remove')")
    @Log(title = "设备资产", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(tMonitorVideoService.deleteTMonitorVideoByIds(ids));
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/VehicleDataMonitorController.java

New file
@@ -0,0 +1,91 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.VehicleDataMonitor;
import com.ycl.platform.service.IVehicleDataMonitorService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 卡口过车数据一致性Controller
 *
 * @author gonghl
 * @date 2024-03-19
 */
@RestController
@RequestMapping("/platform/platform")
public class VehicleDataMonitorController extends BaseController {
    @Autowired
    private IVehicleDataMonitorService vehicleDataMonitorService;

    /**
     * 查询卡口过车数据一致性列表
     */
    @PreAuthorize("@ss.hasPermi('platform:platform:list')")
    @GetMapping("/list")
    public TableDataInfo list(VehicleDataMonitor vehicleDataMonitor) {
        startPage();
        List<VehicleDataMonitor> list = vehicleDataMonitorService.selectVehicleDataMonitorList(vehicleDataMonitor);
        return getDataTable(list);
    }

    /**
     * 导出卡口过车数据一致性列表
     */
    @PreAuthorize("@ss.hasPermi('platform:platform:export')")
    @Log(title = "卡口过车数据一致性", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, VehicleDataMonitor vehicleDataMonitor) {
        List<VehicleDataMonitor> list = vehicleDataMonitorService.selectVehicleDataMonitorList(vehicleDataMonitor);
        ExcelUtil<VehicleDataMonitor> util = new ExcelUtil<VehicleDataMonitor>(VehicleDataMonitor.class);
        util.exportExcel(response, list, "卡口过车数据一致性数据");
    }

    /**
     * 获取卡口过车数据一致性详细信息
     */
    @PreAuthorize("@ss.hasPermi('platform:platform:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Integer id) {
        return success(vehicleDataMonitorService.selectVehicleDataMonitorById(id));
    }

    /**
     * 新增卡口过车数据一致性
     */
    @PreAuthorize("@ss.hasPermi('platform:platform:add')")
    @Log(title = "卡口过车数据一致性", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody VehicleDataMonitor vehicleDataMonitor) {
        return toAjax(vehicleDataMonitorService.insertVehicleDataMonitor(vehicleDataMonitor));
    }

    /**
     * 修改卡口过车数据一致性
     */
    @PreAuthorize("@ss.hasPermi('platform:platform:edit')")
    @Log(title = "卡口过车数据一致性", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody VehicleDataMonitor vehicleDataMonitor) {
        return toAjax(vehicleDataMonitorService.updateVehicleDataMonitor(vehicleDataMonitor));
    }

    /**
     * 删除卡口过车数据一致性
     */
    @PreAuthorize("@ss.hasPermi('platform:platform:remove')")
    @Log(title = "卡口过车数据一致性", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Integer[] ids) {
        return toAjax(vehicleDataMonitorService.deleteVehicleDataMonitorByIds(ids));
    }
}

 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorVideoMapper.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.TMonitorVideo;

import java.util.List;

/**
 * 设备资产Mapper接口
 * 
 * @author ruoyi
 * @date 2024-03-19
 */
public interface TMonitorVideoMapper 
{
    /**
     * 查询设备资产
     * 
     * @param id 设备资产主键
     * @return 设备资产
     */
    public TMonitorVideo selectTMonitorVideoById(Long id);

    /**
     * 查询设备资产列表
     * 
     * @param tMonitorVideo 设备资产
     * @return 设备资产集合
     */
    public List<TMonitorVideo> selectTMonitorVideoList(TMonitorVideo tMonitorVideo);

    /**
     * 新增设备资产
     * 
     * @param tMonitorVideo 设备资产
     * @return 结果
     */
    public int insertTMonitorVideo(TMonitorVideo tMonitorVideo);

    /**
     * 修改设备资产
     * 
     * @param tMonitorVideo 设备资产
     * @return 结果
     */
    public int updateTMonitorVideo(TMonitorVideo tMonitorVideo);

    /**
     * 删除设备资产
     * 
     * @param id 设备资产主键
     * @return 结果
     */
    public int deleteTMonitorVideoById(Long id);

    /**
     * 批量删除设备资产
     * 
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteTMonitorVideoByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/VehicleDataMonitorMapper.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.mapper;


import com.ycl.platform.domain.entity.VehicleDataMonitor;

import java.util.List;

/**
 * 卡口过车数据一致性Mapper接口
 *
 * @author gonghl
 * @date 2024-03-19
 */
public interface VehicleDataMonitorMapper {
    /**
     * 查询卡口过车数据一致性
     *
     * @param id 卡口过车数据一致性主键
     * @return 卡口过车数据一致性
     */
    public VehicleDataMonitor selectVehicleDataMonitorById(Integer id);

    /**
     * 查询卡口过车数据一致性列表
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 卡口过车数据一致性集合
     */
    public List<VehicleDataMonitor> selectVehicleDataMonitorList(VehicleDataMonitor vehicleDataMonitor);

    /**
     * 新增卡口过车数据一致性
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 结果
     */
    public int insertVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor);

    /**
     * 修改卡口过车数据一致性
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 结果
     */
    public int updateVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor);

    /**
     * 删除卡口过车数据一致性
     *
     * @param id 卡口过车数据一致性主键
     * @return 结果
     */
    public int deleteVehicleDataMonitorById(Integer id);

    /**
     * 批量删除卡口过车数据一致性
     *
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteVehicleDataMonitorByIds(Integer[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java

@@ -70,4 +70,12 @@
     * @return
     */
    Result manualScore(ManualScoreForm form);

    /**
     * id发布
     * @param id
     * @return
     */
    Result publishById(String id);

}

 ycl-server/src/main/java/com/ycl/platform/service/ITMonitorVideoService.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.TMonitorVideo;

import java.util.List;

/**
 * 设备资产Service接口
 * 
 * @author ruoyi
 * @date 2024-03-19
 */
public interface ITMonitorVideoService 
{
    /**
     * 查询设备资产
     * 
     * @param id 设备资产主键
     * @return 设备资产
     */
    public TMonitorVideo selectTMonitorVideoById(Long id);

    /**
     * 查询设备资产列表
     * 
     * @param tMonitorVideo 设备资产
     * @return 设备资产集合
     */
    public List<TMonitorVideo> selectTMonitorVideoList(TMonitorVideo tMonitorVideo);

    /**
     * 新增设备资产
     * 
     * @param tMonitorVideo 设备资产
     * @return 结果
     */
    public int insertTMonitorVideo(TMonitorVideo tMonitorVideo);

    /**
     * 修改设备资产
     * 
     * @param tMonitorVideo 设备资产
     * @return 结果
     */
    public int updateTMonitorVideo(TMonitorVideo tMonitorVideo);

    /**
     * 批量删除设备资产
     * 
     * @param ids 需要删除的设备资产主键集合
     * @return 结果
     */
    public int deleteTMonitorVideoByIds(Long[] ids);

    /**
     * 删除设备资产信息
     * 
     * @param id 设备资产主键
     * @return 结果
     */
    public int deleteTMonitorVideoById(Long id);
}

 ycl-server/src/main/java/com/ycl/platform/service/IVehicleDataMonitorService.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.service;


import com.ycl.platform.domain.entity.VehicleDataMonitor;

import java.util.List;

/**
 * 卡口过车数据一致性Service接口
 *
 * @author gonghl
 * @date 2024-03-19
 */
public interface IVehicleDataMonitorService {
    /**
     * 查询卡口过车数据一致性
     *
     * @param id 卡口过车数据一致性主键
     * @return 卡口过车数据一致性
     */
    public VehicleDataMonitor selectVehicleDataMonitorById(Integer id);

    /**
     * 查询卡口过车数据一致性列表
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 卡口过车数据一致性集合
     */
    public List<VehicleDataMonitor> selectVehicleDataMonitorList(VehicleDataMonitor vehicleDataMonitor);

    /**
     * 新增卡口过车数据一致性
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 结果
     */
    public int insertVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor);

    /**
     * 修改卡口过车数据一致性
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 结果
     */
    public int updateVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor);

    /**
     * 批量删除卡口过车数据一致性
     *
     * @param ids 需要删除的卡口过车数据一致性主键集合
     * @return 结果
     */
    public int deleteVehicleDataMonitorByIds(Integer[] ids);

    /**
     * 删除卡口过车数据一致性信息
     *
     * @param id 卡口过车数据一致性主键
     * @return 结果
     */
    public int deleteVehicleDataMonitorById(Integer id);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java

@@ -1,5 +1,6 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.CheckResult;
import com.ycl.platform.domain.form.ManualScoreForm;
@@ -151,4 +152,18 @@
        baseMapper.updateById(checkResult);
        return Result.ok();
    }

    @Override
    public Result publishById(String id) {
        CheckResult checkResult = baseMapper.selectById(id);
        if(Objects.equals(1, checkResult.getPublish())) {
            checkResult.setPublish(0);
        } else {
            checkResult.setPublish(1);
        }
        if(baseMapper.updateById(checkResult) > 0) {
            return Result.ok("发布成功");
        }
        return Result.error("发布失败");
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java

@@ -107,12 +107,13 @@
    @Override
    public Result page(CheckRuleQuery query) {

        IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper)
        IPage<CheckRule> page =  new LambdaQueryChainWrapper<>(baseMapper)
                .like(StringUtils.hasText(query.getRuleName()), CheckRule::getRuleName, query.getRuleName())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        CheckRule::getCreateTime,
                        DateUtils.getDayStart(query.getStart()),
                        DateUtils.getDayEnd(query.getEnd()))
                .eq(Objects.nonNull(query.getAuditState()),CheckRule::getAuditState, query.getAuditState())
                .orderByDesc(CheckRule::getCreateTime)
                .page(PageUtil.getPage(query, CheckRule.class));


 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorVideoServiceImpl.java

New file
@@ -0,0 +1,94 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.TMonitorVideo;
import com.ycl.platform.mapper.TMonitorVideoMapper;
import com.ycl.platform.service.ITMonitorVideoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 设备资产Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-03-19
 */
@Service
public class TMonitorVideoServiceImpl implements ITMonitorVideoService
{
    @Autowired
    private TMonitorVideoMapper tMonitorVideoMapper;

    /**
     * 查询设备资产
     * 
     * @param id 设备资产主键
     * @return 设备资产
     */
    @Override
    public TMonitorVideo selectTMonitorVideoById(Long id)
    {
        return tMonitorVideoMapper.selectTMonitorVideoById(id);
    }

    /**
     * 查询设备资产列表
     * 
     * @param tMonitorVideo 设备资产
     * @return 设备资产
     */
    @Override
    public List<TMonitorVideo> selectTMonitorVideoList(TMonitorVideo tMonitorVideo)
    {
        return tMonitorVideoMapper.selectTMonitorVideoList(tMonitorVideo);
    }

    /**
     * 新增设备资产
     * 
     * @param tMonitorVideo 设备资产
     * @return 结果
     */
    @Override
    public int insertTMonitorVideo(TMonitorVideo tMonitorVideo)
    {
        return tMonitorVideoMapper.insertTMonitorVideo(tMonitorVideo);
    }

    /**
     * 修改设备资产
     * 
     * @param tMonitorVideo 设备资产
     * @return 结果
     */
    @Override
    public int updateTMonitorVideo(TMonitorVideo tMonitorVideo)
    {
        return tMonitorVideoMapper.updateTMonitorVideo(tMonitorVideo);
    }

    /**
     * 批量删除设备资产
     * 
     * @param ids 需要删除的设备资产主键
     * @return 结果
     */
    @Override
    public int deleteTMonitorVideoByIds(Long[] ids)
    {
        return tMonitorVideoMapper.deleteTMonitorVideoByIds(ids);
    }

    /**
     * 删除设备资产信息
     * 
     * @param id 设备资产主键
     * @return 结果
     */
    @Override
    public int deleteTMonitorVideoById(Long id)
    {
        return tMonitorVideoMapper.deleteTMonitorVideoById(id);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/VehicleDataMonitorServiceImpl.java

New file
@@ -0,0 +1,91 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.VehicleDataMonitor;
import com.ycl.platform.mapper.VehicleDataMonitorMapper;
import com.ycl.platform.service.IVehicleDataMonitorService;
import com.ycl.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 卡口过车数据一致性Service业务层处理
 *
 * @author gonghl
 * @date 2024-03-19
 */
@Service
public class VehicleDataMonitorServiceImpl implements IVehicleDataMonitorService {
    @Autowired
    private VehicleDataMonitorMapper vehicleDataMonitorMapper;

    /**
     * 查询卡口过车数据一致性
     *
     * @param id 卡口过车数据一致性主键
     * @return 卡口过车数据一致性
     */
    @Override
    public VehicleDataMonitor selectVehicleDataMonitorById(Integer id) {
        return vehicleDataMonitorMapper.selectVehicleDataMonitorById(id);
    }

    /**
     * 查询卡口过车数据一致性列表
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 卡口过车数据一致性
     */
    @Override
    public List<VehicleDataMonitor> selectVehicleDataMonitorList(VehicleDataMonitor vehicleDataMonitor) {
        return vehicleDataMonitorMapper.selectVehicleDataMonitorList(vehicleDataMonitor);
    }

    /**
     * 新增卡口过车数据一致性
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 结果
     */
    @Override
    public int insertVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor) {
        vehicleDataMonitor.setCreateTime(DateUtils.getNowDate());
        vehicleDataMonitor.setDeleted("0");
        return vehicleDataMonitorMapper.insertVehicleDataMonitor(vehicleDataMonitor);
    }

    /**
     * 修改卡口过车数据一致性
     *
     * @param vehicleDataMonitor 卡口过车数据一致性
     * @return 结果
     */
    @Override
    public int updateVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor) {
        vehicleDataMonitor.setUpdateTime(DateUtils.getNowDate());
        return vehicleDataMonitorMapper.updateVehicleDataMonitor(vehicleDataMonitor);
    }

    /**
     * 批量删除卡口过车数据一致性
     *
     * @param ids 需要删除的卡口过车数据一致性主键
     * @return 结果
     */
    @Override
    public int deleteVehicleDataMonitorByIds(Integer[] ids) {
        return vehicleDataMonitorMapper.deleteVehicleDataMonitorByIds(ids);
    }

    /**
     * 删除卡口过车数据一致性信息
     *
     * @param id 卡口过车数据一致性主键
     * @return 结果
     */
    @Override
    public int deleteVehicleDataMonitorById(Integer id) {
        return vehicleDataMonitorMapper.deleteVehicleDataMonitorById(id);
    }
}

 ycl-server/src/main/resources/application.yml

@@ -95,7 +95,7 @@
user:
  password:
    # 密码最大错误次数
    maxRetryCount: 5
    maxRetryCount: 20
    # 密码锁定时间（默认10分钟）
    lockTime: 10


 ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml

@@ -15,6 +15,7 @@
        <result column="check_time" property="checkTime" />
        <result column="frequency" property="frequency" />
        <result column="examine_range" property="examineRange" />
        <result column="publish" property="publish" />
    </resultMap>

    <select id="page" resultMap="BaseResultMap">
@@ -27,7 +28,8 @@
               tcr.check_time,
               tcr.check_score,
               tcr.system_score,
               tcr.manual_score
               tcr.manual_score,
               tcr.publish
        FROM
             t_check_result tcr
                 INNER JOIN t_check_publish tcp ON tcr.check_publish_id = tcp.id

 ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml

@@ -19,10 +19,16 @@
        <result property="updateUserName"    column="update_user_name"    />
        <result property="description"    column="description"    />
        <result property="alarmScore"    column="alarm_score"    />
        <result property="auditState"    column="audit_state"    />
        <result property="auditUser"    column="audit_user"    />
        <result property="auditDescription"    column="audit_description"    />
        <result property="auditTime"    column="audit_time"    />
    </resultMap>

    <sql id="selectTCheckPublishVo">
        select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time , update_user , description,create_user_name,update_user_name,alarm_score from t_check_publish
        select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time ,
               update_user , description,create_user_name,update_user_name,alarm_score ,audit_state,audit_user,audit_description,audit_time
        from t_check_publish
    </sql>

    <select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult">
@@ -37,6 +43,7 @@
            <if test="updateUser != null "> and update_user = #{updateUser}</if>
            <if test="description != null  and description != ''"> and description = #{description}</if>
            <if test="alarmScore != null"> and alarm_score = #{alarmScore}</if>
            <if test="auditState != null"> and audit_state = #{auditState}</if>
        </where>
    </select>
    
@@ -62,6 +69,10 @@
            <if test="updateUserName != null and updateUserName!= ''">update_user_name,</if>
            <if test="description != null">description,</if>
            <if test="alarmScore != null">alarm_score,</if>
            <if test="auditState != null">alarm_state,</if>
            <if test="auditUser != null and auditUser!=''">alarm_user,</if>
            <if test="auditDescription != null auditDescription!=''">alarm_description,</if>
            <if test="auditTime != null">alarm_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -78,6 +89,10 @@
            <if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if>
            <if test="description != null">#{description},</if>
            <if test="alarmScore != null">#{alarmScore},</if>
            <if test="auditState != null">#{alarmState),</if>
            <if test="auditUser != null and auditUser!=''">#{auditUser},</if>
            <if test="auditDescription != null auditDescription!=''">#{auditDescription},</if>
            <if test="auditTime != null">#{auditTime},</if>
         </trim>
    </insert>

@@ -97,6 +112,10 @@
            <if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if>
            <if test="description != null">description = #{description},</if>
            <if test="alarmScore != null">alarm_score = #{alarmScore},</if>
            <if test="auditState != null">audit_state = #{alarmState),</if>
            <if test="auditUser != null and auditUser!=''">audit_user = #{auditUser},</if>
            <if test="auditDescription != null auditDescription!=''">audit_description = #{auditDescription},</if>
            <if test="auditTime != null">audit_time = #{auditTime},</if>
        </trim>
        where id = #{id}
    </update>

 ycl-server/src/main/resources/mapper/zgyw/TMonitorVideoMapper.xml

New file
@@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.TMonitorVideoMapper">
    
    <resultMap type="com.ycl.platform.domain.entity.TMonitorVideo" id="TMonitorVideoResult">
        <result property="id"    column="id"    />
        <result property="serialNumber"    column="serial_number"    />
        <result property="name"    column="name"    />
        <result property="macAddr"    column="mac_addr"    />
        <result property="ip"    column="ip"    />
        <result property="longitude"    column="longitude"    />
        <result property="latitude"    column="latitude"    />
        <result property="onState"    column="on_state"    />
        <result property="civilCode"    column="civil_code"    />
        <result property="address"    column="address"    />
        <result property="installedTime"    column="installed_time"    />
        <result property="managementUnit"    column="management_unit"    />
        <result property="muContactInfo"    column="mu_contact_info"    />
        <result property="storageDays"    column="storage_days"    />
        <result property="reason"    column="reason"    />
        <result property="defaultOrder"    column="default_order"    />
        <result property="recovery"    column="recovery"    />
        <result property="recoveryTime"    column="recovery_time"    />
        <result property="tag"    column="tag"    />
        <result property="region"    column="region"    />
        <result property="sipDelay"    column="sipDelay"    />
        <result property="videoDelay"    column="videoDelay"    />
        <result property="iframeDelay"    column="iframeDelay"    />
    </resultMap>

    <sql id="selectTMonitorVideoVo">
        select id, serial_number, name, mac_addr, ip, longitude, latitude, on_state, civil_code, address, installed_time, management_unit, mu_contact_info, storage_days, reason, default_order, recovery, recovery_time, tag, region, sipDelay, videoDelay, iframeDelay from t_monitor_video
    </sql>

    <select id="selectTMonitorVideoList"  resultMap="TMonitorVideoResult">
        <include refid="selectTMonitorVideoVo"/>
        <where>  
            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="macAddr != null  and macAddr != ''"> and mac_addr = #{macAddr}</if>
            <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
            <if test="onState != null "> and on_state = #{onState}</if>
            <if test="civilCode != null  and civilCode != ''"> and civil_code = #{civilCode}</if>
            <if test="address != null  and address != ''"> and address = #{address}</if>
            <if test="installedTime != null "> and installed_time = #{installedTime}</if>
            <if test="managementUnit != null  and managementUnit != ''"> and management_unit = #{managementUnit}</if>
            <if test="muContactInfo != null  and muContactInfo != ''"> and mu_contact_info = #{muContactInfo}</if>
            <if test="storageDays != null "> and storage_days = #{storageDays}</if>
            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
            <if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
            <if test="recovery != null "> and recovery = #{recovery}</if>
            <if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
            <if test="tag != null and tag !=''"> and tag = #{tag}</if>
            <if test="region != null  and region != ''"> and region = #{region}</if>
            <if test="sipDelay != null "> and sipDelay = #{sipDelay}</if>
            <if test="videoDelay != null "> and videoDelay = #{videoDelay}</if>
            <if test="iframeDelay != null "> and iframeDelay = #{iframeDelay}</if>
        </where>
    </select>
    
    <select id="selectTMonitorVideoById" parameterType="Long" resultMap="TMonitorVideoResult">
        <include refid="selectTMonitorVideoVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertTMonitorVideo" useGeneratedKeys="true" keyProperty="id">
        insert into t_monitor_video
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="serialNumber != null">serial_number,</if>
            <if test="name != null">name,</if>
            <if test="macAddr != null">mac_addr,</if>
            <if test="ip != null">ip,</if>
            <if test="longitude != null">longitude,</if>
            <if test="latitude != null">latitude,</if>
            <if test="onState != null">on_state,</if>
            <if test="civilCode != null">civil_code,</if>
            <if test="address != null">address,</if>
            <if test="installedTime != null">installed_time,</if>
            <if test="managementUnit != null">management_unit,</if>
            <if test="muContactInfo != null">mu_contact_info,</if>
            <if test="storageDays != null">storage_days,</if>
            <if test="reason != null">reason,</if>
            <if test="defaultOrder != null">default_order,</if>
            <if test="recovery != null">recovery,</if>
            <if test="recoveryTime != null">recovery_time,</if>
            <if test="tag != null and tag !=''">tag,</if>
            <if test="region != null">region,</if>
            <if test="sipDelay != null">sipDelay,</if>
            <if test="videoDelay != null">videoDelay,</if>
            <if test="iframeDelay != null">iframeDelay,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="serialNumber != null">#{serialNumber},</if>
            <if test="name != null">#{name},</if>
            <if test="macAddr != null">#{macAddr},</if>
            <if test="ip != null">#{ip},</if>
            <if test="longitude != null">#{longitude},</if>
            <if test="latitude != null">#{latitude},</if>
            <if test="onState != null">#{onState},</if>
            <if test="civilCode != null">#{civilCode},</if>
            <if test="address != null">#{address},</if>
            <if test="installedTime != null">#{installedTime},</if>
            <if test="managementUnit != null">#{managementUnit},</if>
            <if test="muContactInfo != null">#{muContactInfo},</if>
            <if test="storageDays != null">#{storageDays},</if>
            <if test="reason != null">#{reason},</if>
            <if test="defaultOrder != null">#{defaultOrder},</if>
            <if test="recovery != null">#{recovery},</if>
            <if test="recoveryTime != null">#{recoveryTime},</if>
            <if test="tag != null and tag !=''">#{tag},</if>
            <if test="region != null">#{region},</if>
            <if test="sipDelay != null">#{sipDelay},</if>
            <if test="videoDelay != null">#{videoDelay},</if>
            <if test="iframeDelay != null">#{iframeDelay},</if>
         </trim>
    </insert>

    <update id="updateTMonitorVideo" >
        update t_monitor_video
        <trim prefix="SET" suffixOverrides=",">
            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
            <if test="name != null">name = #{name},</if>
            <if test="macAddr != null">mac_addr = #{macAddr},</if>
            <if test="ip != null">ip = #{ip},</if>
            <if test="longitude != null">longitude = #{longitude},</if>
            <if test="latitude != null">latitude = #{latitude},</if>
            <if test="onState != null">on_state = #{onState},</if>
            <if test="civilCode != null">civil_code = #{civilCode},</if>
            <if test="address != null">address = #{address},</if>
            <if test="installedTime != null">installed_time = #{installedTime},</if>
            <if test="managementUnit != null">management_unit = #{managementUnit},</if>
            <if test="muContactInfo != null">mu_contact_info = #{muContactInfo},</if>
            <if test="storageDays != null">storage_days = #{storageDays},</if>
            <if test="reason != null">reason = #{reason},</if>
            <if test="defaultOrder != null">default_order = #{defaultOrder},</if>
            <if test="recovery != null">recovery = #{recovery},</if>
            <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
            <if test="tag != null and tag !=''">tag = #{tag},</if>
            <if test="region != null">region = #{region},</if>
            <if test="sipDelay != null">sipDelay = #{sipDelay},</if>
            <if test="videoDelay != null">videoDelay = #{videoDelay},</if>
            <if test="iframeDelay != null">iframeDelay = #{iframeDelay},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTMonitorVideoById" parameterType="Long">
        delete from t_monitor_video where id = #{id}
    </delete>

    <delete id="deleteTMonitorVideoByIds" parameterType="String">
        delete from t_monitor_video where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 ycl-server/src/main/resources/mapper/zgyw/VehicleDataMonitorMapper.xml

New file
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.VehicleDataMonitorMapper">

    <resultMap type="com.ycl.platform.domain.entity.VehicleDataMonitor" id="VehicleDataMonitorResult">
        <result property="id" column="id"/>
        <result property="regionCode" column="region_code"/>
        <result property="bayonetName" column="bayonet_name"/>
        <result property="bayonetNumber" column="bayonet_number"/>
        <result property="vehicleDataNumber" column="vehicle_data_number"/>
        <result property="notUniqueData" column="not_unique_data"/>
        <result property="notUniqueDataNumber" column="not_unique_data_number"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="deleted" column="deleted"/>
    </resultMap>

    <sql id="selectVehicleDataMonitorVo">
        select id,
               region_code,
               bayonet_name,
               bayonet_number,
               vehicle_data_number,
               not_unique_data,
               not_unique_data_number,
               create_time,
               update_time,
               deleted
        from t_vehicle_data_monitor
    </sql>

    <select id="selectVehicleDataMonitorList" parameterType="com.ycl.platform.domain.entity.VehicleDataMonitor" resultMap="VehicleDataMonitorResult">
        <include refid="selectVehicleDataMonitorVo"/>
        <where>
            deleted != 1
            <if test="regionCode != null  and regionCode != ''">and region_code = #{regionCode}</if>
            <if test="bayonetName != null  and bayonetName != ''">and bayonet_name like concat('%', #{bayonetName}, '%')</if>
            <if test="bayonetNumber != null  and bayonetNumber != ''">and bayonet_number like concat('%', #{bayonetNumber}, '%')</if>
        </where>
    </select>

    <select id="selectVehicleDataMonitorById" parameterType="Integer" resultMap="VehicleDataMonitorResult">
        <include refid="selectVehicleDataMonitorVo"/>
        where id = #{id}
    </select>

    <insert id="insertVehicleDataMonitor" parameterType="com.ycl.platform.domain.entity.VehicleDataMonitor" useGeneratedKeys="true" keyProperty="id">
        insert into t_vehicle_data_monitor
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="regionCode != null">region_code,</if>
            <if test="bayonetName != null and bayonetName != ''">bayonet_name,</if>
            <if test="bayonetNumber != null and bayonetNumber != ''">bayonet_number,</if>
            <if test="vehicleDataNumber != null">vehicle_data_number,</if>
            <if test="notUniqueData != null">not_unique_data,</if>
            <if test="notUniqueDataNumber != null">not_unique_data_number,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="regionCode != null">#{regionCode},</if>
            <if test="bayonetName != null and bayonetName != ''">#{bayonetName},</if>
            <if test="bayonetNumber != null and bayonetNumber != ''">#{bayonetNumber},</if>
            <if test="vehicleDataNumber != null">#{vehicleDataNumber},</if>
            <if test="notUniqueData != null">#{notUniqueData},</if>
            <if test="notUniqueDataNumber != null">#{notUniqueDataNumber},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="deleted != null">#{deleted},</if>
        </trim>
    </insert>

    <update id="updateVehicleDataMonitor" parameterType="com.ycl.platform.domain.entity.VehicleDataMonitor">
        update t_vehicle_data_monitor
        <trim prefix="SET" suffixOverrides=",">
            <if test="regionCode != null">region_code = #{regionCode},</if>
            <if test="bayonetName != null and bayonetName != ''">bayonet_name = #{bayonetName},</if>
            <if test="bayonetNumber != null and bayonetNumber != ''">bayonet_number = #{bayonetNumber},</if>
            <if test="vehicleDataNumber != null">vehicle_data_number = #{vehicleDataNumber},</if>
            <if test="notUniqueData != null">not_unique_data = #{notUniqueData},</if>
            <if test="notUniqueDataNumber != null">not_unique_data_number = #{notUniqueDataNumber},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="deleted != null">deleted = #{deleted},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteVehicleDataMonitorById" parameterType="Integer">
        delete
        from t_vehicle_data_monitor
        where id = #{id}
    </delete>

    <delete id="deleteVehicleDataMonitorByIds" parameterType="String">
        delete from t_vehicle_data_monitor where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>