diff --git a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java index 26ac6f0..d1a475b 100644 --- a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java +++ b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java @@ -7,8 +7,8 @@ import mjkf.xinke.main.common.http.FuHttpResponse; import mjkf.xinke.main.constant.PricePublishType; import mjkf.xinke.main.model.db.DataAdjacent; import mjkf.xinke.main.model.db.PricePublish; -import mjkf.xinke.main.service.DataAdjacentService; -import mjkf.xinke.main.service.LocalMaterialService; +import mjkf.xinke.main.service.data.DataAdjacentService; +import mjkf.xinke.main.service.data.LocalMaterialService; import mjkf.xinke.main.service.PricePublishService; import mjkf.xinke.main.service.PriceResultService; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java b/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java index c74835c..8f8a008 100644 --- a/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java +++ b/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java @@ -12,7 +12,7 @@ import mjkf.xinke.main.model.db.LocalMaterial; import mjkf.xinke.main.model.vo.LocalMaterialCityAggr; import mjkf.xinke.main.model.vo.LocalMaterialSummary; import mjkf.xinke.main.modular.location.service.LocationService; -import mjkf.xinke.main.service.LocalMaterialService; +import mjkf.xinke.main.service.data.LocalMaterialService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/mjkf/xinke/main/model/db/DataNetwork.java b/src/main/java/mjkf/xinke/main/model/db/DataNetwork.java index 4ab12f0..e12b9e2 100644 --- a/src/main/java/mjkf/xinke/main/model/db/DataNetwork.java +++ b/src/main/java/mjkf/xinke/main/model/db/DataNetwork.java @@ -86,6 +86,7 @@ public class DataNetwork extends Model { public DataNetwork (Row row, MaterialTask task) { var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK; row.getCell(0, policy).setCellType(CellType.STRING); + row.getCell(5, policy).setCellType(CellType.NUMERIC); this.setMaterialId(row.getCell(0, policy).getStringCellValue()); this.setName(row.getCell(1, policy).getStringCellValue().replace(" ", "")); this.setSpec(row.getCell(2, policy).getStringCellValue().replace(" ", "")); @@ -96,8 +97,8 @@ public class DataNetwork extends Model { this.setRemark(row.getCell(7, policy).getStringCellValue()); this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 this.setRegion(MaterialTaskType.getRegion(task.getType())); - if (this.getName().isEmpty()) { - throw new IllegalArgumentException("名称为空"); + if (this.getMaterialId().isEmpty()) { + throw new IllegalArgumentException("材料编码为空"); } if (ObjectUtil.isEmpty(this.getPrice())) { throw new IllegalArgumentException("缺少价格"); diff --git a/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java b/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java index d2fb879..ae6a14c 100644 --- a/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java +++ b/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java @@ -91,8 +91,8 @@ public class FujianSurvey extends Model { this.setTax(((Double) row.getCell(6, policy).getNumericCellValue()).intValue()); this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 this.setRegion(MaterialTaskType.getRegion(task.getType())); - if (this.getName().isEmpty()) { - throw new IllegalArgumentException("名称为空"); + if (this.getMaterialId().isEmpty()) { + throw new IllegalArgumentException("材料编码为空"); } if (ObjectUtil.isEmpty(this.getPrice())) { throw new IllegalArgumentException("缺少价格"); diff --git a/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java b/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java index bc12623..da3ac5e 100644 --- a/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java +++ b/src/main/java/mjkf/xinke/main/model/db/FuzhouHighwayBureau.java @@ -77,6 +77,8 @@ public class FuzhouHighwayBureau extends Model { public FuzhouHighwayBureau (Row row, MaterialTask task) { var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK; + row.getCell(0, policy).setCellType(CellType.STRING); + row.getCell(5, policy).setCellType(CellType.NUMERIC); this.setMaterialId(row.getCell(0, policy).getStringCellValue()); this.setName(row.getCell(1, policy).getStringCellValue().replace(" ", "")); this.setSpec(row.getCell(2, policy).getStringCellValue().replace(" ", "")); @@ -85,8 +87,8 @@ public class FuzhouHighwayBureau extends Model { this.setPrice(BigDecimal.valueOf(row.getCell(5, policy).getNumericCellValue())); this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 this.setRegion(MaterialTaskType.getRegion(task.getType())); - if (this.getName().isEmpty()) { - throw new IllegalArgumentException("名称为空"); + if (this.getMaterialId().isEmpty()) { + throw new IllegalArgumentException("材料编号为空"); } if (ObjectUtil.isEmpty(this.getPrice())) { throw new IllegalArgumentException("缺少价格"); diff --git a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java index 006534b..da19326 100644 --- a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java +++ b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java @@ -113,8 +113,8 @@ public class LocalMaterial extends Model { this.setPosition(row.getCell(8, policy).getStringCellValue()); this.setRemark(row.getCell(9, policy).getStringCellValue()); this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 - if (this.getName().isEmpty()) { - throw new IllegalArgumentException("名称为空"); + if (this.getMaterialId().isEmpty()) { + throw new IllegalArgumentException("材料编码为空"); } if (ObjectUtil.isEmpty(this.getPrice())) { throw new IllegalArgumentException("缺少价格"); diff --git a/src/main/java/mjkf/xinke/main/modular/location/controller/LocationController.java b/src/main/java/mjkf/xinke/main/modular/location/controller/LocationController.java index bac2337..8042fe0 100644 --- a/src/main/java/mjkf/xinke/main/modular/location/controller/LocationController.java +++ b/src/main/java/mjkf/xinke/main/modular/location/controller/LocationController.java @@ -11,7 +11,7 @@ import io.swagger.annotations.ApiOperation; import mjkf.xinke.common.exception.CommonException; import mjkf.xinke.main.model.db.LocalMaterial; import mjkf.xinke.main.modular.location.param.*; -import mjkf.xinke.main.service.LocalMaterialService; +import mjkf.xinke.main.service.data.LocalMaterialService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/mjkf/xinke/main/service/MaterialResultService.java b/src/main/java/mjkf/xinke/main/service/MaterialResultService.java index b358053..bd5ecdb 100644 --- a/src/main/java/mjkf/xinke/main/service/MaterialResultService.java +++ b/src/main/java/mjkf/xinke/main/service/MaterialResultService.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import mjkf.xinke.main.constant.MaterialTaskType; +import mjkf.xinke.main.service.data.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java b/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java index 9d609d4..29ef8b8 100644 --- a/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java +++ b/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java @@ -9,6 +9,7 @@ import mjkf.xinke.main.constant.MaterialTaskType; import mjkf.xinke.main.model.db.MaterialTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import mjkf.xinke.main.service.data.*; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java b/src/main/java/mjkf/xinke/main/service/data/AsphaltDomesticService.java similarity index 96% rename from src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java rename to src/main/java/mjkf/xinke/main/service/data/AsphaltDomesticService.java index 0551aa0..6b599d5 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java +++ b/src/main/java/mjkf/xinke/main/service/data/AsphaltDomesticService.java @@ -1,8 +1,9 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.AsphaltDomestic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import mjkf.xinke.main.service.data.DataService; import org.springframework.stereotype.Service; import java.time.LocalDate; diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java b/src/main/java/mjkf/xinke/main/service/data/AsphaltImportedService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java rename to src/main/java/mjkf/xinke/main/service/data/AsphaltImportedService.java index 2e142b2..c6125e5 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java +++ b/src/main/java/mjkf/xinke/main/service/data/AsphaltImportedService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.AsphaltImported; diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java b/src/main/java/mjkf/xinke/main/service/data/AsphaltModifierService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java rename to src/main/java/mjkf/xinke/main/service/data/AsphaltModifierService.java index 2c51309..afacfcf 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java +++ b/src/main/java/mjkf/xinke/main/service/data/AsphaltModifierService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.AsphaltModifier; diff --git a/src/main/java/mjkf/xinke/main/service/CementService.java b/src/main/java/mjkf/xinke/main/service/data/CementService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/CementService.java rename to src/main/java/mjkf/xinke/main/service/data/CementService.java index 70d6d1d..b26a2fb 100644 --- a/src/main/java/mjkf/xinke/main/service/CementService.java +++ b/src/main/java/mjkf/xinke/main/service/data/CementService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.Cement; diff --git a/src/main/java/mjkf/xinke/main/service/DataAdjacentService.java b/src/main/java/mjkf/xinke/main/service/data/DataAdjacentService.java similarity index 99% rename from src/main/java/mjkf/xinke/main/service/DataAdjacentService.java rename to src/main/java/mjkf/xinke/main/service/data/DataAdjacentService.java index a96d1b8..56d7227 100644 --- a/src/main/java/mjkf/xinke/main/service/DataAdjacentService.java +++ b/src/main/java/mjkf/xinke/main/service/data/DataAdjacentService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; diff --git a/src/main/java/mjkf/xinke/main/service/DataFujianService.java b/src/main/java/mjkf/xinke/main/service/data/DataFujianService.java similarity index 96% rename from src/main/java/mjkf/xinke/main/service/DataFujianService.java rename to src/main/java/mjkf/xinke/main/service/data/DataFujianService.java index 0567f4f..42cc9cb 100644 --- a/src/main/java/mjkf/xinke/main/service/DataFujianService.java +++ b/src/main/java/mjkf/xinke/main/service/data/DataFujianService.java @@ -1,9 +1,8 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.DataFujian; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import mjkf.xinke.main.model.db.DataNetwork; import org.springframework.stereotype.Service; import java.time.LocalDate; diff --git a/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java b/src/main/java/mjkf/xinke/main/service/data/DataGuangdongService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/DataGuangdongService.java rename to src/main/java/mjkf/xinke/main/service/data/DataGuangdongService.java index 3799c03..dde08d4 100644 --- a/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java +++ b/src/main/java/mjkf/xinke/main/service/data/DataGuangdongService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.DataGuangdong; @@ -9,6 +9,7 @@ import java.time.LocalDate; import java.util.List; import java.util.Map; +@Deprecated @Service public class DataGuangdongService extends DataService, DataGuangdong> { public LambdaQueryWrapper getQuery(String keyWord, Integer year, Integer month, String materialId, String name, Integer type) { diff --git a/src/main/java/mjkf/xinke/main/service/DataNetworkService.java b/src/main/java/mjkf/xinke/main/service/data/DataNetworkService.java similarity index 90% rename from src/main/java/mjkf/xinke/main/service/DataNetworkService.java rename to src/main/java/mjkf/xinke/main/service/data/DataNetworkService.java index 8e230dc..ac61f1e 100644 --- a/src/main/java/mjkf/xinke/main/service/DataNetworkService.java +++ b/src/main/java/mjkf/xinke/main/service/data/DataNetworkService.java @@ -1,8 +1,7 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.constant.MaterialTaskType; -import mjkf.xinke.main.model.db.AsphaltModifier; import mjkf.xinke.main.model.db.DataNetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Service; @@ -15,8 +14,7 @@ public class DataNetworkService extends DataService, Dat public LambdaQueryWrapper indexQuery(DataNetwork data) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(DataNetwork::getName, data.getName()); - query.eq(DataNetwork::getSpec, data.getSpec()); + query.eq(DataNetwork::getMaterialId, data.getMaterialId()); query.eq(DataNetwork::getDate, data.getDate()); query.eq(DataNetwork::getRegion, data.getRegion()); return query; @@ -51,7 +49,7 @@ public class DataNetworkService extends DataService, Dat public DataNetwork getMapGroupingBy(Map item) { var o = new DataNetwork(); - o.setName(item.get("name").toString()); + o.setMaterialId(item.get("Material_id").toString()); return o; } diff --git a/src/main/java/mjkf/xinke/main/service/DataService.java b/src/main/java/mjkf/xinke/main/service/data/DataService.java similarity index 99% rename from src/main/java/mjkf/xinke/main/service/DataService.java rename to src/main/java/mjkf/xinke/main/service/data/DataService.java index fd700e0..c622427 100644 --- a/src/main/java/mjkf/xinke/main/service/DataService.java +++ b/src/main/java/mjkf/xinke/main/service/data/DataService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; diff --git a/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java b/src/main/java/mjkf/xinke/main/service/data/DataZhejiangService.java similarity index 96% rename from src/main/java/mjkf/xinke/main/service/DataZhejiangService.java rename to src/main/java/mjkf/xinke/main/service/data/DataZhejiangService.java index 84e490d..70a5bf2 100644 --- a/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java +++ b/src/main/java/mjkf/xinke/main/service/data/DataZhejiangService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.DataZhejiang; @@ -9,8 +9,9 @@ import java.time.LocalDate; import java.util.List; import java.util.Map; +@Deprecated @Service -public class DataZhejiangService extends DataService, DataZhejiang>{ +public class DataZhejiangService extends DataService, DataZhejiang> { public LambdaQueryWrapper getQuery(String keyWord, Integer year, Integer month, String materialId, String name, Integer type) { diff --git a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java b/src/main/java/mjkf/xinke/main/service/data/FujianSurveyService.java similarity index 86% rename from src/main/java/mjkf/xinke/main/service/FujianSurveyService.java rename to src/main/java/mjkf/xinke/main/service/data/FujianSurveyService.java index 0d5bea7..7ba1d9d 100644 --- a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java +++ b/src/main/java/mjkf/xinke/main/service/data/FujianSurveyService.java @@ -1,8 +1,7 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.constant.MaterialTaskType; -import mjkf.xinke.main.model.db.DataNetwork; import mjkf.xinke.main.model.db.FujianSurvey; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Service; @@ -14,8 +13,7 @@ import java.util.Map; public class FujianSurveyService extends DataService, FujianSurvey> { public LambdaQueryWrapper indexQuery(FujianSurvey data) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(FujianSurvey::getName, data.getName()); - query.eq(FujianSurvey::getSpec, data.getSpec()); + query.eq(FujianSurvey::getMaterialId, data.getMaterialId()); query.eq(FujianSurvey::getDate, data.getDate()); query.eq(FujianSurvey::getRegion, data.getRegion()); return query; @@ -24,8 +22,7 @@ public class FujianSurveyService extends DataService, F public LambdaQueryWrapper trendQuery(Object obj, Integer year, Integer month) { var data = (FujianSurvey) obj; LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(FujianSurvey::getName, data.getName()); - query.eq(FujianSurvey::getSpec, data.getSpec()); + query.eq(FujianSurvey::getMaterialId, data.getMaterialId()); var date = LocalDate.of(year, month, 1); query.between(FujianSurvey::getDate, date.minusYears(1), date.plusMonths(1)); query.orderByAsc(FujianSurvey::getDate); @@ -68,8 +65,7 @@ public class FujianSurveyService extends DataService, F public FujianSurvey getMapGroupingBy(Map item) { var o = new FujianSurvey(); - o.setName(item.get("name").toString()); - o.setSpec(item.get("spec").toString()); + o.setMaterialId(item.get("material_id").toString()); return o; } } diff --git a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java b/src/main/java/mjkf/xinke/main/service/data/FuzhouHighwayBureauService.java similarity index 86% rename from src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java rename to src/main/java/mjkf/xinke/main/service/data/FuzhouHighwayBureauService.java index 92de1bf..2538701 100644 --- a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java +++ b/src/main/java/mjkf/xinke/main/service/data/FuzhouHighwayBureauService.java @@ -1,8 +1,7 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.constant.MaterialTaskType; -import mjkf.xinke.main.model.db.FujianSurvey; import mjkf.xinke.main.model.db.FuzhouHighwayBureau; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Service; @@ -15,8 +14,7 @@ public class FuzhouHighwayBureauService extends DataService indexQuery(FuzhouHighwayBureau data) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(FuzhouHighwayBureau::getName, data.getName()); - query.eq(FuzhouHighwayBureau::getSpec, data.getSpec()); + query.eq(FuzhouHighwayBureau::getMaterialId, data.getMaterialId()); query.eq(FuzhouHighwayBureau::getDate, data.getDate()); query.eq(FuzhouHighwayBureau::getRegion, data.getRegion()); return query; @@ -25,8 +23,7 @@ public class FuzhouHighwayBureauService extends DataService trendQuery(Object obj, Integer year, Integer month) { var data = (FuzhouHighwayBureau) obj; LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(FuzhouHighwayBureau::getName, data.getName()); - query.eq(FuzhouHighwayBureau::getSpec, data.getSpec()); + query.eq(FuzhouHighwayBureau::getMaterialId, data.getMaterialId()); var date = LocalDate.of(year, month, 1); query.between(FuzhouHighwayBureau::getDate, date.minusYears(1), date.plusMonths(1)); query.orderByAsc(FuzhouHighwayBureau::getDate); @@ -69,8 +66,7 @@ public class FuzhouHighwayBureauService extends DataService, public LambdaQueryWrapper indexQuery(LocalMaterial data) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(LocalMaterial::getName, data.getName()); + query.eq(LocalMaterial::getSpec, data.getSpec()); query.eq(LocalMaterial::getCity, data.getCity()); query.eq(LocalMaterial::getCounty, data.getCounty()); - query.eq(LocalMaterial::getSpec, data.getSpec()); query.eq(LocalMaterial::getDate, data.getDate()); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/OilService.java b/src/main/java/mjkf/xinke/main/service/data/OilService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/OilService.java rename to src/main/java/mjkf/xinke/main/service/data/OilService.java index 2368a50..aa95f0d 100644 --- a/src/main/java/mjkf/xinke/main/service/OilService.java +++ b/src/main/java/mjkf/xinke/main/service/data/OilService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.Oil; diff --git a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java b/src/main/java/mjkf/xinke/main/service/data/SanmingSteelService.java similarity index 91% rename from src/main/java/mjkf/xinke/main/service/SanmingSteelService.java rename to src/main/java/mjkf/xinke/main/service/data/SanmingSteelService.java index a78108b..8f2ceb7 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/data/SanmingSteelService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.SanmingSteel; @@ -20,8 +20,6 @@ public class SanmingSteelService extends DataService, S public LambdaQueryWrapper trendQuery(Object obj, Integer year, Integer month) { var data = (SanmingSteel) obj; LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(SanmingSteel::getName, data.getName()); - query.eq(SanmingSteel::getSpec, data.getSpec()); query.eq(SanmingSteel::getMaterial, data.getMaterial()); var date = LocalDate.of(year, month, 1); query.between(SanmingSteel::getDate, date.minusYears(1), date.plusMonths(1)); @@ -63,8 +61,6 @@ public class SanmingSteelService extends DataService, S public SanmingSteel getMapGroupingBy(Map item) { var o = new SanmingSteel(); - o.setName(item.get("name").toString()); - o.setSpec(item.get("spec").toString()); o.setMaterial(item.get("material").toString()); return o; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java b/src/main/java/mjkf/xinke/main/service/data/SteelPlateService.java similarity index 94% rename from src/main/java/mjkf/xinke/main/service/SteelPlateService.java rename to src/main/java/mjkf/xinke/main/service/data/SteelPlateService.java index 2d77508..4beaf11 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java +++ b/src/main/java/mjkf/xinke/main/service/data/SteelPlateService.java @@ -1,16 +1,13 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.SteelPlate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.poi.ss.usermodel.Row; import org.springframework.stereotype.Service; import java.time.LocalDate; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @Service @Deprecated diff --git a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java b/src/main/java/mjkf/xinke/main/service/data/SteelRebarService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/SteelRebarService.java rename to src/main/java/mjkf/xinke/main/service/data/SteelRebarService.java index cd4d09a..32c245a 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java +++ b/src/main/java/mjkf/xinke/main/service/data/SteelRebarService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.SteelRebar; diff --git a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java b/src/main/java/mjkf/xinke/main/service/data/SteelSectionService.java similarity index 97% rename from src/main/java/mjkf/xinke/main/service/SteelSectionService.java rename to src/main/java/mjkf/xinke/main/service/data/SteelSectionService.java index 848d074..152a01c 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java +++ b/src/main/java/mjkf/xinke/main/service/data/SteelSectionService.java @@ -1,8 +1,9 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.SteelSection; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import mjkf.xinke.main.service.data.DataService; import org.springframework.stereotype.Service; import java.time.LocalDate; diff --git a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java b/src/main/java/mjkf/xinke/main/service/data/SteelStrandService.java similarity index 98% rename from src/main/java/mjkf/xinke/main/service/SteelStrandService.java rename to src/main/java/mjkf/xinke/main/service/data/SteelStrandService.java index 1413d59..9bc70dd 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java +++ b/src/main/java/mjkf/xinke/main/service/data/SteelStrandService.java @@ -1,4 +1,4 @@ -package mjkf.xinke.main.service; +package mjkf.xinke.main.service.data; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import mjkf.xinke.main.model.db.SteelStrand; diff --git a/src/main/resources/_sql/init/mysql/v0.9.sql b/src/main/resources/_sql/init/mysql/v0.9.sql new file mode 100644 index 0000000..08cb68a --- /dev/null +++ b/src/main/resources/_sql/init/mysql/v0.9.sql @@ -0,0 +1,6 @@ +UPDATE MATERIAL SET ROUND_BIT = 0, ROUND_METHOD = 'normal' WHERE ID IN ('2001001', '2001002', '2001008', '2003004', '2003005', '2003005001', '3001001002', '3001001001', '3001002002', '3001002001', '5509001', '5509002', '5509003', '2001003', '2001006', '2001013', '2001019', '2001025', '2001026', '2003006', '2003007', '2003012', '2003008', '2003009', '2003015', '2003016', '2003017001', '2003017002', '2003021', '2003022', '2004004', '4003001001', '4003001002', '4003002001', '4003002002', '4005001', '6001059', '6001071', '6001080', '6001086', '6001089', '6001092', '6002001', '6002002', '6002003', '6002004', '6002005', '6002006', '6003001', '6003003', '6005005', '6005009', '6005015', '6007002'); +UPDATE MATERIAL SET ROUND_BIT = 2, ROUND_METHOD = 'none' WHERE ID IN ('3003002001', '3003002002', '3003003', '5007003001'); +UPDATE MATERIAL SET ROUND_BIT = 1, ROUND_METHOD = 'none' WHERE ID IN ('2005002', '2009028', '2009033', '5005001', '5005002', '5005003', '5005006', '5005007', '5005009', '5006001', '5006002', '5009002', '6001002', '6001003'); + +DROP INDEX Idx_key ON data_fujian; +DROP INDEX Idx_key ON fuzhou_highway_bureau; \ No newline at end of file