货商类型+货商

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java

@@ -1,4 +0,0 @@
-/*
- * @author pigx archetype
- */
-package com.bsd.pjcloud.erp.controller;

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java

@@ -1,6 +0,0 @@
-/*
- * @author pigx archetype
- * <p>
- * Mybatis Mapper 存放目录
- */
-package com.bsd.pjcloud.erp.mapper;

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java

@@ -1,4 +0,0 @@
-/*
- * @author pigx archetype
- */
-package com.bsd.pjcloud.erp.service;

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/SuperMarketErpApp.java

@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.erp;
+package com.bsd.pjcloud.supermarketerp;
 
 import com.bsd.pjcloud.common.feign.annotation.EnablePjcloudFeignClients;
 import com.bsd.pjcloud.common.security.annotation.EnablePjcloudResourceServer;
@@ -17,8 +17,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @EnableDiscoveryClient
 @EnablePjcloudResourceServer
 @SpringBootApplication
-public class ErpApp {
+public class SuperMarketErpApp {
     public static void main(String[] args) {
-        SpringApplication.run(ErpApp.class, args);
+        SpringApplication.run(SuperMarketErpApp.class, args);
     }
 }

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierController.java

@@ -0,0 +1,123 @@
+package com.bsd.pjcloud.supermarketerp.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
+import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 货商管理
+ *
+ * @author zjf
+ * @date 2024-12-20 12:07:42
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/smErpSupplier" )
+@Tag(description = "smErpSupplier" , name = "货商管理管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class SmErpSupplierController {
+
+    private final  SmErpSupplierService smErpSupplierService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param smErpSupplier 货商管理
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_view')" )
+    public R getSmErpSupplierPage(@ParameterObject Page page, @ParameterObject SmErpSupplierEntity smErpSupplier) {
+        LambdaQueryWrapper<SmErpSupplierEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.like(StrUtil.isNotBlank(smErpSupplier.getSupplierName()),SmErpSupplierEntity::getSupplierName,smErpSupplier.getSupplierName());
+		wrapper.eq(StrUtil.isNotBlank(smErpSupplier.getPhone()),SmErpSupplierEntity::getPhone,smErpSupplier.getPhone());
+		wrapper.like(StrUtil.isNotBlank(smErpSupplier.getLinkName()),SmErpSupplierEntity::getLinkName,smErpSupplier.getLinkName());
+        return R.ok(smErpSupplierService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询货商管理
+     * @param supplierId id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{supplierId}" )
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_view')" )
+    public R getById(@PathVariable("supplierId" ) Long supplierId) {
+        return R.ok(smErpSupplierService.getById(supplierId));
+    }
+
+    /**
+     * 新增货商管理
+     * @param smErpSupplier 货商管理
+     * @return R
+     */
+    @Operation(summary = "新增货商管理" , description = "新增货商管理" )
+    @SysLog("新增货商管理" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_add')" )
+    public R save(@RequestBody SmErpSupplierEntity smErpSupplier) {
+        return R.ok(smErpSupplierService.save(smErpSupplier));
+    }
+
+    /**
+     * 修改货商管理
+     * @param smErpSupplier 货商管理
+     * @return R
+     */
+    @Operation(summary = "修改货商管理" , description = "修改货商管理" )
+    @SysLog("修改货商管理" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_edit')" )
+    public R updateById(@RequestBody SmErpSupplierEntity smErpSupplier) {
+        return R.ok(smErpSupplierService.updateById(smErpSupplier));
+    }
+
+    /**
+     * 通过id删除货商管理
+     * @param ids supplierId列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除货商管理" , description = "通过id删除货商管理" )
+    @SysLog("通过id删除货商管理" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(smErpSupplierService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param smErpSupplier 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplier_export')" )
+    public List<SmErpSupplierEntity> export(SmErpSupplierEntity smErpSupplier,Long[] ids) {
+        return smErpSupplierService.list(Wrappers.lambdaQuery(smErpSupplier).in(ArrayUtil.isNotEmpty(ids), SmErpSupplierEntity::getSupplierId, ids));
+    }
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java

@@ -0,0 +1,123 @@
+package com.bsd.pjcloud.supermarketerp.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
+import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierTypeService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 货商类别
+ *
+ * @author zjf
+ * @date 2024-12-20 11:08:08
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/smErpSupplierType" )
+@Tag(description = "smErpSupplierType" , name = "货商类别管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class SmErpSupplierTypeController {
+
+    private final  SmErpSupplierTypeService smErpSupplierTypeService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param smErpSupplierType 货商类别
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplierType_view')" )
+    public R getSmErpSupplierTypePage(@ParameterObject Page page, @ParameterObject SmErpSupplierTypeEntity smErpSupplierType) {
+        LambdaQueryWrapper<SmErpSupplierTypeEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.like(StrUtil.isNotBlank(smErpSupplierType.getTypeName()),SmErpSupplierTypeEntity::getTypeName,smErpSupplierType.getTypeName());
+        return R.ok(smErpSupplierTypeService.pageScope(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询货商类别
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplierType_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(smErpSupplierTypeService.getById(id));
+    }
+
+    /**
+     * 新增货商类别
+     * @param smErpSupplierType 货商类别
+     * @return R
+     */
+    @Operation(summary = "新增货商类别" , description = "新增货商类别" )
+    @SysLog("新增货商类别" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplierType_add')" )
+    public R save(@RequestBody SmErpSupplierTypeEntity smErpSupplierType) {
+        smErpSupplierType.setDeptId(SecurityUtils.getUser().getDeptId());
+        return R.ok(smErpSupplierTypeService.save(smErpSupplierType));
+    }
+
+    /**
+     * 修改货商类别
+     * @param smErpSupplierType 货商类别
+     * @return R
+     */
+    @Operation(summary = "修改货商类别" , description = "修改货商类别" )
+    @SysLog("修改货商类别" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplierType_edit')" )
+    public R updateById(@RequestBody SmErpSupplierTypeEntity smErpSupplierType) {
+        return R.ok(smErpSupplierTypeService.updateById(smErpSupplierType));
+    }
+
+    /**
+     * 通过id删除货商类别
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除货商类别" , description = "通过id删除货商类别" )
+    @SysLog("通过id删除货商类别" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplierType_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(smErpSupplierTypeService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param smErpSupplierType 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('supermarketerp_smErpSupplierType_export')" )
+    public List<SmErpSupplierTypeEntity> export(SmErpSupplierTypeEntity smErpSupplierType,Long[] ids) {
+        return smErpSupplierTypeService.list(Wrappers.lambdaQuery(smErpSupplierType).in(ArrayUtil.isNotEmpty(ids), SmErpSupplierTypeEntity::getId, ids));
+    }
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierEntity.java

@@ -0,0 +1,163 @@
+package com.bsd.pjcloud.supermarketerp.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.time.LocalDateTime;
+
+/**
+ * 货商管理
+ *
+ * @author zjf
+ * @date 2024-12-20 12:07:42
+ */
+@Data
+@TenantTable
+@TableName("sm_erp_supplier")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "货商管理")
+public class SmErpSupplierEntity extends Model<SmErpSupplierEntity> {
+
+
+	/**
+	* 货商ID
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="货商ID")
+    private Long supplierId;
+
+	/**
+	* 货商名称
+	*/
+    @Schema(description="货商名称")
+    private String supplierName;
+
+	/**
+	* 货商地址
+	*/
+    @Schema(description="货商地址")
+    private String address;
+
+	/**
+	* 电话号码
+	*/
+    @Schema(description="电话号码")
+    private String phone;
+
+	/**
+	* 税号
+	*/
+    @Schema(description="税号")
+    private String tax;
+
+	/**
+	* 联系人
+	*/
+    @Schema(description="联系人")
+    private String linkName;
+
+	/**
+	* 开户行账号
+	*/
+    @Schema(description="开户行账号")
+    private String openAccount;
+
+	/**
+	* 邮箱地址
+	*/
+    @Schema(description="邮箱地址")
+    private String email;
+
+	/**
+	* 所属部门ID
+	*/
+    @Schema(description="所属部门ID")
+    private Long deptId;
+
+	/**
+	* 货商类别
+	*/
+    @Schema(description="货商类别")
+    private String supplierType;
+
+	/**
+	* 货商地区
+	*/
+    @Schema(description="货商地区")
+    private String supplierArea;
+
+	/**
+	* 修改时间
+	*/
+    @Schema(description="修改时间")
+    private LocalDateTime passwordModifyTime;
+
+	/**
+	* 开户行
+	*/
+    @Schema(description="开户行")
+    private String openName;
+
+	/**
+	* 合同号
+	*/
+    @Schema(description="合同号")
+    private String contractNumber;
+
+	/**
+	* 状态 0使用  1禁用
+	*/
+    @Schema(description="状态 0使用  1禁用")
+    private String status;
+
+	/**
+	* 拼音简码
+	*/
+    @Schema(description="拼音简码")
+    private String pinyinCod;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 修改人
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改人")
+    private String updateBy;
+
+	/**
+	* 修改时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记，0未删除，1已删除
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记，0未删除，1已删除")
+    private String delFlag;
+
+	/**
+	* 所属租户ID
+	*/
+    @Schema(description="所属租户ID")
+    private Long tenantId;
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierTypeEntity.java

@@ -0,0 +1,91 @@
+package com.bsd.pjcloud.supermarketerp.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.time.LocalDateTime;
+
+/**
+ * 货商类别
+ *
+ * @author zjf
+ * @date 2024-12-20 11:08:08
+ */
+@Data
+@TenantTable
+@TableName("sm_erp_supplier_type")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "货商类别")
+public class SmErpSupplierTypeEntity extends Model<SmErpSupplierTypeEntity> {
+
+
+	/**
+	* 类别ID
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="类别ID")
+    private Long id;
+
+	/**
+	* 货商类别名称
+	*/
+    @Schema(description="货商类别名称")
+    private String typeName;
+
+	/**
+	* 类别图片
+	*/
+    @Schema(description="类别图片")
+    private String typePic;
+
+	/**
+	* 所属部门ID
+	*/
+    @Schema(description="所属部门ID")
+    private Long deptId;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 修改人
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改人")
+    private String updateBy;
+
+	/**
+	* 修改时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="修改时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记，0未删除，1已删除
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记，0未删除，1已删除")
+    private String delFlag;
+
+	/**
+	* 所属租户ID
+	*/
+    @Schema(description="所属租户ID")
+    private Long tenantId;
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierMapper.java

@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.supermarketerp.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SmErpSupplierMapper extends PjcloudBaseMapper<SmErpSupplierEntity> {
+
+
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierTypeMapper.java

@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.supermarketerp.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SmErpSupplierTypeMapper extends PjcloudBaseMapper<SmErpSupplierTypeEntity> {
+
+
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierService.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.supermarketerp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
+
+public interface SmErpSupplierService extends IService<SmErpSupplierEntity> {
+
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierTypeService.java

@@ -0,0 +1,19 @@
+package com.bsd.pjcloud.supermarketerp.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
+
+public interface SmErpSupplierTypeService extends IService<SmErpSupplierTypeEntity> {
+
+
+    /**
+     * 分页查询
+     * 数据库过滤
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Object pageScope(Page page, LambdaQueryWrapper<SmErpSupplierTypeEntity> wrapper);
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierServiceImpl.java

@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.supermarketerp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
+import com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierMapper;
+import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
+import org.springframework.stereotype.Service;
+/**
+ * 货商管理
+ *
+ * @author zjf
+ * @date 2024-12-20 12:07:42
+ */
+@Service
+public class SmErpSupplierServiceImpl extends ServiceImpl<SmErpSupplierMapper, SmErpSupplierEntity> implements SmErpSupplierService {
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierTypeServiceImpl.java

@@ -0,0 +1,23 @@
+package com.bsd.pjcloud.supermarketerp.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
+import com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierTypeMapper;
+import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierTypeService;
+import org.springframework.stereotype.Service;
+/**
+ * 货商类别
+ *
+ * @author zjf
+ * @date 2024-12-20 11:08:08
+ */
+@Service
+public class SmErpSupplierTypeServiceImpl extends ServiceImpl<SmErpSupplierTypeMapper, SmErpSupplierTypeEntity> implements SmErpSupplierTypeService {
+    @Override
+    public Object pageScope(Page page, LambdaQueryWrapper<SmErpSupplierTypeEntity> wrapper) {
+       return baseMapper.selectPageByScope(page,wrapper, DataScope.of());
+    }
+}

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 6060
+  port: 5051
 
 spring:
   application:

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierMapper.xml

@@ -0,0 +1,30 @@
+<?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.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierMapper">
+
+  <resultMap id="smErpSupplierMap" type="com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity">
+        <id property="supplierId" column="supplier_id"/>
+        <result property="supplierName" column="supplier_name"/>
+        <result property="address" column="address"/>
+        <result property="phone" column="phone"/>
+        <result property="tax" column="tax"/>
+        <result property="linkName" column="link_name"/>
+        <result property="openAccount" column="open_account"/>
+        <result property="email" column="email"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="supplierType" column="supplier_type"/>
+        <result property="supplierArea" column="supplier_area"/>
+        <result property="passwordModifyTime" column="password_modify_time"/>
+        <result property="openName" column="open_name"/>
+        <result property="contractNumber" column="contract_number"/>
+        <result property="status" column="status"/>
+        <result property="pinyinCod" column="pinyin_cod"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+  </resultMap>
+</mapper>

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml

@@ -0,0 +1,18 @@
+<?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.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierTypeMapper">
+
+  <resultMap id="smErpSupplierTypeMap" type="com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity">
+        <id property="id" column="id"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typePic" column="type_pic"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+  </resultMap>
+</mapper>

seata/logs/seata_gc.log.4

@@ -1,5 +1,6 @@
-[0.015s][info][gc] Using G1
-[1.640s][info][gc] GC(0) Pause Young (Normal) (G1 Evacuation Pause) 102M->12M(2048M) 5.298ms
-[5.063s][info][gc] GC(1) Pause Young (Normal) (G1 Evacuation Pause) 103M->16M(2048M) 4.966ms
-[5.633s][info][gc] GC(2) Pause Young (Normal) (G1 Evacuation Pause) 125M->19M(2048M) 3.030ms
-[29.043s][info][gc] GC(3) Pause Young (Normal) (G1 Evacuation Pause) 248M->26M(2048M) 7.181ms
+[0.013s][info][gc] Using G1
+[1.389s][info][gc] GC(0) Pause Young (Normal) (G1 Evacuation Pause) 102M->13M(2048M) 5.780ms
+[2.397s][info][gc] GC(1) Pause Young (Normal) (G1 Evacuation Pause) 104M->16M(2048M) 6.254ms
+[2.942s][info][gc] GC(2) Pause Young (Normal) (G1 Evacuation Pause) 125M->19M(2048M) 4.206ms
+[7402.241s][info][gc] GC(3) Pause Young (Normal) (G1 Evacuation Pause) 398M->28M(2048M) 252.226ms
+[14703.441s][info][gc] GC(4) Pause Young (Normal) (G1 Evacuation Pause) 163M->29M(2048M) 13.963ms