yuansh 5 mēneši atpakaļ
vecāks
revīzija
12bce3ab9e
20 mainītis faili ar 731 papildinājumiem un 8 dzēšanām
  1. 2 1
      jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
  2. 1 1
      jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
  3. 5 1
      jeecg-module-system/jeecg-system-start/pom.xml
  4. 2 0
      jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
  5. 1 1
      jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
  6. 3 3
      jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties
  7. 2 1
      pom.xml
  8. 28 0
      srm-module-code/pom.xml
  9. 180 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProductArchiveController.java
  10. 181 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProductClassController.java
  11. 130 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductArchive.java
  12. 86 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductClass.java
  13. 17 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProductArchiveMapper.java
  14. 17 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProductClassMapper.java
  15. 5 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProductArchiveMapper.xml
  16. 5 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProductClassMapper.xml
  17. 14 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProductArchiveService.java
  18. 14 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProductClassService.java
  19. 19 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProductArchiveServiceImpl.java
  20. 19 0
      srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProductClassServiceImpl.java

+ 2 - 1
jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -65,7 +65,8 @@ public class Swagger2Config implements WebMvcConfigurer {
                 .apiInfo(apiInfo())
                 .select()
                 //此包路径下的类,才生成接口文档
-                .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
+//                .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
+                .apis(RequestHandlerSelectors.basePackage("com.cuidian"))
                 //加了ApiOperation注解的类,才生成接口文档
                 .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))

+ 1 - 1
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java

@@ -30,7 +30,7 @@ import net.sf.jsqlparser.expression.LongValue;
  *
  */
 @Configuration
-@MapperScan(value={"org.jeecg.**.mapper*"})
+@MapperScan(value={"org.jeecg.**.mapper*","com.cuidian.**.mapper*"})
 public class MybatisPlusSaasConfig {
 
     /**

+ 5 - 1
jeecg-module-system/jeecg-system-start/pom.xml

@@ -24,7 +24,11 @@
             <artifactId>jeecg-module-demo</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>com.cuidian.srm</groupId>
+            <artifactId>srm-module-code</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <!-- flyway 数据库自动升级 -->
         <dependency>
             <groupId>org.flywaydb</groupId>

+ 2 - 0
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
@@ -19,6 +20,7 @@ import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication
 //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
+@ComponentScan(basePackages = {"com.cuidian","org.jeecg"})
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     @Override

+ 1 - 1
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -179,7 +179,7 @@ spring:
     password: ''
 #mybatis plus 设置
 mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
+  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/cuidian/**/xml/*Mapper.xml
   global-config:
     # 关闭MP3.0自带的banner
     banner: false

+ 3 - 3
jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://106.15.206.14:3306/global-srm?useUnicode=true&characterEncoding=UTF-8
 username=root
-password=root
-database_name=jeecg-boot
+password=CuiDian1234
+database_name=global-srm
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver

+ 2 - 1
pom.xml

@@ -85,7 +85,8 @@
         <module>jeecg-boot-base-core</module>
         <module>jeecg-module-demo</module>
         <module>jeecg-module-system</module>
-    </modules>
+		<module>srm-module-code</module>
+	</modules>
 
 	<repositories>
 		<repository>

+ 28 - 0
srm-module-code/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <groupId>org.jeecgframework.boot</groupId>
+        <version>3.7.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>srm-module-code</artifactId>
+    <groupId>com.cuidian.srm</groupId>
+    <version>1.0.0</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 180 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProductArchiveController.java

@@ -0,0 +1,180 @@
+package com.cuidian.srm.baseCode.controller;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import com.cuidian.srm.baseCode.entity.BaseProductArchive;
+import com.cuidian.srm.baseCode.service.IBaseProductArchiveService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: base_product_archive
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+@Api(tags="base_product_archive")
+@RestController
+@RequestMapping("/baseCode/baseProductArchive")
+@Slf4j
+public class BaseProductArchiveController extends JeecgController<BaseProductArchive, IBaseProductArchiveService> {
+	@Autowired
+	private IBaseProductArchiveService baseProductArchiveService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param baseProductArchive
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "base_product_archive-分页列表查询")
+	@ApiOperation(value="base_product_archive-分页列表查询", notes="base_product_archive-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BaseProductArchive>> queryPageList(BaseProductArchive baseProductArchive,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+        QueryWrapper<BaseProductArchive> queryWrapper = QueryGenerator.initQueryWrapper(baseProductArchive, req.getParameterMap());
+		Page<BaseProductArchive> page = new Page<BaseProductArchive>(pageNo, pageSize);
+		IPage<BaseProductArchive> pageList = baseProductArchiveService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param baseProductArchive
+	 * @return
+	 */
+	@AutoLog(value = "base_product_archive-添加")
+	@ApiOperation(value="base_product_archive-添加", notes="base_product_archive-添加")
+	@RequiresPermissions("baseCode:base_product_archive:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BaseProductArchive baseProductArchive) {
+		baseProductArchiveService.save(baseProductArchive);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param baseProductArchive
+	 * @return
+	 */
+	@AutoLog(value = "base_product_archive-编辑")
+	@ApiOperation(value="base_product_archive-编辑", notes="base_product_archive-编辑")
+	@RequiresPermissions("baseCode:base_product_archive:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BaseProductArchive baseProductArchive) {
+		baseProductArchiveService.updateById(baseProductArchive);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "base_product_archive-通过id删除")
+	@ApiOperation(value="base_product_archive-通过id删除", notes="base_product_archive-通过id删除")
+	@RequiresPermissions("baseCode:base_product_archive:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		baseProductArchiveService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "base_product_archive-批量删除")
+	@ApiOperation(value="base_product_archive-批量删除", notes="base_product_archive-批量删除")
+	@RequiresPermissions("baseCode:base_product_archive:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.baseProductArchiveService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "base_product_archive-通过id查询")
+	@ApiOperation(value="base_product_archive-通过id查询", notes="base_product_archive-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BaseProductArchive> queryById(@RequestParam(name="id",required=true) String id) {
+		BaseProductArchive baseProductArchive = baseProductArchiveService.getById(id);
+		if(baseProductArchive==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(baseProductArchive);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param baseProductArchive
+    */
+    @RequiresPermissions("baseCode:base_product_archive:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BaseProductArchive baseProductArchive) {
+        return super.exportXls(request, baseProductArchive, BaseProductArchive.class, "base_product_archive");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("baseCode:base_product_archive:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BaseProductArchive.class);
+    }
+
+}

+ 181 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProductClassController.java

@@ -0,0 +1,181 @@
+package com.cuidian.srm.baseCode.controller;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.cuidian.srm.baseCode.entity.BaseProductClass;
+import com.cuidian.srm.baseCode.service.IBaseProductClassService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 产品分类
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+@Api(tags="产品分类")
+@RestController
+@RequestMapping("/baseCode/baseProductClass")
+@Slf4j
+public class BaseProductClassController extends JeecgController<BaseProductClass, IBaseProductClassService> {
+	@Autowired
+	private IBaseProductClassService baseProductClassService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param baseProductClass
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "产品分类-分页列表查询")
+	@ApiOperation(value="产品分类-分页列表查询", notes="产品分类-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BaseProductClass>> queryPageList(BaseProductClass baseProductClass,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+        QueryWrapper<BaseProductClass> queryWrapper = QueryGenerator.initQueryWrapper(baseProductClass, req.getParameterMap());
+		Page<BaseProductClass> page = new Page<BaseProductClass>(pageNo, pageSize);
+		IPage<BaseProductClass> pageList = baseProductClassService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param baseProductClass
+	 * @return
+	 */
+	@AutoLog(value = "产品分类-添加")
+	@ApiOperation(value="产品分类-添加", notes="产品分类-添加")
+	@RequiresPermissions("baseCode:base_product_class:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BaseProductClass baseProductClass) {
+		baseProductClassService.save(baseProductClass);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param baseProductClass
+	 * @return
+	 */
+	@AutoLog(value = "产品分类-编辑")
+	@ApiOperation(value="产品分类-编辑", notes="产品分类-编辑")
+	@RequiresPermissions("baseCode:base_product_class:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BaseProductClass baseProductClass) {
+		baseProductClassService.updateById(baseProductClass);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "产品分类-通过id删除")
+	@ApiOperation(value="产品分类-通过id删除", notes="产品分类-通过id删除")
+	@RequiresPermissions("baseCode:base_product_class:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		baseProductClassService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "产品分类-批量删除")
+	@ApiOperation(value="产品分类-批量删除", notes="产品分类-批量删除")
+	@RequiresPermissions("baseCode:base_product_class:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.baseProductClassService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "产品分类-通过id查询")
+	@ApiOperation(value="产品分类-通过id查询", notes="产品分类-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BaseProductClass> queryById(@RequestParam(name="id",required=true) String id) {
+		BaseProductClass baseProductClass = baseProductClassService.getById(id);
+		if(baseProductClass==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(baseProductClass);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param baseProductClass
+    */
+    @RequiresPermissions("baseCode:base_product_class:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BaseProductClass baseProductClass) {
+        return super.exportXls(request, baseProductClass, BaseProductClass.class, "产品分类");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("baseCode:base_product_class:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BaseProductClass.class);
+    }
+
+}

+ 130 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductArchive.java

@@ -0,0 +1,130 @@
+package com.cuidian.srm.baseCode.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: base_product_archive
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_product_archive")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_product_archive对象", description="base_product_archive")
+public class BaseProductArchive implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+	/**状态(1-启用,0-停用)*/
+	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+    @ApiModelProperty(value = "状态(1-启用,0-停用)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**产品分类*/
+	@Excel(name = "产品分类", width = 15)
+    @ApiModelProperty(value = "产品分类")
+    private String classId;
+	/**编码*/
+	@Excel(name = "编码", width = 15)
+    @ApiModelProperty(value = "编码")
+    private String code;
+	/**中文名*/
+	@Excel(name = "中文名", width = 15)
+    @ApiModelProperty(value = "中文名")
+    private String chineseName;
+	/**英文名*/
+	@Excel(name = "英文名", width = 15)
+    @ApiModelProperty(value = "英文名")
+    private String englishName;
+	/**中文别名*/
+	@Excel(name = "中文别名", width = 15)
+    @ApiModelProperty(value = "中文别名")
+    private String chineseAlias;
+	/**英文别名*/
+	@Excel(name = "英文别名", width = 15)
+    @ApiModelProperty(value = "英文别名")
+    private String englishAlias;
+	/**型号*/
+	@Excel(name = "型号", width = 15)
+    @ApiModelProperty(value = "型号")
+    private String model;
+	/**备件号*/
+	@Excel(name = "备件号", width = 15)
+    @ApiModelProperty(value = "备件号")
+    private String partno;
+	/**订货号*/
+	@Excel(name = "订货号", width = 15)
+    @ApiModelProperty(value = "订货号")
+    private String orderno;
+	/**图号*/
+	@Excel(name = "图号", width = 15)
+    @ApiModelProperty(value = "图号")
+    private String drawingno;
+	/**税率*/
+	@Excel(name = "税率", width = 15)
+    @ApiModelProperty(value = "税率")
+    private Double taxRate;
+	/**计量单位*/
+	@Excel(name = "计量单位", width = 15)
+    @ApiModelProperty(value = "计量单位")
+    private String measurementUnit;
+	/**有害物质(1-是,0-否)*/
+	@Excel(name = "有害物质(1-是,0-否)", width = 15)
+    @ApiModelProperty(value = "有害物质(1-是,0-否)")
+    private Integer harmfulSubstances;
+	/**虚拟产品(1-是,0-否)*/
+	@Excel(name = "虚拟产品(1-是,0-否)", width = 15)
+    @ApiModelProperty(value = "虚拟产品(1-是,0-否)")
+    private Integer virtualProduct;
+	/**返佣(1-是,0-否)*/
+	@Excel(name = "返佣(1-是,0-否)", width = 15)
+    @ApiModelProperty(value = "返佣(1-是,0-否)")
+    private Integer commissionRebate;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String notes;
+}

+ 86 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductClass.java

@@ -0,0 +1,86 @@
+package com.cuidian.srm.baseCode.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 产品分类
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_product_class")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_product_class对象", description="产品分类")
+public class BaseProductClass implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+	/**状态(1-正常,2-冻结)*/
+	@Excel(name = "状态(1-正常,2-冻结)", width = 15)
+    @ApiModelProperty(value = "状态(1-正常,2-冻结)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**编码*/
+	@Excel(name = "编码", width = 15)
+    @ApiModelProperty(value = "编码")
+    private String code;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+	/**父级主键*/
+	@Excel(name = "父级主键", width = 15)
+    @ApiModelProperty(value = "父级主键")
+    private Integer parentId;
+	/**毛利率*/
+	@Excel(name = "毛利率", width = 15)
+    @ApiModelProperty(value = "毛利率")
+    private Double grossMargin;
+	/**税率*/
+	@Excel(name = "税率", width = 15)
+    @ApiModelProperty(value = "税率")
+    private Double taxRate;
+}

+ 17 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProductArchiveMapper.java

@@ -0,0 +1,17 @@
+package com.cuidian.srm.baseCode.mapper;
+
+import java.util.List;
+
+import com.cuidian.srm.baseCode.entity.BaseProductArchive;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: base_product_archive
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+public interface BaseProductArchiveMapper extends BaseMapper<BaseProductArchive> {
+
+}

+ 17 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProductClassMapper.java

@@ -0,0 +1,17 @@
+package com.cuidian.srm.baseCode.mapper;
+
+import java.util.List;
+
+import com.cuidian.srm.baseCode.entity.BaseProductClass;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 产品分类
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+public interface BaseProductClassMapper extends BaseMapper<BaseProductClass> {
+
+}

+ 5 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProductArchiveMapper.xml

@@ -0,0 +1,5 @@
+<?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.cuidian.srm.baseCode.mapper.BaseProductArchiveMapper">
+
+</mapper>

+ 5 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProductClassMapper.xml

@@ -0,0 +1,5 @@
+<?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.cuidian.srm.baseCode.mapper.BaseProductClassMapper">
+
+</mapper>

+ 14 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProductArchiveService.java

@@ -0,0 +1,14 @@
+package com.cuidian.srm.baseCode.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cuidian.srm.baseCode.entity.BaseProductArchive;
+
+/**
+ * @Description: base_product_archive
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+public interface IBaseProductArchiveService extends IService<BaseProductArchive> {
+
+}

+ 14 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProductClassService.java

@@ -0,0 +1,14 @@
+package com.cuidian.srm.baseCode.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cuidian.srm.baseCode.entity.BaseProductClass;
+
+/**
+ * @Description: 产品分类
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+public interface IBaseProductClassService extends IService<BaseProductClass> {
+
+}

+ 19 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProductArchiveServiceImpl.java

@@ -0,0 +1,19 @@
+package com.cuidian.srm.baseCode.service.impl;
+
+import com.cuidian.srm.baseCode.entity.BaseProductArchive;
+import com.cuidian.srm.baseCode.mapper.BaseProductArchiveMapper;
+import com.cuidian.srm.baseCode.service.IBaseProductArchiveService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: base_product_archive
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+@Service
+public class BaseProductArchiveServiceImpl extends ServiceImpl<BaseProductArchiveMapper, BaseProductArchive> implements IBaseProductArchiveService {
+
+}

+ 19 - 0
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProductClassServiceImpl.java

@@ -0,0 +1,19 @@
+package com.cuidian.srm.baseCode.service.impl;
+
+import com.cuidian.srm.baseCode.entity.BaseProductClass;
+import com.cuidian.srm.baseCode.mapper.BaseProductClassMapper;
+import com.cuidian.srm.baseCode.service.IBaseProductClassService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 产品分类
+ * @Author: jeecg-boot
+ * @Date:   2024-11-05
+ * @Version: V1.0
+ */
+@Service
+public class BaseProductClassServiceImpl extends ServiceImpl<BaseProductClassMapper, BaseProductClass> implements IBaseProductClassService {
+
+}