Merge remote-tracking branch 'origin/main'

# Conflicts:
#	cjy-module-traceability/cjy-module-traceability-api/src/main/java/com/cjy/traceability/module/traceability/enums/ErrorCodeConstants.java
main
862857010@qq.com 2 years ago
commit ec2fb7cd01
  1. 82
      cjy-framework/cjy-spring-boot-starter-web/src/main/java/com/cjy/traceability/framework/banner/core/BannerApplicationRunner.java
  2. 3
      cjy-module-traceability/cjy-module-traceability-api/src/main/java/com/cjy/traceability/module/traceability/enums/ErrorCodeConstants.java
  3. 95
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/company/CompanyController.java
  4. 49
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/company/vo/CompanyPageReqVO.java
  5. 60
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/company/vo/CompanyRespVO.java
  6. 42
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/company/vo/CompanySaveReqVO.java
  7. 67
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/company/CompanyDO.java
  8. 35
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/company/CompanyMapper.java
  9. 55
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/company/CompanyService.java
  10. 74
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/company/CompanyServiceImpl.java
  11. 12
      cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/company/CompanyMapper.xml
  12. 2
      cjy-server/src/main/resources/application.yaml

@ -18,47 +18,47 @@ public class BannerApplicationRunner implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) {
ThreadUtil.execute(() -> {
ThreadUtil.sleep(1, TimeUnit.SECONDS); // 延迟 1 秒,保证输出到结尾
log.info("\n----------------------------------------------------------\n\t" +
"项目启动成功!\n\t" +
"接口文档: \t{} \n\t" +
"开发文档: \t{} \n\t" +
"视频教程: \t{} \n" +
"----------------------------------------------------------",
"https://doc.iocoder.cn/api-doc/",
"https://doc.iocoder.cn",
"https://t.zsxq.com/02Yf6M7Qn");
// 数据报表
if (isNotPresent("com.cjy.traceability.module.report.framework.security.config.SecurityConfiguration")) {
System.out.println("[报表模块 cjy-module-report - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]");
}
// 工作流
if (isNotPresent("com.cjy.traceability.framework.flowable.config.CjyFlowableConfiguration")) {
System.out.println("[工作流模块 cjy-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
}
// 商城系统
if (isNotPresent("com.cjy.traceability.module.trade.framework.web.config.TradeWebConfiguration")) {
System.out.println("[商城系统 cjy-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]");
}
// ERP 系统
if (isNotPresent("com.cjy.traceability.module.erp.framework.web.config.ErpWebConfiguration")) {
System.out.println("[ERP 系统 cjy-module-erp - 已禁用][参考 https://doc.iocoder.cn/erp/build/ 开启]");
}
// CRM 系统
if (isNotPresent("com.cjy.traceability.module.crm.framework.web.config.CrmWebConfiguration")) {
System.out.println("[CRM 系统 cjy-module-crm - 已禁用][参考 https://doc.iocoder.cn/crm/build/ 开启]");
}
// 微信公众号
if (isNotPresent("com.cjy.traceability.module.mp.framework.mp.config.MpConfiguration")) {
System.out.println("[微信公众号 cjy-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
}
// 支付平台
if (isNotPresent("com.cjy.traceability.module.pay.framework.pay.config.PayConfiguration")) {
System.out.println("[支付系统 cjy-module-pay - 已禁用][参考 https://doc.iocoder.cn/pay/build/ 开启]");
}
});
// ThreadUtil.execute(() -> {
// ThreadUtil.sleep(1, TimeUnit.SECONDS); // 延迟 1 秒,保证输出到结尾
// log.info("\n----------------------------------------------------------\n\t" +
// "项目启动成功!\n\t" +
// "接口文档: \t{} \n\t" +
// "开发文档: \t{} \n\t" +
// "视频教程: \t{} \n" +
// "----------------------------------------------------------",
// "https://doc.iocoder.cn/api-doc/",
// "https://doc.iocoder.cn",
// "https://t.zsxq.com/02Yf6M7Qn");
//
// // 数据报表
// if (isNotPresent("com.cjy.traceability.module.report.framework.security.config.SecurityConfiguration")) {
// System.out.println("[报表模块 cjy-module-report - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]");
// }
// // 工作流
// if (isNotPresent("com.cjy.traceability.framework.flowable.config.CjyFlowableConfiguration")) {
// System.out.println("[工作流模块 cjy-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
// }
// // 商城系统
// if (isNotPresent("com.cjy.traceability.module.trade.framework.web.config.TradeWebConfiguration")) {
// System.out.println("[商城系统 cjy-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]");
// }
// // ERP 系统
// if (isNotPresent("com.cjy.traceability.module.erp.framework.web.config.ErpWebConfiguration")) {
// System.out.println("[ERP 系统 cjy-module-erp - 已禁用][参考 https://doc.iocoder.cn/erp/build/ 开启]");
// }
// // CRM 系统
// if (isNotPresent("com.cjy.traceability.module.crm.framework.web.config.CrmWebConfiguration")) {
// System.out.println("[CRM 系统 cjy-module-crm - 已禁用][参考 https://doc.iocoder.cn/crm/build/ 开启]");
// }
// // 微信公众号
// if (isNotPresent("com.cjy.traceability.module.mp.framework.mp.config.MpConfiguration")) {
// System.out.println("[微信公众号 cjy-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
// }
// // 支付平台
// if (isNotPresent("com.cjy.traceability.module.pay.framework.pay.config.PayConfiguration")) {
// System.out.println("[支付系统 cjy-module-pay - 已禁用][参考 https://doc.iocoder.cn/pay/build/ 开启]");
// }
// });
}
private static boolean isNotPresent(String className) {

@ -7,5 +7,6 @@ import com.cjy.traceability.framework.common.exception.ErrorCode;
* @createDate 2024/3/7
*/
public interface ErrorCodeConstants {
ErrorCode PROCESSING_WORKSHOP_NOT_EXISTS = new ErrorCode(0001, "加工车间不存在");
ErrorCode PROCESSING_WORKSHOP_NOT_EXISTS = new ErrorCode(001002, "加工车间不存在");
ErrorCode COMPANY_NOT_EXISTS = new ErrorCode( 001001, "企业信息不存在");
}

@ -0,0 +1,95 @@
package com.cjy.traceability.module.traceability.controller.admin.company;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.cjy.traceability.framework.common.pojo.PageParam;
import com.cjy.traceability.framework.common.pojo.PageResult;
import com.cjy.traceability.framework.common.pojo.CommonResult;
import com.cjy.traceability.framework.common.util.object.BeanUtils;
import static com.cjy.traceability.framework.common.pojo.CommonResult.success;
import com.cjy.traceability.framework.excel.core.util.ExcelUtils;
import com.cjy.traceability.framework.operatelog.core.annotations.OperateLog;
import static com.cjy.traceability.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.cjy.traceability.module.traceability.controller.admin.company.vo.*;
import com.cjy.traceability.module.traceability.dal.dataobject.company.CompanyDO;
import com.cjy.traceability.module.traceability.service.company.CompanyService;
@Tag(name = "管理后台 - 企业信息 ")
@RestController
@RequestMapping("/traceability/company")
@Validated
public class CompanyController {
@Resource
private CompanyService companyService;
@PostMapping("/create")
@Operation(summary = "创建企业信息 ")
@PreAuthorize("@ss.hasPermission('traceability:company:create')")
public CommonResult<Integer> createCompany(@Valid @RequestBody CompanySaveReqVO createReqVO) {
return success(companyService.createCompany(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新企业信息 ")
@PreAuthorize("@ss.hasPermission('traceability:company:update')")
public CommonResult<Boolean> updateCompany(@Valid @RequestBody CompanySaveReqVO updateReqVO) {
companyService.updateCompany(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除企业信息 ")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('traceability:company:delete')")
public CommonResult<Boolean> deleteCompany(@RequestParam("id") Integer id) {
companyService.deleteCompany(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得企业信息 ")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('traceability:company:query')")
public CommonResult<CompanyRespVO> getCompany(@RequestParam("id") Integer id) {
CompanyDO company = companyService.getCompany(id);
return success(BeanUtils.toBean(company, CompanyRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得企业信息 分页")
@PreAuthorize("@ss.hasPermission('traceability:company:query')")
public CommonResult<PageResult<CompanyRespVO>> getCompanyPage(@Valid CompanyPageReqVO pageReqVO) {
PageResult<CompanyDO> pageResult = companyService.getCompanyPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, CompanyRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出企业信息 Excel")
@PreAuthorize("@ss.hasPermission('traceability:company:export')")
@OperateLog(type = EXPORT)
public void exportCompanyExcel(@Valid CompanyPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<CompanyDO> list = companyService.getCompanyPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "企业信息 .xls", "数据", CompanyRespVO.class,
BeanUtils.toBean(list, CompanyRespVO.class));
}
}

@ -0,0 +1,49 @@
package com.cjy.traceability.module.traceability.controller.admin.company.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.cjy.traceability.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.cjy.traceability.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 企业信息 分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class CompanyPageReqVO extends PageParam {
@Schema(description = "企业名称", example = "芋艿")
private String companyName;
@Schema(description = "办公地址")
private String companyAddress;
@Schema(description = "负责人")
private String companyLeader;
@Schema(description = "联系电话")
private String companyPhone;
@Schema(description = "主体类型", example = "2")
private String companyType;
@Schema(description = "所属行业")
private String companyIndustry;
@Schema(description = "社会信用代码")
private String companyCode;
@Schema(description = "营业执照")
private String companyLicense;
@Schema(description = "证书")
private String companyCertificate;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

@ -0,0 +1,60 @@
package com.cjy.traceability.module.traceability.controller.admin.company.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 企业信息 Response VO")
@Data
@ExcelIgnoreUnannotated
public class CompanyRespVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23121")
@ExcelProperty("主键ID")
private Integer companyId;
@Schema(description = "企业名称", example = "芋艿")
@ExcelProperty("企业名称")
private String companyName;
@Schema(description = "办公地址")
@ExcelProperty("办公地址")
private String companyAddress;
@Schema(description = "负责人")
@ExcelProperty("负责人")
private String companyLeader;
@Schema(description = "联系电话")
@ExcelProperty("联系电话")
private String companyPhone;
@Schema(description = "主体类型", example = "2")
@ExcelProperty("主体类型")
private String companyType;
@Schema(description = "所属行业")
@ExcelProperty("所属行业")
private String companyIndustry;
@Schema(description = "社会信用代码")
@ExcelProperty("社会信用代码")
private String companyCode;
@Schema(description = "营业执照")
@ExcelProperty("营业执照")
private String companyLicense;
@Schema(description = "证书")
@ExcelProperty("证书")
private String companyCertificate;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

@ -0,0 +1,42 @@
package com.cjy.traceability.module.traceability.controller.admin.company.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 企业信息 新增/修改 Request VO")
@Data
public class CompanySaveReqVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23121")
private Integer companyId;
@Schema(description = "企业名称", example = "芋艿")
private String companyName;
@Schema(description = "办公地址")
private String companyAddress;
@Schema(description = "负责人")
private String companyLeader;
@Schema(description = "联系电话")
private String companyPhone;
@Schema(description = "主体类型", example = "2")
private String companyType;
@Schema(description = "所属行业")
private String companyIndustry;
@Schema(description = "社会信用代码")
private String companyCode;
@Schema(description = "营业执照")
private String companyLicense;
@Schema(description = "证书")
private String companyCertificate;
}

@ -0,0 +1,67 @@
package com.cjy.traceability.module.traceability.dal.dataobject.company;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.cjy.traceability.framework.mybatis.core.dataobject.BaseDO;
/**
* 企业信息 DO
*
* @author qfzj
*/
@TableName("traceability_company")
@KeySequence("traceability_company_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CompanyDO extends BaseDO {
/**
* 主键ID
*/
@TableId
private Integer companyId;
/**
* 企业名称
*/
private String companyName;
/**
* 办公地址
*/
private String companyAddress;
/**
* 负责人
*/
private String companyLeader;
/**
* 联系电话
*/
private String companyPhone;
/**
* 主体类型
*/
private String companyType;
/**
* 所属行业
*/
private String companyIndustry;
/**
* 社会信用代码
*/
private String companyCode;
/**
* 营业执照
*/
private String companyLicense;
/**
* 证书
*/
private String companyCertificate;
}

@ -0,0 +1,35 @@
package com.cjy.traceability.module.traceability.dal.mysql.company;
import java.util.*;
import com.cjy.traceability.framework.common.pojo.PageResult;
import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
import com.cjy.traceability.module.traceability.dal.dataobject.company.CompanyDO;
import org.apache.ibatis.annotations.Mapper;
import com.cjy.traceability.module.traceability.controller.admin.company.vo.*;
/**
* 企业信息 Mapper
*
* @author qfzj
*/
@Mapper
public interface CompanyMapper extends BaseMapperX<CompanyDO> {
default PageResult<CompanyDO> selectPage(CompanyPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CompanyDO>()
.likeIfPresent(CompanyDO::getCompanyName, reqVO.getCompanyName())
.eqIfPresent(CompanyDO::getCompanyAddress, reqVO.getCompanyAddress())
.eqIfPresent(CompanyDO::getCompanyLeader, reqVO.getCompanyLeader())
.eqIfPresent(CompanyDO::getCompanyPhone, reqVO.getCompanyPhone())
.eqIfPresent(CompanyDO::getCompanyType, reqVO.getCompanyType())
.eqIfPresent(CompanyDO::getCompanyIndustry, reqVO.getCompanyIndustry())
.eqIfPresent(CompanyDO::getCompanyCode, reqVO.getCompanyCode())
.eqIfPresent(CompanyDO::getCompanyLicense, reqVO.getCompanyLicense())
.eqIfPresent(CompanyDO::getCompanyCertificate, reqVO.getCompanyCertificate())
.betweenIfPresent(CompanyDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(CompanyDO::getCompanyId));
}
}

@ -0,0 +1,55 @@
package com.cjy.traceability.module.traceability.service.company;
import java.util.*;
import javax.validation.*;
import com.cjy.traceability.module.traceability.controller.admin.company.vo.*;
import com.cjy.traceability.module.traceability.dal.dataobject.company.CompanyDO;
import com.cjy.traceability.framework.common.pojo.PageResult;
import com.cjy.traceability.framework.common.pojo.PageParam;
/**
* 企业信息 Service 接口
*
* @author qfzj
*/
public interface CompanyService {
/**
* 创建企业信息
*
* @param createReqVO 创建信息
* @return 编号
*/
Integer createCompany(@Valid CompanySaveReqVO createReqVO);
/**
* 更新企业信息
*
* @param updateReqVO 更新信息
*/
void updateCompany(@Valid CompanySaveReqVO updateReqVO);
/**
* 删除企业信息
*
* @param id 编号
*/
void deleteCompany(Integer id);
/**
* 获得企业信息
*
* @param id 编号
* @return 企业信息
*/
CompanyDO getCompany(Integer id);
/**
* 获得企业信息 分页
*
* @param pageReqVO 分页查询
* @return 企业信息 分页
*/
PageResult<CompanyDO> getCompanyPage(CompanyPageReqVO pageReqVO);
}

@ -0,0 +1,74 @@
package com.cjy.traceability.module.traceability.service.company;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.cjy.traceability.module.traceability.controller.admin.company.vo.*;
import com.cjy.traceability.module.traceability.dal.dataobject.company.CompanyDO;
import com.cjy.traceability.framework.common.pojo.PageResult;
import com.cjy.traceability.framework.common.pojo.PageParam;
import com.cjy.traceability.framework.common.util.object.BeanUtils;
import com.cjy.traceability.module.traceability.dal.mysql.company.CompanyMapper;
import static com.cjy.traceability.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cjy.traceability.module.traceability.enums.ErrorCodeConstants.*;
/**
* 企业信息 Service 实现类
*
* @author qfzj
*/
@Service
@Validated
public class CompanyServiceImpl implements CompanyService {
@Resource
private CompanyMapper companyMapper;
@Override
public Integer createCompany(CompanySaveReqVO createReqVO) {
// 插入
CompanyDO company = BeanUtils.toBean(createReqVO, CompanyDO.class);
companyMapper.insert(company);
// 返回
return company.getCompanyId();
}
@Override
public void updateCompany(CompanySaveReqVO updateReqVO) {
// 校验存在
validateCompanyExists(updateReqVO.getCompanyId());
// 更新
CompanyDO updateObj = BeanUtils.toBean(updateReqVO, CompanyDO.class);
companyMapper.updateById(updateObj);
}
@Override
public void deleteCompany(Integer id) {
// 校验存在
validateCompanyExists(id);
// 删除
companyMapper.deleteById(id);
}
private void validateCompanyExists(Integer id) {
if (companyMapper.selectById(id) == null) {
throw exception(COMPANY_NOT_EXISTS);
}
}
@Override
public CompanyDO getCompany(Integer id) {
return companyMapper.selectById(id);
}
@Override
public PageResult<CompanyDO> getCompanyPage(CompanyPageReqVO pageReqVO) {
return companyMapper.selectPage(pageReqVO);
}
}

@ -0,0 +1,12 @@
<?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.cjy.traceability.module.traceability.dal.mysql.company.CompanyMapper">
<!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

@ -184,7 +184,7 @@ cjy:
- com.cjy.traceability.module.system.enums.ErrorCodeConstants
- com.cjy.traceability.module.mp.enums.ErrorCodeConstants
tenant: # 多租户相关配置项
enable: true
enable: false
ignore-urls:
- /admin-api/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号
- /admin-api/system/tenant/get-by-website # 基于域名获取租户,不许带租户编号

Loading…
Cancel
Save