dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检测上线

Browse Source
This commit is contained in:
13405411873 2024-09-19 23:05:23 +08:00
parent 9629957e59
commit bd0e7afcf3
10 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/websocket/InspectionMsgSocket.java
View File

@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date: 2023/7/9 10:21 * @Date: 2023/7/9 10:21
* @Description : * @Description :
*/ */
@ServerEndpoint(value = "/websocket/inspectionMsg/{partnerId}") @ServerEndpoint(value = "/admin-api/websocket/inspectionMsg/{partnerId}")
@Component @Component
public class InspectionMsgSocket { public class InspectionMsgSocket {
private final static Logger log = LoggerFactory.getLogger(InspectionMsgSocket.class); private final static Logger log = LoggerFactory.getLogger(InspectionMsgSocket.class);

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java
View File

@ -40,7 +40,7 @@ public class PartnerCustomerInfoController extends BaseController
partnerCustomerInfo.setPartnerId(partners.getPartnerId()); partnerCustomerInfo.setPartnerId(partners.getPartnerId());
int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
// Page<PartnerCustomerInfo> page = new Page<>(pageNum,pageSize); Page<PartnerCustomerInfo> page = new Page<>(pageNum,pageSize);
startPage(); startPage();
List<PartnerCustomerInfo> list = partnerCustomerInfoService.selectPartnerCustomerInfoList(partnerCustomerInfo); List<PartnerCustomerInfo> list = partnerCustomerInfoService.selectPartnerCustomerInfoList(partnerCustomerInfo);
return getDataTable(list); return getDataTable(list);

1
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java
View File

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.partner.mapper;
import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo; import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java
View File

@ -29,7 +29,7 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
List<InspectionInfo> inspectionList(@Param("status") String status, @Param("userId")Long userId); List<InspectionInfo> inspectionList(@Param("status") String status, @Param("userId")Long userId);
List<OrderInfo> orderListSystem(@Param("vo") OrderInfo orderInfo); List<OrderInfo> orderListSystem( OrderInfo orderInfo);
List<JSONObject> statisticsZXTMonth(@Param("partnerId") Long partnerId,@Param("startTime")String startTime,@Param("endTime")String endTime); List<JSONObject> statisticsZXTMonth(@Param("partnerId") Long partnerId,@Param("startTime")String startTime,@Param("endTime")String endTime);

8
dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml
View File

@ -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 id, partner_id, customer_name, customer_phone, user_id, sex, user_age, dept_id, create_time, creator, update_time, updater from partner_customer_info
</sql> </sql>
<select id="selectPartnerCustomerInfoList" parameterType="cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo" resultMap="PartnerCustomerInfoResult"> <select id="selectPartnerCustomerInfoList" parameterType="cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo" resultType="cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo">
select pci.*,sr.name as roleName,sr.code as roleCode from partner_customer_info pci 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 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_users su on su.id = pci.user_id
left join system_user_role sur on sur.user_id = su.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"
<if test="vo.customerName != null and vo.customerName != ''"> and pci.customer_name like concat('%', #{vo.customerName}, '%')</if> <if test="vo.customerName != null and vo.customerName != ''"> and pci.customer_name like concat('%', #{vo.customerName}, '%')</if>
<if test="vo.customerPhone != null and vo.customerPhone != ''"> and pci.customer_phone like concat('%', #{vo.customerPhone}, '%')</if> <if test="vo.customerPhone != null and vo.customerPhone != ''"> and pci.customer_phone like concat('%', #{vo.customerPhone}, '%')</if>
<if test="vo.roleCode != null and vo.roleCode != ''"> and sr.code = #{vo.roleCode}</if> <if test="vo.roleCode != null and vo.roleCode != ''"> and sr.code = #{vo.roleCode}</if>
</where> </where>
group by pci.id group by pci.id
order by suc.next_inspection_date order by suc.next_inspection_date

42
dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml
View File

@ -59,38 +59,38 @@
LEFT JOIN system_users su ON su.id = oi.user_id 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 left join shop_user_car suc on suc.car_id = oi.user_car_id
where 1=1 where 1=1
<if test="vo.orderStatus!=null and vo.orderStatus!='' "> <if test="orderStatus!=null and orderStatus!='' ">
and oi.order_status = #{vo.orderStatus} and oi.order_status = #{orderStatus}
</if> </if>
<if test="vo.validationTime!=null"> <if test="validationTime!=null">
and oi.validation_time is not null and oi.validation_time is not null
</if> </if>
<if test="vo.realName!=null and vo.realName!='' "> <if test="realName!=null and realName!='' ">
and oi.real_name like concat('%',#{vo.realName},'%') and oi.real_name like concat('%',#{realName},'%')
</if> </if>
<if test="vo.orderNo!=null and vo.orderNo!='' "> <if test="orderNo!=null and orderNo!='' ">
and oi.order_no like concat('%',#{vo.orderNo},'%') and oi.order_no like concat('%',#{orderNo},'%')
</if> </if>
<if test="vo.goodsTitle!=null and vo.goodsTitle!='' "> <if test="goodsTitle!=null and goodsTitle!='' ">
and oi.goods_title like concat('%',#{vo.goodsTitle},'%') and oi.goods_title like concat('%',#{goodsTitle},'%')
</if> </if>
<if test="vo.validationRealName!=null and vo.validationRealName!='' "> <if test="validationRealName!=null and validationRealName!='' ">
and oi.validation_real_name like concat('%',#{vo.validationRealName},'%') and oi.validation_real_name like concat('%',#{validationRealName},'%')
</if> </if>
<if test="vo.phonenumber!=null and vo.phonenumber!='' "> <if test="phonenumber!=null and phonenumber!='' ">
and su.mobile like concat('%',#{vo.phonenumber},'%') and su.mobile like concat('%',#{phonenumber},'%')
</if> </if>
<if test="vo.realPayMoney!=null "> <if test="realPayMoney!=null ">
and oi.pay_money <![CDATA[>=]]> #{vo.realPayMoney} and oi.pay_money <![CDATA[>=]]> #{realPayMoney}
</if> </if>
<if test="vo.startTime!=null "> <if test="startTime!=null ">
and oi.pay_time <![CDATA[>=]]> #{vo.startTime} and oi.pay_time <![CDATA[>=]]> #{startTime}
</if> </if>
<if test="vo.endTime!=null "> <if test="endTime!=null ">
and oi.pay_time <![CDATA[<=]]> #{vo.endTime} and oi.pay_time <![CDATA[<=]]> #{endTime}
</if> </if>
<if test="vo.partnerId!=null "> <if test="partnerId!=null ">
and oi.partner_id = #{vo.partnerId} and oi.partner_id = #{partnerId}
</if> </if>
order by order_time desc order by order_time desc
</select> </select>

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/AnnouncementSocket.java
View File

@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date: 2023/7/9 10:21 * @Date: 2023/7/9 10:21
* @Description : * @Description :
*/ */
@ServerEndpoint(value = "/websocket/announcement/{userId}") @ServerEndpoint(value = "/admin-api/websocket/announcement/{userId}")
@Component @Component
public class AnnouncementSocket { public class AnnouncementSocket {
private final static Logger log = LoggerFactory.getLogger(AnnouncementSocket.class); private final static Logger log = LoggerFactory.getLogger(AnnouncementSocket.class);

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java
View File

@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date: 2023/7/9 10:21 * @Date: 2023/7/9 10:21
* @Description : * @Description :
*/ */
@ServerEndpoint(value = "/websocket/rescueDriver/{driverId}") @ServerEndpoint(value = "/admin-api/websocket/rescueDriver/{driverId}")
@Component @Component
public class RescueDriverSocket { public class RescueDriverSocket {
private final static Logger log = LoggerFactory.getLogger(RescueDriverSocket.class); private final static Logger log = LoggerFactory.getLogger(RescueDriverSocket.class);

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java
View File

@ -163,7 +163,7 @@ public class SysLoginController {
} }
List<RoleReqDTO> roleList = roleApi.getRoleList(); List<RoleReqDTO> roleList = roleApi.getRoleList();
List<String> roleNames = roleList.stream().filter(item -> roleIdsByUserId.contains(item.getId())).map(item -> item.getName()).collect(Collectors.toList()); List<String> 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) { if (!flag) {
return error(CommonErrorCodeConstants.LOGIN_ACCOUNT_NOT_EXIST); return error(CommonErrorCodeConstants.LOGIN_ACCOUNT_NOT_EXIST);

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/UserAnnouncementSocket.java
View File

@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date: 2023/7/9 10:21 * @Date: 2023/7/9 10:21
* @Description : * @Description :
*/ */
@ServerEndpoint(value = "/websocket/userAnnouncement/{userId}") @ServerEndpoint(value = "/admin-api/websocket/userAnnouncement/{userId}")
@Component @Component
public class UserAnnouncementSocket { public class UserAnnouncementSocket {
private final static Logger log = LoggerFactory.getLogger(UserAnnouncementSocket.class); private final static Logger log = LoggerFactory.getLogger(UserAnnouncementSocket.class);