ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

master_tdsql
hxh 1 month ago
parent
87db32c885 c5080e71a1
commit
9320e155eb
4 changed files with 32 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
  2. 22
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
  3. 5
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
  4. 25
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

5
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java
View File

@ -36,11 +36,12 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
"WHERE jl.id IN ( "+
"SELECT RECORD_ID "+
"FROM bs_sgc_df_xsjhjlz "+
"where 1=1 "+
"<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
"where (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
"AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
"AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
"</if> " +
"and base.adcd is not null "+
"AND base.adcd is not null "+
"group by RECORD_ID "+
") "+
"</script>")

22
shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
View File

@ -2,6 +2,7 @@ package com.kms.yxgh.df.service;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -91,18 +92,18 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
.filter(s -> !StringUtils.isEmpty(s.getAdcd())) // 过滤掉空字符串
.collect(Collectors.groupingBy(DfYhHiddenDangerModel::getAdcd));
if (!CollectionUtil.isEmpty(groupingByList)) {
List<String> xList =new ArrayList<>();
List<DfYhCharHiddenDangerDto.YAxis>yAxisList=new ArrayList<>();
// 是否查询区级
boolean flag = org.springframework.util.StringUtils.isEmpty(dto.getDistrictLevelFlag())
|| Objects.equals("0", dto.getDistrictLevelFlag());
if (!flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().eq("XZQHDM", dto.getAdcd()).last(" limit 1"));
boolean flag = ( StringUtils.isNotEmpty(dto.getDistrictLevelFlag())
&& Objects.equals("1", dto.getDistrictLevelFlag()));
if (flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper<SysXzqh>()
.eq(SysXzqh::getXzqhdm, dto.getAdcd())
.orderByDesc(SysXzqh::getCreateTime)
.last(" limit 1"));
if (null != xzqhdm) {
xList.add(xzqhdm.getName());
}
@ -111,8 +112,11 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
for (Map.Entry<String, List<DfYhHiddenDangerModel>> entry : groupingByList.entrySet()) {
// 设置 x轴
// 转换名称
if (flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().likeRight("XZQHDM", entry.getKey()));
if (!flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper<SysXzqh>()
.likeRight(SysXzqh::getXzqhdm, entry.getKey())
.orderByDesc(SysXzqh::getCreateTime)
.last("limit 1"));
if (null!=xzqhdm) {
xList.add(xzqhdm.getName());
}

5
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
View File

@ -57,11 +57,12 @@ public interface SzRecordMapper extends BaseMapper<SzRecord> {
"WHERE jl.id IN ( "+
"SELECT RECORD_ID "+
"FROM bs_sgc_sz_xsjhjlz "+
"where 1=1 "+
"<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
"where (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
"AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
"AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
"</if> " +
"and base.adcd is not null "+
"AND base.adcd is not null "+
"group by RECORD_ID "+
") "+
"</script>")

25
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java
View File

@ -2,6 +2,7 @@ package com.kms.yxgh.sz.service;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -133,10 +134,13 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
List<String> xList =new ArrayList<>();
List<SzCharItemDto.YAxis>yAxisList=new ArrayList<>();
// 是否查询区级
boolean flag = org.springframework.util.StringUtils.isEmpty(dto.getDistrictLevelFlag())
|| Objects.equals("0", dto.getDistrictLevelFlag());
if (!flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().eq("XZQHDM", dto.getAdcd()).last(" limit 1"));
boolean flag = (null!=dto.getDistrictLevelFlag()
&& Objects.equals("1", dto.getDistrictLevelFlag()));
if (flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper<SysXzqh>()
.eq(SysXzqh::getXzqhdm, dto.getAdcd())
.orderByDesc(SysXzqh::getCreateTime)
.last(" limit 1"));
if (null != xzqhdm) {
xList.add(xzqhdm.getName());
}
@ -144,8 +148,11 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
for (Map.Entry<String, List<SzHiddenDangerModel>> entry : groupingByList.entrySet()) {
// 设置 x轴
// 转换名称
if (flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().likeRight("XZQHDM", entry.getKey()));
if (!flag) {
SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper<SysXzqh>()
.likeRight(SysXzqh::getXzqhdm, entry.getKey())
.orderByDesc(SysXzqh::getCreateTime)
.last("limit 1"));
if (null!=xzqhdm) {
xList.add(xzqhdm.getName());
}
@ -159,12 +166,6 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
return dfYhCharHiddenDangerDto;
}
public static String getXZQHName(String code) {
return "";
}
private void numberHandle (SzCharInfoItemQueDto dto,SzCharItemDto itemDto) {
// 堤防数量
int dfNumber = this.baseMapper.paragraphCountNumber(dto);

Write Preview
Loading…
Cancel
Save