结构修改

xiangpei

2024-03-05 3b6d665e4f633121180a190321f6f5fd93843916

结构修改

 .gitignore

@@ -47,3 +47,4 @@
!*/build/*.xml


/自贡ui/

 ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/base/AbsEntity.java
@@ -1,4 +1,4 @@
package com.ycl.system.domain.base;
package com.ycl.platform.base;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;

 ycl-pojo/src/main/java/com/ycl/platform/base/AbsForm.java

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/base/AbsForm.java
@@ -1,4 +1,4 @@
package com.ycl.system.domain.base;
package com.ycl.platform.base;

import com.ycl.system.domain.group.Update;
import io.swagger.annotations.ApiModelProperty;

 ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/base/AbsQuery.java
@@ -1,4 +1,4 @@
package com.ycl.system.domain.base;
package com.ycl.platform.base;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/base/AbsVo.java
@@ -1,4 +1,4 @@
package com.ycl.system.domain.base;
package com.ycl.platform.base;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

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

File was renamed from ycl-pojo/src/main/java/com/ycl/platform/entity/TMonitor.java
@@ -1,4 +1,4 @@
package com.ycl.platform.entity;
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,7 +10,7 @@

/**
 * 设备资产对象 t_monitor
 * 
 *
 * @author ruoyi
 * @date 2024-03-04
 */
@@ -142,282 +142,282 @@
    @Excel(name = "类型编码 : [131.摄像机编码;132.网络摄像机编码;]")
    private Long lxbm;

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

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

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

    public String getName() 
    public String getName()
    {
        return name;
    }
    public void setSiteType(Long siteType) 
    public void setSiteType(Long siteType)
    {
        this.siteType = siteType;
    }

    public Long getSiteType() 
    public Long getSiteType()
    {
        return siteType;
    }
    public void setMacAddr(String macAddr) 
    public void setMacAddr(String macAddr)
    {
        this.macAddr = macAddr;
    }

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

    public String getIp() 
    public String getIp()
    {
        return ip;
    }
    public void setCameraFunType(String cameraFunType) 
    public void setCameraFunType(String cameraFunType)
    {
        this.cameraFunType = cameraFunType;
    }

    public String getCameraFunType() 
    public String getCameraFunType()
    {
        return cameraFunType;
    }
    public void setLongitude(String longitude) 
    public void setLongitude(String longitude)
    {
        this.longitude = longitude;
    }

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

    public String getLatitude() 
    public String getLatitude()
    {
        return latitude;
    }
    public void setCameraCaptureArea(String cameraCaptureArea) 
    public void setCameraCaptureArea(String cameraCaptureArea)
    {
        this.cameraCaptureArea = cameraCaptureArea;
    }

    public String getCameraCaptureArea() 
    public String getCameraCaptureArea()
    {
        return cameraCaptureArea;
    }
    public void setOnState(Long onState) 
    public void setOnState(Long onState)
    {
        this.onState = onState;
    }

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

    public String getCivilCode() 
    public String getCivilCode()
    {
        return civilCode;
    }
    public void setIntegratedDevice(Long integratedDevice) 
    public void setIntegratedDevice(Long integratedDevice)
    {
        this.integratedDevice = integratedDevice;
    }

    public Long getIntegratedDevice() 
    public Long getIntegratedDevice()
    {
        return integratedDevice;
    }
    public void setCameraBrand(Long cameraBrand) 
    public void setCameraBrand(Long cameraBrand)
    {
        this.cameraBrand = cameraBrand;
    }

    public Long getCameraBrand() 
    public Long getCameraBrand()
    {
        return cameraBrand;
    }
    public void setAddress(String address) 
    public void setAddress(String address)
    {
        this.address = address;
    }

    public String getAddress() 
    public String getAddress()
    {
        return address;
    }
    public void setNetWorking(Long netWorking) 
    public void setNetWorking(Long netWorking)
    {
        this.netWorking = netWorking;
    }

    public Long getNetWorking() 
    public Long getNetWorking()
    {
        return netWorking;
    }
    public void setPublicSecurity(String publicSecurity) 
    public void setPublicSecurity(String publicSecurity)
    {
        this.publicSecurity = publicSecurity;
    }

    public String getPublicSecurity() 
    public String getPublicSecurity()
    {
        return publicSecurity;
    }
    public void setInstalledTime(Date installedTime) 
    public void setInstalledTime(Date installedTime)
    {
        this.installedTime = installedTime;
    }

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

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

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

    public Long getStorageDays() 
    public Long getStorageDays()
    {
        return storageDays;
    }
    public void setMonitorAzimuth(Long monitorAzimuth) 
    public void setMonitorAzimuth(Long monitorAzimuth)
    {
        this.monitorAzimuth = monitorAzimuth;
    }

    public Long getMonitorAzimuth() 
    public Long getMonitorAzimuth()
    {
        return monitorAzimuth;
    }
    public void setScenePhotoAddr(String scenePhotoAddr) 
    public void setScenePhotoAddr(String scenePhotoAddr)
    {
        this.scenePhotoAddr = scenePhotoAddr;
    }

    public String getScenePhotoAddr() 
    public String getScenePhotoAddr()
    {
        return scenePhotoAddr;
    }
    public void setModel(String model) 
    public void setModel(String model)
    {
        this.model = model;
    }

    public String getModel() 
    public String getModel()
    {
        return model;
    }
    public void setSiteVulgo(String siteVulgo) 
    public void setSiteVulgo(String siteVulgo)
    {
        this.siteVulgo = siteVulgo;
    }

    public String getSiteVulgo() 
    public String getSiteVulgo()
    {
        return siteVulgo;
    }
    public void setCameraType(Long cameraType) 
    public void setCameraType(Long cameraType)
    {
        this.cameraType = cameraType;
    }

    public Long getCameraType() 
    public Long getCameraType()
    {
        return cameraType;
    }
    public void setCameraLightType(Long cameraLightType) 
    public void setCameraLightType(Long cameraLightType)
    {
        this.cameraLightType = cameraLightType;
    }

    public Long getCameraLightType() 
    public Long getCameraLightType()
    {
        return cameraLightType;
    }
    public void setEncodedFormat(Long encodedFormat) 
    public void setEncodedFormat(Long encodedFormat)
    {
        this.encodedFormat = encodedFormat;
    }

    public Long getEncodedFormat() 
    public Long getEncodedFormat()
    {
        return encodedFormat;
    }
    public void setCameraDept(String cameraDept) 
    public void setCameraDept(String cameraDept)
    {
        this.cameraDept = cameraDept;
    }

    public String getCameraDept() 
    public String getCameraDept()
    {
        return cameraDept;
    }
    public void setHybm(String hybm) 
    public void setHybm(String hybm)
    {
        this.hybm = hybm;
    }

    public String getHybm() 
    public String getHybm()
    {
        return hybm;
    }
    public void setLxbm(Long lxbm) 
    public void setLxbm(Long lxbm)
    {
        this.lxbm = lxbm;
    }

    public Long getLxbm() 
    public Long getLxbm()
    {
        return lxbm;
    }

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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/entity/YwPeople.java
@@ -1,10 +1,9 @@
package com.ycl.system.domain.entity;
package com.ycl.platform.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import com.ycl.system.domain.base.AbsEntity;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/entity/YwUnit.java
@@ -1,9 +1,8 @@
package com.ycl.system.domain.entity;
package com.ycl.platform.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import java.io.Serializable;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/form/YwPeopleForm.java
@@ -1,9 +1,9 @@
package com.ycl.system.domain.form;
package com.ycl.platform.domain.form;

import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.system.domain.entity.YwPeople;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.YwPeople;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/form/YwUnitForm.java
@@ -1,9 +1,9 @@
package com.ycl.system.domain.form;
package com.ycl.platform.domain.form;

import com.ycl.system.domain.entity.YwUnit;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.platform.base.AbsForm;
import jakarta.validation.constraints.NotBlank;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;

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

New file
@@ -0,0 +1,19 @@
package com.ycl.platform.domain.query;

import com.ycl.platform.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * 运维人员查询
 *
 * @author xp
 * @since 2024-03-04
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "YwPeople查询", description = "运维人员查询")
public class YwPeopleQuery extends AbsQuery {
}


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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/query/YwUnitQuery.java
@@ -1,10 +1,7 @@
package com.ycl.system.domain.query;
package com.ycl.platform.domain.query;

import com.ycl.system.domain.base.AbsQuery;
import java.util.List;
import org.springframework.lang.NonNull;
import com.ycl.platform.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;


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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/vo/YwPeopleVO.java
@@ -1,12 +1,9 @@
package com.ycl.system.domain.vo;
package com.ycl.platform.domain.vo;

import com.ycl.system.domain.base.AbsVo;
import com.ycl.system.domain.entity.YwPeople;
import java.util.List;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwPeople;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;


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

File was renamed from ycl-pojo/src/main/java/com/ycl/system/domain/vo/YwUnitVO.java
@@ -1,13 +1,10 @@
package com.ycl.system.domain.vo;
package com.ycl.platform.domain.vo;

import com.ycl.system.domain.base.AbsVo;
import java.util.List;
import com.ycl.platform.base.AbsVo;

import com.ycl.system.domain.entity.YwUnit;
import com.ycl.platform.domain.entity.YwUnit;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;


 ycl-pojo/src/main/java/com/ycl/system/domain/query/YwPeopleQuery.java

File was deleted

 ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.system.domain.base.AbsEntity;
import com.ycl.system.domain.base.AbsQuery;
import com.ycl.platform.base.AbsEntity;
import com.ycl.platform.base.AbsQuery;

/**
 * 分页工具类

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

@@ -1,7 +1,7 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.entity.TMonitor;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;

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

File was renamed from ycl-server/src/main/java/com/ycl/system/controller/zgyw/YwPeopleController.java
@@ -1,4 +1,4 @@
package com.ycl.system.controller.zgyw;
package com.ycl.platform.controller;

import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
@@ -8,10 +8,10 @@
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.system.service.YwPeopleService;
import com.ycl.platform.service.YwPeopleService;
import com.ycl.system.Result;
import com.ycl.system.domain.form.YwPeopleForm;
import com.ycl.system.domain.query.YwPeopleQuery;
import com.ycl.platform.domain.form.YwPeopleForm;
import com.ycl.platform.domain.query.YwPeopleQuery;
import org.springframework.web.bind.annotation.*;

/**

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

File was renamed from ycl-server/src/main/java/com/ycl/system/controller/zgyw/YwUnitController.java
@@ -1,12 +1,11 @@
package com.ycl.system.controller.zgyw;
package com.ycl.platform.controller;

import com.ycl.system.Result;
import com.ycl.system.domain.form.YwUnitForm;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.query.YwUnitQuery;
import com.ycl.system.service.YwUnitService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.service.YwUnitService;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;

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

@@ -1,20 +1,20 @@
package com.ycl.platform.mapper;

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

import java.util.List;

/**
 * 设备资产Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2024-03-04
 */
public interface TMonitorMapper 
public interface TMonitorMapper
{
    /**
     * 查询设备资产
     * 
     *
     * @param id 设备资产主键
     * @return 设备资产
     */
@@ -22,7 +22,7 @@

    /**
     * 查询设备资产列表
     * 
     *
     * @param tMonitor 设备资产
     * @return 设备资产集合
     */
@@ -30,7 +30,7 @@

    /**
     * 新增设备资产
     * 
     *
     * @param tMonitor 设备资产
     * @return 结果
     */
@@ -38,7 +38,7 @@

    /**
     * 修改设备资产
     * 
     *
     * @param tMonitor 设备资产
     * @return 结果
     */
@@ -46,7 +46,7 @@

    /**
     * 删除设备资产
     * 
     *
     * @param id 设备资产主键
     * @return 结果
     */
@@ -54,7 +54,7 @@

    /**
     * 批量删除设备资产
     * 
     *
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */

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

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

import com.ycl.platform.domain.entity.YwPeople;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * 运维人员 Mapper 接口
 *
 * @author xp
 * @since 2024-03-04
 */
@Mapper
public interface YwPeopleMapper extends BaseMapper<YwPeople> {

}

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

File was renamed from ycl-server/src/main/java/com/ycl/system/mapper/YwUnitMapper.java
@@ -1,10 +1,9 @@
package com.ycl.system.mapper;
package com.ycl.platform.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;

import com.ycl.system.domain.entity.YwUnit;
import com.ycl.platform.domain.entity.YwUnit;
import org.apache.ibatis.annotations.Mapper;

/**

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

@@ -1,20 +1,20 @@
package com.ycl.platform.service;

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

import java.util.List;

/**
 * 设备资产Service接口
 * 
 *
 * @author ruoyi
 * @date 2024-03-04
 */
public interface ITMonitorService 
public interface ITMonitorService
{
    /**
     * 查询设备资产
     * 
     *
     * @param id 设备资产主键
     * @return 设备资产
     */
@@ -22,7 +22,7 @@

    /**
     * 查询设备资产列表
     * 
     *
     * @param tMonitor 设备资产
     * @return 设备资产集合
     */
@@ -30,7 +30,7 @@

    /**
     * 新增设备资产
     * 
     *
     * @param tMonitor 设备资产
     * @return 结果
     */
@@ -38,7 +38,7 @@

    /**
     * 修改设备资产
     * 
     *
     * @param tMonitor 设备资产
     * @return 结果
     */
@@ -46,7 +46,7 @@

    /**
     * 批量删除设备资产
     * 
     *
     * @param ids 需要删除的设备资产主键集合
     * @return 结果
     */
@@ -54,7 +54,7 @@

    /**
     * 删除设备资产信息
     * 
     *
     * @param id 设备资产主键
     * @return 结果
     */

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

File was renamed from ycl-server/src/main/java/com/ycl/system/service/YwPeopleService.java
@@ -1,10 +1,10 @@
package com.ycl.system.service;
package com.ycl.platform.service;

import com.ycl.system.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPeople;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.system.Result;
import com.ycl.system.domain.form.YwPeopleForm;
import com.ycl.system.domain.query.YwPeopleQuery;
import com.ycl.platform.domain.form.YwPeopleForm;
import com.ycl.platform.domain.query.YwPeopleQuery;
import java.util.List;

/**

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

File was renamed from ycl-server/src/main/java/com/ycl/system/service/YwUnitService.java
@@ -1,11 +1,11 @@
package com.ycl.system.service;
package com.ycl.platform.service;

import com.baomidou.mybatisplus.extension.service.IService;

import com.ycl.system.Result;
import com.ycl.system.domain.entity.YwUnit;
import com.ycl.system.domain.form.YwUnitForm;
import com.ycl.system.domain.query.YwUnitQuery;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.platform.domain.query.YwUnitQuery;

import java.util.List;


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

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

import com.ycl.platform.entity.TMonitor;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ITMonitorService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +10,7 @@

/**
 * 设备资产Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2024-03-04
 */
@@ -22,7 +22,7 @@

    /**
     * 查询设备资产
     * 
     *
     * @param id 设备资产主键
     * @return 设备资产
     */
@@ -34,7 +34,7 @@

    /**
     * 查询设备资产列表
     * 
     *
     * @param tMonitor 设备资产
     * @return 设备资产
     */
@@ -46,7 +46,7 @@

    /**
     * 新增设备资产
     * 
     *
     * @param tMonitor 设备资产
     * @return 结果
     */
@@ -58,7 +58,7 @@

    /**
     * 修改设备资产
     * 
     *
     * @param tMonitor 设备资产
     * @return 结果
     */
@@ -70,7 +70,7 @@

    /**
     * 批量删除设备资产
     * 
     *
     * @param ids 需要删除的设备资产主键
     * @return 结果
     */
@@ -82,7 +82,7 @@

    /**
     * 删除设备资产信息
     * 
     *
     * @param id 设备资产主键
     * @return 结果
     */

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

File was renamed from ycl-server/src/main/java/com/ycl/system/service/impl/YwPeopleServiceImpl.java
@@ -1,25 +1,23 @@
package com.ycl.system.service.impl;
package com.ycl.platform.service.impl;

import com.ycl.system.domain.entity.YwPeople;
import com.ycl.system.mapper.YwPeopleMapper;
import com.ycl.system.service.YwPeopleService;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.service.YwPeopleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.system.domain.form.YwPeopleForm;
import com.ycl.system.domain.vo.YwPeopleVO;
import com.ycl.system.domain.query.YwPeopleQuery;
import com.ycl.platform.domain.form.YwPeopleForm;
import com.ycl.platform.domain.vo.YwPeopleVO;
import com.ycl.platform.domain.query.YwPeopleQuery;
import java.util.List;
import org.apache.commons.lang3.StringUtils;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;

import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;


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

File was renamed from ycl-server/src/main/java/com/ycl/system/service/impl/YwUnitServiceImpl.java
@@ -1,15 +1,16 @@
package com.ycl.system.service.impl;
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;

import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.domain.vo.YwUnitVO;
import com.ycl.system.Result;
import com.ycl.system.domain.entity.YwUnit;
import com.ycl.system.domain.form.YwUnitForm;
import com.ycl.system.domain.query.YwUnitQuery;
import com.ycl.system.domain.vo.YwUnitVO;
import com.ycl.system.mapper.YwUnitMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.system.page.PageUtil;
import com.ycl.system.service.YwUnitService;
import com.ycl.platform.service.YwUnitService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

 ycl-server/src/main/java/com/ycl/system/mapper/YwPeopleMapper.java

File was deleted

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

@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.TMonitorMapper">
    
    <resultMap type="com.ycl.platform.entity.TMonitor" id="TMonitorResult">

    <resultMap type="TMonitor" id="TMonitorResult">
        <result property="id"    column="id"    />
        <result property="serialNumber"    column="serial_number"    />
        <result property="name"    column="name"    />
@@ -42,9 +42,9 @@
        select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm from t_monitor
    </sql>

    <select id="selectTMonitorList" parameterType="com.ycl.platform.entity.TMonitor" resultMap="TMonitorResult">
    <select id="selectTMonitorList" parameterType="TMonitor" resultMap="TMonitorResult">
        <include refid="selectTMonitorVo"/>
        <where>  
        <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="siteType != null "> and site_type = #{siteType}</if>
@@ -77,13 +77,13 @@
            <if test="lxbm != null "> and lxbm = #{lxbm}</if>
        </where>
    </select>
    

    <select id="selectTMonitorById" parameterType="Long" resultMap="TMonitorResult">
        <include refid="selectTMonitorVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertTMonitor" parameterType="com.ycl.platform.entity.TMonitor" useGeneratedKeys="true" keyProperty="id">

    <insert id="insertTMonitor" parameterType="TMonitor" useGeneratedKeys="true" keyProperty="id">
        insert into t_monitor
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
@@ -151,7 +151,7 @@
         </trim>
    </insert>

    <update id="updateTMonitor" parameterType="com.ycl.platform.entity.TMonitor">
    <update id="updateTMonitor" parameterType="TMonitor">
        update t_monitor
        <trim prefix="SET" suffixOverrides=",">
            <if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
@@ -193,9 +193,9 @@
    </delete>

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

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

File was renamed from ycl-server/src/main/resources/mapper/system/YwUnitMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.system.mapper.YwUnitMapper">
    
<mapper namespace="com.ycl.platform.mapper.YwUnitMapper">

    <resultMap type="YwUnit" id="YwUnitResult">
        <result property="id"    column="id"    />
        <result property="unitCode"    column="unit_code"    />
@@ -23,18 +23,18 @@

    <select id="selectYwUnitList" parameterType="YwUnit" resultMap="YwUnitResult">
        <include refid="selectYwUnitVo"/>
        <where>  
        <where>
            <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
        </where>
    </select>
    

    <select id="selectYwUnitById" parameterType="Long" resultMap="YwUnitResult">
        <include refid="selectYwUnitVo"/>
        where id = #{id}
    </select>
        

    <insert id="insertYwUnit" parameterType="YwUnit" useGeneratedKeys="true" keyProperty="id">
        insert into t_yw_unit
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -82,9 +82,9 @@
    </delete>

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