test:(正常使用 没有之前的bug)
parent
4cb510bd71
commit
cdff710a90
|
@ -0,0 +1,25 @@
|
|||
package com.muyu.common.system.remote;
|
||||
|
||||
|
||||
import com.muyu.common.core.constant.ServiceNameConstants;
|
||||
|
||||
import com.muyu.common.core.domain.Result;
|
||||
import com.muyu.common.system.domain.EntInfo;
|
||||
import com.muyu.common.system.remote.factory.RemoteNetworkingFallbackFactory;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 用户服务
|
||||
*
|
||||
* @author muyu
|
||||
*/
|
||||
@FeignClient(contextId = "remoteNetworkingService", value = ServiceNameConstants.NET, fallbackFactory = RemoteNetworkingFallbackFactory.class)
|
||||
public interface RemoteNetworkingService {
|
||||
@GetMapping("/entInfo/list")
|
||||
public Result<List<EntInfo>> list() ;
|
||||
|
||||
}
|
|
@ -16,8 +16,8 @@ import java.util.List;
|
|||
* @author muyu
|
||||
*/
|
||||
@Component
|
||||
public class RemoteUserFallbackFactory implements FallbackFactory<RemoteNetworkingService> {
|
||||
private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
|
||||
public class RemoteNetworkingFallbackFactory implements FallbackFactory<RemoteNetworkingService> {
|
||||
private static final Logger log = LoggerFactory.getLogger(RemoteNetworkingFallbackFactory.class);
|
||||
|
||||
@Override
|
||||
public RemoteNetworkingService create (Throwable throwable) {
|
|
@ -20,4 +20,5 @@ public class ServiceNameConstants {
|
|||
* 文件服务的serviceid
|
||||
*/
|
||||
public static final String FILE_SERVICE = "muyu-file";
|
||||
public static final String NET = "muyu-networking";
|
||||
}
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
package com.muyu.common.datasource.annotation;
|
||||
import com.muyu.common.datasource.annotation;
|
||||
|
||||
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
|
|
|
@ -3,12 +3,12 @@ package com.muyu.common.system.remote;
|
|||
import com.muyu.common.core.constant.SecurityConstants;
|
||||
import com.muyu.common.core.constant.ServiceNameConstants;
|
||||
import com.muyu.common.core.domain.Result;
|
||||
import com.muyu.common.system.domain.EntInfo;
|
||||
|
||||
import com.muyu.common.system.domain.SysRole;
|
||||
import com.muyu.common.system.domain.SysUser;
|
||||
import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
|
||||
import com.muyu.common.system.domain.LoginUser;
|
||||
//import com.muyu.domain.datasources.EntInfo;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
@ -38,8 +38,7 @@ public interface RemoteUserService {
|
|||
@PostMapping("/user")
|
||||
public Result add (@Validated @RequestBody SysUser user);
|
||||
|
||||
@GetMapping("/list")
|
||||
public Result<List<EntInfo>> list();
|
||||
|
||||
|
||||
|
||||
@PostMapping
|
||||
|
@ -48,8 +47,8 @@ public interface RemoteUserService {
|
|||
|
||||
|
||||
|
||||
@GetMapping("selectUserById")
|
||||
public Result selectUserById (Long userId);
|
||||
@GetMapping("/user/selectUserById")
|
||||
public Result<SysUser> selectUserById (@RequestParam("userId") Long userId);
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package com.muyu.common.system.remote.factory;
|
||||
|
||||
import com.muyu.common.core.domain.Result;
|
||||
import com.muyu.common.system.domain.EntInfo;
|
||||
|
||||
import com.muyu.common.system.domain.SysRole;
|
||||
import com.muyu.common.system.remote.RemoteUserService;
|
||||
import com.muyu.common.system.domain.SysUser;
|
||||
import com.muyu.common.system.domain.LoginUser;
|
||||
//import com.muyu.domain.datasources.EntInfo;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
|
@ -39,10 +39,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
|
|||
|
||||
|
||||
|
||||
@Override
|
||||
public Result<List<EntInfo>> list() {
|
||||
return Result.error("获取失败");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result addRole(SysRole role) {
|
||||
|
@ -50,8 +46,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
|
|||
}
|
||||
|
||||
@Override
|
||||
public Result selectUserById(Long userId) {
|
||||
return Result.error("获取用户失败:{}", throwable.getMessage());
|
||||
public Result<SysUser> selectUserById(Long userId) {
|
||||
return Result.error("调用失败:");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -51,14 +51,14 @@ public class FaultRecord {
|
|||
private String vin;
|
||||
|
||||
/** 故障开始时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "故障开始时间", value = "故障开始时间")
|
||||
private Date startTime;
|
||||
|
||||
/** 故障结束时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "故障结束时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "故障结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "故障结束时间", value = "故障结束时间")
|
||||
private Date endTime;
|
||||
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
package com.muyu.domain;
|
||||
|
||||
import com.muyu.common.core.web.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
import javax.naming.ldap.PagedResultsControl;
|
||||
|
||||
/** 支付表
|
||||
* @ClassDescription:
|
||||
* @JdkVersion: 17
|
||||
* @Author: zhangxu
|
||||
* @Created: 2024/5/25 9:33
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor@SuperBuilder
|
||||
public class PayOf extends BaseEntity {
|
||||
/**
|
||||
* 支付id
|
||||
* */
|
||||
private Long id;
|
||||
/**
|
||||
* 企业id
|
||||
* */
|
||||
private Long enterpriseId;
|
||||
/**
|
||||
* 支付方式/类型(id)
|
||||
* */
|
||||
private Long modeOfPaymentId;
|
||||
/**
|
||||
* 需要支付的金额
|
||||
* */
|
||||
private Double price;
|
||||
|
||||
|
||||
}
|
|
@ -1,34 +0,0 @@
|
|||
package com.muyu.domain.datasources;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @ClassDescription:
|
||||
* @JdkVersion: 17
|
||||
* @Author: zhangxu
|
||||
* @Created: 2024/6/10 20:40
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
@TableName("etn_info")
|
||||
public class EntInfo {
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
private String entCode;
|
||||
|
||||
private String ip;
|
||||
|
||||
private Long port;
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
package com.muyu.domain.req;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @ClassDescription:
|
||||
* @JdkVersion: 17
|
||||
* @Author: zhangxu
|
||||
* @Created: 2024/6/24 8:47
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder
|
||||
public class FaultRecordReqVo {
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date max;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date min;
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,27 @@
|
|||
package com.muyu.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* @ClassDescription:
|
||||
* @JdkVersion: 17
|
||||
* @Author: zhangxu
|
||||
* @Created: 2024/6/24 8:37
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder
|
||||
public class FaultRecordVo {
|
||||
|
||||
private String faultCode;
|
||||
|
||||
private String vin;
|
||||
|
||||
private Integer count;
|
||||
|
||||
private String faultLabel;
|
||||
}
|
|
@ -1,47 +0,0 @@
|
|||
package com.muyu.networking.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.muyu.domain.FaultRecord;
|
||||
import com.muyu.networking.mapper.FaultRecordMapper;
|
||||
import com.muyu.networking.service.FaultRecordService;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.amqp.RabbitTemplateConfigurer;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ClassDescription:
|
||||
* @JdkVersion: 17
|
||||
* @Author: zhangxu
|
||||
* @Created: 2024/6/20 15:22
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class FaultRecordServiceImpl extends ServiceImpl<FaultRecordMapper, FaultRecord> implements FaultRecordService {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询故障记录列表
|
||||
*
|
||||
* @param faultRecord 故障记录
|
||||
* @return 故障记录
|
||||
*/
|
||||
@Override
|
||||
public List<FaultRecord> list(FaultRecord faultRecord) {
|
||||
LambdaQueryWrapper<FaultRecord> queryWrapper = new LambdaQueryWrapper<>();
|
||||
return list(queryWrapper);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -69,7 +69,7 @@ public class SysUserController extends BaseController {
|
|||
|
||||
|
||||
@GetMapping("selectUserById")
|
||||
public Result selectUserById (Long userId) {
|
||||
public Result<SysUser> selectUserById (@RequestParam("userId") Long userId) {
|
||||
SysUser user = userService.selectUserById(userId);
|
||||
return success(user);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.muyu.system.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.muyu.common.system.domain.SysUser;
|
||||
import com.muyu.system.domain.SysUserRole;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
|
@ -57,6 +58,10 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
|
|||
*/
|
||||
public int deleteUserRoleInfo (SysUserRole userRole);
|
||||
|
||||
|
||||
public SysUser selectById(Long id);
|
||||
|
||||
|
||||
/**
|
||||
* 批量取消授权用户角色
|
||||
*
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
<result property="sex" column="sex"/>
|
||||
<result property="avatar" column="avatar"/>
|
||||
<result property="entId" column="ent_id"/>
|
||||
<result property="enterpriseId" column="enterprise_id"/>
|
||||
<result property="password" column="password"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
|
@ -56,6 +57,7 @@
|
|||
u.avatar,
|
||||
u.phonenumber,
|
||||
u.ent_id,
|
||||
u.enterprise_id,
|
||||
u.password,
|
||||
u.sex,
|
||||
u.status,
|
||||
|
@ -85,7 +87,7 @@
|
|||
</sql>
|
||||
|
||||
<select id="selectUserList" parameterType="com.muyu.common.system.domain.SysUser" resultMap="SysUserResult">
|
||||
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar,u.ent_id, u.password, u.phonenumber, u.sex, u.status,
|
||||
select u.user_id, u.dept_id, u.nick_name, u.enterprise_id,u.user_name, u.email, u.avatar,u.ent_id, u.password, u.phonenumber, u.sex, u.status,
|
||||
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
|
||||
u
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
|
@ -157,7 +159,7 @@
|
|||
where u.user_name = #{userName} and u.del_flag = '0'
|
||||
</select>
|
||||
|
||||
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
||||
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
||||
<include refid="selectUserVo"/>
|
||||
where u.user_id = #{userId}
|
||||
</select>
|
||||
|
|
|
@ -7,10 +7,10 @@ import com.alibaba.fastjson.JSON;
|
|||
import com.muyu.common.core.domain.Result;
|
||||
import com.muyu.common.core.utils.SpringUtils;
|
||||
import com.muyu.common.system.domain.EntInfo;
|
||||
import com.muyu.common.system.remote.RemoteUserService;
|
||||
|
||||
|
||||
import com.muyu.common.system.remote.RemoteNetworkingService;
|
||||
import com.muyu.vehicle.myDatasource.domain.DataSourceInfo;
|
||||
import com.muyu.vehicle.myDatasource.domain.EnterpriseInfo;
|
||||
import com.muyu.vehicle.myDatasource.factory.DruidDataSourceFactory;
|
||||
import com.muyu.vehicle.myDatasource.rule.DynamicDataSource;
|
||||
import com.rabbitmq.client.Channel;
|
||||
|
@ -26,10 +26,7 @@ import org.springframework.stereotype.Component;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @ClassDescription:
|
||||
|
@ -43,7 +40,7 @@ public class ManyDataSource {
|
|||
|
||||
|
||||
@Autowired
|
||||
private RemoteUserService remoteEntInfoService;
|
||||
private RemoteNetworkingService remoteEntInfoService;
|
||||
|
||||
|
||||
@Autowired
|
||||
|
@ -83,30 +80,30 @@ public class ManyDataSource {
|
|||
}
|
||||
}
|
||||
|
||||
private List<EnterpriseInfo> dataSourceInfoList() {
|
||||
private List<EntInfo> dataSourceInfoList() {
|
||||
List<EntInfo> list = new ArrayList<>();
|
||||
Result<List<EntInfo>> entInfoResult = remoteEntInfoService.list();
|
||||
List<EntInfo> entInfoList = entInfoResult.getData();
|
||||
List<EnterpriseInfo> list = new ArrayList<>();
|
||||
entInfoList.forEach(entInfo -> {
|
||||
list.add(
|
||||
EnterpriseInfo.builder()
|
||||
EntInfo.builder()
|
||||
.entCode(entInfo.getEntCode())
|
||||
.ip(entInfo.getIp())
|
||||
.port(String.valueOf(entInfo.getPort()))
|
||||
.port(entInfo.getPort())
|
||||
.build()
|
||||
);
|
||||
});
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@Bean
|
||||
@Primary
|
||||
public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) {
|
||||
|
||||
Map<Object, Object> dataSourceMap = new HashMap<>();
|
||||
dataSourceInfoList()
|
||||
.stream()
|
||||
.map(enterpriseInfo -> DataSourceInfo.hostAndPortBuild(enterpriseInfo.getEntCode(), enterpriseInfo.getIp(), Integer.valueOf(enterpriseInfo.getPort())))
|
||||
.map(enterpriseInfo -> DataSourceInfo.hostAndPortBuild(enterpriseInfo.getEntCode(), enterpriseInfo.getIp(), enterpriseInfo.getPort().intValue()))
|
||||
.forEach(dataSourceInfo -> {
|
||||
dataSourceMap.put(dataSourceInfo.getKey(), druidDataSourceFactory.create(dataSourceInfo));
|
||||
});
|
||||
|
@ -115,7 +112,8 @@ public class ManyDataSource {
|
|||
// dynamicDataSource.setDefaultTargetDataSource(masterDataSource());
|
||||
dynamicDataSource.setTargetDataSources(dataSourceMap);
|
||||
//将数据源信息备份在defineTargetDataSources中
|
||||
dynamicDataSource.setDefaultTargetDataSource(dataSourceMap);
|
||||
List<Object> list = dataSourceMap.values().stream().toList();
|
||||
dynamicDataSource.setDefineTargetDataSources(dataSourceMap);
|
||||
return dynamicDataSource;
|
||||
}
|
||||
|
||||
|
|
|
@ -34,8 +34,8 @@ import java.util.concurrent.Executors;
|
|||
@Component
|
||||
@Log4j2
|
||||
public class Consumer {
|
||||
private static final String QUEUE_NAME_EVENT_START = "zhiLian-vehicle-end";
|
||||
private static final String QUEUE_NAME_EVENT_ENT = "zhiLian-vehicle-start";
|
||||
private static final String QUEUE_NAME_EVENT_START = "zhiLian-vehicle-start";
|
||||
private static final String QUEUE_NAME_EVENT_ENT = "zhiLian-vehicle-end";
|
||||
|
||||
@Autowired
|
||||
private FaultRecordService recordService;
|
||||
|
@ -69,13 +69,9 @@ public class Consumer {
|
|||
redisTemplate.opsForValue().set(information.getNumber()+"1", String.valueOf(information.getEnterpriseId()));
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
DynamicDataSourceHolder.removeDynamicDataSourceKey();
|
||||
|
||||
}
|
||||
|
||||
|
||||
@RabbitListener( queuesToDeclare= {@Queue(name = QUEUE_NAME_EVENT_START)})
|
||||
public void receive(String msg, Channel channel, Message message) {
|
||||
//获取消息的ID
|
||||
|
@ -102,36 +98,21 @@ public class Consumer {
|
|||
recordService.save(build);
|
||||
// 移除数据源,
|
||||
DynamicDataSourceHolder.removeDynamicDataSourceKey();
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
||||
log.info("消费成功!数据源为:{}",message);
|
||||
|
||||
}
|
||||
|
||||
} catch (IOException e) {
|
||||
|
||||
log.info("消费失败,{}",e.getMessage());
|
||||
|
||||
try {
|
||||
|
||||
//回退消息
|
||||
|
||||
channel.basicReject(message.getMessageProperties().getDeliveryTag(),false);
|
||||
|
||||
log.info("回退成功");
|
||||
|
||||
}catch (IOException ex){
|
||||
|
||||
log.info("回退失败:{}",ex.getMessage());
|
||||
|
||||
}
|
||||
|
||||
throw new RuntimeException(e);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
package com.muyu.networking.service;
|
||||
package com.muyu.vehicle.service;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.muyu.domain.FaultCode;
|
||||
import com.muyu.domain.FaultRecord;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
package com.muyu.networking.service;
|
||||
package com.muyu.vehicle.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.muyu.domain.FaultRecord;
|
||||
import com.muyu.domain.req.FaultRecordReqVo;
|
||||
import com.muyu.domain.vo.FaultRecordVo;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
@ -24,8 +27,9 @@ public interface FaultRecordService extends IService<FaultRecord>
|
|||
*/
|
||||
public List<FaultRecord> list(FaultRecord faultRecord);
|
||||
|
||||
void updateByFaultRecord(FaultRecord build);
|
||||
|
||||
FaultRecord getByFaultRecord(FaultRecord faultRecord);
|
||||
|
||||
void updateByFaultRecord(FaultRecord byFaultRecord);
|
||||
List<FaultRecordVo> countList(FaultRecordReqVo recordReqVo);
|
||||
}
|
|
@ -1,13 +1,14 @@
|
|||
package com.muyu.networking.service.impl;
|
||||
package com.muyu.vehicle.service.Impl;
|
||||
|
||||
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.muyu.domain.FaultCode;
|
||||
import com.muyu.networking.mapper.FaultCodeMapper;
|
||||
import com.muyu.networking.service.FaultCodeService;
|
||||
import com.muyu.vehicle.mapper.FaultCodeMapper;
|
||||
import com.muyu.vehicle.service.FaultCodeService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
@ -32,7 +33,7 @@ public class FaultCodeServiceImpl extends ServiceImpl<FaultCodeMapper, FaultCode
|
|||
@Override
|
||||
public List<FaultCode> list(FaultCode faultCode) {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
package com.muyu.vehicle.service.Impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.muyu.common.core.utils.StringUtils;
|
||||
import com.muyu.domain.FaultRecord;
|
||||
|
||||
|
||||
import com.muyu.domain.req.FaultRecordReqVo;
|
||||
import com.muyu.domain.vo.FaultRecordVo;
|
||||
import com.muyu.vehicle.mapper.FaultRecordMapper;
|
||||
import com.muyu.vehicle.service.FaultRecordService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ClassDescription:
|
||||
* @JdkVersion: 17
|
||||
* @Author: zhangxu
|
||||
* @Created: 2024/6/20 15:22
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class FaultRecordServiceImpl extends ServiceImpl<FaultRecordMapper, FaultRecord> implements FaultRecordService {
|
||||
|
||||
|
||||
|
||||
|
||||
@Autowired
|
||||
private FaultRecordMapper faultRecordMapper;
|
||||
|
||||
/**
|
||||
* 查询故障记录列表
|
||||
*
|
||||
* @param faultRecord 故障记录
|
||||
* @return 故障记录
|
||||
*/
|
||||
@Override
|
||||
public List<FaultRecord> list(FaultRecord faultRecord) {
|
||||
LambdaQueryWrapper<FaultRecord> queryWrapper = new LambdaQueryWrapper<>();
|
||||
if (StringUtils.isNotEmpty(faultRecord.getFaultCode())){
|
||||
queryWrapper.eq(FaultRecord::getFaultCode, faultRecord.getFaultCode());
|
||||
}
|
||||
|
||||
if (StringUtils.isNotEmpty(faultRecord.getVin())){
|
||||
queryWrapper.eq(FaultRecord::getVin, faultRecord.getVin());
|
||||
}
|
||||
return list(queryWrapper);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateByFaultRecord(FaultRecord build) {
|
||||
faultRecordMapper.updateByFaultRecord(build);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FaultRecord getByFaultRecord(FaultRecord faultRecord) {
|
||||
return faultRecordMapper.getByFaultRecord(faultRecord);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FaultRecordVo> countList(FaultRecordReqVo recordReqVo) {
|
||||
return faultRecordMapper.countList(recordReqVo);
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -4,7 +4,9 @@ package com.muyu.vehicle.service.Impl;
|
|||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.muyu.common.core.utils.DateUtils;
|
||||
|
||||
import com.muyu.domain.Information;
|
||||
import com.muyu.domain.Vehicle;
|
||||
import com.muyu.vehicle.mapper.InformationMapper;
|
||||
import com.muyu.vehicle.service.IInformationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -48,8 +50,6 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
|
|||
@Override
|
||||
public List<Information> selectInformationList(Information information)
|
||||
{
|
||||
|
||||
|
||||
return informationMapper.selectInformationList(information);
|
||||
}
|
||||
|
||||
|
@ -102,4 +102,10 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
|
|||
{
|
||||
return informationMapper.deleteInformationById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Information> selectVehicleListAll(Information information) {
|
||||
List<Information> information1 = informationMapper.selectVehicleListAll(information);
|
||||
return information1;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue