Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
integration
Commits
b777c40a
"src/git@gitlab.ruzhoukj.com:wujipeng/rx.git" did not exist on "4b86b64642b5329923a74b2259c39d1d617624e0"
Commit
b777c40a
authored
Mar 06, 2026
by
wujipeng
Browse files
模板结构修改
parent
1808b5d4
Changes
12
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/integration/mapper/TemplateDetailMapper.java
→
src/main/java/com/ruzhoukj/integration/mapper/TemplateDetail
Basic
Mapper.java
View file @
b777c40a
package
com.ruzhoukj.integration.mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetail
Basic
Entity
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -14,11 +14,11 @@ import java.util.List;
* @Desc : 描述信息
*/
@Mapper
public
interface
TemplateDetailMapper
extends
BaseMapper
<
TemplateDetailEntity
>
{
public
interface
TemplateDetail
Basic
Mapper
extends
BaseMapper
<
TemplateDetail
Basic
Entity
>
{
List
<
String
>
getCellNumberList
(
@Param
(
"templateId"
)
String
templateId
);
void
removeByCellNumber
(
@Param
(
"cellNumberList"
)
List
<
String
>
cellNumberList
,
@Param
(
"templateId"
)
String
templateId
);
void
updateByCellNumber
(
@Param
(
"templateDetail"
)
TemplateDetailEntity
templateDetail
);
void
updateByCellNumber
(
@Param
(
"templateDetail"
)
TemplateDetail
Basic
Entity
templateDetail
);
}
src/main/java/com/ruzhoukj/integration/mapper/TemplateDetailMergeMapper.java
0 → 100644
View file @
b777c40a
package
com.ruzhoukj.integration.mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* @author : wujipeng
* @date : 2026/3/6 11:28
* @Version: 1.0
* @Desc : 描述信息
*/
@Mapper
public
interface
TemplateDetailMergeMapper
extends
BaseMapper
<
TemplateDetailMergeEntity
>
{
}
src/main/java/com/ruzhoukj/integration/pojo/entity/TemplateDetailEntity.java
→
src/main/java/com/ruzhoukj/integration/pojo/entity/TemplateDetail
Basic
Entity.java
View file @
b777c40a
...
...
@@ -17,11 +17,11 @@ import lombok.NoArgsConstructor;
* @Desc : 描述信息
*/
@Data
@TableName
(
"template_detail"
)
@TableName
(
"template_detail
_basic
"
)
@Builder
@AllArgsConstructor
@NoArgsConstructor
public
class
TemplateDetailEntity
{
public
class
TemplateDetail
Basic
Entity
{
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
...
...
src/main/java/com/ruzhoukj/integration/pojo/entity/TemplateDetailMergeEntity.java
0 → 100644
View file @
b777c40a
package
com.ruzhoukj.integration.pojo.entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* @author : wujipeng
* @date : 2026/3/6 11:26
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
@TableName
(
value
=
"template_detail_merge"
)
public
class
TemplateDetailMergeEntity
{
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
@TableField
(
value
=
"template_id"
)
@ApiModelProperty
(
value
=
"模板id"
)
private
String
templateId
;
@TableField
(
value
=
"range_cell"
)
@ApiModelProperty
(
value
=
"合并范围"
)
private
String
rangeCell
;
@TableField
(
value
=
"master_cell"
)
@ApiModelProperty
(
value
=
"主单元格"
)
private
String
masterCell
;
}
src/main/java/com/ruzhoukj/integration/pojo/entity/TemplateEntity.java
View file @
b777c40a
...
...
@@ -35,7 +35,7 @@ public class TemplateEntity {
@ApiModelProperty
(
value
=
"基础单元格"
)
@TableField
(
exist
=
false
)
private
Map
<
String
,
TemplateDetailEntity
>
cells
;
private
Map
<
String
,
TemplateDetail
Basic
Entity
>
cells
;
@ApiModelProperty
(
value
=
"拓展属性"
)
@TableField
(
exist
=
false
)
...
...
src/main/java/com/ruzhoukj/integration/service/TemplateDetailService.java
→
src/main/java/com/ruzhoukj/integration/service/TemplateDetail
Basic
Service.java
View file @
b777c40a
package
com.ruzhoukj.integration.service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetail
Basic
Entity
;
import
java.util.List
;
...
...
@@ -11,7 +11,7 @@ import java.util.List;
* @Version: 1.0
* @Desc : 描述信息
*/
public
interface
TemplateDetailService
extends
IService
<
TemplateDetailEntity
>
{
public
interface
TemplateDetail
Basic
Service
extends
IService
<
TemplateDetail
Basic
Entity
>
{
/**
* 获取单元格编号集合
...
...
@@ -23,6 +23,6 @@ public interface TemplateDetailService extends IService<TemplateDetailEntity> {
void
removeByCellNumber
(
List
<
String
>
cellNumberList
,
String
templateId
);
void
updateByCellNumber
(
TemplateDetailEntity
templateDetail
);
void
updateByCellNumber
(
TemplateDetail
Basic
Entity
templateDetail
);
}
src/main/java/com/ruzhoukj/integration/service/TemplateDetailMergeService.java
0 → 100644
View file @
b777c40a
package
com.ruzhoukj.integration.service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity
;
/**
* @author : wujipeng
* @date : 2026/3/6 11:29
* @Version: 1.0
* @Desc : 描述信息
*/
public
interface
TemplateDetailMergeService
extends
IService
<
TemplateDetailMergeEntity
>
{
}
src/main/java/com/ruzhoukj/integration/service/impl/TemplateDetailServiceImpl.java
→
src/main/java/com/ruzhoukj/integration/service/impl/TemplateDetail
Basic
ServiceImpl.java
View file @
b777c40a
package
com.ruzhoukj.integration.service.impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.integration.mapper.TemplateDetailMapper
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity
;
import
com.ruzhoukj.integration.service.TemplateDetailService
;
import
com.ruzhoukj.integration.mapper.TemplateDetail
Basic
Mapper
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetail
Basic
Entity
;
import
com.ruzhoukj.integration.service.TemplateDetail
Basic
Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
...
...
@@ -15,7 +16,7 @@ import java.util.List;
* @Desc : 描述信息
*/
@Service
public
class
TemplateDetailServiceImpl
extends
ServiceImpl
<
TemplateDetailMapper
,
TemplateDetailEntity
>
implements
TemplateDetailService
{
public
class
TemplateDetail
Basic
ServiceImpl
extends
ServiceImpl
<
TemplateDetail
Basic
Mapper
,
TemplateDetail
Basic
Entity
>
implements
TemplateDetail
Basic
Service
{
@Override
public
List
<
String
>
getCellNumberList
(
String
templateId
)
{
return
baseMapper
.
getCellNumberList
(
templateId
);
...
...
@@ -27,7 +28,7 @@ public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper,
}
@Override
public
void
updateByCellNumber
(
TemplateDetailEntity
templateDetail
)
{
public
void
updateByCellNumber
(
TemplateDetail
Basic
Entity
templateDetail
)
{
baseMapper
.
updateByCellNumber
(
templateDetail
);
}
}
src/main/java/com/ruzhoukj/integration/service/impl/TemplateDetailMergeServiceImpl.java
0 → 100644
View file @
b777c40a
package
com.ruzhoukj.integration.service.impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.integration.mapper.TemplateDetailMergeMapper
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity
;
import
com.ruzhoukj.integration.service.TemplateDetailMergeService
;
import
org.springframework.stereotype.Service
;
/**
* @author : wujipeng
* @date : 2026/3/6 11:29
* @Version: 1.0
* @Desc : 描述信息
*/
@Service
public
class
TemplateDetailMergeServiceImpl
extends
ServiceImpl
<
TemplateDetailMergeMapper
,
TemplateDetailMergeEntity
>
implements
TemplateDetailMergeService
{
}
src/main/java/com/ruzhoukj/integration/service/impl/TemplateServiceImpl.java
View file @
b777c40a
...
...
@@ -6,13 +6,12 @@ import com.github.pagehelper.Page;
import
com.github.pagehelper.PageHelper
;
import
com.ruzhoukj.integration.mapper.TemplateMapper
;
import
com.ruzhoukj.integration.pojo.dto.TemplateDTO
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity
;
import
com.ruzhoukj.integration.pojo.entity.TemplateDetail
Basic
Entity
;
import
com.ruzhoukj.integration.pojo.entity.TemplateEntity
;
import
com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity
;
import
com.ruzhoukj.integration.pojo.vo.MetaDataVO
;
import
com.ruzhoukj.integration.pojo.vo.TemplateVO
;
import
com.ruzhoukj.integration.result.PageResult
;
import
com.ruzhoukj.integration.service.TemplateDetailService
;
import
com.ruzhoukj.integration.service.TemplateDetail
Basic
Service
;
import
com.ruzhoukj.integration.service.TemplateExpansionService
;
import
com.ruzhoukj.integration.service.TemplateService
;
import
org.springframework.stereotype.Service
;
...
...
@@ -32,7 +31,7 @@ import java.util.*;
public
class
TemplateServiceImpl
extends
ServiceImpl
<
TemplateMapper
,
TemplateEntity
>
implements
TemplateService
{
@Resource
private
TemplateDetailService
templateDetailService
;
private
TemplateDetail
Basic
Service
templateDetail
Basic
Service
;
@Resource
private
TemplateExpansionService
templateExpansionService
;
...
...
@@ -52,10 +51,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
}
}
//初始化模板详情和模板拓展
List
<
TemplateDetailEntity
>
templateDetailList
=
new
ArrayList
<>();
List
<
TemplateDetail
Basic
Entity
>
templateDetailList
=
new
ArrayList
<>();
List
<
TemplateExpansionEntity
>
templateExpansionList
=
new
ArrayList
<>();
for
(
String
location
:
locations
)
{
templateDetailList
.
add
(
TemplateDetailEntity
.
builder
()
templateDetailList
.
add
(
TemplateDetail
Basic
Entity
.
builder
()
.
templateId
(
templateDTO
.
getId
())
.
location
(
location
)
.
build
());
...
...
@@ -64,14 +63,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
.
location
(
location
)
.
build
());
}
templateDetailService
.
saveBatch
(
templateDetailList
);
templateDetail
Basic
Service
.
saveBatch
(
templateDetailList
);
templateExpansionService
.
saveBatch
(
templateExpansionList
);
}
else
{
//编辑模板
updateById
(
templateDTO
);
}
//查询模板详情单元格编号集合
List
<
String
>
templateDetailList
=
templateDetailService
.
getCellNumberList
(
templateDTO
.
getId
());
List
<
String
>
templateDetailList
=
templateDetail
Basic
Service
.
getCellNumberList
(
templateDTO
.
getId
());
//处理模板详情
handleUpdateTemplateDetail
(
templateDTO
.
getCells
(),
templateDetailList
,
templateDTO
.
getId
());
//查询模板拓展单元格编号集合
...
...
@@ -114,16 +113,16 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
}
}
private
void
handleUpdateTemplateDetail
(
Map
<
String
,
TemplateDetailEntity
>
basic
,
List
<
String
>
CellNumberList
,
String
templateId
)
{
private
void
handleUpdateTemplateDetail
(
Map
<
String
,
TemplateDetail
Basic
Entity
>
basic
,
List
<
String
>
CellNumberList
,
String
templateId
)
{
if
(
ObjectUtils
.
isEmpty
(
basic
))
{
return
;
}
List
<
String
>
removeIdList
=
new
ArrayList
<>();
List
<
TemplateDetailEntity
>
updateList
=
new
ArrayList
<>();
List
<
TemplateDetailEntity
>
insertList
=
new
ArrayList
<>();
List
<
TemplateDetail
Basic
Entity
>
updateList
=
new
ArrayList
<>();
List
<
TemplateDetail
Basic
Entity
>
insertList
=
new
ArrayList
<>();
for
(
String
cellNumber
:
CellNumberList
)
{
if
(
basic
.
containsKey
(
cellNumber
))
{
TemplateDetailEntity
templateDetail
=
basic
.
get
(
cellNumber
);
TemplateDetail
Basic
Entity
templateDetail
=
basic
.
get
(
cellNumber
);
updateList
.
add
(
templateDetail
);
}
else
{
removeIdList
.
add
(
cellNumber
);
...
...
@@ -131,19 +130,19 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
}
//删除旧数据
if
(!
ObjectUtils
.
isEmpty
(
removeIdList
))
{
templateDetailService
.
removeByCellNumber
(
removeIdList
,
templateId
);
templateDetail
Basic
Service
.
removeByCellNumber
(
removeIdList
,
templateId
);
}
//更新数据
templateDetailService
.
updateBatchById
(
updateList
);
templateDetail
Basic
Service
.
updateBatchById
(
updateList
);
//新增新数据
List
<
String
>
insertIdList
=
getUniqueKeys
(
basic
,
CellNumberList
);
for
(
String
cellNumber
:
insertIdList
)
{
TemplateDetailEntity
templateDetail
=
basic
.
get
(
cellNumber
);
TemplateDetail
Basic
Entity
templateDetail
=
basic
.
get
(
cellNumber
);
templateDetail
.
setTemplateId
(
templateId
);
insertList
.
add
(
templateDetail
);
}
if
(!
ObjectUtils
.
isEmpty
(
insertList
))
{
templateDetailService
.
saveBatch
(
insertList
);
templateDetail
Basic
Service
.
saveBatch
(
insertList
);
}
}
...
...
@@ -172,15 +171,15 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override
public
TemplateVO
getTemplateDetail
(
String
id
)
{
Map
<
String
,
TemplateDetailEntity
>
basic
=
new
HashMap
<>();
Map
<
String
,
TemplateDetail
Basic
Entity
>
basic
=
new
HashMap
<>();
Map
<
String
,
TemplateExpansionEntity
>
expansion
=
new
HashMap
<>();
TemplateVO
result
=
baseMapper
.
getTemplateDetail
(
id
);
//查询模板详情
List
<
TemplateDetailEntity
>
templateDetailList
=
templateDetailService
.
list
(
new
LambdaQueryWrapper
<
TemplateDetailEntity
>()
.
eq
(
TemplateDetailEntity:
:
getTemplateId
,
id
));
for
(
TemplateDetailEntity
templateDetailEntity
:
templateDetailList
)
{
basic
.
put
(
templateDetailEntity
.
getLocation
(),
templateDetailEntity
);
List
<
TemplateDetail
Basic
Entity
>
templateDetailList
=
templateDetail
Basic
Service
.
list
(
new
LambdaQueryWrapper
<
TemplateDetail
Basic
Entity
>()
.
eq
(
TemplateDetail
Basic
Entity:
:
getTemplateId
,
id
));
for
(
TemplateDetail
Basic
Entity
templateDetail
Basic
Entity
:
templateDetailList
)
{
basic
.
put
(
templateDetail
Basic
Entity
.
getLocation
(),
templateDetail
Basic
Entity
);
}
//查询模板拓展
List
<
TemplateExpansionEntity
>
templateExpansionList
=
templateExpansionService
...
...
@@ -197,7 +196,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override
@Transactional
public
Boolean
deleteTemplate
(
String
id
)
{
templateDetailService
.
remove
(
new
LambdaQueryWrapper
<
TemplateDetailEntity
>().
eq
(
TemplateDetailEntity:
:
getTemplateId
,
id
));
templateDetail
Basic
Service
.
remove
(
new
LambdaQueryWrapper
<
TemplateDetail
Basic
Entity
>().
eq
(
TemplateDetail
Basic
Entity:
:
getTemplateId
,
id
));
templateExpansionService
.
remove
(
new
LambdaQueryWrapper
<
TemplateExpansionEntity
>().
eq
(
TemplateExpansionEntity:
:
getTemplateId
,
id
));
return
removeById
(
id
);
}
...
...
src/main/resources/com/ruzhoukj/integration/mapper/TemplateDetailMapper.xml
→
src/main/resources/com/ruzhoukj/integration/mapper/TemplateDetail
Basic
Mapper.xml
View file @
b777c40a
<?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.ruzhoukj.integration.mapper.TemplateDetailMapper"
>
<mapper
namespace=
"com.ruzhoukj.integration.mapper.TemplateDetail
Basic
Mapper"
>
<select
id=
"getCellNumberList"
resultType=
"java.lang.String"
>
select
location
...
...
src/main/resources/com/ruzhoukj/integration/mapper/TemplateDetailMergeMapper.xml
0 → 100644
View file @
b777c40a
<?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.ruzhoukj.integration.mapper.TemplateDetailMergeMapper"
>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment