From 393d55e78e1d7e243e9cded033eb768e652b0b0e Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Wed, 12 Nov 2025 17:06:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E7=82=AC=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/support/handler/j/JsonTypeHandler.java | 17 +++++++++--- .../SupervisionStatisticsController.java | 17 ++++-------- .../supervisory/statistics/pojo/Order.java | 1 + .../service/ShouJuStatisticsService.java | 6 ++--- .../resources/application-dev_shou_ju.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../mapper/ShouJuStatisticsMapper.xml | 26 ++----------------- .../mapper/SupervisionStatisticsMapper.xml | 3 ++- 8 files changed, 28 insertions(+), 46 deletions(-) diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java index 77e9e57..f546ae5 100644 --- a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java @@ -1,8 +1,8 @@ package com.njzscloud.common.mp.support.handler.j; import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; import com.njzscloud.common.core.fastjson.Fastjson; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; @@ -28,21 +28,30 @@ public class JsonTypeHandler implements TypeHandler { } + private static Object getResult(String result) { + if (StrUtil.isBlank(result)) return null; + try { + return Fastjson.toBean(result, Object.class); + } catch (Exception e) { + return result; + } + } + @Override public Object getResult(ResultSet rs, String columnName) throws SQLException { String result = rs.getString(columnName); - return StrUtil.isBlank(result) ? null : Fastjson.toBean(result, Object.class); + return getResult(result); } @Override public Object getResult(ResultSet rs, int columnIndex) throws SQLException { String result = rs.getString(columnIndex); - return StrUtil.isBlank(result) ? null : Fastjson.toBean(result, Object.class); + return getResult(result); } @Override public Object getResult(CallableStatement cs, int columnIndex) throws SQLException { String result = cs.getString(columnIndex); - return StrUtil.isBlank(result) ? null : Fastjson.toBean(result, Object.class); + return getResult(result); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/SupervisionStatisticsController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/SupervisionStatisticsController.java index 6150115..caf7d86 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/SupervisionStatisticsController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/SupervisionStatisticsController.java @@ -1,30 +1,23 @@ package com.njzscloud.supervisory.statistics.controller; -import com.njzscloud.common.core.utils.R; import com.njzscloud.supervisory.statistics.service.SupervisionStatisticsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; @Slf4j -@CrossOrigin -@RestController +// @CrossOrigin +// @RestController @RequiredArgsConstructor -@RequestMapping("/statistics/supervision") +// @RequestMapping("/statistics/supervision") public class SupervisionStatisticsController { private final SupervisionStatisticsService supervisionStatisticsService; - +/* @GetMapping("/obtain_data") public R obtainData() { long l = System.currentTimeMillis(); Map data = supervisionStatisticsService.obtainData(); System.out.println("耗时: " + (System.currentTimeMillis() - l)); return R.success(data); - } + } */ } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/Order.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/Order.java index eb3a822..c4f8bbd 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/Order.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/Order.java @@ -16,6 +16,7 @@ public class Order { private String mobile; private String goodsCategoryName; private String createTime; + private String outTime; private String orderStatus; private String carNumber; private String driverName; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java index e410147..7a1965b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java @@ -174,8 +174,8 @@ public class ShouJuStatisticsService implements StatisticsService { .thenApply(list -> { if (list.size() < 6) { List goodsNames = statisticsMapper.getGoodsNames(Wrappers.query().eq("depot_type", 2) - .notLike("name", "青石") - .notLike("name", "矿石") + // .notLike("name", "青石") + // .notLike("name", "矿石") , 6 - list.size()); for (String goodsName : goodsNames) { list.add(new GarbageDisposeSummary() @@ -443,7 +443,7 @@ public class ShouJuStatisticsService implements StatisticsService { .put("days", monthAmount_.get_2()) .put("yearAmountIn", yearAmount_.get_0()) .put("yearAmountOut", yearAmount_.get_1()) - .put("chuzhi", chuzhi) + .put("chuzhi", map2) .build(); } diff --git a/njzscloud-svr/src/main/resources/application-dev_shou_ju.yml b/njzscloud-svr/src/main/resources/application-dev_shou_ju.yml index c02890e..1fbdf9e 100644 --- a/njzscloud-svr/src/main/resources/application-dev_shou_ju.yml +++ b/njzscloud-svr/src/main/resources/application-dev_shou_ju.yml @@ -16,7 +16,7 @@ mybatis-plus: host: 121.43.155.83 port: 22 user: root - credentials: D:/我的/再昇云/客户信息归档/达州首炬/dzsj.pem + credentials: D:/W/首炬/dzsj.pem localPort: 33061 db: host: rm-bp1w3397b718u1882.mysql.rds.aliyuncs.com diff --git a/njzscloud-svr/src/main/resources/application.yml b/njzscloud-svr/src/main/resources/application.yml index 06c40c3..9570919 100644 --- a/njzscloud-svr/src/main/resources/application.yml +++ b/njzscloud-svr/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: file-size-threshold: 1MB resolve-lazily: true profiles: - active: ${APP_PROFILE:dev} + active: ${APP_PROFILE:dev_shou_ju} web: resources: add-mappings: false diff --git a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml index e1a42e3..2117f19 100644 --- a/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/ShouJuStatisticsMapper.xml @@ -15,8 +15,6 @@ WHERE a.station_id = 1 AND a.status IN (0, 1, 2, 3) AND a.type != 4 - AND b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' ORDER BY a.create_time DESC LIMIT 5) t1 UNION ALL @@ -29,8 +27,6 @@ INNER JOIN ba_goods b ON b.id = a.goods_id AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.station_id = 2 AND a.type != 4 - AND b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' AND a.status IN (0, 1, 2, 3) ORDER BY a.create_time DESC LIMIT 5) t2) a @@ -53,10 +49,8 @@ FROM ba_order a INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 1 AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) INNER JOIN ba_goods_category c ON c.id = b.category_id - WHERE b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%拆除垃圾(派车清运零星客户专用)%' + WHERE b.name NOT LIKE '%拆除垃圾(派车清运零星客户专用)%' AND b.name NOT LIKE '%拆除垃圾（活动优惠）%' - AND b.name NOT LIKE '%矿石%' AND a.type != 4 GROUP BY b.name) t ORDER BY weight DESC @@ -68,8 +62,6 @@ FROM ba_order a INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 2 AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) INNER JOIN ba_goods_category c ON c.id = b.category_id - WHERE b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' AND b.name NOT LIKE '%一期项目%' AND a.type != 4 GROUP BY b.name) t @@ -85,8 +77,6 @@ INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 2 AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.out_time >= UNIX_TIMESTAMP(DATE_FORMAT(CURDATE(), '%Y-%m-01 00:00:00')) AND a.type != 4 - AND b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' AND a.out_time UNIX_TIMESTAMP(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-%m-01'), INTERVAL 1 MONTH)) GROUP BY a.goods_name) t ORDER BY weight DESC @@ -103,8 +93,6 @@ INNER JOIN ba_goods c ON c.id = a.goods_id AND c.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.status IN (0, 1, 2, 3) AND a.type != 4 - AND c.name NOT LIKE '%青石%' - AND c.name NOT LIKE '%矿石%' GROUP BY b.id, IF(a.status = 1, 1, 0)) t1 INNER JOIN ba_user t2 ON t2.id = t1.id ORDER BY c DESC @@ -120,8 +108,6 @@ INNER JOIN ba_goods c ON c.id = a.goods_id AND c.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.status IN (0, 1, 2, 3) AND a.type != 4 - AND c.name NOT LIKE '%青石%' - AND c.name NOT LIKE '%矿石%' GROUP BY b.id, IF(a.status = 1, 1, 0)) t1 INNER JOIN ba_user t2 ON t2.id = t1.id ORDER BY c DESC)tt2 @@ -137,8 +123,6 @@ INNER JOIN ba_goods b ON b.id = a.goods_id AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.vip_user = #{userId} AND a.type != 4 - AND b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' ORDER BY a.create_time DESC LIMIT 10 @@ -148,8 +132,6 @@ INNER JOIN ba_goods b ON b.id = a.goods_id AND b.depot_type = 1 AND b.id NOT IN (287, 286, 279, 278, 293, 273, 271, 270, 262, 2) WHERE a.out_time >= #{startTime} AND a.out_time #{endTime} - AND b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' AND a.type != 4 @@ -177,8 +157,6 @@ AND a.out_time >= #{startTime} AND a.out_time #{endTime} AND a.type != 4 - AND b.name NOT LIKE '%青石%' - AND b.name NOT LIKE '%矿石%' diff --git a/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml index c64ecf8..9ea3750 100644 --- a/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml @@ -105,10 +105,11 @@ SELECT a.order_no, d.realname, d.mobile, + FROM_UNIXTIME(a.out_time, '%Y-%m-%d %H:%i:%s') out_time, e.name goods_category_name, FROM_UNIXTIME(a.create_time, '%Y-%m-%d %H:%i:%s') create_time, IF(a.type = 5 AND a.finish = 0 AND a.car_number = '', '待派车', - IF(b.status = 1 AND a.status NOT IN (1, 4, 5), '未接单', IF(b.status = 2 AND a.status NOT IN (1, 4, 5), '运输中', IF(b.status = 3, '已完成', + IF(b.status = 1 AND a.status NOT IN (1, 4, 5), '已派单', IF(b.status = 2 AND a.status NOT IN (1, 4, 5), '运输中', IF(b.status = 3, '已完成', CASE a.status WHEN '0' THEN '待授权' WHEN '1' THEN '已完成'