@@ -1,11 +1,10 @@ | |||||
package com.ningdatech.pmapi.common.enums; | |||||
package com.ningdatech.pmapi.common.enumeration; | |||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Getter; | import lombok.Getter; | ||||
import lombok.NoArgsConstructor; | import lombok.NoArgsConstructor; | ||||
/** | /** | ||||
* 导出选项枚举 | * 导出选项枚举 | ||||
* | * | ||||
@@ -19,129 +18,129 @@ public enum ExportOptionEnum { | |||||
/** | /** | ||||
* 导出选项 | * 导出选项 | ||||
*/ | */ | ||||
id(1,"项目ID"), | |||||
id(1, "项目ID"), | |||||
projectName(2,"项目名称"), | |||||
projectName(2, "项目名称"), | |||||
areaCode(3,"行政区划编码"), | |||||
areaCode(3, "行政区划编码"), | |||||
area(4,"行政区划名称"), | |||||
area(4, "行政区划名称"), | |||||
responsibleMan(5,"项目负责人"), | |||||
responsibleMan(5, "项目负责人"), | |||||
responsibleManMobile(6,"项目负责人手机号"), | |||||
responsibleManMobile(6, "项目负责人手机号"), | |||||
contactName(7,"项目联系人"), | |||||
contactName(7, "项目联系人"), | |||||
contactPhone(8,"项目联系人手机号"), | |||||
contactPhone(8, "项目联系人手机号"), | |||||
higherSuperOrg(9,"上级业务主管单位"), | |||||
higherSuperOrg(9, "上级业务主管单位"), | |||||
higherSuperOrgCode(10,"上级主管单位浙政钉ID"), | |||||
higherSuperOrgCode(10, "上级主管单位浙政钉ID"), | |||||
superOrg(11,"本级主管部门"), | |||||
superOrg(11, "本级主管部门"), | |||||
superOrgCode(12,"本级主管部门浙政钉ID"), | |||||
superOrgCode(12, "本级主管部门浙政钉ID"), | |||||
buildOrgName(13,"建设单位名称"), | |||||
buildOrgName(13, "建设单位名称"), | |||||
buildOrgZheJiangGovDingId(14,"建设单位浙政钉ID"), | |||||
buildOrgZheJiangGovDingId(14, "建设单位浙政钉ID"), | |||||
buildOrgCode(15,"建设单位统一信用代码"), | |||||
buildOrgCode(15, "建设单位统一信用代码"), | |||||
projectType(16,"项目类型"), | |||||
projectType(16, "项目类型"), | |||||
isFirst(17,"是否首次新建"), | |||||
isFirst(17, "是否首次新建"), | |||||
relatedExistsApplication(18,"关联应用"), | |||||
relatedExistsApplication(18, "关联应用"), | |||||
relatedExistsApplicationCode(19,"关联应用IRS编码"), | |||||
relatedExistsApplicationCode(19, "关联应用IRS编码"), | |||||
declareAmount(20,"申报金额(万元)"), | |||||
declareAmount(20, "申报金额(万元)"), | |||||
approvedTotalInvestmentIncrease(21,"批复金额"), | |||||
approvedTotalInvestmentIncrease(21, "批复金额"), | |||||
/** | /** | ||||
* 表里没有 | * 表里没有 | ||||
*/ | */ | ||||
budgetSource(22,"预算来源"), | |||||
budgetSource(22, "预算来源"), | |||||
projectYear(23,"预算年度"), | |||||
projectYear(23, "预算年度"), | |||||
projectIntroduction(24,"项目简介"), | |||||
projectIntroduction(24, "项目简介"), | |||||
buildBasis(25,"立项依据"), | |||||
buildBasis(25, "立项依据"), | |||||
buildLevel(26,"建设层级"), | |||||
buildLevel(26, "建设层级"), | |||||
developCode(27,"发改编码"), | |||||
developCode(27, "发改编码"), | |||||
financialCode(28,"财政编码"), | |||||
financialCode(28, "财政编码"), | |||||
/** | /** | ||||
* 表里没有 | * 表里没有 | ||||
*/ | */ | ||||
informationValidity(29,"信息是否有效"), | |||||
informationValidity(29, "信息是否有效"), | |||||
isDigitalReform(30,"是否数字化改革项目"), | |||||
isDigitalReform(30, "是否数字化改革项目"), | |||||
bizDomain(31,"综合应用领域"), | |||||
bizDomain(31, "综合应用领域"), | |||||
isCloud(32,"是否上云"), | |||||
isCloud(32, "是否上云"), | |||||
cloudType(33,"云类型"), | |||||
cloudType(33, "云类型"), | |||||
fourSystems(34,"四大体系"), | |||||
isTemporaryAugment(35,"是否临时增补"), | |||||
fourSystems(34, "四大体系"), | |||||
isTemporaryAugment(35, "是否临时增补"), | |||||
protectionLevel(36,"等保级别"), | |||||
protectionLevel(36, "等保级别"), | |||||
isSecretComments(37,"是否密评"), | |||||
isSecretComments(37, "是否密评"), | |||||
businessNumber(38,"业务编号"), | |||||
businessNumber(38, "业务编号"), | |||||
businessName(39,"业务名称"), | |||||
businessName(39, "业务名称"), | |||||
orgName(40,"单位名称"), | |||||
orgName(40, "单位名称"), | |||||
softwareDevelopmentAmount(41,"软件开发(万元)"), | |||||
softwareDevelopmentAmount(41, "软件开发(万元)"), | |||||
cloudHardwarePurchaseAmount(42,"云资源、硬件购置(万元)"), | |||||
cloudHardwarePurchaseAmount(42, "云资源、硬件购置(万元)"), | |||||
thirdPartyAmount(43,"第三方服务(万元)"), | |||||
thirdPartyAmount(43, "第三方服务(万元)"), | |||||
safetyInputTitle(44,"投入项"), | |||||
safetyInputTitle(44, "投入项"), | |||||
safetyInputDescribe(45,"内容描述"), | |||||
safetyInputDescribe(45, "内容描述"), | |||||
safetyInputAmount(46,"金额"), | |||||
safetyInputAmount(46, "金额"), | |||||
annualPlanAmount(47,"年度支付金额(万元)"), | |||||
annualPlanAmount(47, "年度支付金额(万元)"), | |||||
annualPlanHaveAmount(48,"自有资金(万元)"), | |||||
annualPlanHaveAmount(48, "自有资金(万元)"), | |||||
declareGovOwnFinanceAmount(49,"政府投资-本级财政资金(万元)"), | |||||
declareGovOwnFinanceAmount(49, "政府投资-本级财政资金(万元)"), | |||||
declareGovSuperiorFinanceAmount(50,"政府投资-上级补助资金(万元)"), | |||||
declareGovSuperiorFinanceAmount(50, "政府投资-上级补助资金(万元)"), | |||||
declareBankLendingAmount(51,"银行贷款(万元)"), | |||||
declareBankLendingAmount(51, "银行贷款(万元)"), | |||||
declareOtherAmount(52,"其它资金(万元)"), | |||||
declareOtherAmount(52, "其它资金(万元)"), | |||||
engineeringSpeedOne(53,"第一季度"), | |||||
engineeringSpeedOne(53, "第一季度"), | |||||
engineeringSpeedTwo(54,"第二季度"), | |||||
engineeringSpeedTwo(54, "第二季度"), | |||||
engineeringSpeedThree(55,"第三季度"), | |||||
engineeringSpeedThree(55, "第三季度"), | |||||
engineeringSpeedFour(56,"第四季度"), | |||||
engineeringSpeedFour(56, "第四季度"), | |||||
preliminaryPlanFile(57,"初步方案"), | |||||
preliminaryPlanFile(57, "初步方案"), | |||||
supportingMaterialsFile(58,"附件-佐证材料"), | |||||
supportingMaterialsFile(58, "附件-佐证材料"), | |||||
projectRemarks(59,"备注"); | |||||
projectRemarks(59, "备注"); | |||||
private Integer code; | private Integer code; | ||||
private String desc; | private String desc; | ||||
@@ -2,7 +2,7 @@ package com.ningdatech.pmapi.common.handler; | |||||
import cn.hutool.json.JSONUtil; | import cn.hutool.json.JSONUtil; | ||||
import com.ningdatech.basic.model.ApiResponse; | import com.ningdatech.basic.model.ApiResponse; | ||||
import com.ningdatech.pmapi.common.utils.BizUtils; | |||||
import com.ningdatech.pmapi.common.util.BizUtils; | |||||
import org.springframework.core.MethodParameter; | import org.springframework.core.MethodParameter; | ||||
import org.springframework.http.MediaType; | import org.springframework.http.MediaType; | ||||
import org.springframework.http.converter.HttpMessageConverter; | import org.springframework.http.converter.HttpMessageConverter; | ||||
@@ -5,8 +5,8 @@ import cn.hutool.core.collection.CollUtil; | |||||
import com.google.common.collect.Maps; | import com.google.common.collect.Maps; | ||||
import com.ningdatech.basic.util.StrPool; | import com.ningdatech.basic.util.StrPool; | ||||
import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity; | import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO; | |||||
import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; | |||||
import com.alibaba.fastjson.TypeReference; | import com.alibaba.fastjson.TypeReference; | ||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.pmapi.common.enums.ProjectProessStageEnum; | |||||
import com.ningdatech.pmapi.common.enumeration.ProjectProessStageEnum; | |||||
import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDto; | import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDto; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto; | import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto; | ||||
@@ -108,7 +108,7 @@ public class PrequalificationDeclaredProjectManage { | |||||
project.setUpdateOn(LocalDateTime.now()); | project.setUpdateOn(LocalDateTime.now()); | ||||
project.setInstCode(instanceId); | project.setInstCode(instanceId); | ||||
//调用状态机 进入下一个通过状态 | //调用状态机 进入下一个通过状态 | ||||
stateMachineUtils.execute(project,stateMachineUtils.getProjectStatusPassEvent(project.getStatus())); | |||||
stateMachineUtils.execute(project, stateMachineUtils.getProjectStatusPassEvent(project.getStatus())); | |||||
projectService.updateById(project); | projectService.updateById(project); | ||||
} catch (Exception e) { | } catch (Exception e) { | ||||
log.error("提交预审 项目信息修改 错误 ", e); | log.error("提交预审 项目信息修改 错误 ", e); | ||||
@@ -1,9 +1,8 @@ | |||||
package com.ningdatech.pmapi.projectlib.model.vo; | package com.ningdatech.pmapi.projectlib.model.vo; | ||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.ningdatech.pmapi.common.utils.BizUtils; | |||||
import com.ningdatech.pmapi.common.util.BizUtils; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -15,7 +14,6 @@ import java.util.List; | |||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Objects; | import java.util.Objects; | ||||
import java.util.Optional; | import java.util.Optional; | ||||
import java.util.concurrent.atomic.AtomicReference; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -274,21 +272,21 @@ public class ProjectDetailVO { | |||||
private List<ProjectApplicationVO> projectApplications; | private List<ProjectApplicationVO> projectApplications; | ||||
@ApiModelProperty("动态form") | @ApiModelProperty("动态form") | ||||
private Map<String,Object> dynamicForm; | |||||
private Map<String, Object> dynamicForm; | |||||
private String projectTypeName; | private String projectTypeName; | ||||
public String getProjectTypeName(){ | |||||
if(Objects.nonNull(this.projectType)){ | |||||
public String getProjectTypeName() { | |||||
if (Objects.nonNull(this.projectType)) { | |||||
Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType)) | Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType)) | ||||
.ifPresent(desc -> this.projectTypeName = desc); | .ifPresent(desc -> this.projectTypeName = desc); | ||||
} | } | ||||
return this.projectTypeName; | return this.projectTypeName; | ||||
} | } | ||||
public void buildDynamicForm(String dynamicFormStr){ | |||||
if(StringUtils.isNotBlank(dynamicFormStr) && BizUtils.getJSONType(dynamicFormStr)){ | |||||
this.dynamicForm = JSON.parseObject(dynamicFormStr,Map.class); | |||||
public void buildDynamicForm(String dynamicFormStr) { | |||||
if (StringUtils.isNotBlank(dynamicFormStr) && BizUtils.getJSONType(dynamicFormStr)) { | |||||
this.dynamicForm = JSON.parseObject(dynamicFormStr, Map.class); | |||||
} | } | ||||
} | } | ||||
} | } |
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.ningdatech.basic.exception.BizException; | import com.ningdatech.basic.exception.BizException; | ||||
import com.ningdatech.pmapi.scheduler.contants.TaskContant; | import com.ningdatech.pmapi.scheduler.contants.TaskContant; | ||||
import com.ningdatech.pmapi.sys.contant.RegionConst; | import com.ningdatech.pmapi.sys.contant.RegionConst; | ||||
import com.ningdatech.pmapi.sys.entity.Region; | |||||
import com.ningdatech.pmapi.sys.model.entity.Region; | |||||
import com.ningdatech.pmapi.sys.service.IRegionService; | import com.ningdatech.pmapi.sys.service.IRegionService; | ||||
import com.wflow.bean.dto.WflowModelHistorysDto; | import com.wflow.bean.dto.WflowModelHistorysDto; | ||||
import com.wflow.bean.entity.WflowModels; | import com.wflow.bean.entity.WflowModels; | ||||
@@ -8,12 +8,12 @@ import com.ningdatech.basic.util.CollUtils; | |||||
import com.ningdatech.log.annotation.WebLog; | import com.ningdatech.log.annotation.WebLog; | ||||
import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity; | import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity; | ||||
import com.ningdatech.pmapi.common.util.TreeUtil; | import com.ningdatech.pmapi.common.util.TreeUtil; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuQueryDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuSaveDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.MenuVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuQueryDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuSaveDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.model.vo.MenuVO; | |||||
import com.ningdatech.pmapi.sys.manage.MenuManage; | import com.ningdatech.pmapi.sys.manage.MenuManage; | ||||
import com.ningdatech.pmapi.sys.service.IMenuService; | import com.ningdatech.pmapi.sys.service.IMenuService; | ||||
import com.ningdatech.pmapi.user.util.LoginUserUtil; | import com.ningdatech.pmapi.user.util.LoginUserUtil; | ||||
@@ -3,11 +3,11 @@ package com.ningdatech.pmapi.sys.controller; | |||||
import com.ningdatech.basic.model.IdVo; | import com.ningdatech.basic.model.IdVo; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.log.annotation.WebLog; | import com.ningdatech.log.annotation.WebLog; | ||||
import com.ningdatech.pmapi.sys.entity.req.NoticeListReq; | |||||
import com.ningdatech.pmapi.sys.entity.req.NoticeSaveReq; | |||||
import com.ningdatech.pmapi.sys.entity.req.NoticeStatusModifyReq; | |||||
import com.ningdatech.pmapi.sys.entity.vo.NoticeDetailVO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.NoticeListItemVO; | |||||
import com.ningdatech.pmapi.sys.model.req.NoticeListReq; | |||||
import com.ningdatech.pmapi.sys.model.req.NoticeSaveReq; | |||||
import com.ningdatech.pmapi.sys.model.req.NoticeStatusModifyReq; | |||||
import com.ningdatech.pmapi.sys.model.vo.NoticeDetailVO; | |||||
import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO; | |||||
import com.ningdatech.pmapi.sys.manage.NoticeManage; | import com.ningdatech.pmapi.sys.manage.NoticeManage; | ||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
@@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil; | |||||
import cn.hutool.core.lang.Assert; | import cn.hutool.core.lang.Assert; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.log.annotation.WebLog; | import com.ningdatech.log.annotation.WebLog; | ||||
import com.ningdatech.pmapi.sys.entity.Role; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RolePageReq; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RoleSaveDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.RoleVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Role; | |||||
import com.ningdatech.pmapi.sys.model.req.RolePageReq; | |||||
import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.model.vo.RoleVO; | |||||
import com.ningdatech.pmapi.sys.manage.RoleManage; | import com.ningdatech.pmapi.sys.manage.RoleManage; | ||||
import com.ningdatech.pmapi.sys.service.IRoleService; | import com.ningdatech.pmapi.sys.service.IRoleService; | ||||
import com.ningdatech.pmapi.user.util.LoginUserUtil; | import com.ningdatech.pmapi.user.util.LoginUserUtil; | ||||
@@ -1,13 +1,10 @@ | |||||
package com.ningdatech.pmapi.sys.convert; | package com.ningdatech.pmapi.sys.convert; | ||||
import cn.hutool.core.util.ObjectUtil; | |||||
import com.ningdatech.basic.util.CollUtils; | |||||
import com.ningdatech.pmapi.sys.entity.Region; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RegionTreeDTO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.RegionTreeVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Region; | |||||
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.RegionTreeDTO; | |||||
import com.ningdatech.pmapi.sys.model.vo.RegionTreeVO; | |||||
import org.apache.commons.collections4.CollectionUtils; | import org.apache.commons.collections4.CollectionUtils; | ||||
import org.apache.commons.lang3.tuple.Pair; | |||||
import java.util.ArrayList; | import java.util.ArrayList; | ||||
import java.util.Collections; | import java.util.Collections; | ||||
@@ -5,9 +5,9 @@ import cn.hutool.core.collection.CollUtil; | |||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.pmapi.common.util.TreeUtil; | import com.ningdatech.pmapi.common.util.TreeUtil; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.service.IRoleMenuService; | import com.ningdatech.pmapi.sys.service.IRoleMenuService; | ||||
import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; | import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -11,12 +11,12 @@ import com.ningdatech.basic.util.CollUtils; | |||||
import com.ningdatech.file.entity.vo.result.AttachFileVo; | import com.ningdatech.file.entity.vo.result.AttachFileVo; | ||||
import com.ningdatech.file.service.FileService; | import com.ningdatech.file.service.FileService; | ||||
import com.ningdatech.pmapi.common.util.BizUtils; | import com.ningdatech.pmapi.common.util.BizUtils; | ||||
import com.ningdatech.pmapi.sys.entity.Notice; | |||||
import com.ningdatech.pmapi.sys.entity.req.NoticeListReq; | |||||
import com.ningdatech.pmapi.sys.entity.req.NoticeSaveReq; | |||||
import com.ningdatech.pmapi.sys.entity.req.NoticeStatusModifyReq; | |||||
import com.ningdatech.pmapi.sys.entity.vo.NoticeDetailVO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.NoticeListItemVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Notice; | |||||
import com.ningdatech.pmapi.sys.model.req.NoticeListReq; | |||||
import com.ningdatech.pmapi.sys.model.req.NoticeSaveReq; | |||||
import com.ningdatech.pmapi.sys.model.req.NoticeStatusModifyReq; | |||||
import com.ningdatech.pmapi.sys.model.vo.NoticeDetailVO; | |||||
import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO; | |||||
import com.ningdatech.pmapi.sys.service.INoticeService; | import com.ningdatech.pmapi.sys.service.INoticeService; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
@@ -2,8 +2,8 @@ package com.ningdatech.pmapi.sys.manage; | |||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.pmapi.sys.convert.RegionConverter; | import com.ningdatech.pmapi.sys.convert.RegionConverter; | ||||
import com.ningdatech.pmapi.sys.entity.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.RegionTreeVO; | |||||
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.model.vo.RegionTreeVO; | |||||
import com.ningdatech.pmapi.sys.service.IRegionService; | import com.ningdatech.pmapi.sys.service.IRegionService; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.entity.Role; | |||||
import com.ningdatech.pmapi.sys.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RolePageReq; | |||||
import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.entity.vo.RoleVO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.entity.Role; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.model.req.RolePageReq; | |||||
import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO; | |||||
import com.ningdatech.pmapi.sys.model.vo.RoleVO; | |||||
import com.ningdatech.pmapi.sys.service.IRoleMenuService; | import com.ningdatech.pmapi.sys.service.IRoleMenuService; | ||||
import com.ningdatech.pmapi.sys.service.IMenuService; | import com.ningdatech.pmapi.sys.service.IMenuService; | ||||
import com.ningdatech.pmapi.sys.service.IRoleService; | import com.ningdatech.pmapi.sys.service.IRoleService; | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import org.springframework.stereotype.Repository; | import org.springframework.stereotype.Repository; | ||||
/** | /** | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.Notice; | |||||
import com.ningdatech.pmapi.sys.model.entity.Notice; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.Region; | |||||
import com.ningdatech.pmapi.sys.model.entity.Region; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -1,8 +1,8 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.Resource; | |||||
import com.ningdatech.pmapi.sys.entity.dto.ResourceQueryDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Resource; | |||||
import com.ningdatech.pmapi.sys.model.dto.ResourceQueryDTO; | |||||
import org.apache.ibatis.annotations.Param; | import org.apache.ibatis.annotations.Param; | ||||
import org.springframework.stereotype.Repository; | import org.springframework.stereotype.Repository; | ||||
@@ -3,7 +3,7 @@ | |||||
<mapper namespace="com.ningdatech.pmapi.sys.mapper.ResourceMapper"> | <mapper namespace="com.ningdatech.pmapi.sys.mapper.ResourceMapper"> | ||||
<!-- 通用查询映射结果 --> | <!-- 通用查询映射结果 --> | ||||
<resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.entity.Resource"> | |||||
<resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.model.entity.Resource"> | |||||
<id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
<result column="created_by" jdbcType="BIGINT" property="createBy"/> | <result column="created_by" jdbcType="BIGINT" property="createBy"/> | ||||
<result column="create_time" jdbcType="TIMESTAMP" property="createOn"/> | <result column="create_time" jdbcType="TIMESTAMP" property="createOn"/> | ||||
@@ -35,7 +35,7 @@ | |||||
) | ) | ||||
</select> | </select> | ||||
<insert id="saveOrUpdateUnique" parameterType="com.ningdatech.pmapi.sys.entity.Resource"> | |||||
<insert id="saveOrUpdateUnique" parameterType="com.ningdatech.pmapi.sys.model.entity.Resource"> | |||||
insert into nd_resource ( id, created_by, create_time, updated_by, update_time, | insert into nd_resource ( id, created_by, create_time, updated_by, update_time, | ||||
code, name, menu_id, describe_) | code, name, menu_id, describe_) | ||||
values (#{id,jdbcType=BIGINT}, #{createUser,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},#{updateUser,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, | values (#{id,jdbcType=BIGINT}, #{createUser,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},#{updateUser,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.Role; | |||||
import com.ningdatech.pmapi.sys.model.entity.Role; | |||||
import org.apache.ibatis.annotations.Param; | import org.apache.ibatis.annotations.Param; | ||||
import org.springframework.stereotype.Repository; | import org.springframework.stereotype.Repository; | ||||
@@ -3,7 +3,7 @@ | |||||
<mapper namespace="com.ningdatech.pmapi.sys.mapper.RoleMapper"> | <mapper namespace="com.ningdatech.pmapi.sys.mapper.RoleMapper"> | ||||
<!-- 通用查询映射结果 --> | <!-- 通用查询映射结果 --> | ||||
<resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.entity.Role"> | |||||
<resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.model.entity.Role"> | |||||
<id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
<result column="created_by" jdbcType="BIGINT" property="createBy"/> | <result column="created_by" jdbcType="BIGINT" property="createBy"/> | ||||
<result column="create_time" jdbcType="TIMESTAMP" property="createOn"/> | <result column="create_time" jdbcType="TIMESTAMP" property="createOn"/> | ||||
@@ -1,6 +1,6 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenuDatascope; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenuDatascope; | |||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
/** | /** | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenu; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.mapper; | package com.ningdatech.pmapi.sys.mapper; | ||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.ningdatech.pmapi.sys.entity.UserRole; | |||||
import com.ningdatech.pmapi.sys.model.entity.UserRole; | |||||
import org.springframework.stereotype.Repository; | import org.springframework.stereotype.Repository; | ||||
/** | /** | ||||
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
@@ -6,7 +6,6 @@ import lombok.*; | |||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
import javax.validation.constraints.NotEmpty; | import javax.validation.constraints.NotEmpty; | ||||
import javax.validation.constraints.NotNull; | |||||
import java.io.Serializable; | import java.io.Serializable; | ||||
/** | /** |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import lombok.Builder; | import lombok.Builder; | ||||
import lombok.Data; | import lombok.Data; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import com.baomidou.mybatisplus.core.conditions.update.Update; | import com.baomidou.mybatisplus.core.conditions.update.Update; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import com.baomidou.mybatisplus.core.conditions.update.Update; | import com.baomidou.mybatisplus.core.conditions.update.Update; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.dto; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Getter; | import lombok.Getter; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.*; | import com.baomidou.mybatisplus.annotation.*; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; |
@@ -1,7 +1,6 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableField; | |||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
@@ -9,11 +8,6 @@ import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.*; | import lombok.*; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
import javax.validation.constraints.NotEmpty; | |||||
import javax.validation.constraints.Size; | |||||
import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* 实体类 | * 实体类 |
@@ -1,8 +1,8 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import com.ningdatech.pmapi.sys.entity.enumeration.AuthorizeType; | |||||
import com.ningdatech.pmapi.sys.model.enumeration.AuthorizeTypeEnum; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.*; | import lombok.*; | ||||
@@ -48,7 +48,7 @@ public class RoleAuthority extends BaseEntity { | |||||
@ApiModelProperty(value = "权限类型") | @ApiModelProperty(value = "权限类型") | ||||
@NotNull(message = "权限类型不能为空") | @NotNull(message = "权限类型不能为空") | ||||
@TableField("authority_type") | @TableField("authority_type") | ||||
private AuthorizeType authorityType; | |||||
private AuthorizeTypeEnum authorityType; | |||||
/** | /** | ||||
* 角色id | * 角色id | ||||
@@ -62,7 +62,7 @@ public class RoleAuthority extends BaseEntity { | |||||
@Builder | @Builder | ||||
public RoleAuthority(Long id, LocalDateTime createTime, Long createdBy, | public RoleAuthority(Long id, LocalDateTime createTime, Long createdBy, | ||||
Long authorityId, AuthorizeType authorityType, Long roleId) { | |||||
Long authorityId, AuthorizeTypeEnum authorityType, Long roleId) { | |||||
this.id = id; | this.id = id; | ||||
this.createOn = createTime; | this.createOn = createTime; | ||||
this.createBy = createdBy; | this.createBy = createdBy; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity; | |||||
package com.ningdatech.pmapi.sys.model.entity; | |||||
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.enumeration; | |||||
package com.ningdatech.pmapi.sys.model.enumeration; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
@@ -21,7 +21,7 @@ import java.util.stream.Stream; | |||||
@AllArgsConstructor | @AllArgsConstructor | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@ApiModel(value = "AuthorizeType", description = "权限类型-枚举") | @ApiModel(value = "AuthorizeType", description = "权限类型-枚举") | ||||
public enum AuthorizeType { | |||||
public enum AuthorizeTypeEnum { | |||||
/** | /** | ||||
* MENU="菜单" | * MENU="菜单" | ||||
@@ -40,15 +40,15 @@ public enum AuthorizeType { | |||||
/** | /** | ||||
* 根据当前枚举的name匹配 | * 根据当前枚举的name匹配 | ||||
*/ | */ | ||||
public static AuthorizeType match(String val, AuthorizeType def) { | |||||
public static AuthorizeTypeEnum match(String val, AuthorizeTypeEnum def) { | |||||
return Stream.of(values()).parallel().filter(item -> item.name().equalsIgnoreCase(val)).findAny().orElse(def); | return Stream.of(values()).parallel().filter(item -> item.name().equalsIgnoreCase(val)).findAny().orElse(def); | ||||
} | } | ||||
public static AuthorizeType get(String val) { | |||||
public static AuthorizeTypeEnum get(String val) { | |||||
return match(val, null); | return match(val, null); | ||||
} | } | ||||
public boolean eq(AuthorizeType val) { | |||||
public boolean eq(AuthorizeTypeEnum val) { | |||||
return val != null && getCode().equals(val.name()); | return val != null && getCode().equals(val.name()); | ||||
} | } | ||||
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.enumeration; | |||||
package com.ningdatech.pmapi.sys.model.enumeration; | |||||
import lombok.Getter; | import lombok.Getter; | ||||
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.enumeration; | |||||
package com.ningdatech.pmapi.sys.model.enumeration; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.req; | |||||
package com.ningdatech.pmapi.sys.model.req; | |||||
import com.ningdatech.basic.model.PagePo; | import com.ningdatech.basic.model.PagePo; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.req; | |||||
package com.ningdatech.pmapi.sys.model.req; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.req; | |||||
package com.ningdatech.pmapi.sys.model.req; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.req; | |||||
import com.ningdatech.basic.model.PagePo; | import com.ningdatech.basic.model.PagePo; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.ningdatech.pmapi.sys.entity.enumeration.AuthorizeType; | |||||
import com.ningdatech.pmapi.sys.model.enumeration.AuthorizeTypeEnum; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.ToString; | import lombok.ToString; | ||||
@@ -20,7 +20,7 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; | |||||
@ToString(callSuper = true) | @ToString(callSuper = true) | ||||
public class MenuResourceTreeVO { | public class MenuResourceTreeVO { | ||||
private AuthorizeType type; | |||||
private AuthorizeTypeEnum type; | |||||
private String code; | private String code; | ||||
private String icon; | private String icon; | ||||
private Boolean isDef; | private Boolean isDef; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity; | import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import com.ningdatech.file.entity.vo.result.AttachFileVo; | import com.ningdatech.file.entity.vo.result.AttachFileVo; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Builder; | import lombok.Builder; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,4 +1,4 @@ | |||||
package com.ningdatech.pmapi.sys.entity.dto; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; |
@@ -1,6 +1,6 @@ | |||||
package com.ningdatech.pmapi.sys.entity.vo; | |||||
package com.ningdatech.pmapi.sys.model.vo; | |||||
import com.ningdatech.pmapi.sys.entity.BaseEntity; | |||||
import com.ningdatech.pmapi.sys.model.entity.BaseEntity; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.*; | import lombok.*; |
@@ -1,9 +1,9 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuSaveDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuSaveDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuUpdateDTO; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.ningdatech.pmapi.sys.entity.Notice; | |||||
import com.ningdatech.pmapi.sys.model.entity.Notice; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -1,8 +1,8 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.ningdatech.pmapi.sys.entity.Region; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Region; | |||||
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -1,6 +1,6 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenuDatascope; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenuDatascope; | |||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
/** | /** | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenu; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -1,9 +1,9 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.ningdatech.pmapi.sys.entity.Role; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RoleSaveDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Role; | |||||
import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO; | |||||
import java.util.List; | import java.util.List; | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.service; | package com.ningdatech.pmapi.sys.service; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.ningdatech.pmapi.sys.entity.UserRole; | |||||
import com.ningdatech.pmapi.sys.model.entity.UserRole; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -12,10 +12,10 @@ import com.google.common.collect.Lists; | |||||
import com.ningdatech.basic.exception.BaseUncheckedException; | import com.ningdatech.basic.exception.BaseUncheckedException; | ||||
import com.ningdatech.basic.util.ValidatorUtil; | import com.ningdatech.basic.util.ValidatorUtil; | ||||
import com.ningdatech.pmapi.common.constant.DefValConstants; | import com.ningdatech.pmapi.common.constant.DefValConstants; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.entity.enumeration.MenuTypeEnum; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuSaveDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.enumeration.MenuTypeEnum; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuSaveDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.mapper.MenuMapper; | import com.ningdatech.pmapi.sys.mapper.MenuMapper; | ||||
import com.ningdatech.pmapi.sys.service.IMenuService; | import com.ningdatech.pmapi.sys.service.IMenuService; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.service.impl; | package com.ningdatech.pmapi.sys.service.impl; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.ningdatech.pmapi.sys.entity.Notice; | |||||
import com.ningdatech.pmapi.sys.model.entity.Notice; | |||||
import com.ningdatech.pmapi.sys.mapper.NoticeMapper; | import com.ningdatech.pmapi.sys.mapper.NoticeMapper; | ||||
import com.ningdatech.pmapi.sys.service.INoticeService; | import com.ningdatech.pmapi.sys.service.INoticeService; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.pmapi.sys.convert.RegionConverter; | import com.ningdatech.pmapi.sys.convert.RegionConverter; | ||||
import com.ningdatech.pmapi.sys.entity.Region; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Region; | |||||
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.mapper.RegionMapper; | import com.ningdatech.pmapi.sys.mapper.RegionMapper; | ||||
import com.ningdatech.pmapi.sys.service.IRegionService; | import com.ningdatech.pmapi.sys.service.IRegionService; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
@@ -1,6 +1,6 @@ | |||||
package com.ningdatech.pmapi.sys.service.impl; | package com.ningdatech.pmapi.sys.service.impl; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenuDatascope; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenuDatascope; | |||||
import com.ningdatech.pmapi.sys.mapper.RoleMenuDatascopeMapper; | import com.ningdatech.pmapi.sys.mapper.RoleMenuDatascopeMapper; | ||||
import com.ningdatech.pmapi.sys.service.IRoleMenuDatascopeService; | import com.ningdatech.pmapi.sys.service.IRoleMenuDatascopeService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.sys.service.impl; | package com.ningdatech.pmapi.sys.service.impl; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.ningdatech.pmapi.sys.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.model.entity.RoleMenu; | |||||
import com.ningdatech.pmapi.sys.mapper.RoleMenuMapper; | import com.ningdatech.pmapi.sys.mapper.RoleMenuMapper; | ||||
import com.ningdatech.pmapi.sys.service.IRoleMenuService; | import com.ningdatech.pmapi.sys.service.IRoleMenuService; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
@@ -12,11 +12,11 @@ import com.ningdatech.basic.exception.BizException; | |||||
import com.ningdatech.basic.exception.code.ExceptionCode; | import com.ningdatech.basic.exception.code.ExceptionCode; | ||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.cache.repository.CachePlusOps; | import com.ningdatech.cache.repository.CachePlusOps; | ||||
import com.ningdatech.pmapi.sys.entity.*; | |||||
import com.ningdatech.pmapi.sys.entity.dto.MenuDataScopeDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RoleSaveDTO; | |||||
import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.MenuDataScopeDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO; | |||||
import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO; | |||||
import com.ningdatech.pmapi.sys.mapper.RoleMapper; | import com.ningdatech.pmapi.sys.mapper.RoleMapper; | ||||
import com.ningdatech.pmapi.sys.model.entity.*; | |||||
import com.ningdatech.pmapi.sys.service.*; | import com.ningdatech.pmapi.sys.service.*; | ||||
import com.ningdatech.pmapi.sys.utils.AuthCacheKeyUtils; | import com.ningdatech.pmapi.sys.utils.AuthCacheKeyUtils; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -4,8 +4,8 @@ import cn.hutool.http.HttpStatus; | |||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.ningdatech.basic.exception.BaseUncheckedException; | import com.ningdatech.basic.exception.BaseUncheckedException; | ||||
import com.ningdatech.pmapi.sys.entity.Role; | |||||
import com.ningdatech.pmapi.sys.entity.UserRole; | |||||
import com.ningdatech.pmapi.sys.model.entity.Role; | |||||
import com.ningdatech.pmapi.sys.model.entity.UserRole; | |||||
import com.ningdatech.pmapi.sys.mapper.RoleMapper; | import com.ningdatech.pmapi.sys.mapper.RoleMapper; | ||||
import com.ningdatech.pmapi.sys.mapper.UserRoleMapper; | import com.ningdatech.pmapi.sys.mapper.UserRoleMapper; | ||||
import com.ningdatech.pmapi.sys.service.IUserRoleService; | import com.ningdatech.pmapi.sys.service.IUserRoleService; | ||||
@@ -6,7 +6,7 @@ import java.util.List; | |||||
import com.ningdatech.basic.model.PagePo; | import com.ningdatech.basic.model.PagePo; | ||||
import com.ningdatech.pmapi.common.enums.ExportOptionEnum; | |||||
import com.ningdatech.pmapi.common.enumeration.ExportOptionEnum; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -3,7 +3,7 @@ package com.ningdatech.pmapi.sys.service; | |||||
import cn.hutool.db.Db; | import cn.hutool.db.Db; | ||||
import cn.hutool.db.Entity; | import cn.hutool.db.Entity; | ||||
import com.ningdatech.pmapi.AppTests; | import com.ningdatech.pmapi.AppTests; | ||||
import com.ningdatech.pmapi.sys.entity.Menu; | |||||
import com.ningdatech.pmapi.sys.model.entity.Menu; | |||||
import org.junit.jupiter.api.Test; | import org.junit.jupiter.api.Test; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||