多公司配置

code/src/test/java/CommonDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class CommonDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-common")
+                .parent("com.fjhx.common")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

hx-admin/src/main/resources/application-dev.yml

@@ -6,6 +6,10 @@ spring:
             strict: true
             primary: base
             datasource:
+                common:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 oa:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

hx-admin/src/main/resources/application-prod.yml

@@ -6,6 +6,10 @@ spring:
             strict: true
             primary: base
             datasource:
+                common:
+                    url: jdbc:mysql://127.0.0.1:28643/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 oa:
                     url: jdbc:mysql://127.0.0.1:28643/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

hx-admin/src/main/resources/application-test.yml

@@ -6,6 +6,10 @@ spring:
             strict: true
             primary: base
             datasource:
+                common:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 oa:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -24,4 +24,6 @@ public interface SourceConstant {
 
     String MAIL = "mail";
 
+    String COMMON = "common";
+
 }

hx-common/src/main/java/com/fjhx/common/controller/corporation/CorporationController.java

@@ -0,0 +1,68 @@
+package com.fjhx.common.controller.corporation;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.corporation.vo.CorporationVo;
+import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
+import com.fjhx.common.entity.corporation.dto.CorporationDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.service.corporation.CorporationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 多公司配置 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@RestController
+@RequestMapping("/corporation")
+public class CorporationController {
+
+    @Autowired
+    private CorporationService corporationService;
+
+    /**
+     * 多公司配置分页
+     */
+    @PostMapping("/page")
+    public Page<CorporationVo> page(@RequestBody CorporationSelectDto dto) {
+        return corporationService.getPage(dto);
+    }
+
+    /**
+     * 多公司配置明细
+     */
+    @PostMapping("/detail")
+    public CorporationVo detail(@RequestBody BaseSelectDto dto) {
+        return corporationService.detail(dto.getId());
+    }
+
+    /**
+     * 多公司配置新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody CorporationDto corporationDto) {
+        corporationService.add(corporationDto);
+    }
+
+    /**
+     * 多公司配置编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody CorporationDto corporationDto) {
+        corporationService.edit(corporationDto);
+    }
+
+    /**
+     * 多公司配置删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        corporationService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/entity/corporation/dto/CorporationDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.corporation.dto;
+
+import com.fjhx.common.entity.corporation.po.Corporation;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多公司配置新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class CorporationDto extends Corporation {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/corporation/dto/CorporationSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.corporation.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多公司配置列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class CorporationSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -0,0 +1,75 @@
+package com.fjhx.common.entity.corporation.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BasePo;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 多公司配置
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+@TableName("corporation")
+public class Corporation extends BasePo {
+
+    /**
+     * 公司名称
+     */
+    private String name;
+
+    /**
+     * 公司英文名称
+     */
+    private String nameEn;
+
+    /**
+     * 企业类型
+     */
+    private Integer type;
+
+    /**
+     * 统一信用代码
+     */
+    private String uscCode;
+
+    /**
+     * 法定代表人
+     */
+    private String legalPersonName;
+
+    /**
+     * 注册资本
+     */
+    private String registeredCapital;
+
+    /**
+     * 营业开始日期
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 营业结束日期
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    private Date stopDate;
+
+    /**
+     * 纳税人资质
+     */
+    private Integer taxpayerQualification;
+
+    /**
+     * 进出口企业代码
+     */
+    private String iaeeCode;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/corporation/vo/CorporationVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.corporation.vo;
+
+import com.fjhx.common.entity.corporation.po.Corporation;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 多公司配置列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class CorporationVo extends Corporation {
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/corporation/CorporationMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.corporation;
+
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.corporation.vo.CorporationVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 多公司配置 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+public interface CorporationMapper extends BaseMapper<Corporation> {
+
+    /**
+     * 多公司配置分页
+     */
+    Page<CorporationVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Corporation> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/service/corporation/CorporationService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.corporation;
+
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.corporation.vo.CorporationVo;
+import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
+import com.fjhx.common.entity.corporation.dto.CorporationDto;
+
+
+/**
+ * <p>
+ * 多公司配置 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+public interface CorporationService extends BaseService<Corporation> {
+
+    /**
+     * 多公司配置分页
+     */
+    Page<CorporationVo> getPage(CorporationSelectDto dto);
+
+    /**
+     * 多公司配置明细
+     */
+    CorporationVo detail(Long id);
+
+    /**
+     * 多公司配置新增
+     */
+    void add(CorporationDto corporationDto);
+
+    /**
+     * 多公司配置编辑
+     */
+    void edit(CorporationDto corporationDto);
+
+    /**
+     * 多公司配置删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/corporation/impl/CorporationServiceImpl.java

@@ -0,0 +1,66 @@
+package com.fjhx.common.service.corporation.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.mapper.corporation.CorporationMapper;
+import com.fjhx.common.service.corporation.CorporationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.corporation.vo.CorporationVo;
+import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.common.entity.corporation.dto.CorporationDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 多公司配置 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@DS(SourceConstant.COMMON)
+@Service
+public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corporation> implements CorporationService {
+
+    @Override
+    public Page<CorporationVo> getPage(CorporationSelectDto dto) {
+        IWrapper<Corporation> wrapper = getWrapper();
+        wrapper.orderByDesc("c", Corporation::getId);
+        if(ObjectUtil.isNotEmpty(dto.getKeyword())){
+            wrapper.and(q->q.like(Corporation::getName,dto.getKeyword())
+                    .or().like(Corporation::getLegalPersonName,dto.getKeyword())
+                    .or().like(Corporation::getNameEn,dto.getKeyword()));
+        }
+        Page<CorporationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public CorporationVo detail(Long id) {
+        Corporation Corporation = this.getById(id);
+        CorporationVo result = BeanUtil.toBean(Corporation, CorporationVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(CorporationDto corporationDto) {
+        this.save(corporationDto);
+    }
+
+    @Override
+    public void edit(CorporationDto corporationDto) {
+        this.updateById(corporationDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-common/src/main/resources/mapper/corporation/CorporationMapper.xml

@@ -0,0 +1,25 @@
+<?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.fjhx.common.mapper.corporation.CorporationMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.corporation.vo.CorporationVo">
+        select
+            c.id,
+            c.name,
+            c.name_en,
+            c.type,
+            c.usc_code,
+            c.legal_person_name,
+            c.registered_capital,
+            c.start_date,
+            c.stop_date,
+            c.taxpayer_qualification,
+            c.iaee_code,
+            c.create_user,
+            c.create_time,
+            c.update_user,
+            c.update_time
+        from corporation c
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>