From 687ba4df15eac23554984fca2aec1b619c5849b3 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Wed, 18 Sep 2024 18:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                        | 2 +-
 src/main/java/mjkf/xinke/core/config/GlobalConfigure.java | 2 +-
 .../java/mjkf/xinke/main/controller/BudgetController.java | 8 ++++----
 .../xinke/main/controller/LocalMaterialController.java    | 2 +-
 .../main/modular/location/service/LocationService.java    | 4 +++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2222a08..17c3b21 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - /opt/files/material-manage-service:/files
       - /etc/localtime:/etc/localtime
     ports:
-      - "9882:9882"
+      - "19882:9882"
     environment:
       - TZ="Asia/Shanghai"
     entrypoint: java -server -Xms256m -Xmx256m -jar app.jar --spring.profiles.active=test
\ No newline at end of file
diff --git a/src/main/java/mjkf/xinke/core/config/GlobalConfigure.java b/src/main/java/mjkf/xinke/core/config/GlobalConfigure.java
index 878892e..40f1532 100644
--- a/src/main/java/mjkf/xinke/core/config/GlobalConfigure.java
+++ b/src/main/java/mjkf/xinke/core/config/GlobalConfigure.java
@@ -74,7 +74,7 @@ import java.util.*;
  * @date 2021/10/9 14:24
  **/
 @Configuration
-@MapperScan(basePackages = {"mjkf.xinke.**.mapper, mjkf.xinke.**.dao, com.bstek.**.mapper"})
+@MapperScan(basePackages = {"mjkf.xinke.**.mapper, mjkf.xinke.**.dao, com.bstek.**.mapper, mjkf.xinke.main.modular.**.mapper"})
 public class GlobalConfigure implements WebMvcConfigurer {
 
     private static final String COMMON_REPEAT_SUBMIT_CACHE_KEY = "common-repeatSubmit:";
diff --git a/src/main/java/mjkf/xinke/main/controller/BudgetController.java b/src/main/java/mjkf/xinke/main/controller/BudgetController.java
index d420ff9..40e9e84 100644
--- a/src/main/java/mjkf/xinke/main/controller/BudgetController.java
+++ b/src/main/java/mjkf/xinke/main/controller/BudgetController.java
@@ -156,8 +156,8 @@ public class BudgetController {
 
     // todo-1 公众网站历史数据
     // todo-1 地图里程数据
-    // todo-1 价格权重调整
-    // todo-1 外省数据上传
-    // todo-1 外省数据价格对比
-    // todo-1 趋势表加入调查表数据
+    // todo-2 价格权重调整
+    // todo-2 外省数据上传
+    // todo-2 外省数据价格对比
+    // todo-2 趋势表加入调查表数据
 }
diff --git a/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java b/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java
index ddac700..439eaae 100644
--- a/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java
+++ b/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java
@@ -44,7 +44,7 @@ public class LocalMaterialController {
 
     @ApiOperation("获取地材列表")
     @GetMapping("/")
-    public HttpResponse list (
+    public HttpResponse<List<LocalMaterialSummary>> list (
             @ApiParam(value = "年") @RequestParam(value="year") Integer year,
             @ApiParam(value = "月") @RequestParam(value="month") Integer month,
             @ApiParam(value = "地市") @RequestParam(value="city", required=false) String city,
diff --git a/src/main/java/mjkf/xinke/main/modular/location/service/LocationService.java b/src/main/java/mjkf/xinke/main/modular/location/service/LocationService.java
index f6ffbdf..373c177 100644
--- a/src/main/java/mjkf/xinke/main/modular/location/service/LocationService.java
+++ b/src/main/java/mjkf/xinke/main/modular/location/service/LocationService.java
@@ -85,7 +85,9 @@ public class LocationService extends ServiceImpl<BaseMapper<Location>, Location>
     @Transactional(rollbackFor = Exception.class)
     public void delete(List<LocationIdParam> locationIdParamList) {
         // 执行删除
-        this.removeByIds(CollStreamUtil.toList(locationIdParamList, LocationIdParam::getId));
+        for (var i : CollStreamUtil.toList(locationIdParamList, LocationIdParam::getId)) {
+            this.removeById(i);
+        }
     }
 
     public Location detail(LocationIdParam locationIdParam) {