From bd0e7afcf3c8feb045ce05d938dbfc8ee314f2cc Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Thu, 19 Sep 2024 23:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../websocket/InspectionMsgSocket.java | 2 +- .../PartnerCustomerInfoController.java | 2 +- .../mapper/PartnerCustomerInfoMapper.java | 1 - .../payment/mapper/OrderInfoMapper.java | 2 +- .../partner/PartnerCustomerInfoMapper.xml | 8 ++-- .../mapper/payment/OrderInfoMapper.xml | 42 +++++++++---------- .../controller/admin/AnnouncementSocket.java | 2 +- .../controller/admin/RescueDriverSocket.java | 2 +- .../controller/admin/SysLoginController.java | 2 +- .../admin/UserAnnouncementSocket.java | 2 +- 10 files changed, 33 insertions(+), 32 deletions(-) diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/websocket/InspectionMsgSocket.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/websocket/InspectionMsgSocket.java index bb08250f..62c57b8b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/websocket/InspectionMsgSocket.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/websocket/InspectionMsgSocket.java @@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap; * @Date: 2023/7/9 10:21 * @Description : */ -@ServerEndpoint(value = "/websocket/inspectionMsg/{partnerId}") +@ServerEndpoint(value = "/admin-api/websocket/inspectionMsg/{partnerId}") @Component public class InspectionMsgSocket { private final static Logger log = LoggerFactory.getLogger(InspectionMsgSocket.class); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java index 1bd654e8..766d9758 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java @@ -40,7 +40,7 @@ public class PartnerCustomerInfoController extends BaseController partnerCustomerInfo.setPartnerId(partners.getPartnerId()); int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); -// Page page = new Page<>(pageNum,pageSize); + Page page = new Page<>(pageNum,pageSize); startPage(); List list = partnerCustomerInfoService.selectPartnerCustomerInfoList(partnerCustomerInfo); return getDataTable(list); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java index bfb88807..7053d3dd 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.partner.mapper; import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java index 6527d64f..d9f3abcf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java @@ -29,7 +29,7 @@ public interface OrderInfoMapper extends BaseMapper { List inspectionList(@Param("status") String status, @Param("userId")Long userId); - List orderListSystem(@Param("vo") OrderInfo orderInfo); + List orderListSystem( OrderInfo orderInfo); List statisticsZXTMonth(@Param("partnerId") Long partnerId,@Param("startTime")String startTime,@Param("endTime")String endTime); diff --git a/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml index 3335fd15..5947ce4e 100644 --- a/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml @@ -23,8 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, partner_id, customer_name, customer_phone, user_id, sex, user_age, dept_id, create_time, creator, update_time, updater from partner_customer_info - + select pci.*, + sr.name as roleName, + sr.code as roleCode + from partner_customer_info pci left join shop_user_car suc on suc.user_id = pci.user_id left join system_users su on su.id = pci.user_id left join system_user_role sur on sur.user_id = su.id @@ -34,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pci.customer_name like concat('%', #{vo.customerName}, '%') and pci.customer_phone like concat('%', #{vo.customerPhone}, '%') and sr.code = #{vo.roleCode} - group by pci.id order by suc.next_inspection_date diff --git a/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml index 5bb1e0b3..88fa98cb 100644 --- a/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml @@ -59,38 +59,38 @@ LEFT JOIN system_users su ON su.id = oi.user_id left join shop_user_car suc on suc.car_id = oi.user_car_id where 1=1 - - and oi.order_status = #{vo.orderStatus} + + and oi.order_status = #{orderStatus} - + and oi.validation_time is not null - - and oi.real_name like concat('%',#{vo.realName},'%') + + and oi.real_name like concat('%',#{realName},'%') - - and oi.order_no like concat('%',#{vo.orderNo},'%') + + and oi.order_no like concat('%',#{orderNo},'%') - - and oi.goods_title like concat('%',#{vo.goodsTitle},'%') + + and oi.goods_title like concat('%',#{goodsTitle},'%') - - and oi.validation_real_name like concat('%',#{vo.validationRealName},'%') + + and oi.validation_real_name like concat('%',#{validationRealName},'%') - - and su.mobile like concat('%',#{vo.phonenumber},'%') + + and su.mobile like concat('%',#{phonenumber},'%') - - and oi.pay_money =]]> #{vo.realPayMoney} + + and oi.pay_money =]]> #{realPayMoney} - - and oi.pay_time =]]> #{vo.startTime} + + and oi.pay_time =]]> #{startTime} - - and oi.pay_time #{vo.endTime} + + and oi.pay_time #{endTime} - - and oi.partner_id = #{vo.partnerId} + + and oi.partner_id = #{partnerId} order by order_time desc diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/AnnouncementSocket.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/AnnouncementSocket.java index d2dbdf9b..4a705872 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/AnnouncementSocket.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/AnnouncementSocket.java @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; * @Date: 2023/7/9 10:21 * @Description : */ -@ServerEndpoint(value = "/websocket/announcement/{userId}") +@ServerEndpoint(value = "/admin-api/websocket/announcement/{userId}") @Component public class AnnouncementSocket { private final static Logger log = LoggerFactory.getLogger(AnnouncementSocket.class); diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java index 1e9b1549..03a66fa4 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap; * @Date: 2023/7/9 10:21 * @Description : */ -@ServerEndpoint(value = "/websocket/rescueDriver/{driverId}") +@ServerEndpoint(value = "/admin-api/websocket/rescueDriver/{driverId}") @Component public class RescueDriverSocket { private final static Logger log = LoggerFactory.getLogger(RescueDriverSocket.class); diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java index 1aa85f96..3fefa956 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java @@ -163,7 +163,7 @@ public class SysLoginController { } List roleList = roleApi.getRoleList(); List roleNames = roleList.stream().filter(item -> roleIdsByUserId.contains(item.getId())).map(item -> item.getName()).collect(Collectors.toList()); - Boolean flag = (loginBody.getType().equals("0") && roleNames.contains("救援业务管理员")) || (loginBody.getType().equals("0") && roleNames.contains("交警大队")); + Boolean flag = (loginBody.getType().equals("0") && roleNames.contains("调度中心")) || (loginBody.getType().equals("0") && roleNames.contains("交警大队")); // 角色认证登录 if (!flag) { return error(CommonErrorCodeConstants.LOGIN_ACCOUNT_NOT_EXIST); diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/UserAnnouncementSocket.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/UserAnnouncementSocket.java index 84a9ac98..2803b336 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/UserAnnouncementSocket.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/UserAnnouncementSocket.java @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap; * @Date: 2023/7/9 10:21 * @Description : */ -@ServerEndpoint(value = "/websocket/userAnnouncement/{userId}") +@ServerEndpoint(value = "/admin-api/websocket/userAnnouncement/{userId}") @Component public class UserAnnouncementSocket { private final static Logger log = LoggerFactory.getLogger(UserAnnouncementSocket.class);