diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java index 95a8b4316..4f7655493 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java @@ -67,6 +67,21 @@ public class BasicdataClientEntity extends TenantEntity { */ @ApiModelProperty(value = "客户名称") private String clientName; + /** + * 客户类型 + */ + @ApiModelProperty(value = "客户类型") + private String clientType; + /** + * 联系人 + */ + @ApiModelProperty(value = "联系人") + private String linkman; + /** + * 联系电话 + */ + @ApiModelProperty(value = "联系电话") + private String phone; /** * 客户类型;1 C端 2 B端 */ diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerBaseEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerBaseEntity.java new file mode 100644 index 000000000..e27463696 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerBaseEntity.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础客户基地表 实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@TableName("logpm_basicdata_customer_base") +@ApiModel(value = "BasicdataCustomerBase对象", description = "基础客户基地表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataCustomerBaseEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 基地名称 + */ + @ApiModelProperty(value = "基地名称") + private String baseName; + /** + * 基地编码 + */ + @ApiModelProperty(value = "基地编码") + private String baseCode; + /** + * 客户ID + */ + @ApiModelProperty(value = "客户ID") + private String clientId; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java new file mode 100644 index 000000000..88e656b69 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCustomerStoreEntity.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础客户商场表 实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@TableName("logpm_basicdata_customer_store") +@ApiModel(value = "BasicdataCustomerStore对象", description = "基础客户商场表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataCustomerStoreEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场名称") + private String storeName; + /** + * 商场编码 + */ + @ApiModelProperty(value = "商场编码") + private String storeCode; + /** + * 客户ID + */ + @ApiModelProperty(value = "客户ID") + private String clientId; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java index 0c664319a..f94cec062 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java @@ -67,16 +67,22 @@ public class BasicdataStoreContactEntity extends TenantEntity { * 门店名称 */ @ApiModelProperty(value = "门店名称") - private String shopId; + private Long shopId; /** * 联系人 */ @ApiModelProperty(value = "联系人") - private Integer linkman; + private String linkman; /** * 联系电话 */ @ApiModelProperty(value = "联系电话") - private Integer phone; + private String phone; + + /** + * 区分类型 + */ + @ApiModelProperty(value = "区分类型") + private Integer partitionType; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java new file mode 100644 index 000000000..47c8b36a7 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 基础客户基地表 Feign接口类 + * + * @author cyz + * @since 2023-06-09 + */ +@FeignClient( + value = "blade-basicdataCustomerBase" +) +public interface IBasicdataCustomerBaseClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/top121"; + + /** + * 获取基础客户基地表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java new file mode 100644 index 000000000..43c12baca --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 基础客户商场表 Feign接口类 + * + * @author cyz + * @since 2023-06-09 + */ +@FeignClient( + value = "blade-basicdataCustomerStore" +) +public interface IBasicdataCustomerStoreClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/top1233333"; + + /** + * 获取基础客户商场表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCustomerBaseVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCustomerBaseVO.java new file mode 100644 index 000000000..994d67347 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCustomerBaseVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础客户基地表 视图实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataCustomerBaseVO extends BasicdataCustomerBaseEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCustomerStoreVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCustomerStoreVO.java new file mode 100644 index 000000000..885f7f9b4 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCustomerStoreVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础客户商场表 视图实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataCustomerStoreVO extends BasicdataCustomerStoreEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCustomerBaseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCustomerBaseController.java new file mode 100644 index 000000000..d01967bea --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCustomerBaseController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import com.logpm.basicdata.vo.BasicdataCustomerBaseVO; +import com.logpm.basicdata.excel.BasicdataCustomerBaseExcel; +import com.logpm.basicdata.service.IBasicdataCustomerBaseService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 基础客户基地表 控制器 + * + * @author cyz + * @since 2023-06-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/basicdataCustomerBase") +@Api(value = "基础客户基地表", tags = "基础客户基地表接口") +public class BasicdataCustomerBaseController extends BladeController { + + private final IBasicdataCustomerBaseService basicdataCustomerBaseService; + + /** + * 基础客户基地表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataCustomerBase") + public R detail(BasicdataCustomerBaseEntity basicdataCustomerBase) { + BasicdataCustomerBaseEntity detail = basicdataCustomerBaseService.getOne(Condition.getQueryWrapper(basicdataCustomerBase)); + return R.data(detail); + } + /** + * 基础客户基地表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataCustomerBase") + public R> list(@ApiIgnore @RequestParam Map basicdataCustomerBase, Query query) { + IPage pages = basicdataCustomerBaseService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataCustomerBase, BasicdataCustomerBaseEntity.class)); + return R.data(pages); + } + + /** + * 基础客户基地表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataCustomerBase") + public R> page(BasicdataCustomerBaseVO basicdataCustomerBase, Query query) { + IPage pages = basicdataCustomerBaseService.selectBasicdataCustomerBasePage(Condition.getPage(query), basicdataCustomerBase); + return R.data(pages); + } + + /** + * 基础客户基地表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataCustomerBase") + public R save(@Valid @RequestBody BasicdataCustomerBaseEntity basicdataCustomerBase) { + return R.status(basicdataCustomerBaseService.save(basicdataCustomerBase)); + } + + /** + * 基础客户基地表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataCustomerBase") + public R update(@Valid @RequestBody BasicdataCustomerBaseEntity basicdataCustomerBase) { + return R.status(basicdataCustomerBaseService.updateById(basicdataCustomerBase)); + } + + /** + * 基础客户基地表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataCustomerBase") + public R submit(@Valid @RequestBody BasicdataCustomerBaseEntity basicdataCustomerBase) { + return R.status(basicdataCustomerBaseService.saveOrUpdate(basicdataCustomerBase)); + } + + /** + * 基础客户基地表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataCustomerBaseService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataCustomerBase") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataCustomerBase") + public void exportBasicdataCustomerBase(@ApiIgnore @RequestParam Map basicdataCustomerBase, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataCustomerBase, BasicdataCustomerBaseEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataCustomerBase::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataCustomerBaseEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataCustomerBaseService.exportBasicdataCustomerBase(queryWrapper); + ExcelUtil.export(response, "基础客户基地表数据" + DateUtil.time(), "基础客户基地表数据表", list, BasicdataCustomerBaseExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCustomerStoreController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCustomerStoreController.java new file mode 100644 index 000000000..71ad951e2 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCustomerStoreController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import com.logpm.basicdata.vo.BasicdataCustomerStoreVO; +import com.logpm.basicdata.excel.BasicdataCustomerStoreExcel; +import com.logpm.basicdata.service.IBasicdataCustomerStoreService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 基础客户商场表 控制器 + * + * @author cyz + * @since 2023-06-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/basicdataCustomerStore") +@Api(value = "基础客户商场表", tags = "基础客户商场表接口") +public class BasicdataCustomerStoreController extends BladeController { + + private final IBasicdataCustomerStoreService basicdataCustomerStoreService; + + /** + * 基础客户商场表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataCustomerStore") + public R detail(BasicdataCustomerStoreEntity basicdataCustomerStore) { + BasicdataCustomerStoreEntity detail = basicdataCustomerStoreService.getOne(Condition.getQueryWrapper(basicdataCustomerStore)); + return R.data(detail); + } + /** + * 基础客户商场表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataCustomerStore") + public R> list(@ApiIgnore @RequestParam Map basicdataCustomerStore, Query query) { + IPage pages = basicdataCustomerStoreService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataCustomerStore, BasicdataCustomerStoreEntity.class)); + return R.data(pages); + } + + /** + * 基础客户商场表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataCustomerStore") + public R> page(BasicdataCustomerStoreVO basicdataCustomerStore, Query query) { + IPage pages = basicdataCustomerStoreService.selectBasicdataCustomerStorePage(Condition.getPage(query), basicdataCustomerStore); + return R.data(pages); + } + + /** + * 基础客户商场表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataCustomerStore") + public R save(@Valid @RequestBody BasicdataCustomerStoreEntity basicdataCustomerStore) { + return R.status(basicdataCustomerStoreService.save(basicdataCustomerStore)); + } + + /** + * 基础客户商场表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataCustomerStore") + public R update(@Valid @RequestBody BasicdataCustomerStoreEntity basicdataCustomerStore) { + return R.status(basicdataCustomerStoreService.updateById(basicdataCustomerStore)); + } + + /** + * 基础客户商场表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataCustomerStore") + public R submit(@Valid @RequestBody BasicdataCustomerStoreEntity basicdataCustomerStore) { + return R.status(basicdataCustomerStoreService.saveOrUpdate(basicdataCustomerStore)); + } + + /** + * 基础客户商场表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataCustomerStoreService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataCustomerStore") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataCustomerStore") + public void exportBasicdataCustomerStore(@ApiIgnore @RequestParam Map basicdataCustomerStore, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataCustomerStore, BasicdataCustomerStoreEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataCustomerStore::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataCustomerStoreEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataCustomerStoreService.exportBasicdataCustomerStore(queryWrapper); + ExcelUtil.export(response, "基础客户商场表数据" + DateUtil.time(), "基础客户商场表数据表", list, BasicdataCustomerStoreExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java index c4519d977..448afa2d5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java @@ -117,7 +117,8 @@ public class BasicdataFreightController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入basicdataFreight") public R submit(@Valid @RequestBody BasicdataFreightEntity basicdataFreight) { - return R.status(basicdataFreightService.saveOrUpdate(basicdataFreight)); + + return R.status(basicdataFreightService.ownSaveOrUpdate(basicdataFreight)); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCustomerBaseDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCustomerBaseDTO.java new file mode 100644 index 000000000..9bc63bd82 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCustomerBaseDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础客户基地表 数据传输对象实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataCustomerBaseDTO extends BasicdataCustomerBaseEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCustomerStoreDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCustomerStoreDTO.java new file mode 100644 index 000000000..234baae69 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCustomerStoreDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础客户商场表 数据传输对象实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataCustomerStoreDTO extends BasicdataCustomerStoreEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCustomerBaseExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCustomerBaseExcel.java new file mode 100644 index 000000000..330974add --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCustomerBaseExcel.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 基础客户基地表 Excel实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataCustomerBaseExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 基地名称 + */ + @ColumnWidth(20) + @ExcelProperty("基地名称") + private String baseName; + /** + * 基地编码 + */ + @ColumnWidth(20) + @ExcelProperty("基地编码") + private String baseCode; + /** + * 客户ID + */ + @ColumnWidth(20) + @ExcelProperty("客户ID") + private String clientId; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCustomerStoreExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCustomerStoreExcel.java new file mode 100644 index 000000000..cc37ec356 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCustomerStoreExcel.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 基础客户商场表 Excel实体类 + * + * @author cyz + * @since 2023-06-09 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataCustomerStoreExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 商场名称 + */ + @ColumnWidth(20) + @ExcelProperty("商场名称") + private String storeName; + /** + * 商场编码 + */ + @ColumnWidth(20) + @ExcelProperty("商场编码") + private String storeCode; + /** + * 客户ID + */ + @ColumnWidth(20) + @ExcelProperty("客户ID") + private String clientId; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCustomerBaseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCustomerBaseClient.java new file mode 100644 index 000000000..a55f36e1d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCustomerBaseClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import com.logpm.basicdata.service.IBasicdataCustomerBaseService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 基础客户基地表 Feign实现类 + * + * @author cyz + * @since 2023-06-09 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataCustomerBaseClient implements IBasicdataCustomerBaseClient { + + private final IBasicdataCustomerBaseService basicdataCustomerBaseService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataCustomerBaseService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCustomerStoreClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCustomerStoreClient.java new file mode 100644 index 000000000..0627462f0 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCustomerStoreClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import com.logpm.basicdata.service.IBasicdataCustomerStoreService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 基础客户商场表 Feign实现类 + * + * @author cyz + * @since 2023-06-09 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataCustomerStoreClient implements IBasicdataCustomerStoreClient { + + private final IBasicdataCustomerStoreService basicdataCustomerStoreService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataCustomerStoreService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerBaseMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerBaseMapper.java new file mode 100644 index 000000000..1c06d282e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerBaseMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import com.logpm.basicdata.vo.BasicdataCustomerBaseVO; +import com.logpm.basicdata.excel.BasicdataCustomerBaseExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 基础客户基地表 Mapper 接口 + * + * @author cyz + * @since 2023-06-09 + */ +public interface BasicdataCustomerBaseMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataCustomerBase + * @return + */ + List selectBasicdataCustomerBasePage(IPage page, BasicdataCustomerBaseVO basicdataCustomerBase); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataCustomerBase(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerBaseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerBaseMapper.xml new file mode 100644 index 000000000..7277fbf10 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerBaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerStoreMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerStoreMapper.java new file mode 100644 index 000000000..9ad751831 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerStoreMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import com.logpm.basicdata.vo.BasicdataCustomerStoreVO; +import com.logpm.basicdata.excel.BasicdataCustomerStoreExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 基础客户商场表 Mapper 接口 + * + * @author cyz + * @since 2023-06-09 + */ +public interface BasicdataCustomerStoreMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataCustomerStore + * @return + */ + List selectBasicdataCustomerStorePage(IPage page, BasicdataCustomerStoreVO basicdataCustomerStore); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataCustomerStore(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerStoreMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerStoreMapper.xml new file mode 100644 index 000000000..7b1a3c5c0 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCustomerStoreMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCustomerBaseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCustomerBaseService.java new file mode 100644 index 000000000..98a9884f5 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCustomerBaseService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import com.logpm.basicdata.vo.BasicdataCustomerBaseVO; +import com.logpm.basicdata.excel.BasicdataCustomerBaseExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 基础客户基地表 服务类 + * + * @author cyz + * @since 2023-06-09 + */ +public interface IBasicdataCustomerBaseService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataCustomerBase + * @return + */ + IPage selectBasicdataCustomerBasePage(IPage page, BasicdataCustomerBaseVO basicdataCustomerBase); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataCustomerBase(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCustomerStoreService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCustomerStoreService.java new file mode 100644 index 000000000..eab140e46 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCustomerStoreService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import com.logpm.basicdata.vo.BasicdataCustomerStoreVO; +import com.logpm.basicdata.excel.BasicdataCustomerStoreExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 基础客户商场表 服务类 + * + * @author cyz + * @since 2023-06-09 + */ +public interface IBasicdataCustomerStoreService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataCustomerStore + * @return + */ + IPage selectBasicdataCustomerStorePage(IPage page, BasicdataCustomerStoreVO basicdataCustomerStore); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataCustomerStore(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataFreightService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataFreightService.java index d31e0ba7f..2a8db5ee4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataFreightService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataFreightService.java @@ -22,6 +22,7 @@ import com.logpm.basicdata.vo.BasicdataFreightVO; import com.logpm.basicdata.excel.BasicdataFreightExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; + import java.util.List; /** @@ -49,4 +50,10 @@ public interface IBasicdataFreightService extends BaseService exportBasicdataFreight(Wrapper queryWrapper); + /** + * 添加或修改 + * @param basicdataFreight + * @return + */ + Boolean ownSaveOrUpdate(BasicdataFreightEntity basicdataFreight); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 38b398428..042c9bcc0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -21,14 +21,17 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity; +import com.logpm.basicdata.entity.BasicdataStoreContactEntity; import com.logpm.basicdata.mapper.BasicdataHistoricalContractMapper; import com.logpm.basicdata.service.IBasicdataHistoricalContractService; +import com.logpm.basicdata.service.IBasicdataStoreContactService; import com.logpm.basicdata.vo.BasicdataClientVO; import com.logpm.basicdata.excel.BasicdataClientExcel; import com.logpm.basicdata.mapper.BasicdataClientMapper; import com.logpm.basicdata.service.IBasicdataClientService; import com.logpm.basicdata.vo.BasicdataHistoricalContractVO; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -43,12 +46,14 @@ import java.util.List; * @author cyz * @since 2023-05-16 */ +@Slf4j @Service @AllArgsConstructor public class BasicdataClientServiceImpl extends BaseServiceImpl implements IBasicdataClientService { - private IBasicdataHistoricalContractService basicdataHistoricalContractService; + private final IBasicdataHistoricalContractService basicdataHistoricalContractService; + private final IBasicdataStoreContactService basicdataStoreContactService; @Override public IPage selectBasicdataClientPage(IPage page, BasicdataClientVO basicdataClient) { @@ -73,11 +78,24 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl implements IBasicdataCustomerBaseService { + + @Override + public IPage selectBasicdataCustomerBasePage(IPage page, BasicdataCustomerBaseVO basicdataCustomerBase) { + return page.setRecords(baseMapper.selectBasicdataCustomerBasePage(page, basicdataCustomerBase)); + } + + + @Override + public List exportBasicdataCustomerBase(Wrapper queryWrapper) { + List basicdataCustomerBaseList = baseMapper.exportBasicdataCustomerBase(queryWrapper); + //basicdataCustomerBaseList.forEach(basicdataCustomerBase -> { + // basicdataCustomerBase.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataCustomerBase.getType())); + //}); + return basicdataCustomerBaseList; + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCustomerStoreServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCustomerStoreServiceImpl.java new file mode 100644 index 000000000..0402c145a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCustomerStoreServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import com.logpm.basicdata.vo.BasicdataCustomerStoreVO; +import com.logpm.basicdata.excel.BasicdataCustomerStoreExcel; +import com.logpm.basicdata.mapper.BasicdataCustomerStoreMapper; +import com.logpm.basicdata.service.IBasicdataCustomerStoreService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 基础客户商场表 服务实现类 + * + * @author cyz + * @since 2023-06-09 + */ +@Service +public class BasicdataCustomerStoreServiceImpl extends BaseServiceImpl implements IBasicdataCustomerStoreService { + + @Override + public IPage selectBasicdataCustomerStorePage(IPage page, BasicdataCustomerStoreVO basicdataCustomerStore) { + return page.setRecords(baseMapper.selectBasicdataCustomerStorePage(page, basicdataCustomerStore)); + } + + + @Override + public List exportBasicdataCustomerStore(Wrapper queryWrapper) { + List basicdataCustomerStoreList = baseMapper.exportBasicdataCustomerStore(queryWrapper); + //basicdataCustomerStoreList.forEach(basicdataCustomerStore -> { + // basicdataCustomerStore.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataCustomerStore.getType())); + //}); + return basicdataCustomerStoreList; + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java index 3014afb29..311917415 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java @@ -21,6 +21,8 @@ import com.logpm.basicdata.vo.BasicdataFreightVO; import com.logpm.basicdata.excel.BasicdataFreightExcel; import com.logpm.basicdata.mapper.BasicdataFreightMapper; import com.logpm.basicdata.service.IBasicdataFreightService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -34,6 +36,8 @@ import java.util.List; * @since 2023-06-08 */ @Service +@AllArgsConstructor +@Slf4j public class BasicdataFreightServiceImpl extends BaseServiceImpl implements IBasicdataFreightService { @Override @@ -51,4 +55,17 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl voList = new ArrayList<>(); if(Func.isNotEmpty(o1) && Func.isNotEmpty(o)){ String o2 = (String) o; List l = Arrays.asList(o2.split(",")); @@ -111,15 +115,33 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl collect = listAll.stream().collect(Collectors.groupingBy(p -> p.getBrandId(), Collectors.counting())); collect.forEach((k, v) -> System.out.println(k + ":" + v)); + + collect.forEach((k,v) ->{ + if(v >= l.size()){ + List coll =basicdataStoreBrandVOS.stream().filter(distinctByKey(person -> person.getBrandId())).collect(Collectors.toList()) + .stream().map(e -> { + if (k.equals(e.getBrandId())) { + return e; + } + return null; + }).collect(Collectors.toList()); + voList.addAll(coll); + } + + }); + } - return null; + return voList; } + public static Predicate distinctByKey(Function keyExtractor) { + Map seen = new ConcurrentHashMap<>(16); + return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null; + } + + } diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 26af3dd3b..eb5b4757e 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-3-27 13:32:56", - "updatedTime": "2023-6-8 11:27:20", + "updatedTime": "2023-6-9 17:53:49", "dbConns": [], "profile": { "default": { @@ -747,7 +747,7 @@ "#DDE5FF" ], "DDLToggleCase": "L", - "menuWidth": "469px", + "menuWidth": "407px", "themeMode": "themeDay" }, "entities": [ @@ -34385,6 +34385,888 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "865E2039-46B4-4BF2-948F-696FFB16E73E", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "logpm_dasicdata_customer_base", + "defName": "基础客户基地表", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "tenant_id", + "defName": "租户号", + "comment": "", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "refDict": "", + "uiHint": "", + "id": "B4C01877-359B-4FFC-9FCF-1C132153AAE1" + }, + { + "defKey": "create_user", + "defName": "创建人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "D8710354-A715-448A-B39E-DFD94EF155B9" + }, + { + "defKey": "create_time", + "defName": "创建时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "7C78459F-56EE-4C55-BFD8-CD8E6D36500C" + }, + { + "defKey": "update_user", + "defName": "更新人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "2F0F665F-942F-4FE6-94DA-1047652D2FFF" + }, + { + "defKey": "update_time", + "defName": "更新时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "89D65E2C-86C6-448D-BD1B-E10935A20A00" + }, + { + "defKey": "status", + "defName": "状态", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "6E26C5D0-A2BE-4042-B0E2-54BE9223CA02" + }, + { + "defKey": "is_deleted", + "defName": "是否已删除", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "31CEBA66-E6A0-4941-B8FA-924B482CEEB6" + }, + { + "defKey": "create_dept", + "defName": "创建部门", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "5DC597CE-97AC-4D7D-A2B5-33C3FD3092BE" + }, + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5419408F-E6C5-469F-92FD-1DF5156C7D00" + }, + { + "defKey": "reserve1", + "defName": "预留1", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "8171C907-F5F1-4DA5-AB32-F2593E0C90EC" + }, + { + "defKey": "reserve2", + "defName": "预留2", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "C11E30BC-5501-49DF-BD4F-2463F24E8E0C" + }, + { + "defKey": "reserve3", + "defName": "预留3", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "CB97F130-EF00-4E5D-9A0A-9E3673AF7FA3" + }, + { + "defKey": "reserve4", + "defName": "预留4", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "45E868E1-4E33-4DF2-83D2-5621405AD22E" + }, + { + "defKey": "reserve5", + "defName": "预留5", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "02BEA355-3AF8-424A-A9AB-7E06EDBE660A" + }, + { + "defKey": "base_name", + "defName": "基地名称", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "54F6237A-6F86-4BFC-8196-92AAED6D111F" + }, + { + "defKey": "base_code", + "defName": "基地编码", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "8E3BC494-3977-46CD-8A43-1B6D6BAD191E" + }, + { + "defKey": "client_id", + "defName": "客户ID", + "comment": "", + "type": "VARCHAR", + "len": 20, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "16802020-D772-4A7F-8491-E743BA1CD012" + } + ], + "correlations": [], + "indexes": [] + }, + { + "id": "74441E51-EDB1-49F8-AD27-8506AF889909", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "logpm_basicdata_customer_store", + "defName": "基础客户商场表", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "tenant_id", + "defName": "租户号", + "comment": "", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "refDict": "", + "uiHint": "", + "id": "FCA92C50-C893-44FA-B5C7-8A9890A5A130" + }, + { + "defKey": "create_user", + "defName": "创建人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "F9355829-3836-47AD-BA3F-4CE49D48606B" + }, + { + "defKey": "create_time", + "defName": "创建时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "5F43C18C-9F62-46A9-A832-A42A8F377B6D" + }, + { + "defKey": "update_user", + "defName": "更新人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "74001DF8-947B-4C93-A4A5-262CDAEDFD53" + }, + { + "defKey": "update_time", + "defName": "更新时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "07D4A930-CBFC-4425-8FB0-D2AF089089FE" + }, + { + "defKey": "status", + "defName": "状态", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "FC82B54C-C4FC-4B2C-80FC-1E8CF423D643" + }, + { + "defKey": "is_deleted", + "defName": "是否已删除", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "256A090D-9767-459E-A960-33C1DDF9DB1E" + }, + { + "defKey": "create_dept", + "defName": "创建部门", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "88DAD418-245B-43A6-AECE-F45F163CB87A" + }, + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C6C9C6C6-71E3-4DD9-889D-9D9AD8556EC3" + }, + { + "defKey": "reserve1", + "defName": "预留1", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "30B6F1FC-AE06-4059-AC20-A81BAD17F6DB" + }, + { + "defKey": "reserve2", + "defName": "预留2", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "A446DB00-8D7A-4EE9-A743-F3F4F3083FC9" + }, + { + "defKey": "reserve3", + "defName": "预留3", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "2C1D62E7-9B35-41E0-909E-D744F246E8D5" + }, + { + "defKey": "reserve4", + "defName": "预留4", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "590F5E1F-7EA2-44C0-9C9E-879C4EC134F7" + }, + { + "defKey": "reserve5", + "defName": "预留5", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "0DC9DD7A-2E6D-4450-94C5-D901657F6AB6" + }, + { + "defKey": "store_name", + "defName": "商场名称", + "comment": "", + "type": "VARCHAR", + "len": 50, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "59FA27C8-B4BB-4620-897F-4D54CDA6DDF7" + }, + { + "defKey": "store_code", + "defName": "商场编码", + "comment": "", + "type": "VARCHAR", + "len": 50, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "42BB0891-F19B-4297-A07C-44264F8E69D1" + }, + { + "defKey": "client_id", + "defName": "客户ID", + "comment": "", + "type": "VARCHAR", + "len": 20, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5FCC176E-CF0E-4025-9E59-5398FD5C4CDB" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -34464,7 +35346,9 @@ "001983CF-CC73-4913-B17C-DC0B9AD74585", "94D9FA31-F4D1-4F34-91D7-6C72598A7F91", "E537F18D-462D-4551-9BFF-25DF347A2EE5", - "B8E50F9F-033E-4F86-8443-D849F4A0F013" + "B8E50F9F-033E-4F86-8443-D849F4A0F013", + "865E2039-46B4-4BF2-948F-696FFB16E73E", + "74441E51-EDB1-49F8-AD27-8506AF889909" ], "refViews": [], "refDiagrams": [],