From f29c8786807015d78b9be8a33397f69478d92a76 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 12 七月 2025 16:52:27 +0800
Subject: [PATCH] 1.设备优化 2.配煤计算器
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/init/MyStartupRunner.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/init/MyStartupRunner.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/init/MyStartupRunner.java
index f56a37d..321646e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/init/MyStartupRunner.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/init/MyStartupRunner.java
@@ -1,12 +1,15 @@
package com.ruoyi.web.controller.init;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.basic.dto.CoalFieldDto;
import com.ruoyi.basic.entity.City;
+import com.ruoyi.basic.entity.CoalField;
import com.ruoyi.basic.entity.District;
import com.ruoyi.basic.entity.Province;
-import com.ruoyi.basic.mapper.CityMapper;
-import com.ruoyi.basic.mapper.DistrictMapper;
-import com.ruoyi.basic.mapper.ProvinceMapper;
+import com.ruoyi.basic.mapper.*;
+import com.ruoyi.basic.service.CoalFieldService;
+import com.ruoyi.basic.service.CoalPlanService;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.web.controller.init.dto.AreaDTO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +18,11 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Slf4j
@Component
@@ -26,6 +33,10 @@
private CityMapper cityMapper;
@Autowired
private DistrictMapper districtMapper;
+ @Autowired
+ private CoalFieldService coalFieldService;
+ @Autowired
+ private CoalPlanService coalPlanService;
/**
* 椤圭洰鍚姩鏃堕渶瑕佹墽琛岀殑鏂规硶
@@ -37,6 +48,8 @@
public void run(String... args) throws Exception {
// 鍒濆鍖栫渷甯傚尯
initRegion();
+ // 鍒濆鏂板閰嶇叅璁＄畻鍣ㄤ腑鐨勫瓧娈靛拰鏂规
+ initCoalFields();
}
private void initRegion() {
@@ -96,14 +109,30 @@
});
- provinceMapper.insertOrUpdate(provinces);
- cityMapper.insertOrUpdate(cities);
- districtMapper.insertOrUpdate(districts);
-
+ provinceMapper.insert(provinces);
+ cityMapper.insert(cities);
+ districtMapper.insert(districts);
log.info("鍦板尯淇℃伅鍒濆鍖栫粨鏉�");
}
}
}
+
+ private void initCoalFields() {
+
+ List<CoalFieldDto> fields = Stream.of("鍙戠儹閲�", "纭垎", "鐏板垎", "姘村垎")
+ .map(CoalFieldDto::from)
+ .toList();
+ // 鎵归噺鑾峰彇宸插瓨鍦ㄧ殑 fieldNames
+ Set<String> existingFieldNames = coalFieldService.getFieldNamesByNames(
+ fields.stream().map(CoalFieldDto::getFieldName).collect(Collectors.toSet())
+ );
+
+ fields.forEach(field -> {
+ if (!existingFieldNames.contains(field.getFieldName())) {
+ coalFieldService.addOrEditCoalField(field);
+ }
+ });
+ }
}
--
Gitblit v1.9.3