Skip to content

B
basic-api-boot
提交 cb49a3ae 作者: 方治民
操作

fix: 修复分支合并带来的依赖冗余问题

上级 7b2ee871
正在显示 包含 41 行增加 和 83 行删除
app/src/main/java/com/yiring/app/service/car/impl/CarServiceImpl.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.car.impl;
import cn.hutool.core.util.StrUtil;
import com.yiring.app.domain.car.Car;
import com.yiring.app.domain.car.CarRepository;
import com.yiring.app.param.car.CarParam;
......@@ -11,15 +12,15 @@ import com.yiring.auth.domain.role.Role;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import com.yiring.common.param.IdParam;
import com.yiring.common.util.StrUtils;
import com.yiring.common.util.date.DateUtils;
import com.yiring.common.vo.PageVo;
import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.persistence.criteria.Predicate;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.*;
import org.springframework.data.jpa.domain.Specification;
......@@ -69,7 +70,7 @@ public class CarServiceImpl implements CarService {
}
Car car = optional.get();
//如果标签卡在使用中无法修改
if (StringUtils.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
if (StrUtil.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法修改");
}
if (!car.getCarNum().equals(carParam.getCarNum())) {
......@@ -207,24 +208,24 @@ public class CarServiceImpl implements CarService {
return (root, query, criteriaBuilder) -> {
List<Predicate> list = new ArrayList<>();
//查询条件
if (StrUtils.isNotBlank(carParam.getCarNum())) {
if (StrUtil.isNotBlank(carParam.getCarNum())) {
//车牌号码查询
list.add(criteriaBuilder.like(root.get("carNum").as(String.class), "%" + carParam.getCarNum() + "%"));
list.add(criteriaBuilder.like(root.get(Car.Fields.carNum), "%" + carParam.getCarNum() + "%"));
}
if (StrUtils.isNotBlank(carParam.getCarType())) {
if (StrUtil.isNotBlank(carParam.getCarType())) {
//车辆类型查询
list.add(criteriaBuilder.like(root.get("carType").as(String.class), "%" + carParam.getCarType() + "%"));
}
if (StrUtils.isNotBlank(carParam.getDriverName())) {
if (StrUtil.isNotBlank(carParam.getDriverName())) {
//司机名称查询
list.add(
criteriaBuilder.like(root.get("driverName").as(String.class), "%" + carParam.getDriverName() + "%")
);
}
if (StrUtils.isNotBlank(carParam.getDriverMobile())) {
if (StrUtil.isNotBlank(carParam.getDriverMobile())) {
//司机电话号码查询
list.add(
criteriaBuilder.like(
......@@ -234,50 +235,48 @@ public class CarServiceImpl implements CarService {
);
}
if (StrUtils.isNotBlank(carParam.getOrgId())) {
if (StrUtil.isNotBlank(carParam.getOrgId())) {
//所属单位查询
list.add(criteriaBuilder.like(root.get("orgId").as(String.class), "%" + carParam.getOrgId() + "%"));
}
if (StrUtils.isNotBlank(carParam.getReason())) {
if (StrUtil.isNotBlank(carParam.getReason())) {
//来访原因查询
list.add(criteriaBuilder.like(root.get("reason").as(String.class), "%" + carParam.getReason() + "%"));
}
if (StrUtils.isNotNull(carParam.getCreateTimeStart()) && StrUtils.isNotNull(carParam.getCreateTimeEnd())) {
if (Objects.nonNull(carParam.getCreateTimeStart()) && Objects.nonNull(carParam.getCreateTimeEnd())) {
//来访时间区间段查询
list.add(
criteriaBuilder.between(
root.get("createTime").as(Date.class),
DateUtils.toDate(carParam.getCreateTimeStart()),
DateUtils.toDate(carParam.getCreateTimeEnd())
root.get(Car.Fields.createTime),
carParam.getCreateTimeStart(),
carParam.getCreateTimeEnd()
)
);
}
if (StrUtils.isNotBlank(carParam.getLabelCard())) {
if (StrUtil.isNotBlank(carParam.getLabelCard())) {
//标签卡号查询
list.add(
criteriaBuilder.like(root.get("labelCard").as(String.class), "%" + carParam.getLabelCard() + "%")
);
}
if (StrUtils.isNotBlank(carParam.getLabelCardStatus())) {
if (StrUtil.isNotBlank(carParam.getLabelCardStatus())) {
//标签卡状态查询
list.add(
criteriaBuilder.equal(root.get("labelCardStatus").as(String.class), carParam.getLabelCardStatus())
);
}
if (
StrUtils.isNotNull(carParam.getCardRecTimeStart()) && StrUtils.isNotNull(carParam.getCardRecTimeEnd())
) {
if (Objects.nonNull(carParam.getCardRecTimeStart()) && Objects.nonNull(carParam.getCardRecTimeEnd())) {
//来访时间区间段查询
list.add(
criteriaBuilder.between(
root.get("cardRecTime").as(Date.class),
DateUtils.toDate(carParam.getCardRecTimeStart()),
DateUtils.toDate(carParam.getCardRecTimeEnd())
root.get(Car.Fields.cardRecTime),
carParam.getCardRecTimeStart(),
carParam.getCardRecTimeEnd()
)
);
}
......
app/src/main/java/com/yiring/app/service/dict/impl/DictServiceImpl.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.dict.impl;
import cn.hutool.core.util.StrUtil;
import com.yiring.app.param.dict.DictParam;
import com.yiring.app.param.dict.DictQueryParam;
import com.yiring.app.service.dict.DictService;
......@@ -11,7 +12,6 @@ import com.yiring.common.dict.DictRepository;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.util.DictUtils;
import com.yiring.common.util.StrUtils;
import com.yiring.common.vo.PageVo;
import java.time.LocalDateTime;
import java.util.*;
......@@ -163,7 +163,7 @@ public class DictServiceImpl implements DictService {
public Specification<Dict> condition(DictQueryParam dictQueryParam) {
return (root, query, criteriaBuilder) -> {
List<Predicate> list = new ArrayList<>();
if (StrUtils.isNotBlank(dictQueryParam.getDictType())) {
if (StrUtil.isNotBlank(dictQueryParam.getDictType())) {
list.add(
criteriaBuilder.like(
root.get("dictType").as(String.class),
......@@ -172,7 +172,7 @@ public class DictServiceImpl implements DictService {
);
}
if (StrUtils.isNotBlank(dictQueryParam.getDictLabel())) {
if (StrUtil.isNotBlank(dictQueryParam.getDictLabel())) {
list.add(
criteriaBuilder.like(
root.get("dictLabel").as(String.class),
......
app/src/main/java/com/yiring/app/service/video/impl/VideoServiceImpl.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.video.impl;
import cn.hutool.core.util.StrUtil;
import com.yiring.app.domain.video.Video;
import com.yiring.app.domain.video.VideoRepository;
import com.yiring.app.param.video.VideoParam;
......@@ -12,7 +13,6 @@ import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.util.StrUtils;
import com.yiring.common.vo.PageVo;
import java.time.LocalDateTime;
import java.util.ArrayList;
......@@ -133,7 +133,7 @@ public class VideoServiceImpl implements VideoService {
public Specification<Video> condition(VideoQueryParam videoQueryParam) {
return (root, query, criteriaBuilder) -> {
List<Predicate> list = new ArrayList<>();
if (StrUtils.isNotBlank(videoQueryParam.getVideoName())) {
if (StrUtil.isNotBlank(videoQueryParam.getVideoName())) {
list.add(
criteriaBuilder.like(
root.get("videoName").as(String.class),
......@@ -142,13 +142,13 @@ public class VideoServiceImpl implements VideoService {
);
}
if (StrUtils.isNotBlank(videoQueryParam.getUuid())) {
if (StrUtil.isNotBlank(videoQueryParam.getUuid())) {
list.add(
criteriaBuilder.like(root.get("uuid").as(String.class), "%" + videoQueryParam.getUuid() + "%")
);
}
if (StrUtils.isNotBlank(videoQueryParam.getStatus())) {
if (StrUtil.isNotBlank(videoQueryParam.getStatus())) {
list.add(criteriaBuilder.equal(root.get("uuid").as(String.class), videoQueryParam.getStatus()));
}
Predicate[] predicates = new Predicate[list.size()];
......
app/src/main/java/com/yiring/app/vo/car/CarVo.java
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.car;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......@@ -11,7 +12,6 @@ import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.apache.commons.lang3.StringUtils;
/**
* @author tzl
......@@ -42,7 +42,7 @@ public class CarVo implements Serializable {
String carTypeName;
public String getCarTypeName() {
if (StringUtils.isNotBlank(carType)) {
if (StrUtil.isNotBlank(carType)) {
return DictUtils.getDictLabel("car_type", carType);
}
return null;
......@@ -67,7 +67,7 @@ public class CarVo implements Serializable {
String labelCardStatusName;
public String getLabelCardStatusName() {
if (StringUtils.isNotBlank(carType)) {
if (StrUtil.isNotBlank(carType)) {
return DictUtils.getDictLabel("car_label_status", labelCardStatus);
}
return null;
......
basic-auth/build.gradle
......@@ -15,14 +15,11 @@ dependencies {
implementation "cn.dev33:sa-token-spring-boot-starter:${saTokenVersion}"
implementation "cn.dev33:sa-token-dao-redis-jackson:${saTokenVersion}"
// hutool-core
// hutool
implementation "cn.hutool:hutool-core:${hutoolVersion}"
// hutool-json
implementation "cn.hutool:hutool-json:${hutoolVersion}"
// hutool-http
implementation "cn.hutool:hutool-http:${hutoolVersion}"
implementation "cn.hutool:hutool-extra:${hutoolVersion}"
// fastjson
implementation "com.alibaba:fastjson:${fastJsonVersion}"
......
basic-auth/src/main/java/com/yiring/auth/util/ZyUtil.java
......@@ -4,13 +4,13 @@ package com.yiring.auth.util;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.yiring.common.core.Result;
import com.yiring.common.util.BeanUtils;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
......@@ -30,7 +30,7 @@ public class ZyUtil {
RedisTemplate<String, Object> redisTemplate;
static {
redisTemplate = BeanUtils.getBean("redisTemplate");
redisTemplate = SpringUtil.getBean("redisTemplate");
}
public final String CLIENT_ID = "sc21080400";
......
basic-common/util/build.gradle
......@@ -8,4 +8,8 @@ dependencies {
implementation "cn.hutool:hutool-extra:${hutoolVersion}"
// fastjson
implementation "com.alibaba:fastjson:${fastJsonVersion}"
implementation group: 'org.apache.poi', name: 'poi', version: '5.2.2'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
}
basic-common/util/src/main/java/com/yiring/common/util/BeanUtils.java deleted 100644 → 0
/* (C) 2022 YiRing, Inc. */
package com.yiring.common.util;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@Component
public class BeanUtils implements ApplicationContextAware {
/**
* 以静态变量保存ApplicationContext,可在任意代码中取出ApplicaitonContext.
*/
private static ApplicationContext context;
/**
* 实现ApplicationContextAware接口的context注入函数, 将其存入静态变量.
*/
@Override
public void setApplicationContext(ApplicationContext context) {
BeanUtils.context = context;
}
public static ApplicationContext getApplicationContext() {
return context;
}
/**
* 从静态变量ApplicationContext中取得Bean, 自动转型为所赋值对象的类型. 方法返回值的类型由调用者决定
*/
public static <T> T getBean(String name) {
return (T) context.getBean(name);
}
/// 获取当前环境
public String getActiveProfile() {
return context.getEnvironment().getActiveProfiles()[0];
}
}
build.gradle
......@@ -75,9 +75,6 @@ subprojects {
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
implementation group: 'org.apache.poi', name: 'poi', version: '5.0.0'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.0.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
}
[compileJava,compileTestJava,javadoc]*.options*.encoding ='UTF-8'
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论