Commit 3a027148 authored by wujipeng's avatar wujipeng
Browse files

优化

parent f288a364
...@@ -19,6 +19,6 @@ public interface TemplateDetailMapper extends BaseMapper<TemplateDetailEntity> { ...@@ -19,6 +19,6 @@ public interface TemplateDetailMapper extends BaseMapper<TemplateDetailEntity> {
void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId); void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId);
void updateByCellNumber(@Param("templateDetailList") List<TemplateDetailEntity> templateDetailList, @Param("templateId") String templateId); void updateByCellNumber(@Param("templateDetail") TemplateDetailEntity templateDetail);
} }
...@@ -17,6 +17,6 @@ import java.util.List; ...@@ -17,6 +17,6 @@ import java.util.List;
public interface TemplateExpansionMapper extends BaseMapper<TemplateExpansionEntity> { public interface TemplateExpansionMapper extends BaseMapper<TemplateExpansionEntity> {
void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId); void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId);
void updateByCellNumber(@Param("templateExpansionList") List<TemplateExpansionEntity> templateExpansionList, @Param("templateId") String templateId); void updateByCellNumber(@Param("templateExpansion") TemplateExpansionEntity templateExpansion);
} }
...@@ -23,6 +23,6 @@ public interface TemplateDetailService extends IService<TemplateDetailEntity> { ...@@ -23,6 +23,6 @@ public interface TemplateDetailService extends IService<TemplateDetailEntity> {
void removeByCellNumber(List<String> cellNumberList, String templateId); void removeByCellNumber(List<String> cellNumberList, String templateId);
void updateByCellNumber(List<TemplateDetailEntity> templateDetailList, String templateId); void updateByCellNumber(TemplateDetailEntity templateDetail);
} }
...@@ -15,6 +15,6 @@ public interface TemplateExpansionService extends IService<TemplateExpansionEnti ...@@ -15,6 +15,6 @@ public interface TemplateExpansionService extends IService<TemplateExpansionEnti
void removeByCellNumber(List<String> removeIdList, String templateId); void removeByCellNumber(List<String> removeIdList, String templateId);
void updateByCellNumber(List<TemplateExpansionEntity> templateExpansionList, String templateId); void updateByCellNumber(TemplateExpansionEntity templateExpansion);
} }
...@@ -27,7 +27,7 @@ public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper, ...@@ -27,7 +27,7 @@ public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper,
} }
@Override @Override
public void updateByCellNumber(List<TemplateDetailEntity> templateDetailList, String templateId) { public void updateByCellNumber(TemplateDetailEntity templateDetail) {
baseMapper.updateByCellNumber(templateDetailList, templateId); baseMapper.updateByCellNumber(templateDetail);
} }
} }
...@@ -22,7 +22,7 @@ public class TemplateExpansionServiceImpl extends ServiceImpl<TemplateExpansionM ...@@ -22,7 +22,7 @@ public class TemplateExpansionServiceImpl extends ServiceImpl<TemplateExpansionM
} }
@Override @Override
public void updateByCellNumber(List<TemplateExpansionEntity> templateExpansionList, String templateId) { public void updateByCellNumber(TemplateExpansionEntity templateExpansion) {
baseMapper.updateByCellNumber(templateExpansionList,templateId); baseMapper.updateByCellNumber(templateExpansion);
} }
} }
...@@ -91,9 +91,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -91,9 +91,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
} }
//删除旧数据 //删除旧数据
templateExpansionService.removeByCellNumber(removeIdList, templateId); if (!ObjectUtils.isEmpty(removeIdList)) {
templateExpansionService.removeByCellNumber(removeIdList, templateId);
}
//更新数据 //更新数据
templateExpansionService.updateByCellNumber(updateList, templateId); for (TemplateExpansionEntity templateExpansion : updateList) {
templateExpansion.setTemplateId(templateId);
templateExpansionService.updateByCellNumber(templateExpansion);
}
//新增新数据 //新增新数据
List<String> insertIdList = getUniqueKeys(expansion, CellNumberList); List<String> insertIdList = getUniqueKeys(expansion, CellNumberList);
for (String cellNumber : insertIdList) { for (String cellNumber : insertIdList) {
...@@ -101,7 +106,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -101,7 +106,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
templateExpansion.setTemplateId(templateId); templateExpansion.setTemplateId(templateId);
insertList.add(templateExpansion); insertList.add(templateExpansion);
} }
templateExpansionService.saveBatch(insertList); if (!ObjectUtils.isEmpty(insertList)) {
templateExpansionService.saveBatch(insertList);
}
} }
private void handleUpdateTemplateDetail(Map<String, String> data, Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) { private void handleUpdateTemplateDetail(Map<String, String> data, Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) {
...@@ -121,9 +128,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -121,9 +128,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
} }
//删除旧数据 //删除旧数据
templateDetailService.removeByCellNumber(removeIdList, templateId); if (!ObjectUtils.isEmpty(removeIdList)) {
templateDetailService.removeByCellNumber(removeIdList, templateId);
}
//更新数据 //更新数据
templateDetailService.updateByCellNumber(updateList, templateId); for (TemplateDetailEntity templateDetail : updateList) {
templateDetail.setTemplateId(templateId);
templateDetailService.updateByCellNumber(templateDetail);
}
//新增新数据 //新增新数据
List<String> insertIdList = getUniqueKeys(data, CellNumberList); List<String> insertIdList = getUniqueKeys(data, CellNumberList);
for (String cellNumber : insertIdList) { for (String cellNumber : insertIdList) {
...@@ -132,7 +144,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -132,7 +144,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
templateDetail.setTemplateId(templateId); templateDetail.setTemplateId(templateId);
insertList.add(templateDetail); insertList.add(templateDetail);
} }
templateDetailService.saveBatch(insertList); if (!ObjectUtils.isEmpty(insertList)) {
templateDetailService.saveBatch(insertList);
}
} }
public static <T> List<String> getUniqueKeys(Map<String, T> data, public static <T> List<String> getUniqueKeys(Map<String, T> data,
......
...@@ -22,25 +22,23 @@ ...@@ -22,25 +22,23 @@
</foreach> </foreach>
</delete> </delete>
<update id="updateByCellNumber"> <update id="updateByCellNumber">
<foreach collection="templateDetailList" item="item"> update
UPDATE template_detail
template_detail set
SET value = #{templateDetail.value},
value = #{item.value}, type = #{templateDetail.type},
type = #{item.type}, static_value = #{templateDetail.staticValue},
static_value = #{item.staticValue}, format = #{templateDetail.format},
format = #{item.format}, meta_id = #{templateDetail.metaId},
meta_id = #{item.metaId}, formula = #{templateDetail.formula},
formula = #{item.formula}, report_id = #{templateDetail.reportId},
report_id = #{item.reportId}, report_name = #{templateDetail.reportName},
report_name = #{item.reportName}, report_location = #{templateDetail.reportLocation},
report_location = #{item.reportLocation}, offset = #{templateDetail.offset},
offset = #{item.offset}, offset_number = #{templateDetail.offsetNumber}
offset_number = #{item.offsetNumber} where
WHERE template_id = #{templateDetail.templateId}
template_id = #{templateId} and
AND location = #{templateDetail.location}
location = #{item.location}
</foreach>
</update> </update>
</mapper> </mapper>
...@@ -14,15 +14,13 @@ ...@@ -14,15 +14,13 @@
</foreach> </foreach>
</delete> </delete>
<update id="updateByCellNumber"> <update id="updateByCellNumber">
<foreach collection="templateExpansionList" item="item"> update
UPDATE template_expansion
template_expansion set
SET json = #{templateExpansion.json}
json = #{item.json} where
WHERE template_id = #{templateExpansion.templateId}
template_id = #{templateId} and
AND location = #{templateExpansion.location}
location = #{item.location}
</foreach>
</update> </update>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment