From f1a6cad94501a6106ea7886a72f09349d369d37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Wed, 8 Mar 2023 15:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=99=E6=94=BF=E9=92=89=E6=9D=A1=E7=BA=BF?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/GeneratorCodeKingbaseConfig.java | 2 +- .../pmapi/ding/task/GovBusinessStripsTask.java | 19 ++++ .../expert/assembler/ExpertInfoCmdAssembler.java | 2 - .../controller/DingOrganizationController.java | 1 - .../controller/GovBusinessStripController.java | 20 ++++ .../MetaOrganizationLineTagController.java | 19 ++++ .../controller/OrganizationTagController.java | 2 + .../organization/entity/GovBusinessStrip.java | 38 +++++++ .../entity/MetaOrganizationLineTag.java | 109 +++++++++++++++++++++ .../pmapi/organization/entity/OrganizationTag.java | 71 +------------- .../helper/LineOrganizationHelper.java | 16 +++ .../mapper/GovBusinessStripMapper.java | 16 +++ .../organization/mapper/GovBusinessStripMapper.xml | 5 + .../mapper/MetaOrganizationLineTagMapper.java | 16 +++ .../mapper/MetaOrganizationLineTagMapper.xml | 5 + .../service/IGovBusinessStripService.java | 16 +++ .../service/IMetaOrganizationLineTagService.java | 16 +++ .../service/impl/GovBusinessStripServiceImpl.java | 20 ++++ .../impl/MetaOrganizationLineTagServiceImpl.java | 20 ++++ 19 files changed, 340 insertions(+), 73 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/ding/task/GovBusinessStripsTask.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/MetaOrganizationLineTagController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/GovBusinessStrip.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/MetaOrganizationLineTag.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/helper/LineOrganizationHelper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IGovBusinessStripService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IMetaOrganizationLineTagService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/GovBusinessStripServiceImpl.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/MetaOrganizationLineTagServiceImpl.java diff --git a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java b/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java index 9ab87ff..523c862 100644 --- a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java +++ b/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java @@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig { } public static void main(String[] args) { - generate("Liuxinxin", "organization", PATH_LXX, "organization_tag"); + generate("Liuxinxin", "organization", PATH_LXX, "gov_business_strip"); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/GovBusinessStripsTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/GovBusinessStripsTask.java new file mode 100644 index 0000000..9aa9b05 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/GovBusinessStripsTask.java @@ -0,0 +1,19 @@ +package com.ningdatech.pmapi.ding.task; + +import org.springframework.stereotype.Component; + +/** + * @author liuxinxin + * @date 2023/3/8 下午2:55 + */ + +@Component +public class GovBusinessStripsTask { + + private final static Integer PAGE_SIZE = 20; + + private final static Integer GROUP_SIZE = 100; + + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java index 8e712d0..f22c6e8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java @@ -46,8 +46,6 @@ public class ExpertInfoCmdAssembler { } - - private static List buildExpertAvoidCompanyList(ExpertProfessionalInfo professionalInfo) { List expertAvoidCompanyList = new ArrayList<>(); List avoidCompanyList = professionalInfo.getAvoidCompanyList(); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java index 8c70934..5c80996 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java @@ -47,5 +47,4 @@ public class DingOrganizationController { public List getChildOrganizationList(@RequestParam(value = "parentCode", required = false) String parentCode) { return organizationManage.getChildOrganizationList(parentCode); } - } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java new file mode 100644 index 0000000..78981ed --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.organization.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *

+ * 前端控制器 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +@Controller +@RequestMapping("/pmapi.organization/gov-business-strip") +public class GovBusinessStripController { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/MetaOrganizationLineTagController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/MetaOrganizationLineTagController.java new file mode 100644 index 0000000..21771d1 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/MetaOrganizationLineTagController.java @@ -0,0 +1,19 @@ +package com.ningdatech.pmapi.organization.controller; + + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + *

+ * 前端控制器 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +@Controller +@RequestMapping("/pmapi.organization/meta-organization-line-tag") +public class MetaOrganizationLineTagController { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java index 9e219e0..dd13531 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java @@ -18,5 +18,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/v1/organization-tag") public class OrganizationTagController { +// @PostMapping("条线单位") +// private } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/GovBusinessStrip.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/GovBusinessStrip.java new file mode 100644 index 0000000..6f014f9 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/GovBusinessStrip.java @@ -0,0 +1,38 @@ +package com.ningdatech.pmapi.organization.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +@TableName("gov_business_strip") +@Data +@ApiModel(value = "GovBusinessStrip对象", description = "") +public class GovBusinessStrip implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private LocalDateTime createOn; + + private LocalDateTime updateOn; + + private Long createBy; + + private Long updateBy; + + private String businessStripCode; + + private String businessStripName; +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/MetaOrganizationLineTag.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/MetaOrganizationLineTag.java new file mode 100644 index 0000000..a98efe0 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/MetaOrganizationLineTag.java @@ -0,0 +1,109 @@ +package com.ningdatech.pmapi.organization.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +@TableName("meta_organization_line_tag") +@ApiModel(value = "MetaOrganizationLineTag对象", description = "") +public class MetaOrganizationLineTag implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private LocalDateTime createOn; + + private LocalDateTime updateOn; + + private Long createBy; + + private Long updateBy; + + private String lineTagName; + + private Long lineTagLevel; + + private String lineTagCode; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public LocalDateTime getCreateOn() { + return createOn; + } + + public void setCreateOn(LocalDateTime createOn) { + this.createOn = createOn; + } + public LocalDateTime getUpdateOn() { + return updateOn; + } + + public void setUpdateOn(LocalDateTime updateOn) { + this.updateOn = updateOn; + } + public Long getCreateBy() { + return createBy; + } + + public void setCreateBy(Long createBy) { + this.createBy = createBy; + } + public Long getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(Long updateBy) { + this.updateBy = updateBy; + } + public String getLineTagName() { + return lineTagName; + } + + public void setLineTagName(String lineTagName) { + this.lineTagName = lineTagName; + } + public Long getLineTagLevel() { + return lineTagLevel; + } + + public void setLineTagLevel(Long lineTagLevel) { + this.lineTagLevel = lineTagLevel; + } + public String getLineTagCode() { + return lineTagCode; + } + + public void setLineTagCode(String lineTagCode) { + this.lineTagCode = lineTagCode; + } + + @Override + public String toString() { + return "MetaOrganizationLineTag{" + + "id=" + id + + ", createOn=" + createOn + + ", updateOn=" + updateOn + + ", createBy=" + createBy + + ", updateBy=" + updateBy + + ", lineTagName=" + lineTagName + + ", lineTagLevel=" + lineTagLevel + + ", lineTagCode=" + lineTagCode + + "}"; + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java index b9fe690..17c9dc5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.organization.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; @@ -15,6 +16,7 @@ import java.time.LocalDateTime; * @since 2023-03-06 */ @TableName("organization_tag") +@Data @ApiModel(value = "OrganizationTag对象", description = "") public class OrganizationTag implements Serializable { @@ -33,73 +35,4 @@ public class OrganizationTag implements Serializable { private String organizationCode; private String tagCode; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public LocalDateTime getCreateOn() { - return createOn; - } - - public void setCreateOn(LocalDateTime createOn) { - this.createOn = createOn; - } - - public LocalDateTime getUpdateOn() { - return updateOn; - } - - public void setUpdateOn(LocalDateTime updateOn) { - this.updateOn = updateOn; - } - - public Long getCreateBy() { - return createBy; - } - - public void setCreateBy(Long createBy) { - this.createBy = createBy; - } - - public Long getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(Long updateBy) { - this.updateBy = updateBy; - } - - public String getOrganizationCode() { - return organizationCode; - } - - public void setOrganizationCode(String organizationCode) { - this.organizationCode = organizationCode; - } - - public String getTagCode() { - return tagCode; - } - - public void setTagCode(String tagCode) { - this.tagCode = tagCode; - } - - @Override - public String toString() { - return "OrganizationTag{" + - "id=" + id + - ", createOn=" + createOn + - ", updateOn=" + updateOn + - ", createBy=" + createBy + - ", updateBy=" + updateBy + - ", organizationCode=" + organizationCode + - ", tagCode=" + tagCode + - "}"; - } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/helper/LineOrganizationHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/helper/LineOrganizationHelper.java new file mode 100644 index 0000000..f129136 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/helper/LineOrganizationHelper.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.organization.helper; + +/** + * @author liuxinxin + * @date 2023/3/8 上午9:53 + */ + +public interface LineOrganizationHelper { + + void getLineOrganization(); + + /** + * 获取上级条线主管单位 + */ + void getSuperLineOrganization(); +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.java new file mode 100644 index 0000000..b767324 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.organization.mapper; + +import com.ningdatech.pmapi.organization.entity.GovBusinessStrip; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +public interface GovBusinessStripMapper extends BaseMapper { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.xml new file mode 100644 index 0000000..381441f --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.java new file mode 100644 index 0000000..2006b3c --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.organization.mapper; + +import com.ningdatech.pmapi.organization.entity.MetaOrganizationLineTag; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +public interface MetaOrganizationLineTagMapper extends BaseMapper { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.xml new file mode 100644 index 0000000..51be7ef --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/MetaOrganizationLineTagMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IGovBusinessStripService.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IGovBusinessStripService.java new file mode 100644 index 0000000..22f930a --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IGovBusinessStripService.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.organization.service; + +import com.ningdatech.pmapi.organization.entity.GovBusinessStrip; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +public interface IGovBusinessStripService extends IService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IMetaOrganizationLineTagService.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IMetaOrganizationLineTagService.java new file mode 100644 index 0000000..5a2689e --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IMetaOrganizationLineTagService.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.organization.service; + +import com.ningdatech.pmapi.organization.entity.MetaOrganizationLineTag; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +public interface IMetaOrganizationLineTagService extends IService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/GovBusinessStripServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/GovBusinessStripServiceImpl.java new file mode 100644 index 0000000..d2b799b --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/GovBusinessStripServiceImpl.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.organization.service.impl; + +import com.ningdatech.pmapi.organization.entity.GovBusinessStrip; +import com.ningdatech.pmapi.organization.mapper.GovBusinessStripMapper; +import com.ningdatech.pmapi.organization.service.IGovBusinessStripService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +@Service +public class GovBusinessStripServiceImpl extends ServiceImpl implements IGovBusinessStripService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/MetaOrganizationLineTagServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/MetaOrganizationLineTagServiceImpl.java new file mode 100644 index 0000000..df27e05 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/MetaOrganizationLineTagServiceImpl.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.organization.service.impl; + +import com.ningdatech.pmapi.organization.entity.MetaOrganizationLineTag; +import com.ningdatech.pmapi.organization.mapper.MetaOrganizationLineTagMapper; +import com.ningdatech.pmapi.organization.service.IMetaOrganizationLineTagService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author Liuxinxin + * @since 2023-03-08 + */ +@Service +public class MetaOrganizationLineTagServiceImpl extends ServiceImpl implements IMetaOrganizationLineTagService { + +}