From 72264b5104870d1b865d695a848eebedee5216ba Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 18 Aug 2023 13:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/redis/lock/RedisRepository.java | 4 ++-- src/main/java/com/zhgd/xmgl/entity/BaseRequest.java | 2 +- .../java/com/zhgd/xmgl/modules/basicdata/entity/Company.java | 3 +++ .../modules/basicdata/service/impl/CompanyServiceImpl.java | 2 ++ .../checking/controller/dto/CheckingPointInfoPageDto.java | 2 ++ .../modules/checking/mapper/xml/CheckingPointInfoMapper.xml | 5 ++++- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/redis/lock/RedisRepository.java b/src/main/java/com/zhgd/redis/lock/RedisRepository.java index 1dc167e1a..6fdb2a1d3 100644 --- a/src/main/java/com/zhgd/redis/lock/RedisRepository.java +++ b/src/main/java/com/zhgd/redis/lock/RedisRepository.java @@ -514,13 +514,13 @@ public class RedisRepository { /** - * 存在则获取，不存在则查询后获取 + * 存在则获取，不存在则查询后获取，默认4小时过期时间 * * @param key the key * @return 需要的对象 */ public Y getOrSet(String key, Supplier supplier) { - return getOrSet(key, supplier, 12 * 60 * 60L); + return getOrSet(key, supplier, 4 * 60 * 60L); } /** diff --git a/src/main/java/com/zhgd/xmgl/entity/BaseRequest.java b/src/main/java/com/zhgd/xmgl/entity/BaseRequest.java index 7d735ed74..7628b67b1 100644 --- a/src/main/java/com/zhgd/xmgl/entity/BaseRequest.java +++ b/src/main/java/com/zhgd/xmgl/entity/BaseRequest.java @@ -17,7 +17,7 @@ public class BaseRequest extends PageQO { and cpi.update_date >= #{dto.queryStartTime} - and cpi.update_date concat(#{dto.queryEndTime},' 23:59:59') + and cpi.update_date concat(date_format(#{dto.queryEndTime},'%Y-%m-%d'),' 23:59:59') */ @ApiModelProperty(value = "查询开始时间，格式：2023-05-22") diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Company.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Company.java index d6bd3879d..d46485bd8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Company.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Company.java @@ -99,5 +99,8 @@ public class Company implements Serializable { @ApiModelProperty(value = "登录密码") @TableField(exist = false) private java.lang.String showPassword; + @ApiModelProperty(value = "人员姓名") + @TableField(exist = false) + private java.lang.String realName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java index 2036b3079..222cc9396 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java @@ -578,6 +578,7 @@ public class CompanyServiceImpl extends ServiceImpl impl su.setUserTel(company.getCompanyTel()); su.setSn(uuid); su.setAccountType(2); + su.setRealName(company.getRealName()); systemUserMapper.insert(su); } @@ -603,6 +604,7 @@ public class CompanyServiceImpl extends ServiceImpl impl su.setPassword(passwordEncoder.encode(company.getShowPassword())); su.setShowPassword(company.getShowPassword()); su.setUserTel(company.getCompanyTel()); + su.setRealName(company.getRealName()); systemUserMapper.update(su, new LambdaQueryWrapper().eq(SystemUser::getSn, company.getFullSn()).eq(SystemUser::getAccountType, 2)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/dto/CheckingPointInfoPageDto.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/dto/CheckingPointInfoPageDto.java index 2235ee74b..e4f024cca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/dto/CheckingPointInfoPageDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/dto/CheckingPointInfoPageDto.java @@ -25,4 +25,6 @@ public class CheckingPointInfoPageDto { private Date queryEndTime; @ApiModelProperty("巡检点状态 1：正常 2：异常 需要默认选择正常") private Integer status; + @ApiModelProperty("巡检点名称") + private String checkingPointName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml index e2403f592..d2e0a1ec6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml @@ -26,7 +26,10 @@ and cpi.update_date >= #{dto.queryStartTime} - and cpi.update_date concat(#{dto.queryEndTime},' 23:59:59') + and cpi.update_date concat(date_format(#{dto.queryEndTime},'%Y-%m-%d'),' 23:59:59') + + + and cp.checking_point_name like concat('%',#{dto.checkingPointName},'%') group by cpi.id order by cpi.create_date desc