项目结构调整

zhanghua

2022-09-20 78515395d832445e5423895caaab21195cc12ac3

项目结构调整

 document/~$ÊÓƵ·ÖÎö±¨¾¯£¨2.X°æ£©ÍÆËÍÄ£¿é½Ó¿Ú˵Ã÷.docx

Binary files differ

 document/ÎÊÌâÀàÐÍ.xls

Binary files differ

 ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java

@@ -1,7 +1,7 @@
package com.ycl.bo;

import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsResource;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

 ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java

@@ -1,6 +1,6 @@
package com.ycl.dto;

import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.entity.user.UmsMenu;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

 ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.depart;
package com.ycl.entity.depart;

import com.baomidou.mybatisplus.annotation.*;
import com.ycl.api.BaseEntity;

 ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.api.BaseEntity;

 ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user;
package com.ycl.entity.user;

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

 ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.user.vo;
package com.ycl.entity.user.vo;

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

 ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.depart;
package com.ycl.mapper.depart;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.depart.UmsDepart;

/**
 * <p>

 ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java

File was deleted

 ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java

File was deleted

 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsAdminLoginLog;
import com.ycl.entity.user.UmsAdminLoginLog;

/**
 * <p>

 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.user.UmsAdmin;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsAdminRoleRelation;
import com.ycl.entity.user.UmsAdminRoleRelation;

/**
 * <p>

 ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsDepartManage;
import com.ycl.entity.user.UmsDepartManage;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.entity.user.UmsMenu;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsResourceCategory;
import com.ycl.entity.user.UmsResourceCategory;

/**
 * <p>

 ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.user.UmsResource;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsRole;
import com.ycl.entity.user.UmsRole;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsRoleMenuRelation;
import com.ycl.entity.user.UmsRoleMenuRelation;

/**
 * <p>

 ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.user;
package com.ycl.mapper.user;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.user.UmsRoleResourceRelation;
import com.ycl.entity.user.UmsRoleResourceRelation;

/**
 * <p>

 ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
@@ -1,8 +1,8 @@
package com.ycl.service.platform.depart;
package com.ycl.service.depart;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.vo.depart.DepartVO;

import java.util.List;

 ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
@@ -1,4 +1,4 @@
package com.ycl.service.platform.depart.impl;
package com.ycl.service.depart.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,14 +6,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.user.AdminDepartDTO;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.platform.user.UmsDepartManage;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.UmsDepartManage;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.platform.depart.UmsDepartMapper;
import com.ycl.service.platform.depart.UmsDepartService;
import com.ycl.service.platform.user.UmsDepartManageService;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.mapper.depart.UmsDepartMapper;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.common.PojoUtils;
import com.ycl.vo.depart.DepartVO;
import org.apache.commons.lang3.StringUtils;

 ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java

File was deleted

 ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java

File was deleted

 ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java

File was deleted

 ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java

File was deleted

 ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
@@ -1,10 +1,10 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;




import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsResource;

import java.util.List;


 ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java
@@ -1,7 +1,7 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.user.UmsAdminRoleRelation;
import com.ycl.entity.user.UmsAdminRoleRelation;

/**
 * ç®¡ç†å‘˜è§’色关系管理Service

 ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
@@ -1,13 +1,13 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.platform.user.UmsRole;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsResource;
import com.ycl.entity.user.UmsRole;
import com.ycl.vo.user.UserVO;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.transaction.annotation.Transactional;

 ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java
@@ -1,8 +1,8 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.api.BasePageDTO;
import com.ycl.entity.platform.user.UmsDepartManage;
import com.ycl.entity.user.UmsDepartManage;

import java.util.List;


 ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java
@@ -1,10 +1,10 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.entity.user.UmsMenu;

import java.util.List;


 ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java
@@ -1,8 +1,8 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;


import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.user.UmsResourceCategory;
import com.ycl.entity.user.UmsResourceCategory;

import java.util.List;


 ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java
@@ -1,9 +1,9 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.user.UmsResource;

/**
 * åŽå°èµ„源管理Service

 ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
@@ -1,7 +1,7 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.user.UmsRoleMenuRelation;
import com.ycl.entity.user.UmsRoleMenuRelation;

/**
 * è§’色菜单关系管理Service

 ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
@@ -1,7 +1,7 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.user.UmsRoleResourceRelation;
import com.ycl.entity.user.UmsRoleResourceRelation;

/**
 * è§’色资源关系管理Service

 ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
@@ -1,10 +1,10 @@
package com.ycl.service.platform.user;
package com.ycl.service.user;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.platform.user.UmsRole;
import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.UmsResource;
import com.ycl.entity.user.UmsRole;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
@@ -1,16 +1,16 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.platform.user.UmsAdminRoleRelation;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.mapper.platform.user.UmsAdminMapper;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsAdminRoleRelation;
import com.ycl.entity.user.UmsResource;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.redis.RedisService;
import com.ycl.service.platform.user.UmsAdminCacheService;
import com.ycl.service.platform.user.UmsAdminRoleRelationService;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsAdminRoleRelationService;
import com.ycl.service.user.UmsAdminService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;


 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java
@@ -1,9 +1,9 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.user.UmsAdminRoleRelation;
import com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper;
import com.ycl.service.platform.user.UmsAdminRoleRelationService;
import com.ycl.entity.user.UmsAdminRoleRelation;
import com.ycl.mapper.user.UmsAdminRoleRelationMapper;
import com.ycl.service.user.UmsAdminRoleRelationService;
import org.springframework.stereotype.Service;

/**

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
@@ -1,4 +1,4 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -10,19 +10,19 @@
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.platform.user.*;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.Asserts;
import com.ycl.mapper.platform.user.UmsAdminLoginLogMapper;
import com.ycl.mapper.platform.user.UmsAdminMapper;
import com.ycl.mapper.platform.user.UmsResourceMapper;
import com.ycl.mapper.platform.user.UmsRoleMapper;
import com.ycl.service.platform.depart.UmsDepartService;
import com.ycl.service.platform.user.UmsDepartManageService;
import com.ycl.mapper.user.UmsAdminLoginLogMapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.platform.user.UmsAdminCacheService;
import com.ycl.service.platform.user.UmsAdminRoleRelationService;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsAdminRoleRelationService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.JwtTokenUtil;
import com.ycl.utils.SpringUtil;
import com.ycl.utils.common.LiveTimeMillisecond;
@@ -74,7 +74,7 @@
    @Resource
    private UmsResourceMapper umsResourceMapper;
    @Resource
    private UmsDepartService sccgDepartService;
    private UmsDepartService departService;
    @Resource
    private UmsDepartManageService umsAdminDepartService;
    @Resource
@@ -322,9 +322,9 @@
        List<UmsAdmin> records = page1.getRecords();
        if (CollUtil.isNotEmpty(records)) {
            records.forEach(e -> {
                UmsDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
                if (null != sccgDepart) {
                    e.setDepartName(sccgDepart.getDepartName());
                UmsDepart umsDepart = departService.getById(e.getDepartmentId());
                if (null != umsDepart) {
                    e.setDepartName(umsDepart.getDepartName());
                }
            });
        }

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
@@ -1,16 +1,16 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.api.BasePageDTO;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.platform.user.UmsDepartManage;
import com.ycl.mapper.platform.user.UmsDepartManageMapper;
import com.ycl.service.platform.depart.UmsDepartService;
import com.ycl.service.platform.user.UmsDepartManageService;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsDepartManage;
import com.ycl.mapper.user.UmsDepartManageMapper;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.vo.depart.DepartVO;
import org.springframework.stereotype.Service;


 ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
@@ -1,12 +1,12 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.mapper.platform.user.UmsMenuMapper;
import com.ycl.service.platform.user.UmsMenuService;
import com.ycl.entity.user.UmsMenu;
import com.ycl.mapper.user.UmsMenuMapper;
import com.ycl.service.user.UmsMenuService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;


 ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java
@@ -1,10 +1,10 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.user.UmsResourceCategory;
import com.ycl.mapper.platform.user.UmsResourceCategoryMapper;
import com.ycl.service.platform.user.UmsResourceCategoryService;
import com.ycl.entity.user.UmsResourceCategory;
import com.ycl.mapper.user.UmsResourceCategoryMapper;
import com.ycl.service.user.UmsResourceCategoryService;
import org.springframework.stereotype.Service;

import java.util.Date;

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
@@ -1,14 +1,14 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.mapper.platform.user.UmsResourceMapper;
import com.ycl.service.platform.user.UmsAdminCacheService;
import com.ycl.service.platform.user.UmsResourceService;
import com.ycl.entity.user.UmsResource;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java
@@ -1,9 +1,9 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.user.UmsRoleMenuRelation;
import com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper;
import com.ycl.service.platform.user.UmsRoleMenuRelationService;
import com.ycl.entity.user.UmsRoleMenuRelation;
import com.ycl.mapper.user.UmsRoleMenuRelationMapper;
import com.ycl.service.user.UmsRoleMenuRelationService;
import org.springframework.stereotype.Service;

/**

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
@@ -1,9 +1,9 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.user.UmsRoleResourceRelation;
import com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper;
import com.ycl.service.platform.user.UmsRoleResourceRelationService;
import com.ycl.entity.user.UmsRoleResourceRelation;
import com.ycl.mapper.user.UmsRoleResourceRelationMapper;
import com.ycl.service.user.UmsRoleResourceRelationService;
import org.springframework.stereotype.Service;

/**

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
@@ -1,18 +1,18 @@
package com.ycl.service.platform.user.impl;
package com.ycl.service.user.impl;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.user.*;
import com.ycl.mapper.platform.user.UmsMenuMapper;
import com.ycl.mapper.platform.user.UmsResourceMapper;
import com.ycl.mapper.platform.user.UmsRoleMapper;
import com.ycl.service.platform.user.UmsAdminCacheService;
import com.ycl.service.platform.user.UmsRoleMenuRelationService;
import com.ycl.service.platform.user.UmsRoleResourceRelationService;
import com.ycl.service.platform.user.UmsRoleService;
import com.ycl.entity.user.*;
import com.ycl.mapper.user.UmsMenuMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsRoleMenuRelationService;
import com.ycl.service.user.UmsRoleResourceRelationService;
import com.ycl.service.user.UmsRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 ycl-common/src/main/java/com/ycl/vo/zf/ZfVO.java

@@ -45,7 +45,7 @@

        @ApiModelProperty("事发地址")
        @NotBlank(message = "事发地址不能为空")
        private String afAddr;
        private String address;

        @ApiModelProperty("举报人")
        @NotBlank(message = "举报人不能为空")

 ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.depart.UmsDepartMapper">
<mapper namespace="com.ycl.mapper.depart.UmsDepartMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.depart.UmsDepart">
    <resultMap id="BaseResultMap" type="com.ycl.entity.depart.UmsDepart">
        <id column="id" property="id" />
        <result column="depart_name" property="departName" />
        <result column="depart_des" property="departDes" />

 ycl-common/src/main/resources/mapper/platform/zf/VideowarmEventsreportMapper.xml

File was deleted

 ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsAdminLoginLogMapper">
<mapper namespace="com.ycl.mapper.user.UmsAdminLoginLogMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdminLoginLog">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminLoginLog">
        <id column="id" property="id" />
        <result column="admin_id" property="adminId" />
        <result column="create_time" property="createTime" />

 ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsAdminMapper">
<mapper namespace="com.ycl.mapper.user.UmsAdminMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdmin">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdmin">
        <id column="id" property="id"/>
        <result column="username" property="username"/>
        <result column="password" property="password"/>

 ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsAdminRoleRelationMapper">
<mapper namespace="com.ycl.mapper.user.UmsAdminRoleRelationMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdminRoleRelation">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminRoleRelation">
        <id column="id" property="id" />
        <result column="admin_id" property="adminId" />
        <result column="role_id" property="roleId" />

 ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsDepartManageMapper">
<mapper namespace="com.ycl.mapper.user.UmsDepartManageMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsDepartManage">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsDepartManage">
        <id column="id" property="id"/>
        <result column="user_id" property="userId"/>
        <result column="depart_id" property="departId"/>

 ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsMenuMapper">
<mapper namespace="com.ycl.mapper.user.UmsMenuMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsMenu">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu">
        <id column="id" property="id" />
        <result column="parent_id" property="parentId" />
        <result column="create_time" property="createTime" />
@@ -15,7 +15,7 @@
        <result column="hidden" property="hidden" />
    </resultMap>

    <select id="getMenuList" resultType="com.ycl.entity.platform.user.UmsMenu">
    <select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
        SELECT
            m.id id,
            m.parent_id parentId,
@@ -37,7 +37,7 @@
        GROUP BY
            m.id
    </select>
    <select id="getMenuListByRoleId" resultType="com.ycl.entity.platform.user.UmsMenu">
    <select id="getMenuListByRoleId" resultType="com.ycl.entity.user.UmsMenu">
        SELECT
            m.id id,
            m.parent_id parentId,

 ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsResourceCategoryMapper">
<mapper namespace="com.ycl.mapper.user.UmsResourceCategoryMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsResourceCategory">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResourceCategory">
        <id column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="name" property="name" />

 ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsResourceMapper">
<mapper namespace="com.ycl.mapper.user.UmsResourceMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsResource">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResource">
        <id column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="name" property="name" />
@@ -12,7 +12,7 @@
        <result column="category_id" property="categoryId" />
    </resultMap>

    <select id="getResourceList" resultType="com.ycl.entity.platform.user.UmsResource">
    <select id="getResourceList" resultType="com.ycl.entity.user.UmsResource">
        SELECT
            ur.id id,
            ur.create_time createTime,
@@ -32,7 +32,7 @@
            ur.id
    </select>

    <select id="getResourceListByRoleId" resultType="com.ycl.entity.platform.user.UmsResource">
    <select id="getResourceListByRoleId" resultType="com.ycl.entity.user.UmsResource">
        SELECT
            r.id id,
            r.create_time createTime,

 ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsRoleMapper">
<mapper namespace="com.ycl.mapper.user.UmsRoleMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRole">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRole">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="description" property="description" />
@@ -13,7 +13,7 @@
        <result column="sort" property="sort" />
    </resultMap>

    <select id="getRoleList" resultType="com.ycl.entity.platform.user.UmsRole">
    <select id="getRoleList" resultType="com.ycl.entity.user.UmsRole">
        select r.*
        from ums_admin_role_relation ar left join ums_role r on ar.role_id = r.id
        where ar.admin_id = #{adminId}

 ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsRoleMenuRelationMapper">
<mapper namespace="com.ycl.mapper.user.UmsRoleMenuRelationMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRoleMenuRelation">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleMenuRelation">
        <id column="id" property="id" />
        <result column="role_id" property="roleId" />
        <result column="menu_id" property="menuId" />

 ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.user.UmsRoleResourceRelationMapper">
<mapper namespace="com.ycl.mapper.user.UmsRoleResourceRelationMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRoleResourceRelation">
    <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleResourceRelation">
        <id column="id" property="id" />
        <result column="role_id" property="roleId" />
        <result column="resource_id" property="resourceId" />

 ycl-generator/src/main/java/com/ycl/MysqlGenerator.java

@@ -57,7 +57,7 @@

        // å…¨å±€é…ç½®
        GlobalConfig gc = new GlobalConfig();
        String projectPath = System.getProperty("user.dir");
        final String projectPath = System.getProperty("user.dir");
        gc.setOutputDir(projectPath + "/ycl-generator/src/main/java");
        gc.setAuthor("wl");//作者
        gc.setBaseResultMap(true); //mapper.xml ç”Ÿæˆ ResultMap
@@ -83,7 +83,7 @@
//        pc.setModuleName(scanner("模块名"));
        pc.setModuleName(null);
        pc.setParent("com.ycl");
        String packageName = scanner("请输入包名");
        final String packageName = scanner("请输入包名");
        //自定义所在包的名称  åŸºæœ¬æ²¡å¿…要
        pc.setEntity(PN_ENTITY + PN_DELIMITER + packageName);
        pc.setController(PN_CONTROLLER + PN_DELIMITER + packageName);
@@ -108,7 +108,7 @@
//             String templatePath = "/templates/mapper.xml.vm";

        // è‡ªå®šä¹‰è¾“出配置
        List<FileOutConfig> focList = new ArrayList<>();
        List<FileOutConfig> focList = new ArrayList<FileOutConfig>();
        // è‡ªå®šä¹‰é…ç½®ä¼šè¢«ä¼˜å…ˆè¾“出
        focList.add(new FileOutConfig(templatePath) {
            @Override
@@ -158,7 +158,7 @@
        //去除字段前缀
        strategy.setFieldPrefix("");

        List<TableFill> tableFills = new ArrayList<>();
        List<TableFill> tableFills = new ArrayList<TableFill>();

        TableFill createTimeFill = new TableFill("createTime", FieldFill.INSERT);
        TableFill modifiedTimeFill = new TableFill("modifiedTime", FieldFill.UPDATE);

 ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java

@@ -1,9 +1,9 @@
package com.ycl.config;

import com.ycl.component.DynamicSecurityService;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.service.platform.user.UmsResourceService;
import com.ycl.entity.user.UmsResource;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.user.UmsResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

 ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java

@@ -6,9 +6,9 @@
import com.ycl.api.BasePageVO;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.service.platform.depart.UmsDepartService;
import com.ycl.service.platform.user.UmsDepartManageService;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.auth.UserAuthUtil;
import com.ycl.vo.depart.DepartVO;
import io.swagger.annotations.Api;

 ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java

@@ -3,8 +3,8 @@

import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.dict.DatabaseDictionary;
import com.ycl.service.platform.dict.IDatabaseDictionaryService;
import com.ycl.entity.dict.DatabaseDictionary;
import com.ycl.service.dict.IDatabaseDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;

 ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java

@@ -2,13 +2,13 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.api.CommonResult;
import com.ycl.entity.platform.portal.UmsThirdApplications;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.entity.platform.portal.UmsWebsiteLogo;
import com.ycl.entity.platform.user.vo.UmsMenuVo;
import com.ycl.service.platform.portal.UmsThirdApplicationsService;
import com.ycl.service.platform.user.UmsMenuService;
import com.ycl.service.platform.portal.UmsWebsiteLogoService;
import com.ycl.entity.portal.ThirdApplications;
import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.portal.WebsiteLogo;
import com.ycl.entity.user.vo.UmsMenuVo;
import com.ycl.service.portal.UmsThirdApplicationsService;
import com.ycl.service.user.UmsMenuService;
import com.ycl.service.portal.UmsWebsiteLogoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -33,14 +33,14 @@

    @ApiOperation("logo管理-添加logo")
    @PostMapping("/logo/add")
    public CommonResult addLogo(@RequestBody @Validated UmsWebsiteLogo umsWebsiteLogo) {
        return CommonResult.success(umsWebsiteLogoService.save(umsWebsiteLogo));
    public CommonResult addLogo(@RequestBody @Validated WebsiteLogo websiteLogo) {
        return CommonResult.success(umsWebsiteLogoService.save(websiteLogo));
    }

    @ApiOperation("logo管理-修改logo")
    @PutMapping("/logo/update")
    public CommonResult updateLogo(@RequestBody UmsWebsiteLogo umsWebsiteLogo) {
        return CommonResult.success(umsWebsiteLogoService.updateById(umsWebsiteLogo));
    public CommonResult updateLogo(@RequestBody WebsiteLogo websiteLogo) {
        return CommonResult.success(umsWebsiteLogoService.updateById(websiteLogo));
    }

    @ApiOperation("logo管理-查询logo")
@@ -52,7 +52,7 @@
    @ApiOperation("logo管理-查询logo")
    @GetMapping("/logo/searchOne")
    public CommonResult searchLogo(@RequestParam Integer id) {
        return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<UmsWebsiteLogo>().eq("id", id)));
        return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<WebsiteLogo>().eq("id", id)));
    }

    @ApiOperation("logo管理-删除logo")
@@ -112,14 +112,14 @@

    @ApiOperation("第三方接口管理-添加")
    @PostMapping("/thirdApp/add")
    public CommonResult addThirdApp(@RequestBody @Validated UmsThirdApplications umsThirdApplications) {
        return CommonResult.success(umsThirdApplicationsService.save(umsThirdApplications));
    public CommonResult addThirdApp(@RequestBody @Validated ThirdApplications thirdApplications) {
        return CommonResult.success(umsThirdApplicationsService.save(thirdApplications));
    }

    @ApiOperation("第三方接口管理-修改")
    @PutMapping("/thirdApp/update")
    public CommonResult updateThirdApp(@RequestBody UmsThirdApplications umsThirdApplications) {
        return CommonResult.success(umsThirdApplicationsService.updateById(umsThirdApplications));
    public CommonResult updateThirdApp(@RequestBody ThirdApplications thirdApplications) {
        return CommonResult.success(umsThirdApplicationsService.updateById(thirdApplications));
    }

    @ApiOperation("第三方接口管理-查询")
@@ -131,7 +131,7 @@
    @ApiOperation("第三方接口管理-查询通过id")
    @GetMapping("/thirdApp/searchOne")
    public CommonResult searchThirdApp(@RequestParam Integer id) {
        return CommonResult.success(umsThirdApplicationsService.getOne(new QueryWrapper<UmsThirdApplications>().eq("id", id)));
        return CommonResult.success(umsThirdApplicationsService.getOne(new QueryWrapper<ThirdApplications>().eq("id", id)));
    }

    @ApiOperation("第三方接口管理-删除")

 ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java

@@ -3,8 +3,8 @@

import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.region.SccgRegion;
import com.ycl.service.platform.region.ISccgRegionService;
import com.ycl.entity.region.SccgRegion;
import com.ycl.service.region.ISccgRegionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;

 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java

@@ -5,8 +5,8 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.dto.UmsStoreInfoParam;
import com.ycl.entity.platform.store.StoreInfo;
import com.ycl.service.platform.store.StoreInfoService;
import com.ycl.entity.store.StoreInfo;
import com.ycl.service.store.StoreInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,12 +57,12 @@
    public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
        StoreInfo storeInfo = StoreInfo.builder()
                .owner(umsStoreInfoParam.getOwner())
                .storename(umsStoreInfoParam.getStorename())
                .storeName(umsStoreInfoParam.getStorename())
                .contact(umsStoreInfoParam.getContact())
                .storeaddr(umsStoreInfoParam.getStoreaddr())
                .storephoto(umsStoreInfoParam.getStorephoto())
                .idcardinfo(umsStoreInfoParam.getIdcardinfo())
                .storescore(umsStoreInfoParam.getStorescore()).build();
                .storeAddress(umsStoreInfoParam.getStoreaddr())
                .storePhoto(umsStoreInfoParam.getStorephoto())
                .idCardInfo(umsStoreInfoParam.getIdcardinfo())
                .storeScore(umsStoreInfoParam.getStorescore()).build();
        boolean success = storeInfoService.save(storeInfo);
        if (success) {
            return CommonResult.success(null);

 ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java

@@ -4,8 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.entity.platform.store.StoreScoreRule;
import com.ycl.service.platform.store.StoreScoreRuleService;
import com.ycl.entity.store.StoreScoreRule;
import com.ycl.service.store.StoreScoreRuleService;
import com.ycl.vo.store.StoreScoreRuleVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -7,11 +7,11 @@
import com.ycl.dto.UmsAdminLoginParam;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.platform.user.UmsAdmin;
import com.ycl.entity.platform.user.UmsRole;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsRole;
import com.ycl.service.redis.RedisService;
import com.ycl.service.platform.user.UmsAdminService;
import com.ycl.service.platform.user.UmsRoleService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.user.UmsRoleService;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;

 ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java

@@ -4,8 +4,8 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.service.platform.user.UmsMenuService;
import com.ycl.entity.user.UmsMenu;
import com.ycl.service.user.UmsMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

 ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java

@@ -1,8 +1,8 @@
package com.ycl.controller.user;

import com.ycl.api.CommonResult;
import com.ycl.entity.platform.user.UmsResourceCategory;
import com.ycl.service.platform.user.UmsResourceCategoryService;
import com.ycl.entity.user.UmsResourceCategory;
import com.ycl.service.user.UmsResourceCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

 ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java

@@ -4,8 +4,8 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.component.DynamicSecurityMetadataSource;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.service.platform.user.UmsResourceService;
import com.ycl.entity.user.UmsResource;
import com.ycl.service.user.UmsResourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

 ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java

@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.entity.platform.user.UmsMenu;
import com.ycl.entity.platform.user.UmsResource;
import com.ycl.entity.platform.user.UmsRole;
import com.ycl.service.platform.user.UmsRoleService;
import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.UmsResource;
import com.ycl.entity.user.UmsRole;
import com.ycl.service.user.UmsRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

 ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java

@@ -3,13 +3,12 @@

import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.service.platform.zf.IEnforcelawReportService;
import com.ycl.entity.zf.EnforceLawReport;
import com.ycl.service.zf.IEnforcelawReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
@@ -20,7 +19,6 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.stream.Collectors;

/**
 * <p>
@@ -49,7 +47,7 @@
                               @RequestParam(required = false) Integer current,
                               @RequestParam(required = false) Integer size
    ) {
        Page<EnforcelawReport> enforcelawReportPage = new Page<>();
        Page<EnforceLawReport> enforcelawReportPage = new Page<>();
        enforcelawReportPage.setCurrent(current);
        enforcelawReportPage.setSize(size);
        return CommonResult.success(enforcelawReportService.selectPageVo(enforcelawReportPage,startTime,endTime,community,status,partiesName,partiesID));
@@ -57,12 +55,12 @@
    @GetMapping("/search/one")
    @ApiOperation("查询城市违建详情")
    public CommonResult getOne(@RequestParam Integer id) {
        return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforcelawReport>().eq("id", id)));
        return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforceLawReport>().eq("id", id)));
    }

    @PostMapping("/add")
    @ApiOperation("添加城市违建详情")
    public CommonResult add(@RequestBody EnforcelawReport enforcelawReport) {
    public CommonResult add(@RequestBody EnforceLawReport enforcelawReport) {
        return CommonResult.success(enforcelawReportService.save(enforcelawReport));
    }

@@ -74,7 +72,7 @@

    @PutMapping("/update")
    @ApiOperation("修改城市违建详情")
    public CommonResult modify(@RequestBody EnforcelawReport enforcelawReport) {
    public CommonResult modify(@RequestBody EnforceLawReport enforcelawReport) {
        return CommonResult.success(enforcelawReportService.updateById(enforcelawReport));
    }

@@ -88,7 +86,7 @@
                              @RequestParam(required = false) String partiesName,
                              @RequestParam(required = false) String partiesID,
                              HttpServletResponse response) {
        QueryWrapper<EnforcelawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
        QueryWrapper<EnforceLawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
            enforcelawReportQueryWrapper.between("cTime", startTime, endTime);
        }
@@ -107,6 +105,6 @@
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("城市违建" + ".xlsx", "utf-8"));
        EasyExcel.write(response.getOutputStream(), EnforcelawReport.class).sheet("列表").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
        EasyExcel.write(response.getOutputStream(), EnforceLawReport.class).sheet("列表").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
    }
}

 ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java

@@ -7,9 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.platform.zf.VideowarmEventsreport;
import com.ycl.service.platform.zf.IVideowarmEventsreportService;
import com.ycl.entity.zf.VideoWarnEventsReport;
import com.ycl.service.zf.IVideowarmEventsreportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
@@ -20,7 +19,6 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.stream.Collectors;

/**
 * <p>
@@ -49,7 +47,7 @@
                               @RequestParam(required = false) Integer current,
                               @RequestParam(required = false) Integer size
    ) {
        Page<VideowarmEventsreport> page = new Page<>();
        Page<VideoWarnEventsReport> page = new Page<>();
        page.setCurrent(current);
        page.setSize(size);
        return CommonResult.success(iVideowarmEventsreportService.selectPageVo(page,startTime,endTime,eventName,eventType,eventLocation,eventRegion));
@@ -57,13 +55,13 @@
    @GetMapping("/search/one")
    @ApiOperation("查询违规情况详情")
    public CommonResult getOne(@RequestParam Integer id) {
        return CommonResult.success(iVideowarmEventsreportService.getOne(new QueryWrapper<VideowarmEventsreport>().eq("id", id)));
        return CommonResult.success(iVideowarmEventsreportService.getOne(new QueryWrapper<VideoWarnEventsReport>().eq("id", id)));
    }

    @PostMapping("/add")
    @ApiOperation("添加违规情况详情")
    public CommonResult add(@RequestBody VideowarmEventsreport videowarmEventsreport) {
        return CommonResult.success(iVideowarmEventsreportService.save(videowarmEventsreport));
    public CommonResult add(@RequestBody VideoWarnEventsReport videoWarnEventsReport) {
        return CommonResult.success(iVideowarmEventsreportService.save(videoWarnEventsReport));
    }

    @DeleteMapping("/delete")
@@ -74,8 +72,8 @@

    @PutMapping("/update")
    @ApiOperation("修改违规情况详情")
    public CommonResult modify(@RequestBody VideowarmEventsreport videowarmEventsreport) {
        return CommonResult.success(iVideowarmEventsreportService.updateById(videowarmEventsreport));
    public CommonResult modify(@RequestBody VideoWarnEventsReport videoWarnEventsReport) {
        return CommonResult.success(iVideowarmEventsreportService.updateById(videoWarnEventsReport));
    }

    @GetMapping("/download")
@@ -88,7 +86,7 @@
                              @RequestParam(required = false) String eventLocation,
                              @RequestParam(required = false) String eventRegion,
                              HttpServletResponse response) {
        QueryWrapper<VideowarmEventsreport> VideowarmEventsreportQueryWrapper = new QueryWrapper<>();
        QueryWrapper<VideoWarnEventsReport> VideowarmEventsreportQueryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
            VideowarmEventsreportQueryWrapper.between("cTime", startTime, endTime);
        }
@@ -107,6 +105,6 @@
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("违规情况" + ".xlsx", "utf-8"));
        EasyExcel.write(response.getOutputStream(), VideowarmEventsreport.class).sheet("列表").doWrite(iVideowarmEventsreportService.list(VideowarmEventsreportQueryWrapper));
        EasyExcel.write(response.getOutputStream(), VideoWarnEventsReport.class).sheet("列表").doWrite(iVideowarmEventsreportService.list(VideowarmEventsreportQueryWrapper));
    }
}

 ycl-platform/src/main/java/com/ycl/controller/zf/ViolateRuleController.java

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

import com.ycl.api.CommonResult;
import com.ycl.service.platform.zf.IEnforcelawReportService;
import com.ycl.service.zf.IEnforcelawReportService;
import com.ycl.vo.zf.ZfVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 ycl-platform/src/main/java/com/ycl/entity/dict/DatabaseDictionary.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.dict;
package com.ycl.entity.dict;

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

 ycl-platform/src/main/java/com/ycl/entity/portal/ThirdApplications.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.portal;
package com.ycl.entity.portal;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,7 +22,7 @@
@Setter
@TableName("ums_third_applications")
@ApiModel(value = "UmsThirdApplications对象", description = "第三方接口")
public class UmsThirdApplications implements Serializable {
public class ThirdApplications implements Serializable {

    private static final long serialVersionUID = 1L;


 ycl-platform/src/main/java/com/ycl/entity/portal/WebsiteLogo.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.portal;
package com.ycl.entity.portal;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -23,7 +23,7 @@
@Setter
@TableName("ums_website_logo")
@ApiModel(value = "UmsWebsiteLogo对象", description = "logo")
public class UmsWebsiteLogo implements Serializable {
public class WebsiteLogo implements Serializable {

    private static final long serialVersionUID = 1L;


 ycl-platform/src/main/java/com/ycl/entity/region/SccgRegion.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/region/SccgRegion.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.region;
package com.ycl.entity.region;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.catalina.LifecycleState;

import java.io.Serializable;
import java.util.List;

 ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
@@ -1,6 +1,7 @@
package com.ycl.entity.platform.store;
package com.ycl.entity.store;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -21,7 +22,7 @@
 */
@Getter
@Setter
@TableName("ums_store_storeinfo")
@TableName("ums_store_store_info")
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StoreInfo对象", description = "")
@@ -36,25 +37,32 @@
    private Integer id;

    @ApiModelProperty("姓名")
    @TableField("owner")
    private String owner;

    @ApiModelProperty("门店名称")
    private String storename;
    @TableField("store_name")
    private String storeName;

    @ApiModelProperty("联系方式")
    @TableField("contact")
    private String contact;

    @ApiModelProperty("地址")
    private String storeaddr;
    @TableField("store_address")
    private String storeAddress;

    @ApiModelProperty("照片")
    private String storephoto;
    @TableField("store_photo")
    private String storePhoto;

    @ApiModelProperty("身份证信息")
    private String idcardinfo;
    @TableField("id_card")
    private String idCardInfo;

    @ApiModelProperty("门店积分")
    private BigDecimal storescore;
    @TableField("store_score")
    private BigDecimal storeScore;


}

 ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.store;
package com.ycl.entity.store;

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

 ycl-platform/src/main/java/com/ycl/entity/zf/EnforceLawReport.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/zf/EnforcelawReport.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.zf;
package com.ycl.entity.zf;

import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -22,8 +22,8 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_enforcelaw_report")
public class EnforcelawReport implements Serializable {
@TableName("ums_enforce_law_report")
public class EnforceLawReport implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -36,8 +36,8 @@
    /**
     * è¿æ³•/违建信息来源，字典项
     */
    @TableField("infoResoure")
    private String infoResoure;
    @TableField("info_resource")
    private String infoResource;

    /**
     * å—理人
@@ -48,7 +48,7 @@
    /**
     * é—®é¢˜ç±»åž‹
     */
    @TableField("problemTypes")
    @TableField("problem_types")
    private String problemTypes;

    /**
@@ -62,7 +62,6 @@
     */
    @TableField("county")
    private String county;

    /**
     * æ‰€å±žè¡—道
     */
@@ -72,8 +71,8 @@
    /**
     * äº‹å‘地址
     */
    @TableField("afAddr")
    private String afAddr;
    @TableField("address")
    private String address;

    /**
     * ä¸¾æŠ¥äºº
@@ -96,89 +95,89 @@
    /**
     * é—®é¢˜æè¿°
     */
    @TableField("problemDesc")
    @TableField("problem_desc")
    private String problemDesc;

    /**
     * æ‰§æ³•äºº
     */
    @TableField("lawOfficer")
    @TableField("law_officer")
    private String lawOfficer;

    /**
     * å½“事人姓名
     */
    @TableField("partiesName")
    @TableField("parties_name")
    @ExcelProperty(value = "当事人姓名",index = 0)
    private String partiesName;

    /**
     * å½“事人身份证号码
     */
    @TableField("partiesID")
    @TableField("parties_id_card")
    @ExcelProperty(value = "当事人身份证号码",index = 1)
    private String partiesID;

    /**
     * å½“事人联系电话
     */
    @TableField("partiesPhone")
    @TableField("parties_phone")
    @ExcelProperty(value = "当事人联系电话",index = 2)
    private String partiesPhone;

    /**
     * èº«ä»½è¯æ­£é¢ç…§ç‰‡
     */
    @TableField("idPositiveImage")
    private String idPositiveImage;
    @TableField("id_card_positive")
    private String idCardPositive;

    /**
     * èº«ä»½è¯åé¢ç…§ç‰‡
     */
    @TableField("idNegativeImage")
    private String idNegativeImage;
    @TableField("id_card_negative")
    private String idCardNegative;

    /**
     * è¿å»ºå…·ä½“位置
     */
    @TableField("illegalBuildLocation")
    @TableField("illegal_build_location")
    private String illegalBuildLocation;

    /**
     * è¿æ³•å»ºè®¾é•¿(ç±³)
     */
    @TableField("illegalBuildLength")
    @TableField("illegal_build_length")
    private BigDecimal illegalBuildLength;

    /**
     * è¿æ³•å»ºè®¾å®½(ç±³)
     */
    @TableField("illegalBuildWidth")
    @TableField("illegal_build_width")
    private BigDecimal illegalBuildWidth;

    /**
     * è¿æ³•å»ºè®¾é«˜(ç±³)
     */
    @TableField("illegalBuildHigh")
    private BigDecimal illegalBuildHigh;
    @TableField("illegal_build_height")
    private BigDecimal illegalBuildHeight;

    /**
     * è¿æ³•å»ºç­‘材料
     */
    @TableField("illegalBuildMaterials")
    @TableField("illegal_build_materials")
    private String illegalBuildMaterials;

    /**
     * ä¸Šä¼ é™„件(违法照片)
     */
    @TableField("illegalPhotos")
    @TableField("illegal_photos")
    private String illegalPhotos;

    /**
     * æ•´æ”¹åŽç…§ç‰‡
     */
    @TableField("rectifidPhotos")
    private String rectifidPhotos;
    @TableField("rectification_photos")
    private String rectificationPhotos;

    /**
     * ä¸Šä¼ é™„件
@@ -189,7 +188,7 @@
    /**
     * å¤„置备注信息
     */
    @TableField("disposeRemark")
    @TableField("dispose_remark")
    private String disposeRemark;

    /**
@@ -207,8 +206,8 @@
    /**
     * åˆ›å»ºæ—¶é—´
     */
    @TableField("cTime")
    private LocalDateTime cTime;
    @TableField("create_time")
    private LocalDateTime createTime;

    /**
     * æ‰€å±žç¤¾åŒº

 ycl-platform/src/main/java/com/ycl/entity/zf/VideoWarnEventsReport.java

File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/zf/VideowarmEventsreport.java
@@ -1,4 +1,4 @@
package com.ycl.entity.platform.zf;
package com.ycl.entity.zf;

import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -23,8 +23,8 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_videowarm_eventsreport")
public class VideowarmEventsreport implements Serializable {
@TableName("ums_video_warn_events_report")
public class VideoWarnEventsReport implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -38,58 +38,58 @@
    /**
     * äº‹ä»¶åç§°
     */
    @TableField("eventName")
    @TableField("event_name")
    @ExcelProperty(value = "事件名称",index = 0)
    private String eventName;

    /**
     * æ‰€å±žç±»åž‹
     */
    @TableField("eventType")
    @TableField("event_type")
    @ExcelProperty(value = "所属类型",index = 1)
    private String eventType;

    /**
     * æ˜¯å¦å…³è”商铺
     */
    @TableField("associatedShops")
    @TableField("associated_shops")
    private String associatedShops;

    /**
     * æ‰€å±žä½ç½®(地图上定位)
     */
    @TableField("eventLocation")
    @TableField("event_location")
    private String eventLocation;

    /**
     * æ‰€å±žåŒºåŸŸ
     */
    @TableField("eventRegion")
    @TableField("event_region")
    private String eventRegion;

    /**
     * ä¸Šä¼ è§†é¢‘/图片(截图)
     */
    @TableField("videoOrImage")
    private String videoOrImage;
    @TableField("media")
    private String media;

    /**
     * å†…容描述(违法违章描述)
     */
    @TableField("contentDesc")
    private String contentDesc;
    @TableField("content")
    private String content;

    /**
     * æ—¶é—´ä¿¡æ¯
     */
    @TableField("eventTime")
    @TableField("event_time")
    private LocalDate eventTime;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    @TableField("cTime")
    private LocalDateTime cTime;
    @TableField("create_time")
    private LocalDateTime createTime;


}

 ycl-platform/src/main/java/com/ycl/mapper/dict/DatabaseDictionaryMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.dict;
package com.ycl.mapper.dict;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.dict.DatabaseDictionary;
import com.ycl.entity.dict.DatabaseDictionary;

/**
 * <p>

 ycl-platform/src/main/java/com/ycl/mapper/portal/UmsThirdApplicationsMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.portal.ThirdApplications;

/**
 * <p>
 *  Mapper æŽ¥å£
 * </p>
 *
 * @author wl
 * @since 2022-09-08
 */
public interface UmsThirdApplicationsMapper extends BaseMapper<ThirdApplications> {

}

 ycl-platform/src/main/java/com/ycl/mapper/portal/UmsWebsiteLogoMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.portal.WebsiteLogo;

/**
 * <p>
 * Mapper æŽ¥å£
 * </p>
 *
 * @author wl
 * @since 2022-09-07
 */
public interface UmsWebsiteLogoMapper extends BaseMapper<WebsiteLogo> {

}

 ycl-platform/src/main/java/com/ycl/mapper/region/SccgRegionMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/region/SccgRegionMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.region;
package com.ycl.mapper.region;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.region.SccgRegion;
import com.ycl.entity.region.SccgRegion;

/**
 * <p>

 ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.store;
package com.ycl.mapper.store;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.store.StoreInfo;
import com.ycl.entity.store.StoreInfo;

/**
 * <p>

 ycl-platform/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
@@ -1,7 +1,7 @@
package com.ycl.mapper.platform.store;
package com.ycl.mapper.store;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.platform.store.StoreScoreRule;
import com.ycl.entity.store.StoreScoreRule;

/**
 * <p>

 ycl-platform/src/main/java/com/ycl/mapper/zf/EnforcelawReportMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/zf/EnforcelawReportMapper.java
@@ -1,8 +1,8 @@
package com.ycl.mapper.platform.zf;
package com.ycl.mapper.zf;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.zf.EnforceLawReport;

/**
 * <p>
@@ -12,7 +12,7 @@
 * @author lyq
 * @since 2022-09-14
 */
public interface EnforcelawReportMapper extends BaseMapper<EnforcelawReport> {
public interface EnforcelawReportMapper extends BaseMapper<EnforceLawReport> {

    Page<EnforcelawReport> selectPageVo(Page<EnforcelawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
    Page<EnforceLawReport> selectPageVo(Page<EnforceLawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
}

 ycl-platform/src/main/java/com/ycl/mapper/zf/VideowarmEventsreportMapper.java

File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/zf/VideowarmEventsreportMapper.java
@@ -1,9 +1,8 @@
package com.ycl.mapper.platform.zf;
package com.ycl.mapper.zf;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.platform.zf.VideowarmEventsreport;
import com.ycl.entity.zf.VideoWarnEventsReport;

/**
 * <p>
@@ -13,7 +12,7 @@
 * @author wl
 * @since 2022-09-16
 */
public interface VideowarmEventsreportMapper extends BaseMapper<VideowarmEventsreport> {
public interface VideowarmEventsreportMapper extends BaseMapper<VideoWarnEventsReport> {

    Page selectPageVo(Page<VideowarmEventsreport> page, String startTime, String endTime, String eventLocation, String eventName, String eventType, String eventRegion);
    Page selectPageVo(Page<VideoWarnEventsReport> page, String startTime, String endTime, String eventLocation, String eventName, String eventType, String eventRegion);
}

 ycl-platform/src/main/java/com/ycl/service/dict/IDatabaseDictionaryService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java
@@ -1,7 +1,7 @@
package com.ycl.service.platform.dict;
package com.ycl.service.dict;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.dict.DatabaseDictionary;
import com.ycl.entity.dict.DatabaseDictionary;

import java.util.List;


 ycl-platform/src/main/java/com/ycl/service/dict/impl/DatabaseDictionaryServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java
@@ -1,20 +1,15 @@
package com.ycl.service.platform.dict.impl;
package com.ycl.service.dict.impl;

import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.dict.DatabaseDictionary;
import com.ycl.mapper.platform.dict.DatabaseDictionaryMapper;
import com.ycl.service.platform.dict.IDatabaseDictionaryService;
import com.ycl.entity.dict.DatabaseDictionary;
import com.ycl.mapper.dict.DatabaseDictionaryMapper;
import com.ycl.service.dict.IDatabaseDictionaryService;
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
import io.micrometer.core.instrument.util.StringEscapeUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;


 ycl-platform/src/main/java/com/ycl/service/portal/UmsThirdApplicationsService.java

New file
@@ -0,0 +1,16 @@
package com.ycl.service.portal;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.portal.ThirdApplications;

/**
 * <p>
 * æœåŠ¡ç±»
 * </p>
 *
 * @author wl
 * @since 2022-09-08
 */
public interface UmsThirdApplicationsService extends IService<ThirdApplications> {

}

 ycl-platform/src/main/java/com/ycl/service/portal/UmsWebsiteLogoService.java

New file
@@ -0,0 +1,16 @@
package com.ycl.service.portal;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.portal.WebsiteLogo;

/**
 * <p>
 *  æœåŠ¡ç±»
 * </p>
 *
 * @author wl
 * @since 2022-09-07
 */
public interface UmsWebsiteLogoService extends IService<WebsiteLogo> {

}

 ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsThirdApplicationsServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ycl.service.portal.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.portal.ThirdApplications;
import com.ycl.mapper.portal.UmsThirdApplicationsMapper;
import com.ycl.service.portal.UmsThirdApplicationsService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author wl
 * @since 2022-09-08
 */
@Service
public class UmsThirdApplicationsServiceImpl extends ServiceImpl<UmsThirdApplicationsMapper, ThirdApplications> implements UmsThirdApplicationsService {

}

 ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsWebsiteLogoServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ycl.service.portal.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.portal.WebsiteLogo;
import com.ycl.mapper.portal.UmsWebsiteLogoMapper;
import com.ycl.service.portal.UmsWebsiteLogoService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author wl
 * @since 2022-09-07
 */
@Service
public class UmsWebsiteLogoServiceImpl extends ServiceImpl<UmsWebsiteLogoMapper, WebsiteLogo> implements UmsWebsiteLogoService {

}

 ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/region/ISccgRegionService.java
@@ -1,7 +1,7 @@
package com.ycl.service.platform.region;
package com.ycl.service.region;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.region.SccgRegion;
import com.ycl.entity.region.SccgRegion;

import java.util.List;


 ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/region/impl/SccgRegionServiceImpl.java
@@ -1,11 +1,11 @@
package com.ycl.service.platform.region.impl;
package com.ycl.service.region.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.entity.platform.region.SccgRegion;
import com.ycl.mapper.platform.region.SccgRegionMapper;
import com.ycl.service.platform.region.ISccgRegionService;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.region.SccgRegion;
import com.ycl.mapper.region.SccgRegionMapper;
import com.ycl.service.region.ISccgRegionService;
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;

 ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
@@ -1,8 +1,8 @@
package com.ycl.service.platform.store;
package com.ycl.service.store;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.store.StoreInfo;
import com.ycl.entity.store.StoreInfo;
import org.springframework.web.multipart.MultipartFile;

/**

 ycl-platform/src/main/java/com/ycl/service/store/StoreScoreRuleService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
@@ -1,8 +1,8 @@
package com.ycl.service.platform.store;
package com.ycl.service.store;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.store.StoreScoreRule;
import com.ycl.entity.store.StoreScoreRule;
import com.ycl.vo.store.StoreScoreRuleVO;

/**

 ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
@@ -1,14 +1,14 @@
package com.ycl.service.platform.store.impl;
package com.ycl.service.store.impl;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.store.StoreInfo;
import com.ycl.entity.store.StoreInfo;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.platform.store.StoreInfoMapper;
import com.ycl.service.platform.store.StoreInfoService;
import com.ycl.mapper.store.StoreInfoMapper;
import com.ycl.service.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
import com.ycl.vo.store.StoreInfoExcelVo;
import lombok.extern.slf4j.Slf4j;
@@ -37,7 +37,7 @@
        Page<StoreInfo> page = new Page<>(pageSize, pageNum);
        LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
        if (StrUtil.isNotEmpty(keyword)) {
            wrapper.like(StoreInfo::getStorename, keyword);
            wrapper.like(StoreInfo::getStoreName, keyword);
        }
        return page(page, wrapper);
    }

 ycl-platform/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
@@ -1,13 +1,13 @@
package com.ycl.service.platform.store.impl;
package com.ycl.service.store.impl;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.store.StoreScoreRule;
import com.ycl.entity.store.StoreScoreRule;
import com.ycl.exception.ApiException;
import com.ycl.mapper.platform.store.StoreScoreRuleMapper;
import com.ycl.service.platform.store.StoreScoreRuleService;
import com.ycl.mapper.store.StoreScoreRuleMapper;
import com.ycl.service.store.StoreScoreRuleService;
import com.ycl.vo.store.StoreScoreRuleVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

 ycl-platform/src/main/java/com/ycl/service/zf/IEnforcelawReportService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/zf/IEnforcelawReportService.java
@@ -1,8 +1,8 @@
package com.ycl.service.platform.zf;
package com.ycl.service.zf;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.zf.EnforceLawReport;
import com.ycl.vo.zf.ZfVO;

/**
@@ -13,7 +13,7 @@
 * @author wl
 * @since 2022-09-14
 */
public interface IEnforcelawReportService extends IService<EnforcelawReport> {
public interface IEnforcelawReportService extends IService<EnforceLawReport> {

    /**
     * ä¸ŠæŠ¥
@@ -22,5 +22,5 @@
    void report(ZfVO.ZfReportVO params);


    Page<EnforcelawReport> selectPageVo(Page<EnforcelawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
    Page<EnforceLawReport> selectPageVo(Page<EnforceLawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
}

 ycl-platform/src/main/java/com/ycl/service/zf/IVideowarmEventsreportService.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/zf/IVideowarmEventsreportService.java
@@ -1,9 +1,8 @@
package com.ycl.service.platform.zf;
package com.ycl.service.zf;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.platform.zf.VideowarmEventsreport;
import com.ycl.entity.zf.VideoWarnEventsReport;

/**
 * <p>
@@ -13,7 +12,7 @@
 * @author wl
 * @since 2022-09-16
 */
public interface IVideowarmEventsreportService extends IService<VideowarmEventsreport> {
public interface IVideowarmEventsreportService extends IService<VideoWarnEventsReport> {

    Page selectPageVo(Page<VideowarmEventsreport> enforcelawReportPage, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion);
    Page selectPageVo(Page<VideoWarnEventsReport> enforcelawReportPage, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion);
}

 ycl-platform/src/main/java/com/ycl/service/zf/impl/EnforcelawReportServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/zf/impl/EnforcelawReportServiceImpl.java
@@ -1,12 +1,12 @@
package com.ycl.service.platform.zf.impl;
package com.ycl.service.zf.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.zf.EnforceLawReport;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.platform.zf.EnforcelawReportMapper;
import com.ycl.service.platform.zf.IEnforcelawReportService;
import com.ycl.mapper.zf.EnforcelawReportMapper;
import com.ycl.service.zf.IEnforcelawReportService;
import com.ycl.vo.zf.ZfVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -23,7 +23,7 @@
 * @since 2022-09-14
 */
@Service
public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforcelawReport> implements IEnforcelawReportService {
public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforceLawReport> implements IEnforcelawReportService {

    @Resource
    private EnforcelawReportMapper enforcelawReportMapper;
@@ -31,7 +31,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void report(ZfVO.ZfReportVO params) {
        EnforcelawReport enforcelawReport = new EnforcelawReport();
        EnforceLawReport enforcelawReport = new EnforceLawReport();
        BeanUtils.copyProperties(params, enforcelawReport);
        if (enforcelawReportMapper.insert(enforcelawReport) != 1) {
            throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
@@ -39,7 +39,7 @@
    }

    @Override
    public Page<EnforcelawReport> selectPageVo(Page<EnforcelawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID) {
    public Page<EnforceLawReport> selectPageVo(Page<EnforceLawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID) {
        return enforcelawReportMapper.selectPageVo(page, startTime, endTime, community, status, partiesName, partiesID);
    }
}

 ycl-platform/src/main/java/com/ycl/service/zf/impl/VideowarmEventsreportServiceImpl.java

File was renamed from ycl-common/src/main/java/com/ycl/service/platform/zf/impl/VideowarmEventsreportServiceImpl.java
@@ -1,11 +1,10 @@
package com.ycl.service.platform.zf.impl;
package com.ycl.service.zf.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.zf.EnforcelawReport;
import com.ycl.entity.platform.zf.VideowarmEventsreport;
import com.ycl.mapper.platform.zf.VideowarmEventsreportMapper;
import com.ycl.service.platform.zf.IVideowarmEventsreportService;
import com.ycl.entity.zf.VideoWarnEventsReport;
import com.ycl.mapper.zf.VideowarmEventsreportMapper;
import com.ycl.service.zf.IVideowarmEventsreportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -18,13 +17,13 @@
 * @since 2022-09-16
 */
@Service
public class VideowarmEventsreportServiceImpl extends ServiceImpl<VideowarmEventsreportMapper, VideowarmEventsreport> implements IVideowarmEventsreportService {
public class VideowarmEventsreportServiceImpl extends ServiceImpl<VideowarmEventsreportMapper, VideoWarnEventsReport> implements IVideowarmEventsreportService {

    @Autowired
    VideowarmEventsreportMapper eventsreportMapper;

    @Override
    public Page selectPageVo(Page<VideowarmEventsreport> page, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion) {
    public Page selectPageVo(Page<VideoWarnEventsReport> page, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion) {
        return eventsreportMapper.selectPageVo(page, startTime, endTime, eventLocation, eventName, eventType, eventRegion);
    }
}

 ycl-platform/src/main/resources/mapper/dict/DatabaseDictionaryMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.dict.DatabaseDictionaryMapper">
<mapper namespace="com.ycl.mapper.dict.DatabaseDictionaryMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.dict.DatabaseDictionary">
    <resultMap id="BaseResultMap" type="com.ycl.entity.dict.DatabaseDictionary">
        <id column="id" property="id" />
        <result column="dictName" property="dictName" />
        <result column="typeName" property="typeName" />

 ycl-platform/src/main/resources/mapper/portal/UmsThirdApplicationsMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.portal.UmsThirdApplicationsMapper">
<mapper namespace="com.ycl.mapper.portal.UmsThirdApplicationsMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsThirdApplications">
    <resultMap id="BaseResultMap" type="com.ycl.entity.portal.ThirdApplications">
        <id column="id" property="id" />
        <result column="application_name" property="applicationName" />
        <result column="application_icon_url" property="applicationIconUrl" />

 ycl-platform/src/main/resources/mapper/portal/UmsWebsiteLogoMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.portal.UmsWebsiteLogoMapper">
<mapper namespace="com.ycl.mapper.portal.UmsWebsiteLogoMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsWebsiteLogo">
    <resultMap id="BaseResultMap" type="com.ycl.entity.portal.WebsiteLogo">
        <id column="id" property="id" />
        <result column="title" property="title" />
        <result column="login_page_icon_url" property="loginPageIconUrl" />

 ycl-platform/src/main/resources/mapper/region/SccgRegionMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/region/SccgRegionMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.region.SccgRegionMapper">
<mapper namespace="com.ycl.mapper.region.SccgRegionMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.region.SccgRegion">
    <resultMap id="BaseResultMap" type="com.ycl.entity.region.SccgRegion">
        <id column="id" property="id"/>
        <result column="region_name" property="regionName"/>
        <result column="parent_id" property="parentId"/>

 ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.store.StoreInfoMapper">
<mapper namespace="com.ycl.mapper.store.StoreInfoMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.store.StoreInfo">
    <resultMap id="BaseResultMap" type="com.ycl.entity.store.StoreInfo">
        <id column="id" property="id"/>
        <result column="owner" property="owner"/>
        <result column="storename" property="storename"/>

 ycl-platform/src/main/resources/mapper/zf/EnforcelawReportMapper.xml

File was renamed from ycl-common/src/main/resources/mapper/platform/zf/EnforcelawReportMapper.xml
@@ -1,9 +1,9 @@
<?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.mapper.platform.zf.EnforcelawReportMapper">
<mapper namespace="com.ycl.mapper.zf.EnforcelawReportMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.platform.zf.EnforcelawReport">
    <resultMap id="BaseResultMap" type="com.ycl.entity.zf.EnforceLawReport">
        <id column="id" property="id" />
        <result column="infoResoure" property="infoResoure" />
        <result column="acceptor" property="acceptor" />
@@ -11,7 +11,7 @@
        <result column="category" property="category" />
        <result column="county" property="county" />
        <result column="street" property="street" />
        <result column="afAddr" property="afAddr" />
        <result column="address" property="address" />
        <result column="informer" property="informer" />
        <result column="contact" property="contact" />
        <result column="reason" property="reason" />
@@ -39,10 +39,10 @@

    <!-- é€šç”¨æŸ¥è¯¢ç»“果列 -->
    <sql id="Base_Column_List">
        id, infoResoure, acceptor, problemTypes, category, county, street, afAddr, informer, contact, reason, problemDesc, lawOfficer, partiesName, partiesID, partiesPhone, idPositiveImage, idNegativeImage, illegalBuildLocation, illegalBuildLength, illegalBuildWidth, illegalBuildHigh, illegalBuildMaterials, IllegalPhotos, rectifidPhotos, accessory, disposeRemark, inspectors, status, cTime, community
        id, infoResoure, acceptor, problemTypes, category, county, street, address, informer, contact, reason, problemDesc, lawOfficer, partiesName, partiesID, partiesPhone, idPositiveImage, idNegativeImage, illegalBuildLocation, illegalBuildLength, illegalBuildWidth, illegalBuildHigh, illegalBuildMaterials, IllegalPhotos, rectifidPhotos, accessory, disposeRemark, inspectors, status, cTime, community
    </sql>

    <select id="selectPageVo" resultType="com.ycl.entity.platform.zf.EnforcelawReport">
    <select id="selectPageVo" resultType="com.ycl.entity.zf.EnforceLawReport">
        SELECT * FROM ums_enforcelaw_report
            <where>
                <if test="community!=null and community!=''" >

 ycl-platform/src/main/resources/mapper/zf/VideowarmEventsreportMapper.xml

New file
@@ -0,0 +1,46 @@
<?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.mapper.zf.VideowarmEventsreportMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.zf.VideoWarnEventsReport">
        <id column="id" property="id" />
        <result column="event_name" property="eventName" />
        <result column="event_type" property="eventType" />
        <result column="associated_shop" property="associatedShops" />
        <result column="event_location" property="eventLocation" />
        <result column="event_region" property="eventRegion" />
        <result column="media" property="media" />
        <result column="content" property="content" />
        <result column="event_time" property="eventTime" />
        <result column="create_time" property="createTime" />
    </resultMap>

    <!-- é€šç”¨æŸ¥è¯¢ç»“果列 -->
    <sql id="Base_Column_List">
        id, event_name, event_type, associated_shop, event_location, event_region, media, content, event_time, create_time
    </sql>


    <select id="selectPageVo" resultType="com.ycl.entity.zf.VideoWarnEventsReport">
        SELECT * FROM ums_videowarm_eventsreport
        <where>
            <if test="eventName!=null and eventName!=''" >
                event_name=#{eventName}
            </if>
            <if test="eventType!=null and eventType!=''" >
                event_type=#{eventType}
            </if>
            <if test="eventLocation!=null and eventLocation!=''" >
                event_location=#{eventLocation}
            </if>
            <if test="eventRegion!=null and eventRegion!=''" >
                event_region=#{eventRegion}
            </if>
            <if test="startTime!=null and startTime!=''and endTime!=null and endTime!=''" >
                create_time between #{startTime} and #{endTime}
            </if>
        </where>
    </select>

</mapper>