From d284a6ee6d3e7d1b0f273b292de73016a34533c3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 17 三月 2025 14:14:15 +0800
Subject: [PATCH] art: eam 模块添加， 业务编码修改

---
 lxzn-module-eam/pom.xml                                                                                                                        |   25 +++++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java                        |  126 +++++++++++++++++++++++++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBusinessCodeRuleMapper.java                                |   14 ++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysBusinessCodeRuleService.java                             |   14 ++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBusinessCodeRuleMapper.xml                             |    5 +
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBusinessCodeRule.java                                      |   83 ++++++++++++++++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBusinessCodeRuleServiceImpl.java                     |   19 +++
 lxzn-module-system/lxzn-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai |    9 -
 pom.xml                                                                                                                                        |    3 
 9 files changed, 291 insertions(+), 7 deletions(-)

diff --git a/lxzn-module-eam/pom.xml b/lxzn-module-eam/pom.xml
new file mode 100644
index 0000000..1aaf5a1
--- /dev/null
+++ b/lxzn-module-eam/pom.xml
@@ -0,0 +1,25 @@
+<?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>lxzn-boot-parent</artifactId>
+        <groupId>org.jeecgframework.boot</groupId>
+        <version>3.4.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>lxzn-module-eam</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>lxzn-boot-base-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>lxzn-system-biz</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java
new file mode 100644
index 0000000..c662045
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java
@@ -0,0 +1,126 @@
+package org.jeecg.modules.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.system.entity.SysBusinessCodeRule;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+ /**
+ * @Description: 涓氬姟缂栫爜瑙勫垯
+ * @Author: jeecg-boot
+ * @Date:   2025-03-17
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="涓氬姟缂栫爜瑙勫垯")
+@RestController
+@RequestMapping("/sys/sysBusinessCodeRule")
+public class SysBusinessCodeRuleController extends JeecgController<SysBusinessCodeRule, ISysBusinessCodeRuleService> {
+	@Autowired
+	private ISysBusinessCodeRuleService sysBusinessCodeRuleService;
+	
+	/**
+	 * 鍒嗛〉鍒楄〃鏌ヨ
+	 *
+	 * @param sysBusinessCodeRule
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+//	@AutoLog(value = "涓氬姟缂栫爜瑙勫垯-鍒嗛〉鍒楄〃鏌ヨ")
+	@ApiOperation(value="涓氬姟缂栫爜瑙勫垯-鍒嗛〉鍒楄〃鏌ヨ", notes="涓氬姟缂栫爜瑙勫垯-鍒嗛〉鍒楄〃鏌ヨ")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SysBusinessCodeRule sysBusinessCodeRule,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SysBusinessCodeRule> queryWrapper = QueryGenerator.initQueryWrapper(sysBusinessCodeRule, req.getParameterMap());
+		Page<SysBusinessCodeRule> page = new Page<SysBusinessCodeRule>(pageNo, pageSize);
+		IPage<SysBusinessCodeRule> pageList = sysBusinessCodeRuleService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 娣诲姞
+	 *
+	 * @param sysBusinessCodeRule
+	 * @return
+	 */
+//	@AutoLog(value = "涓氬姟缂栫爜瑙勫垯-娣诲姞")
+	@ApiOperation(value="涓氬姟缂栫爜瑙勫垯-娣诲姞", notes="涓氬姟缂栫爜瑙勫垯-娣诲姞")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SysBusinessCodeRule sysBusinessCodeRule) {
+		sysBusinessCodeRuleService.save(sysBusinessCodeRule);
+		return Result.OK("娣诲姞鎴愬姛锛�");
+	}
+	
+	/**
+	 * 缂栬緫
+	 *
+	 * @param sysBusinessCodeRule
+	 * @return
+	 */
+//	@AutoLog(value = "涓氬姟缂栫爜瑙勫垯-缂栬緫")
+	@ApiOperation(value="涓氬姟缂栫爜瑙勫垯-缂栬緫", notes="涓氬姟缂栫爜瑙勫垯-缂栬緫")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody SysBusinessCodeRule sysBusinessCodeRule) {
+		sysBusinessCodeRuleService.updateById(sysBusinessCodeRule);
+		return Result.OK("缂栬緫鎴愬姛!");
+	}
+	
+	/**
+	 * 閫氳繃id鍒犻櫎
+	 *
+	 * @param id
+	 * @return
+	 */
+//	@AutoLog(value = "涓氬姟缂栫爜瑙勫垯-閫氳繃id鍒犻櫎")
+	@ApiOperation(value="涓氬姟缂栫爜瑙勫垯-閫氳繃id鍒犻櫎", notes="涓氬姟缂栫爜瑙勫垯-閫氳繃id鍒犻櫎")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		sysBusinessCodeRuleService.removeById(id);
+		return Result.OK("鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 * 鎵归噺鍒犻櫎
+	 *
+	 * @param ids
+	 * @return
+	 */
+//	@AutoLog(value = "涓氬姟缂栫爜瑙勫垯-鎵归噺鍒犻櫎")
+	@ApiOperation(value="涓氬姟缂栫爜瑙勫垯-鎵归噺鍒犻櫎", notes="涓氬姟缂栫爜瑙勫垯-鎵归噺鍒犻櫎")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.sysBusinessCodeRuleService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SysBusinessCodeRule sysBusinessCodeRule = sysBusinessCodeRuleService.getById(id);
+		return Result.OK(sysBusinessCodeRule);
+	}
+
+}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBusinessCodeRule.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBusinessCodeRule.java
new file mode 100644
index 0000000..d87f243
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBusinessCodeRule.java
@@ -0,0 +1,83 @@
+package org.jeecg.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 涓氬姟缂栫爜瑙勫垯
+ * @Author: jeecg-boot
+ * @Date:   2025-03-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_business_code_rule")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="sys_business_code_rule瀵硅薄", description="涓氬姟缂栫爜瑙勫垯")
+public class SysBusinessCodeRule implements Serializable {
+    
+	/**涓婚敭*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "涓婚敭")
+	private String id;
+	/**鍒涘缓浜�*/
+	@Excel(name = "鍒涘缓浜�", width = 15)
+    @ApiModelProperty(value = "鍒涘缓浜�")
+	private String createBy;
+	/**鍒涘缓鏃堕棿*/
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+	private Date createTime;
+	/**鏇存柊浜�*/
+	@Excel(name = "鏇存柊浜�", width = 15)
+    @ApiModelProperty(value = "鏇存柊浜�")
+	private String updateBy;
+	/**鏇存柊鏃堕棿*/
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+	private Date updateTime;
+	/**鍒犻櫎鏍囪*/
+	@Excel(name = "鍒犻櫎鏍囪", width = 15)
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+	private Integer delFlag;
+	/**涓氬姟鍚嶇О*/
+	@Excel(name = "涓氬姟鍚嶇О", width = 15)
+    @ApiModelProperty(value = "涓氬姟鍚嶇О")
+	private String businessName;
+	/**涓氬姟缂栫爜*/
+	@Excel(name = "涓氬姟缂栫爜", width = 15)
+    @ApiModelProperty(value = "涓氬姟缂栫爜")
+	private String businessCode;
+	/**缂栫爜鍓嶇紑*/
+	@Excel(name = "缂栫爜鍓嶇紑", width = 15)
+    @ApiModelProperty(value = "缂栫爜鍓嶇紑")
+	private String prefix;
+	/**骞翠唤缂栫爜鏍煎紡*/
+	@Excel(name = "骞翠唤缂栫爜鏍煎紡", width = 15)
+    @ApiModelProperty(value = "骞翠唤缂栫爜鏍煎紡")
+	private String yearFormat;
+	/**鏈堜唤缂栫爜鏍煎紡*/
+	@Excel(name = "鏈堜唤缂栫爜鏍煎紡", width = 15)
+    @ApiModelProperty(value = "鏈堜唤缂栫爜鏍煎紡")
+	private String monthFormat;
+	/**澶� 缂栫爜鏍煎紡*/
+	@Excel(name = "澶� 缂栫爜鏍煎紡", width = 15)
+    @ApiModelProperty(value = "澶� 缂栫爜鏍煎紡")
+	private String dayFormat;
+	/**搴忓彿闀垮害*/
+	@Excel(name = "搴忓彿闀垮害", width = 15)
+    @ApiModelProperty(value = "搴忓彿闀垮害")
+	private Integer seqLength;
+	/**褰撳墠搴忓彿*/
+	@Excel(name = "褰撳墠搴忓彿", width = 15)
+    @ApiModelProperty(value = "褰撳墠搴忓彿")
+	private Integer currentNum;
+}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBusinessCodeRuleMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBusinessCodeRuleMapper.java
new file mode 100644
index 0000000..4881321
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBusinessCodeRuleMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.system.entity.SysBusinessCodeRule;
+
+/**
+ * @Description: 涓氬姟缂栫爜瑙勫垯
+ * @Author: jeecg-boot
+ * @Date:   2025-03-17
+ * @Version: V1.0
+ */
+public interface SysBusinessCodeRuleMapper extends BaseMapper<SysBusinessCodeRule> {
+
+}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBusinessCodeRuleMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBusinessCodeRuleMapper.xml
new file mode 100644
index 0000000..fde3cdb
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysBusinessCodeRuleMapper.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="org.jeecg.modules.system.mapper.SysBusinessCodeRuleMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysBusinessCodeRuleService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysBusinessCodeRuleService.java
new file mode 100644
index 0000000..f1179ee
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysBusinessCodeRuleService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.service;
+
+import org.jeecg.modules.system.entity.SysBusinessCodeRule;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 涓氬姟缂栫爜瑙勫垯
+ * @Author: jeecg-boot
+ * @Date:   2025-03-17
+ * @Version: V1.0
+ */
+public interface ISysBusinessCodeRuleService extends IService<SysBusinessCodeRule> {
+
+}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBusinessCodeRuleServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBusinessCodeRuleServiceImpl.java
new file mode 100644
index 0000000..3a3505e
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBusinessCodeRuleServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.system.service.impl;
+
+import org.jeecg.modules.system.entity.SysBusinessCodeRule;
+import org.jeecg.modules.system.mapper.SysBusinessCodeRuleMapper;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 涓氬姟缂栫爜瑙勫垯
+ * @Author: jeecg-boot
+ * @Date:   2025-03-17
+ * @Version: V1.0
+ */
+@Service
+public class SysBusinessCodeRuleServiceImpl extends ServiceImpl<SysBusinessCodeRuleMapper, SysBusinessCodeRule> implements ISysBusinessCodeRuleService {
+
+}
diff --git "a/lxzn-module-system/lxzn-system-biz/src/main/resources/jeecg/code-template/one/java/$\173bussiPackage\175/$\173entityPackage\175/entity/$\173entityName\175.javai" "b/lxzn-module-system/lxzn-system-biz/src/main/resources/jeecg/code-template/one/java/$\173bussiPackage\175/$\173entityPackage\175/entity/$\173entityName\175.javai"
index bf55735..e069cdc 100644
--- "a/lxzn-module-system/lxzn-system-biz/src/main/resources/jeecg/code-template/one/java/$\173bussiPackage\175/$\173entityPackage\175/entity/$\173entityName\175.javai"
+++ "b/lxzn-module-system/lxzn-system-biz/src/main/resources/jeecg/code-template/one/java/$\173bussiPackage\175/$\173entityPackage\175/entity/$\173entityName\175.javai"
@@ -1,20 +1,17 @@
 package ${bussiPackage}.${entityPackage}.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.io.Serializable;
+import java.util.Date;
 /**
  * @Description: ${tableVo.ftlDescription}
  * @Author: jeecg-boot
@@ -26,7 +23,7 @@
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="${tableName}瀵硅薄", description="${tableVo.ftlDescription}")
-public class ${entityName} {
+public class ${entityName} implements Serializable {
     
     <#list originalColumns as po>
 	/**${po.filedComment}*/
diff --git a/pom.xml b/pom.xml
index ea03698..86773ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,8 @@
         <module>lxzn-module-dnc</module>
 		<module>lxzn-module-flowable</module>
 		<module>lxzn-module-msi</module>
-    </modules>
+		<module>lxzn-module-eam</module>
+	</modules>
 
 	<repositories>
 		<repository>

--
Gitblit v1.9.3