ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
@@ -1,7 +1,7 @@ package com.ycl.bo; import com.ycl.entity.user.UmsAdmin; import com.ycl.entity.user.UmsResource; import com.ycl.entity.platform.user.UmsAdmin; import com.ycl.entity.platform.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.user.UmsMenu; import com.ycl.entity.platform.user.UmsMenu; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/depart/SccgDepart.java @@ -1,4 +1,4 @@ package com.ycl.entity.depart; package com.ycl.entity.platform.depart; import com.baomidou.mybatisplus.annotation.*; import com.ycl.api.BaseEntity; @@ -21,9 +21,9 @@ */ @Getter @Setter @TableName("sccg_depart") @ApiModel(value = "SccgDepart对象", description = "部门表") public class SccgDepart extends BaseEntity implements Serializable { @TableName("ums_depart") @ApiModel(value = "umsDepart对象", description = "部门表") public class UmsDepart extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -55,7 +55,7 @@ private byte isDeleted; @TableField(exist = false) private List<SccgDepart> children; private List<UmsDepart> children; @TableField(exist = false) private List<AdminDepartDTO.UserInfoDTO> userInfoDTOS; ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/UmsThirdApplications.java @@ -1,4 +1,4 @@ package com.ycl.entity.platform; package com.ycl.entity.platform.portal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/platform/UmsWebsiteLogo.java @@ -1,7 +1,6 @@ package com.ycl.entity.platform; package com.ycl.entity.platform.portal; 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; ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/store/StoreInfo.java @@ -1,4 +1,4 @@ package com.ycl.entity.store; package com.ycl.entity.platform.store; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/store/StoreScoreRule.java @@ -1,4 +1,4 @@ package com.ycl.entity.store; package com.ycl.entity.platform.store; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.TableName; import com.ycl.api.BaseEntity; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java @@ -1,4 +1,4 @@ package com.ycl.entity.user; package com.ycl.entity.platform.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java @@ -1,4 +1,4 @@ package com.ycl.entity.user.vo; package com.ycl.entity.platform.user.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List;
New file @@ -0,0 +1,197 @@ package com.ycl.entity.platform.zfreport; 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 lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.math.BigDecimal; /** * <p> * 违规事项处置管理：包含违法(违建)情况上报、立案、派遣、处置、核查、结案 * </p> * * @author lyq * @since 2022-09-14 */ @Data @EqualsAndHashCode(callSuper = false) @TableName("ums_enforcelaw_report") public class EnforcelawReport implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 违法/违建信息来源，字典项 */ @TableField("inforesoure") private String inforesoure; /** * 受理人 */ @TableField("acceptor") private String acceptor; /** * 问题类型 */ @TableField("problemtypes") private String problemtypes; /** * 违建/违规类别 */ @TableField("category") private String category; /** * 所属区县 */ @TableField("county") private String county; /** * 所属街道 */ @TableField("street") private String street; /** * 事发地址 */ @TableField("afaddr") private String afaddr; /** * 举报人 */ @TableField("informer") private String informer; /** * 联系方式 */ @TableField("contact") private String contact; /** * 案由，字典项 */ @TableField("reason") private String reason; /** * 问题描述 */ @TableField("problemdesc") private String problemdesc; /** * 执法人 */ @TableField("lawOfficer") private String lawOfficer; /** * 当事人姓名 */ @TableField("partiesName") private String partiesName; /** * 当事人身份证号码 */ @TableField("partiesID") private String partiesID; /** * 当事人联系电话 */ @TableField("partiesPhone") private String partiesPhone; /** * 身份证正面照片 */ @TableField("idPositiveImage") private String idPositiveImage; /** * 身份证反面照片 */ @TableField("idNegativeImage") private String idNegativeImage; /** * 违建具体位置 */ @TableField("illegalBuildLocation") private String illegalBuildLocation; /** * 违法建设长(米) */ @TableField("illegalBuildLength") private BigDecimal illegalBuildLength; /** * 违法建设宽(米) */ @TableField("illegalBuildWidth") private BigDecimal illegalBuildWidth; /** * 违法建设高(米) */ @TableField("illegalBuildHigh") private BigDecimal illegalBuildHigh; /** * 违法建筑材料 */ @TableField("illegalBuildMaterials") private String illegalBuildMaterials; /** * 上传附件(违法照片) */ @TableField("IllegalPhotos") private String IllegalPhotos; /** * 整改后照片 */ @TableField("rectifidPhotos") private String rectifidPhotos; /** * 上传附件 */ @TableField("accessory") private String accessory; /** * 处置备注信息 */ @TableField("disposeRemark") private String disposeRemark; /** * 审核人 */ @TableField("inspectors") private String inspectors; } ycl-common/src/main/java/com/ycl/mapper/depart/SccgDepartMapper.java
File was deleted ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java
New file @@ -0,0 +1,16 @@ package com.ycl.mapper.platform.depart; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.platform.depart.UmsDepart; /** * <p> * 部门表 Mapper 接口 * </p> * * @author lyq * @since 2022-09-07 */ public interface UmsDepartMapper extends BaseMapper<UmsDepart> { } ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/UmsThirdApplicationsMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.platform; package com.ycl.mapper.platform.portal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.platform.UmsThirdApplications; import com.ycl.entity.platform.portal.UmsThirdApplications; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/platform/UmsWebsiteLogoMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.platform; package com.ycl.mapper.platform.portal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.platform.UmsWebsiteLogo; import com.ycl.entity.platform.portal.UmsWebsiteLogo; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.store; package com.ycl.mapper.platform.store; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.store.StoreInfo; import com.ycl.entity.platform.store.StoreInfo; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.store; package com.ycl.mapper.platform.store; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.store.StoreScoreRule; import com.ycl.entity.platform.store.StoreScoreRule; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsAdminLoginLog; import com.ycl.entity.platform.user.UmsAdminLoginLog; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsAdmin; import com.ycl.entity.platform.user.UmsAdmin; import org.apache.ibatis.annotations.Param; import java.util.List; ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsAdminRoleRelation; import com.ycl.entity.platform.user.UmsAdminRoleRelation; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsDepartManage; import com.ycl.entity.platform.user.UmsDepartManage; import org.apache.ibatis.annotations.Param; import java.util.List; ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsMenu; import com.ycl.entity.platform.user.UmsMenu; import org.apache.ibatis.annotations.Param; import java.util.List; ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsResourceCategory; import com.ycl.entity.platform.user.UmsResourceCategory; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsResource; import com.ycl.entity.platform.user.UmsResource; import org.apache.ibatis.annotations.Param; import java.util.List; ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsRole; import com.ycl.entity.platform.user.UmsRole; import org.apache.ibatis.annotations.Param; import java.util.List; ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsRoleMenuRelation; import com.ycl.entity.platform.user.UmsRoleMenuRelation; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
File was renamed from ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java @@ -1,7 +1,7 @@ package com.ycl.mapper.user; package com.ycl.mapper.platform.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsRoleResourceRelation; import com.ycl.entity.platform.user.UmsRoleResourceRelation; /** * <p> ycl-common/src/main/java/com/ycl/mapper/platform/zfreport/EnforcelawReportMapper.java
New file @@ -0,0 +1,16 @@ package com.ycl.mapper.platform.zfreport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.platform.zfreport.EnforcelawReport; /** * <p> * 违规事项处置管理：包含违法(违建)情况上报、立案、派遣、处置、核查、结案 Mapper 接口 * </p> * * @author lyq * @since 2022-09-14 */ public interface EnforcelawReportMapper extends BaseMapper<EnforcelawReport> { } ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/depart/SccgDepartService.java @@ -1,11 +1,9 @@ package com.ycl.service.depart; package com.ycl.service.platform.depart; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.api.BasePageDTO; import com.ycl.entity.depart.SccgDepart; import com.ycl.entity.platform.depart.UmsDepart; import com.ycl.vo.depart.DepartVO; import org.apache.catalina.LifecycleState; import java.util.List; @@ -17,7 +15,7 @@ * @author lyq * @since 2022-09-07 */ public interface SccgDepartService extends IService<SccgDepart> { public interface UmsDepartService extends IService<UmsDepart> { /** * 新增 * @@ -31,7 +29,7 @@ * @param id * @return */ SccgDepart loadDepartById(long id); UmsDepart loadDepartById(long id); /** * 修改 @@ -50,14 +48,14 @@ * 树形 * @return */ List<SccgDepart> tree(); List<UmsDepart> tree(); /** * 分页 * @param params * @return */ IPage<SccgDepart> pageDepart(DepartVO.PageDepartVO params); IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params); /** * 修改状态 ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java @@ -1,4 +1,4 @@ package com.ycl.service.depart.impl; package com.ycl.service.platform.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.depart.SccgDepart; import com.ycl.entity.user.UmsDepartManage; import com.ycl.entity.platform.depart.UmsDepart; import com.ycl.entity.platform.user.UmsDepartManage; import com.ycl.enums.common.ResultCode; import com.ycl.exception.ApiException; import com.ycl.mapper.depart.SccgDepartMapper; import com.ycl.service.depart.SccgDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminService; 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.utils.common.PojoUtils; import com.ycl.vo.depart.DepartVO; import org.apache.commons.lang3.StringUtils; @@ -34,9 +34,9 @@ * @since 2022-09-07 */ @Service public class SccgDepartServiceImpl extends ServiceImpl<SccgDepartMapper, SccgDepart> implements SccgDepartService { public class UmsDepartServiceImpl extends ServiceImpl<UmsDepartMapper, UmsDepart> implements UmsDepartService { @Resource private SccgDepartMapper sccgDepartMapper; private UmsDepartMapper sccgDepartMapper; @Resource private UmsDepartManageService umsAdminDepartService; @Resource @@ -45,11 +45,11 @@ @Override @Transactional(rollbackFor = Exception.class) public void create(DepartVO.AddDepartVO addDepartVO) { SccgDepart sccgDepart = this.queryByName(addDepartVO.getDepartName()); UmsDepart sccgDepart = this.queryByName(addDepartVO.getDepartName()); if (null != sccgDepart) { throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS); } SccgDepart depart = new SccgDepart(); UmsDepart depart = new UmsDepart(); BeanUtils.copyProperties(addDepartVO, depart); if (sccgDepartMapper.insert(depart) <= 0) { throw new ApiException(ResultCode.RECORD_SAVE_FAIL); @@ -57,8 +57,8 @@ } @Override public SccgDepart loadDepartById(long id) { SccgDepart sccgDepart = sccgDepartMapper.selectById(id); public UmsDepart loadDepartById(long id) { UmsDepart sccgDepart = sccgDepartMapper.selectById(id); if (null == sccgDepart) { throw new ApiException(ResultCode.RECORD_NOT_EXISTS); } @@ -68,11 +68,11 @@ @Override @Transactional(rollbackFor = Exception.class) public void update(DepartVO.UpdateDepartVO updateDepartVO) { SccgDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName()); UmsDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName()); if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) { throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS); } SccgDepart depart = this.getById(updateDepartVO.getId()); UmsDepart depart = this.getById(updateDepartVO.getId()); BeanUtils.copyProperties(updateDepartVO, depart); List<Long> userIds = updateDepartVO.getUserIds(); if (CollUtil.isNotEmpty(userIds)) { @@ -103,13 +103,13 @@ } @Override public List<SccgDepart> tree() { public List<UmsDepart> tree() { // 1.查出所有网格 List<SccgDepart> list = list(); List<UmsDepart> list = list(); // 2.组装成父子的树型结构 // 2.1、找到所有的一级网格:使用jdk8的stream流进行过滤 List<SccgDepart> collect = list.stream().filter(griddingEntity -> { List<UmsDepart> collect = list.stream().filter(griddingEntity -> { //分类父id为0就表示该网格为 一级网格 return griddingEntity.getParentId() == 0; }).map(item -> { @@ -117,26 +117,26 @@ item.setChildren(getChildrens(item, list)); return item; }).collect(Collectors.toList()); List<SccgDepart> treeData = getTreeData(collect); List<UmsDepart> treeData = getTreeData(collect); return treeData; } @Override public IPage<SccgDepart> pageDepart(DepartVO.PageDepartVO params) { Page<SccgDepart> page = new Page<>(params.getCurrent(), params.getPageSize()); LambdaQueryWrapper<SccgDepart> query = new LambdaQueryWrapper<>(); public IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params) { Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize()); LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(params.getDepartName())) { query.like(SccgDepart::getDepartName, params.getDepartName()); query.like(UmsDepart::getDepartName, params.getDepartName()); } if (PojoUtils.Vo.isUsefulSearchParam(params.getDepartType())) { query.like(SccgDepart::getDepartType, params.getDepartType()); query.like(UmsDepart::getDepartType, params.getDepartType()); } query.orderByDesc(SccgDepart::getCreateTime); Page<SccgDepart> departPage = sccgDepartMapper.selectPage(page, query); List<SccgDepart> records = departPage.getRecords(); query.orderByDesc(UmsDepart::getCreateTime); Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query); List<UmsDepart> records = departPage.getRecords(); //负责人 if (CollUtil.isNotEmpty(records)) { for (SccgDepart record : records) { for (UmsDepart record : records) { List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId()); if (CollUtil.isNotEmpty(umsAdminDeparts)) { List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> { @@ -154,7 +154,7 @@ @Override public void updateStatus(DepartVO.StatusDepartVO params) { SccgDepart sccgDepart = this.loadDepartById(params.getId()); UmsDepart sccgDepart = this.loadDepartById(params.getId()); BeanUtils.copyProperties(params, sccgDepart); if (sccgDepartMapper.updateById(sccgDepart) <= 0) { throw new ApiException(ResultCode.RECORD_UPDATE_FAIL); @@ -167,7 +167,7 @@ * * @return */ public List<SccgDepart> getTreeData(List<SccgDepart> griddingEntities) { public List<UmsDepart> getTreeData(List<UmsDepart> griddingEntities) { for (int i = 0; i < griddingEntities.size(); i++) { //如果Children的size小于1就说明为空，设置为null if (griddingEntities.get(i).getChildren().size() < 1) { @@ -187,8 +187,8 @@ * @param all 所有网格 * @return */ public List<SccgDepart> getChildrens(SccgDepart root, List<SccgDepart> all) { List<SccgDepart> collect = all.stream().filter(griddingEntity -> { public List<UmsDepart> getChildrens(UmsDepart root, List<UmsDepart> all) { List<UmsDepart> collect = all.stream().filter(griddingEntity -> { return griddingEntity.getParentId().equals(root.getId()); }).map(item -> { item.setChildren(getChildrens(item, all)); @@ -204,10 +204,10 @@ * @param name * @return */ private SccgDepart queryByName(String name) { LambdaQueryWrapper<SccgDepart> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SccgDepart::getDepartName, name); SccgDepart sccgDepart = this.sccgDepartMapper.selectOne(queryWrapper); private UmsDepart queryByName(String name) { LambdaQueryWrapper<UmsDepart> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(UmsDepart::getDepartName, name); UmsDepart sccgDepart = this.sccgDepartMapper.selectOne(queryWrapper); return sccgDepart; }
File was renamed from ycl-common/src/main/java/com/ycl/service/platform/UmsThirdApplicationsService.java @@ -1,7 +1,7 @@ package com.ycl.service.platform; package com.ycl.service.platform.portal; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.platform.UmsThirdApplications; import com.ycl.entity.platform.portal.UmsThirdApplications; /** * <p> ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/platform/UmsWebsiteLogoService.java @@ -1,7 +1,7 @@ package com.ycl.service.platform; package com.ycl.service.platform.portal; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.platform.UmsWebsiteLogo; import com.ycl.entity.platform.portal.UmsWebsiteLogo; /** * <p> ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/platform/impl/UmsThirdApplicationsServiceImpl.java @@ -1,9 +1,9 @@ package com.ycl.service.platform.impl; package com.ycl.service.platform.portal.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.platform.UmsThirdApplications; import com.ycl.mapper.platform.UmsThirdApplicationsMapper; import com.ycl.service.platform.UmsThirdApplicationsService; import com.ycl.entity.platform.portal.UmsThirdApplications; import com.ycl.mapper.platform.portal.UmsThirdApplicationsMapper; import com.ycl.service.platform.portal.UmsThirdApplicationsService; import org.springframework.stereotype.Service; /** ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/platform/impl/UmsWebsiteLogoServiceImpl.java @@ -1,9 +1,9 @@ package com.ycl.service.platform.impl; package com.ycl.service.platform.portal.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.platform.UmsWebsiteLogo; import com.ycl.mapper.platform.UmsWebsiteLogoMapper; import com.ycl.service.platform.UmsWebsiteLogoService; import com.ycl.entity.platform.portal.UmsWebsiteLogo; import com.ycl.mapper.platform.portal.UmsWebsiteLogoMapper; import com.ycl.service.platform.portal.UmsWebsiteLogoService; import org.springframework.stereotype.Service; /** ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/store/StoreInfoService.java @@ -1,8 +1,8 @@ package com.ycl.service.store; package com.ycl.service.platform.store; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.store.StoreInfo; import com.ycl.entity.platform.store.StoreInfo; import org.springframework.web.multipart.MultipartFile; /** ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/store/StoreScoreRuleService.java @@ -1,8 +1,8 @@ package com.ycl.service.store; package com.ycl.service.platform.store; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.store.StoreScoreRule; import com.ycl.entity.platform.store.StoreScoreRule; import com.ycl.vo.store.StoreScoreRuleVO; /** ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java @@ -1,14 +1,14 @@ package com.ycl.service.store.impl; package com.ycl.service.platform.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.store.StoreInfo; import com.ycl.entity.platform.store.StoreInfo; import com.ycl.enums.common.ResultCode; import com.ycl.exception.ApiException; import com.ycl.mapper.store.StoreInfoMapper; import com.ycl.service.store.StoreInfoService; import com.ycl.mapper.platform.store.StoreInfoMapper; import com.ycl.service.platform.store.StoreInfoService; import com.ycl.utils.ExcelUtils; import com.ycl.vo.store.StoreInfoExcelVo; import lombok.extern.slf4j.Slf4j; ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java @@ -1,13 +1,13 @@ package com.ycl.service.store.impl; package com.ycl.service.platform.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.store.StoreScoreRule; import com.ycl.entity.platform.store.StoreScoreRule; import com.ycl.exception.ApiException; import com.ycl.mapper.store.StoreScoreRuleMapper; import com.ycl.service.store.StoreScoreRuleService; import com.ycl.mapper.platform.store.StoreScoreRuleMapper; import com.ycl.service.platform.store.StoreScoreRuleService; import com.ycl.vo.store.StoreScoreRuleVO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java @@ -1,10 +1,10 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.ycl.entity.user.UmsAdmin; import com.ycl.entity.user.UmsResource; import com.ycl.entity.platform.user.UmsAdmin; import com.ycl.entity.platform.user.UmsResource; import java.util.List;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java @@ -1,7 +1,7 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.user.UmsAdminRoleRelation; import com.ycl.entity.platform.user.UmsAdminRoleRelation; /** * 管理员角色关系管理Service ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java @@ -1,13 +1,13 @@ package com.ycl.service.user; package com.ycl.service.platform.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.user.UmsAdmin; import com.ycl.entity.user.UmsResource; import com.ycl.entity.user.UmsRole; import com.ycl.entity.platform.user.UmsAdmin; import com.ycl.entity.platform.user.UmsResource; import com.ycl.entity.platform.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/platform/user/UmsDepartManageService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java @@ -1,8 +1,8 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.api.BasePageDTO; import com.ycl.entity.user.UmsDepartManage; import com.ycl.entity.platform.user.UmsDepartManage; import java.util.List;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java @@ -1,10 +1,10 @@ package com.ycl.service.user; package com.ycl.service.platform.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.user.UmsMenu; import com.ycl.entity.platform.user.UmsMenu; import java.util.List;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java @@ -1,8 +1,8 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.user.UmsResourceCategory; import com.ycl.entity.platform.user.UmsResourceCategory; import java.util.List;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java @@ -1,9 +1,9 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.user.UmsResource; import com.ycl.entity.platform.user.UmsResource; /** * 后台资源管理Service ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java @@ -1,7 +1,7 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.user.UmsRoleMenuRelation; import com.ycl.entity.platform.user.UmsRoleMenuRelation; /** * 角色菜单关系管理Service ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java @@ -1,7 +1,7 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.user.UmsRoleResourceRelation; import com.ycl.entity.platform.user.UmsRoleResourceRelation; /** * 角色资源关系管理Service ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java @@ -1,10 +1,10 @@ package com.ycl.service.user; package com.ycl.service.platform.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.user.UmsMenu; import com.ycl.entity.user.UmsResource; import com.ycl.entity.user.UmsRole; import com.ycl.entity.platform.user.UmsMenu; import com.ycl.entity.platform.user.UmsResource; import com.ycl.entity.platform.user.UmsRole; import org.springframework.transaction.annotation.Transactional; import java.util.List; ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java @@ -1,16 +1,15 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.user.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.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.service.redis.RedisService; import com.ycl.service.user.UmsAdminCacheService; import com.ycl.service.user.UmsAdminRoleRelationService; import com.ycl.service.user.UmsAdminService; import org.springframework.beans.factory.annotation.Autowired; import com.ycl.service.platform.user.UmsAdminCacheService; import com.ycl.service.platform.user.UmsAdminRoleRelationService; import com.ycl.service.platform.user.UmsAdminService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java @@ -1,9 +1,9 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.user.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.user.UmsAdminRoleRelation; import com.ycl.mapper.user.UmsAdminRoleRelationMapper; import com.ycl.service.user.UmsAdminRoleRelationService; import com.ycl.entity.platform.user.UmsAdminRoleRelation; import com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper; import com.ycl.service.platform.user.UmsAdminRoleRelationService; import org.springframework.stereotype.Service; /** ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java @@ -1,4 +1,4 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.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.depart.SccgDepart; import com.ycl.entity.user.*; import com.ycl.entity.platform.depart.UmsDepart; import com.ycl.entity.platform.user.*; import com.ycl.exception.Asserts; 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.SccgDepartService; 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.service.redis.RedisService; import com.ycl.service.user.UmsAdminCacheService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminRoleRelationService; import com.ycl.service.user.UmsAdminService; import com.ycl.service.platform.user.UmsAdminCacheService; import com.ycl.service.platform.user.UmsAdminRoleRelationService; import com.ycl.service.platform.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 SccgDepartService sccgDepartService; private UmsDepartService sccgDepartService; @Resource private UmsDepartManageService umsAdminDepartService; @Resource @@ -322,7 +322,7 @@ List<UmsAdmin> records = page1.getRecords(); if (CollUtil.isNotEmpty(records)) { records.forEach(e -> { SccgDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId()); UmsDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId()); if (null != sccgDepart) { e.setDepartName(sccgDepart.getDepartName()); } ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java @@ -1,16 +1,16 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.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.depart.SccgDepart; import com.ycl.entity.user.UmsAdmin; import com.ycl.entity.user.UmsDepartManage; import com.ycl.mapper.user.UmsDepartManageMapper; import com.ycl.service.depart.SccgDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminService; 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.vo.depart.DepartVO; import org.springframework.stereotype.Service; @@ -32,7 +32,7 @@ @Resource private UmsDepartManageMapper umsDepartManageMapper; @Resource private SccgDepartService sccgDepartService; private UmsDepartService sccgDepartService; @Resource private UmsAdminService umsAdminService; @@ -72,7 +72,7 @@ DepartVO.AdminDepartInfoVO adminDepartInfoVO = null; for (UmsDepartManage umsAdminDepart : departList) { adminDepartInfoVO = new DepartVO.AdminDepartInfoVO(); SccgDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId()); UmsDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId()); UmsAdmin umsAdmin = umsAdminService.getById(userId); adminDepartInfoVO.setDepartId(umsAdminDepart.getDepartId()); adminDepartInfoVO.setDepartName(sccgDepart.getDepartName()); ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java @@ -1,12 +1,12 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.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.user.UmsMenu; import com.ycl.mapper.user.UmsMenuMapper; import com.ycl.service.user.UmsMenuService; import com.ycl.entity.platform.user.UmsMenu; import com.ycl.mapper.platform.user.UmsMenuMapper; import com.ycl.service.platform.user.UmsMenuService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java @@ -1,10 +1,10 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.user.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.user.UmsResourceCategory; import com.ycl.mapper.user.UmsResourceCategoryMapper; import com.ycl.service.user.UmsResourceCategoryService; import com.ycl.entity.platform.user.UmsResourceCategory; import com.ycl.mapper.platform.user.UmsResourceCategoryMapper; import com.ycl.service.platform.user.UmsResourceCategoryService; import org.springframework.stereotype.Service; import java.util.Date; ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java @@ -1,14 +1,14 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.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.user.UmsResource; import com.ycl.mapper.user.UmsResourceMapper; import com.ycl.service.user.UmsAdminCacheService; import com.ycl.service.user.UmsResourceService; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java @@ -1,9 +1,9 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.user.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.user.UmsRoleMenuRelation; import com.ycl.mapper.user.UmsRoleMenuRelationMapper; import com.ycl.service.user.UmsRoleMenuRelationService; import com.ycl.entity.platform.user.UmsRoleMenuRelation; import com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper; import com.ycl.service.platform.user.UmsRoleMenuRelationService; import org.springframework.stereotype.Service; /** ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java @@ -1,9 +1,9 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.user.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.user.UmsRoleResourceRelation; import com.ycl.mapper.user.UmsRoleResourceRelationMapper; import com.ycl.service.user.UmsRoleResourceRelationService; import com.ycl.entity.platform.user.UmsRoleResourceRelation; import com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper; import com.ycl.service.platform.user.UmsRoleResourceRelationService; import org.springframework.stereotype.Service; /** ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java @@ -1,18 +1,18 @@ package com.ycl.service.user.impl; package com.ycl.service.platform.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.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 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;
New file @@ -0,0 +1,16 @@ package com.ycl.service.platform.zfreport; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.platform.zfreport.EnforcelawReport; /** * <p> * 违规事项处置管理：包含违法(违建)情况上报、立案、派遣、处置、核查、结案 服务类 * </p> * * @author lyq * @since 2022-09-14 */ public interface IEnforcelawReportService extends IService<EnforcelawReport> { } ycl-common/src/main/java/com/ycl/service/platform/zfreport/impl/EnforcelawReportServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ycl.service.platform.zfreport.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.entity.platform.zfreport.EnforcelawReport; import com.ycl.mapper.platform.zfreport.EnforcelawReportMapper; import com.ycl.service.platform.zfreport.IEnforcelawReportService; import org.springframework.stereotype.Service; /** * <p> * 违规事项处置管理：包含违法(违建)情况上报、立案、派遣、处置、核查、结案 服务实现类 * </p> * * @author lyq * @since 2022-09-14 */ @Service public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforcelawReport> implements IEnforcelawReportService { } ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/depart/SccgDepartMapper.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.depart.SccgDepartMapper"> <mapper namespace="com.ycl.mapper.platform.depart.UmsDepartMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.depart.SccgDepart"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/portal/UmsThirdApplicationsMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/platform/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.UmsThirdApplicationsMapper"> <mapper namespace="com.ycl.mapper.platform.portal.UmsThirdApplicationsMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.UmsThirdApplications"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsThirdApplications"> <id column="id" property="id" /> <result column="application_name" property="applicationName" /> <result column="application_icon_url" property="applicationIconUrl" /> ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/platform/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.UmsWebsiteLogoMapper"> <mapper namespace="com.ycl.mapper.platform.portal.UmsWebsiteLogoMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.UmsWebsiteLogo"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsWebsiteLogo"> <id column="id" property="id" /> <result column="title" property="title" /> <result column="login_page_icon_url" property="loginPageIconUrl" /> ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.store.StoreInfoMapper"> <mapper namespace="com.ycl.mapper.platform.store.StoreInfoMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.store.StoreInfo"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.store.StoreInfo"> <id column="id" property="id"/> <result column="owner" property="owner"/> <result column="storename" property="storename"/> ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsAdminLoginLogMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsAdminLoginLogMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminLoginLog"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/platform/user/UmsAdminMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsAdminMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsAdminMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdmin"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdmin"> <id column="id" property="id"/> <result column="username" property="username"/> <result column="password" property="password"/> ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsAdminRoleRelationMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminRoleRelation"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/platform/user/UmsDepartManageMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsDepartManageMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsDepartManageMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsDepartManage"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/platform/user/UmsMenuMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsMenuMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsMenuMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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.user.UmsMenu"> <select id="getMenuList" resultType="com.ycl.entity.platform.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.user.UmsMenu"> <select id="getMenuListByRoleId" resultType="com.ycl.entity.platform.user.UmsMenu"> SELECT m.id id, m.parent_id parentId, ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsResourceCategoryMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsResourceCategoryMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResourceCategory"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsResourceCategory"> <id column="id" property="id" /> <result column="create_time" property="createTime" /> <result column="name" property="name" /> ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsResourceMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsResourceMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResource"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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.user.UmsResource"> <select id="getResourceList" resultType="com.ycl.entity.platform.user.UmsResource"> SELECT ur.id id, ur.create_time createTime, @@ -32,7 +32,7 @@ ur.id </select> <select id="getResourceListByRoleId" resultType="com.ycl.entity.user.UmsResource"> <select id="getResourceListByRoleId" resultType="com.ycl.entity.platform.user.UmsResource"> SELECT r.id id, r.create_time createTime, ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsRoleMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsRoleMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRole"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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.user.UmsRole"> <select id="getRoleList" resultType="com.ycl.entity.platform.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/platform/user/UmsRoleMenuRelationMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsRoleMenuRelationMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleMenuRelation"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/platform/user/UmsRoleResourceRelationMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/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.user.UmsRoleResourceRelationMapper"> <mapper namespace="com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleResourceRelation"> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRoleResourceRelation"> <id column="id" property="id" /> <result column="role_id" property="roleId" /> <result column="resource_id" property="resourceId" /> ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml
New file @@ -0,0 +1,42 @@ <?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.zfreport.EnforcelawReportMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.platform.zfreport.EnforcelawReport"> <id column="id" property="id" /> <result column="inforesoure" property="inforesoure" /> <result column="acceptor" property="acceptor" /> <result column="problemtypes" property="problemtypes" /> <result column="category" property="category" /> <result column="county" property="county" /> <result column="street" property="street" /> <result column="afaddr" property="afaddr" /> <result column="informer" property="informer" /> <result column="contact" property="contact" /> <result column="reason" property="reason" /> <result column="problemdesc" property="problemdesc" /> <result column="lawOfficer" property="lawOfficer" /> <result column="partiesName" property="partiesName" /> <result column="partiesID" property="partiesID" /> <result column="partiesPhone" property="partiesPhone" /> <result column="idPositiveImage" property="idPositiveImage" /> <result column="idNegativeImage" property="idNegativeImage" /> <result column="illegalBuildLocation" property="illegalBuildLocation" /> <result column="illegalBuildLength" property="illegalBuildLength" /> <result column="illegalBuildWidth" property="illegalBuildWidth" /> <result column="illegalBuildHigh" property="illegalBuildHigh" /> <result column="illegalBuildMaterials" property="illegalBuildMaterials" /> <result column="IllegalPhotos" property="IllegalPhotos" /> <result column="rectifidPhotos" property="rectifidPhotos" /> <result column="accessory" property="accessory" /> <result column="disposeRemark" property="disposeRemark" /> <result column="inspectors" property="inspectors" /> </resultMap> <!-- 通用查询结果列 --> <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 </sql> </mapper> ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
@@ -1,15 +1,13 @@ package com.ycl.config; import com.ycl.component.DynamicSecurityService; import com.ycl.entity.user.UmsResource; import com.ycl.service.user.UmsAdminService; import com.ycl.service.user.UmsResourceService; import com.ycl.entity.platform.user.UmsResource; import com.ycl.service.platform.user.UmsAdminService; import com.ycl.service.platform.user.UmsResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.userdetails.UserDetailsService; import java.util.List; 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.depart.SccgDepart; import com.ycl.service.depart.SccgDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.entity.platform.depart.UmsDepart; import com.ycl.service.platform.depart.UmsDepartService; import com.ycl.service.platform.user.UmsDepartManageService; import com.ycl.utils.auth.UserAuthUtil; import com.ycl.vo.depart.DepartVO; import io.swagger.annotations.Api; @@ -34,7 +34,7 @@ public class DepartController extends BaseController { @Autowired private SccgDepartService departService; private UmsDepartService departService; @Resource private UmsDepartManageService umsAdminDepartService; @Resource @@ -63,15 +63,15 @@ @ApiOperation("详情") @PostMapping(value = "/detail") public CommonResult<SccgDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) { SccgDepart sccgDepart = departService.loadDepartById(params.getId()); public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) { UmsDepart sccgDepart = departService.loadDepartById(params.getId()); return CommonResult.success(sccgDepart); } @ApiOperation("树结构") @GetMapping(value = "/tree") public CommonResult<List<SccgDepart>> tree() { List<SccgDepart> tree = departService.tree(); public CommonResult<List<UmsDepart>> tree() { List<UmsDepart> tree = departService.tree(); return CommonResult.success(tree); } @@ -84,8 +84,8 @@ @ApiOperation("查询全部部门") @GetMapping(value = "/page") public CommonResult<IPage<SccgDepart>> page(DepartVO.PageDepartVO params) { IPage<SccgDepart> page = departService.pageDepart(params); public CommonResult<IPage<UmsDepart>> page(DepartVO.PageDepartVO params) { IPage<UmsDepart> page = departService.pageDepart(params); return CommonResult.success(page); }
File was renamed from ycl-platform/src/main/java/com/ycl/controller/platform/UmsWebsitePortalController.java @@ -1,14 +1,14 @@ package com.ycl.controller.platform; package com.ycl.controller.portal; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ycl.api.CommonResult; import com.ycl.entity.platform.UmsThirdApplications; import com.ycl.entity.user.UmsMenu; import com.ycl.entity.platform.UmsWebsiteLogo; import com.ycl.entity.user.vo.UmsMenuVo; import com.ycl.service.platform.UmsThirdApplicationsService; import com.ycl.service.user.UmsMenuService; import com.ycl.service.platform.UmsWebsiteLogoService; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; 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.store.StoreInfo; import com.ycl.service.store.StoreInfoService; import com.ycl.entity.platform.store.StoreInfo; import com.ycl.service.platform.store.StoreInfoService; 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/store/StoreScoreRuleController.java
@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; import com.ycl.entity.store.StoreInfo; import com.ycl.entity.store.StoreScoreRule; import com.ycl.service.store.StoreScoreRuleService; import com.ycl.entity.platform.store.StoreScoreRule; import com.ycl.service.platform.store.StoreScoreRuleService; import com.ycl.vo.store.StoreScoreRuleVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -23,6 +23,7 @@ */ @RestController @RequestMapping("/store/scorerule") @Api(tags = "积分管理") public class StoreScoreRuleController { private StoreScoreRuleService storeScoreRuleService;
@@ -2,23 +2,20 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; import com.ycl.dto.UmsAdminLoginParam; import com.ycl.dto.UmsAdminParam; import com.ycl.dto.UpdateAdminPasswordParam; import com.ycl.entity.user.UmsAdmin; import com.ycl.entity.user.UmsRole; import com.ycl.entity.platform.user.UmsAdmin; import com.ycl.entity.platform.user.UmsRole; import com.ycl.service.redis.RedisService; import com.ycl.service.user.UmsAdminService; import com.ycl.service.user.UmsRoleService; import com.ycl.service.platform.user.UmsAdminService; import com.ycl.service.platform.user.UmsRoleService; import com.ycl.utils.redis.RedisKey; import com.ycl.vo.user.UserVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java
@@ -4,11 +4,10 @@ import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; import com.ycl.dto.UmsMenuNode; import com.ycl.entity.user.UmsMenu; import com.ycl.service.user.UmsMenuService; import com.ycl.entity.platform.user.UmsMenu; import com.ycl.service.platform.user.UmsMenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java
@@ -1,11 +1,10 @@ package com.ycl.controller.user; import com.ycl.api.CommonResult; import com.ycl.entity.user.UmsResourceCategory; import com.ycl.service.user.UmsResourceCategoryService; import com.ycl.entity.platform.user.UmsResourceCategory; import com.ycl.service.platform.user.UmsResourceCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java
@@ -4,11 +4,10 @@ import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; import com.ycl.component.DynamicSecurityMetadataSource; import com.ycl.entity.user.UmsResource; import com.ycl.service.user.UmsResourceService; import com.ycl.entity.platform.user.UmsResource; import com.ycl.service.platform.user.UmsResourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java
@@ -3,13 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; 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 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; ycl-platform/src/main/java/com/ycl/controller/zfreport/EnforcelawReportController.java
New file @@ -0,0 +1,22 @@ package com.ycl.controller.zfreport; import com.ycl.controller.BaseController; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * 违规事项处置管理：包含违法(违建)情况上报、立案、派遣、处置、核查、结案 前端控制器 * </p> * * @author lyq * @since 2022-09-14 */ @RestController @RequestMapping("/enforcelaw-report") @Api(tags = "执法管理：违规事项处置管理") public class EnforcelawReportController extends BaseController { }
