结构修改

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;

 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,6 +1,6 @@
package com.ycl.platform.mapper;

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

import java.util.List;


 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,6 +1,6 @@
package com.ycl.platform.service;

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

import java.util.List;


 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;

 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

@@ -4,7 +4,7 @@
"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,7 +42,7 @@
        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>  
            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
@@ -83,7 +83,7 @@
        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>

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

File was renamed from ycl-server/src/main/resources/mapper/system/YwUnitMapper.xml
@@ -2,7 +2,7 @@
<!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"    />