Browse Source

Merge branch 'master' into release-sy-v1.0.0

master_tdsql
hxh 1 year ago
parent
commit
bd4aae7996
  1. 27
      shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
  2. 2
      shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java
  3. 59
      shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
  4. 12
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
  5. 12
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java
  6. 5
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java
  7. 29
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
  8. 12
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
  9. 14
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java
  10. 98
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java
  11. 12
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java
  12. 14
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcxyController.java
  13. 10
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java
  14. 13
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJdsbController.java
  15. 157
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  16. 13
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java
  17. 13
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSwtzController.java
  18. 13
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java
  19. 45
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java
  20. 6
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
  21. 15
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzQqhj.java
  22. 1
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
  23. 1
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzZxxx.java
  24. 37
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java
  25. 13
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/HistogramDto.java
  26. 11
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/NumDto.java
  27. 16
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java
  28. 2
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java
  29. 36
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
  30. 19
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java
  31. 11
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java
  32. 12
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java
  33. 9
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java
  34. 125
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
  35. 70
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  36. 34
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java
  37. 65
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java
  38. 6
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
  39. 42
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
  40. 36
      shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml
  41. 30
      shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml
  42. 119
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
  43. 122
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
  44. 44
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
  45. 74
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
  46. 92
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

27
shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@ -6,6 +6,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.BaseEntityUtils;
@ -56,26 +57,44 @@ public class SysXzqhController extends BaseController
private SysDeptService sysDeptService;
@GetMapping("/getGuangDong")
public AjaxResult getGuangDong() {
List<SysXzqh> list = sysXzqhService.list(Wrappers.lambdaQuery(SysXzqh.class)
.likeRight(SysXzqh::getXzqhdm, "44")
.eq(SysXzqh::getLayer, 2));
SysXzqh sysXzqh = new SysXzqh();
sysXzqh.setLayer(2);
sysXzqh.setXzqhdm("省外");
sysXzqh.setName("省外");
list.add(sysXzqh);
return AjaxResult.success(list);
}
@GetMapping("/common")
public AjaxResult common(){
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
SysDept sysDept = sysDeptService.getById(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String userName = user.getUserName();
if (userName.equals("admin")) {
/*if (userName.equals("admin")) {
List<SysXzqh> list = sysXzqhService.list();
return AjaxResult.success(list);
}else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
}else */if (xzqh.getLayer()==1) {
String substring = xzqh.getXzqhdm().substring(0, 2);
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", substring);
List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return AjaxResult.success(list);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
String substring = xzqh.getXzqhdm().substring(0, 4);
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", substring);

2
shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java

@ -47,7 +47,7 @@ public class SysXzqh extends BaseEntity
/** 层级 */
@Excel(name = "层级")
@ApiModelProperty("层级")
private BigDecimal layer;
private Integer layer;
/** 类型 */
@Excel(name = "类型")

59
shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java

@ -1,8 +1,13 @@
package com.kms.system.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh;
import com.kms.system.mapper.SysXzqhMapper;
import com.shuili.common.core.domain.entity.SysDept;
import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.core.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -16,4 +21,58 @@ import org.springframework.stereotype.Service;
@Service
public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
@Autowired
private SysXzqhMapper sysXzqhMapper;
@Autowired
private SysDeptService sysDeptService;
public String getSubString(String adcd) {
SysXzqh sysXzqh = sysXzqhMapper.selectOne(Wrappers.lambdaQuery(SysXzqh.class)
.eq(SysXzqh::getXzqhdm, adcd));
if (sysXzqh == null) {
return null;
}
if (sysXzqh.getLayer() == 1) {
return sysXzqh.getXzqhdm().substring(0, 2);
} else if (sysXzqh.getLayer() == 2) {
return sysXzqh.getXzqhdm().substring(0, 4);
}else {
return sysXzqh.getXzqhdm();
}
}
public Integer getLayer() {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.getById(deptId);
SysXzqh sysXzqh = sysXzqhMapper.selectById(sysDept.getXzqhId());
return sysXzqh.getLayer();
}
public String getXzqh() {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.getById(deptId);
SysXzqh sysXzqh = sysXzqhMapper.selectById(sysDept.getXzqhId());
return sysXzqh.getXzqhdm();
}
}

12
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java

@ -83,10 +83,10 @@ public class BsSgcDfBzbpController extends BaseController
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -104,10 +104,10 @@ public class BsSgcDfBzbpController extends BaseController
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -121,10 +121,10 @@ public class BsSgcDfBzbpController extends BaseController
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {

12
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java

@ -84,10 +84,10 @@ public class BsSgcDfJbxxController extends BaseController
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -105,10 +105,10 @@ public class BsSgcDfJbxxController extends BaseController
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -122,10 +122,10 @@ public class BsSgcDfJbxxController extends BaseController
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {

5
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java

@ -109,6 +109,7 @@ public class BsSgcSzAqjdxxController extends BaseController
BsSgcSzSzrw byId = bsSgcSzSzrwService.getById(szrwId);
byId.setStatus("1");
bsSgcSzSzrwService.updateById(byId);
String taskId = byId.getTaskId();
BsSgcSzAqrw szAqrw = bsSgcSzAqrwService.getById(taskId);
@ -130,6 +131,10 @@ public class BsSgcSzAqjdxxController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzAqjdxx bsSgcSzAqjdxx)
{
String szrwId = bsSgcSzAqjdxx.getSzrwId();
BsSgcSzSzrw byId = bsSgcSzSzrwService.getById(szrwId);
byId.setStatus("1");
bsSgcSzSzrwService.updateById(byId);
return toAjax(bsSgcSzAqjdxxService.updateById(bsSgcSzAqjdxx));
}

29
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java

@ -10,6 +10,7 @@ import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDept;
@ -60,6 +61,22 @@ public class BsSgcSzAqrwController extends BaseController
@Autowired
private SysDeptService sysDeptService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
List<AqrwDto> list = bsSgcSzAqrwService.getLevel(taskId);
return AjaxResult.success(list);
}
@GetMapping("/getList/{taskId}")
public AjaxResult getList(@PathVariable String taskId) {
List<AqrwDto> list = bsSgcSzAqrwService.getList(taskId);
return AjaxResult.success(list);
}
/**
* 查询水闸安全鉴定任务信息列表
*/
@ -80,10 +97,10 @@ public class BsSgcSzAqrwController extends BaseController
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -101,10 +118,10 @@ public class BsSgcSzAqrwController extends BaseController
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -118,10 +135,10 @@ public class BsSgcSzAqrwController extends BaseController
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {

12
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java

@ -80,10 +80,10 @@ public class BsSgcSzBzbpController extends BaseController
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -101,10 +101,10 @@ public class BsSgcSzBzbpController extends BaseController
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -118,10 +118,10 @@ public class BsSgcSzBzbpController extends BaseController
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {

14
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java

@ -8,9 +8,11 @@ import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzFxzz;
import com.kms.yg.sz.domain.BsSgcSzFxzzcy;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.BsSgcSzFxzzDto;
import com.kms.yg.sz.service.BsSgcSzFxzzService;
import com.kms.yg.sz.service.BsSgcSzFxzzcyService;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil;
@ -53,6 +55,9 @@ public class BsSgcSzFxzzController extends BaseController
@Autowired
private BsSgcSzFxzzService bsSgcSzFxzzService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private BsSgcSzFxzzcyService bsSgcSzFxzzcyService;
@ -103,7 +108,10 @@ public class BsSgcSzFxzzController extends BaseController
@ApiOperation("防汛组织新增")
public AjaxResult add(@RequestBody BsSgcSzFxzzDto dto)
{
String wagaId = dto.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
BsSgcSzFxzz bsSgcSzFxzz = new BsSgcSzFxzz();
BeanUtils.copyProperties(dto,bsSgcSzFxzz);
BaseEntityUtils.preInsert(bsSgcSzFxzz);
@ -127,6 +135,10 @@ public class BsSgcSzFxzzController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzFxzz bsSgcSzFxzz)
{
String wagaId = bsSgcSzFxzz.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzFxzzService.updateById(bsSgcSzFxzz));
}

98
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java

@ -2,6 +2,7 @@ package com.kms.yg.sz.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@ -14,7 +15,9 @@ import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzFzr;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.FzrDto;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.service.BsSgcSzFzrService;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDept;
@ -58,6 +61,10 @@ public class BsSgcSzFzrController extends BaseController
@Autowired
private BsSgcSzFzrService bsSgcSzFzrService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private SysXzqhService sysXzqhService;
@ -65,6 +72,20 @@ public class BsSgcSzFzrController extends BaseController
private SysDeptService sysDeptService;
@GetMapping("/getHistogram")
public HashMap<String, HashMap<String,String>> getHistogram() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
HashMap<String, HashMap<String,String>> dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
return dto;
}
/**
* 查询水闸负责人列表
@ -73,71 +94,7 @@ public class BsSgcSzFzrController extends BaseController
@ApiOperation("水闸负责人列表")
public IPage list(@RequestBody SearchParam<BsSgcSzFzr> sp)
{
BsSgcSzFzr projectInfo = sp.getData();
String adcd = null;
if (projectInfo != null) {
adcd = projectInfo.getAdcd();
}
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
if (projectInfo != null && projectInfo.getAdcd() != null) {
String infoAdcd = projectInfo.getAdcd();
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
infoAdcd = xzqh.getXzqhdm();
}
return bsSgcSzFzrService.selectPage(sp,infoAdcd);
}else {
return bsSgcSzFzrService.selectPage(sp,null);
}
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return bsSgcSzFzrService.selectPage(sp,substring);
}else {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
adcd = xzqh.getXzqhdm();
}
return bsSgcSzFzrService.selectPage(sp, adcd);
}
return bsSgcSzFzrService.selectPage(sp);
}
/**
@ -172,6 +129,10 @@ public class BsSgcSzFzrController extends BaseController
public AjaxResult add(@RequestBody BsSgcSzFzr bsSgcSzFzr)
{
BaseEntityUtils.preInsert(bsSgcSzFzr);
String wagaId = bsSgcSzFzr.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzFzrService.save(bsSgcSzFzr));
}
@ -183,6 +144,12 @@ public class BsSgcSzFzrController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzFzr bsSgcSzFzr)
{
String wagaId = bsSgcSzFzr.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzFzrService.updateById(bsSgcSzFzr));
}
@ -196,4 +163,5 @@ public class BsSgcSzFzrController extends BaseController
{
return toAjax(bsSgcSzFzrService.removeByIds(Arrays.asList(ids)));
}
}

12
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java

@ -84,10 +84,10 @@ public class BsSgcSzGcdaController extends BaseController
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -105,10 +105,10 @@ public class BsSgcSzGcdaController extends BaseController
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -122,10 +122,10 @@ public class BsSgcSzGcdaController extends BaseController
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
if (xzqh.getLayer()==1) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
} else if (xzqh.getLayer()==2) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {

14
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcxyController.java

@ -6,7 +6,9 @@ import java.util.List;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzGcxy;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.service.BsSgcSzGcxyService;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil;
@ -48,6 +50,9 @@ public class BsSgcSzGcxyController extends BaseController
@Autowired
private BsSgcSzGcxyService bsSgcSzGcxyService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private SysXzqhService sysXzqhService;
@ -96,6 +101,10 @@ public class BsSgcSzGcxyController extends BaseController
public AjaxResult add(@RequestBody BsSgcSzGcxy bsSgcSzGcxy)
{
BaseEntityUtils.preInsert(bsSgcSzGcxy);
String wagaId = bsSgcSzGcxy.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzGcxyService.save(bsSgcSzGcxy));
}
@ -107,6 +116,11 @@ public class BsSgcSzGcxyController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzGcxy bsSgcSzGcxy)
{
String wagaId = bsSgcSzGcxy.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzGcxyService.updateById(bsSgcSzGcxy));
}

10
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java

@ -102,7 +102,7 @@ public class BsSgcSzHzxxController extends BaseController
{
BaseEntityUtils.preInsert(bsSgcSzHzxx);
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(bsSgcSzHzxx.getWagaId());
byId.setHzStatus("0");//同上
byId.setHzStatus("1");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzHzxxService.save(bsSgcSzHzxx));
}
@ -115,6 +115,14 @@ public class BsSgcSzHzxxController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzHzxx bsSgcSzHzxx)
{
String status = bsSgcSzHzxx.getStatus();
String wagaId = bsSgcSzHzxx.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setHzStatus(status);
if (status.equals("2")) {
byId.setSecurityCategory(bsSgcSzHzxx.getSecurityCategoryNow());
}
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzHzxxService.updateById(bsSgcSzHzxx));
}

13
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJdsbController.java

@ -6,7 +6,9 @@ import java.util.List;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzJdsb;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.service.BsSgcSzJdsbService;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil;
@ -48,6 +50,9 @@ public class BsSgcSzJdsbController extends BaseController
@Autowired
private BsSgcSzJdsbService bsSgcSzJdsbService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private SysXzqhService sysXzqhService;
@ -96,6 +101,10 @@ public class BsSgcSzJdsbController extends BaseController
public AjaxResult add(@RequestBody BsSgcSzJdsb bsSgcSzJdsb)
{
BaseEntityUtils.preInsert(bsSgcSzJdsb);
String wagaId = bsSgcSzJdsb.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzJdsbService.save(bsSgcSzJdsb));
}
@ -107,6 +116,10 @@ public class BsSgcSzJdsbController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzJdsb bsSgcSzJdsb)
{
String wagaId = bsSgcSzJdsb.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzJdsbService.updateById(bsSgcSzJdsb));
}

157
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@ -1,16 +1,22 @@
package com.kms.yg.sz.controller;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzBzbp;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
@ -49,8 +55,7 @@ import com.shuili.common.enums.BusinessType;
@RestController
@RequestMapping("/yg/jbxx")
@Api(tags = "水闸安全管理基本信息")
public class BsSgcSzSafeJbxxController extends BaseController
{
public class BsSgcSzSafeJbxxController extends BaseController {
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@ -60,75 +65,78 @@ public class BsSgcSzSafeJbxxController extends BaseController
@Autowired
private SysDeptService sysDeptService;
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
List<PieDto> list = bsSgcSzSafeJbxxService.getPie(layer, xzqh);
List<HashMap<String, String>> listBy = new ArrayList<>();
HashMap<String, String> map = new HashMap<>();
for (PieDto pieDto : list) {
map.put(pieDto.getName(), pieDto.getNum());
}
listBy.add(map);
return listBy;
}
@GetMapping("/getHistogram")
public HashMap<String, HashMap<String,String>> getHistogram() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
HashMap<String, HashMap<String,String>> dto = bsSgcSzSafeJbxxService.getHistogram(layer, xzqh);
return dto;
}
/**
* 查询水闸安全管理基本信息列表
*/
@PostMapping("/list")
@ApiOperation("水闸安全管理基本信息列表")
public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp)
{
BsSgcSzSafeJbxx projectInfo = sp.getData();
String adcd = null;
if (projectInfo != null) {
adcd = projectInfo.getAdcd();
}
public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
BsSgcSzSafeJbxx data = sp.getData();
Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
.ne(BsSgcSzSafeJbxx::getStatus,"0")
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
return page;
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
if (projectInfo != null && projectInfo.getAdcd() != null) {
String infoAdcd = projectInfo.getAdcd();
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
infoAdcd = xzqh.getXzqhdm();
}
return bsSgcSzSafeJbxxService.selectPage(sp,infoAdcd);
}else {
return bsSgcSzSafeJbxxService.selectPage(sp,null);
}
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return bsSgcSzSafeJbxxService.selectPage(sp,substring);
}else {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
adcd = xzqh.getXzqhdm();
}
return bsSgcSzSafeJbxxService.selectPage(sp, adcd);
}
}
@PostMapping("/listByStatus")
public IPage listByStatus(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
BsSgcSzSafeJbxx data = sp.getData();
Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
.eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0")
.or().eq(BsSgcSzSafeJbxx::getZxStatus,"0")
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
return page;
}
@ -138,8 +146,7 @@ public class BsSgcSzSafeJbxxController extends BaseController
@Log(title = "水闸安全管理基本信息导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("水闸安全管理基本信息导出")
public AjaxResult export(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx)
{
public AjaxResult export(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) {
List<BsSgcSzSafeJbxx> list = bsSgcSzSafeJbxxService.listByIds(bsSgcSzSafeJbxx.getIds());
ExcelUtil<BsSgcSzSafeJbxx> util = new ExcelUtil<>(BsSgcSzSafeJbxx.class);
return util.exportExcel(list, "jbxx");
@ -150,8 +157,7 @@ public class BsSgcSzSafeJbxxController extends BaseController
*/
@ApiOperation(" 水闸安全管理基本信息详情")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(bsSgcSzSafeJbxxService.getById(id));
}
@ -161,10 +167,8 @@ public class BsSgcSzSafeJbxxController extends BaseController
@Log(title = "水闸安全管理基本信息新增", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("水闸安全管理基本信息新增")
public AjaxResult add(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx)
{
public AjaxResult add(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) {
BaseEntityUtils.preInsert(bsSgcSzSafeJbxx);
bsSgcSzSafeJbxx.setStatus("0"); //状态:0已填报 1审核通过 2审核不通过
return toAjax(bsSgcSzSafeJbxxService.save(bsSgcSzSafeJbxx));
}
@ -174,8 +178,8 @@ public class BsSgcSzSafeJbxxController extends BaseController
@ApiOperation("水闸安全管理基本信息修改")
@Log(title = "水闸安全管理基本信息修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx)
{
public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) {
// bsSgcSzSafeJbxx.setStatus("4");
return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx));
}
@ -184,9 +188,8 @@ public class BsSgcSzSafeJbxxController extends BaseController
*/
@ApiOperation("水闸安全管理基本信息删除")
@Log(title = "水闸安全管理基本信息删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(bsSgcSzSafeJbxxService.removeByIds(Arrays.asList(ids)));
}
}

13
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java

@ -5,7 +5,9 @@ import java.util.List;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.BsSgcSzSjcs;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.kms.yg.sz.service.BsSgcSzSjcsService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
@ -48,6 +50,9 @@ public class BsSgcSzSjcsController extends BaseController
@Autowired
private BsSgcSzSjcsService bsSgcSzSjcsService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private SysXzqhService sysXzqhService;
@ -96,6 +101,10 @@ public class BsSgcSzSjcsController extends BaseController
public AjaxResult add(@RequestBody BsSgcSzSjcs bsSgcSzSjcs)
{
BaseEntityUtils.preInsert(bsSgcSzSjcs);
String wagaId = bsSgcSzSjcs.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzSjcsService.save(bsSgcSzSjcs));
}
@ -107,6 +116,10 @@ public class BsSgcSzSjcsController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzSjcs bsSgcSzSjcs)
{
String wagaId = bsSgcSzSjcs.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzSjcsService.updateById(bsSgcSzSjcs));
}

13
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSwtzController.java

@ -5,7 +5,9 @@ import java.util.List;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.BsSgcSzSwtz;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.kms.yg.sz.service.BsSgcSzSwtzService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
@ -48,6 +50,9 @@ public class BsSgcSzSwtzController extends BaseController
@Autowired
private BsSgcSzSwtzService bsSgcSzSwtzService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private SysXzqhService sysXzqhService;
@ -96,6 +101,10 @@ public class BsSgcSzSwtzController extends BaseController
public AjaxResult add(@RequestBody BsSgcSzSwtz bsSgcSzSwtz)
{
BaseEntityUtils.preInsert(bsSgcSzSwtz);
String wagaId = bsSgcSzSwtz.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzSwtzService.save(bsSgcSzSwtz));
}
@ -107,6 +116,10 @@ public class BsSgcSzSwtzController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzSwtz bsSgcSzSwtz)
{
String wagaId = bsSgcSzSwtz.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzSwtzService.updateById(bsSgcSzSwtz));
}

13
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java

@ -5,7 +5,9 @@ import java.util.List;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.BsSgcSzXlnl;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.kms.yg.sz.service.BsSgcSzXlnlService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
@ -48,6 +50,9 @@ public class BsSgcSzXlnlController extends BaseController
@Autowired
private BsSgcSzXlnlService bsSgcSzXlnlService;
@Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
private SysXzqhService sysXzqhService;
@ -96,6 +101,10 @@ public class BsSgcSzXlnlController extends BaseController
public AjaxResult add(@RequestBody BsSgcSzXlnl bsSgcSzXlnl)
{
BaseEntityUtils.preInsert(bsSgcSzXlnl);
String wagaId = bsSgcSzXlnl.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzXlnlService.save(bsSgcSzXlnl));
}
@ -107,6 +116,10 @@ public class BsSgcSzXlnlController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BsSgcSzXlnl bsSgcSzXlnl)
{
String wagaId = bsSgcSzXlnl.getWagaId();
BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
byId.setStatus("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzXlnlService.updateById(bsSgcSzXlnl));
}

45
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java

@ -1,8 +1,12 @@
package com.kms.yg.sz.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil;
@ -52,6 +56,47 @@ public class BsSgcSzYhxxController extends BaseController
@Autowired
private SysDeptService sysDeptService;
@GetMapping("/getHistogram")
public HashMap<String, HashMap<String,String>> getHistogram() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
HashMap<String, HashMap<String,String>> dto = bsSgcSzYhxxService.getHistogram(layer, sysXzqhService.getSubString(xzqh));
return dto;
}
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
List<PieDto> list = bsSgcSzYhxxService.getPie(layer, xzqh);
List<HashMap<String, String>> listBy = new ArrayList<>();
HashMap<String, String> map = new HashMap<>();
for (PieDto pieDto : list) {
if (pieDto.getStatus().equals("0")) {
pieDto.setStatus("未解决");
}else {
pieDto.setStatus("已解决");
}
map.put(pieDto.getStatus(), pieDto.getNum());
}
listBy.add(map);
return listBy;
}
/**
* 查询水闸隐患信息列表
*/

6
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java

@ -103,11 +103,11 @@ public class BsSgcSzFzr extends BaseEntity
@ApiModelProperty("类型")
private String type;
@TableField("waga_name")
@TableField(exist = false)
private String wagaName;
/*
@TableField("waga_type")
private String wagaType;
private String wagaType;*/
@TableField("waga_id")
private String wagaId;

15
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzQqhj.java

@ -1,6 +1,8 @@
package com.kms.yg.sz.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -29,6 +31,9 @@ public class BsSgcSzQqhj extends BaseEntity
@ApiModelProperty("水闸id")
private String wagaId;
@TableField(exist = false)
private String engScal;
/** 工程功能 */
@Excel(name = "工程功能")
@ApiModelProperty("工程功能")
@ -97,4 +102,14 @@ public class BsSgcSzQqhj extends BaseEntity
@ApiModelProperty("保护范围")
private String relation;
@TableField(exist = false)
private String wagaName;
@TableField(exist = false)
private String wagaType;
@TableField(exist = false)
private String wagaCode;
@TableField(exist = false)
private String adcd;
}

1
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java

@ -189,4 +189,5 @@ public class BsSgcSzSafeJbxx extends BaseEntity
@ApiModelProperty("注销状态")
private String zxStatus;
private String reason;
}

1
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzZxxx.java

@ -95,4 +95,5 @@ public class BsSgcSzZxxx extends BaseEntity
@ApiModelProperty("审核状态")
private String relation;
private String reason;
}

37
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java

@ -0,0 +1,37 @@
package com.kms.yg.sz.domain.dto;
import lombok.Data;
@Data
public class AqrwDto {
private String adcdName;
private int total;
private int zeroNum;
private int oneNum;
private int twoNum;
private int threeNum;
private int one;
private int two;
private int three;
private String rate;
public void setTotal() {
this.total = this.zeroNum+this.oneNum+this.twoNum+this.threeNum;
}
public void setRate() {
this.rate = String.valueOf(this.threeNum/this.total);
}
}

13
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/HistogramDto.java

@ -0,0 +1,13 @@
package com.kms.yg.sz.domain.dto;
import lombok.Data;
import java.util.HashMap;
import java.util.List;
@Data
public class HistogramDto {
private HashMap<String, List<String>> map;
}

11
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/NumDto.java

@ -0,0 +1,11 @@
package com.kms.yg.sz.domain.dto;
import lombok.Data;
@Data
public class NumDto {
private String name;
private int num;
}

16
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java

@ -0,0 +1,16 @@
package com.kms.yg.sz.domain.dto;
import lombok.Data;
@Data
public class PieDto {
private String name;
private String num;
private String status;
private String type;
}

2
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java

@ -20,6 +20,8 @@ public class SzrwDto {
private String status;
private String remark;
/** 计划完成时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "计划完成时间", width = 30, dateFormat = "yyyy-MM-dd")

36
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java

@ -1,8 +1,13 @@
package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.dto.NumDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzAqrw;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
/**
* 水闸安全鉴定任务信息Mapper接口
@ -13,4 +18,35 @@ import com.kms.yg.sz.domain.BsSgcSzAqrw;
@Repository
public interface BsSgcSzAqrwMapper extends BaseMapper<BsSgcSzAqrw> {
List<NumDto> getZeroNum(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getOneNum(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getTwoNum(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getThreeNum(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getNum(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getOne(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getTwo(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getThree(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
}

19
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.BsSgcSzFzr;
import com.kms.yg.sz.domain.dto.PieDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* 水闸负责人Mapper接口
@ -14,4 +18,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Repository
public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
List<BsSgcSzFzr> getList(@Param("id") String id,
@Param("wagaId") String wagaId,
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
List<PieDto> getType1(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getType2(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getType3(@Param("layer") Integer layer,
@Param("adcd") String adcd);
}

11
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java

@ -1,9 +1,12 @@
package com.kms.yg.sz.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzQqhj;
import java.util.List;
/**
* 水闸确权划界Mapper接口
*
@ -13,4 +16,12 @@ import com.kms.yg.sz.domain.BsSgcSzQqhj;
@Repository
public interface BsSgcSzQqhjMapper extends BaseMapper<BsSgcSzQqhj> {
List<BsSgcSzQqhj> getList(@Param("id") String id,
@Param("wagaName") String wagaName,
@Param("wagaType") String wagaType,
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
}

12
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.PieDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* 水闸安全管理基本信息Mapper接口
@ -14,4 +18,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Repository
public interface BsSgcSzSafeJbxxMapper extends BaseMapper<BsSgcSzSafeJbxx> {
List<PieDto> getPie(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getNo(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getFin(@Param("layer") Integer layer,
@Param("adcd") String adcd);
}

9
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.dto.PieDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzYhxx;
import java.util.List;
/**
* 水闸隐患信息Mapper接口
*
@ -13,4 +17,9 @@ import com.kms.yg.sz.domain.BsSgcSzYhxx;
@Repository
public interface BsSgcSzYhxxMapper extends BaseMapper<BsSgcSzYhxx> {
List<PieDto> getPie(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getHistogram(@Param("layer") Integer layer,
@Param("adcd") String xzqh);
}

125
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java

@ -1,12 +1,17 @@
package com.kms.yg.sz.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.kms.yg.sz.domain.dto.NumDto;
import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper;
import com.shuili.common.core.domain.SearchParam;
@ -30,7 +35,7 @@ import java.util.stream.Collectors;
* @date 2024-01-16
*/
@Service
public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAqrw>{
public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAqrw> {
@Autowired
private BsSgcSzAqrwMapper bsSgcSzAqrwMapper;
@ -38,13 +43,18 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
@Autowired
private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private BsSgcSzSzrwMapper bsSgcSzSzrwMapper;
@Autowired
private BsSgcSzSzrwService bsSgcSzSzrwService;
public IPage selectPage(SearchParam<BsSgcSzAqrw> sp,String adcd) {
public IPage selectPage(SearchParam<BsSgcSzAqrw> sp, String adcd) {
QueryWrapper<BsSgcSzAqrw> queryWrapper = new QueryWrapper<>();
BsSgcSzAqrw projectInfo = sp.getData();
@ -52,16 +62,16 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
String projectName = projectInfo.getTaskName();
String projectType = projectInfo.getTaskStatus();
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
queryWrapper.like(projectName != null, "task_name", projectName);
queryWrapper.like(projectType != null && projectType!="", "task_type", projectType);
queryWrapper.like(projectType != null && projectType != "", "task_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
}
Map<String, Object> params = sp.getParams();
if (params!=null) {
if (params != null) {
//create_time
if (params.get("orderBy") != null) {
String orderBy = (String) params.get("orderBy");
@ -70,7 +80,7 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
}
Page<BsSgcSzAqrw> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<BsSgcSzAqrw> page = new Page<>(sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzAqrw> infoPage = bsSgcSzAqrwMapper.selectPage(page, queryWrapper);
return infoPage;
@ -84,11 +94,13 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
List<String> ids = Arrays.asList(sluiceIds);
bsSgcSzAqrw.setCompletionNumber(0L);
bsSgcSzAqrw.setIncompletionNumber((long) sluiceIds.length);
String xzqh = sysXzqhService.getXzqh();
bsSgcSzAqrw.setAdcd(xzqh);
bsSgcSzAqrwMapper.insert(bsSgcSzAqrw);
//存关联表
String id = bsSgcSzAqrw.getId();
List<BsSgcSzSzrw> collect = ids.stream().map(x ->
new BsSgcSzSzrw(x, id, bsSgcSzAqrw.getPlanCompletionTime(), null, null, null, null, null,"0"))
new BsSgcSzSzrw(x, id, bsSgcSzAqrw.getPlanCompletionTime(), null, null, null, null, null, "0"))
.collect(Collectors.toList());
bsSgcSzSzrwService.saveBatch(collect);
@ -132,4 +144,103 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
bsSgcSzAqrwMapper.updateById(bsSgcSzAqrw);
}
public List<AqrwDto> getList(String taskId) {
BsSgcSzAqrw szAqrw = bsSgcSzAqrwMapper.selectById(taskId);
String adcd = szAqrw.getAdcd();
SysXzqh byId = sysXzqhService.getById(adcd);
Integer layer = byId.getLayer();
List<NumDto> Num = bsSgcSzAqrwMapper.getNum(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> zeroNum = bsSgcSzAqrwMapper.getZeroNum(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> oneNum = bsSgcSzAqrwMapper.getOneNum(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> twoNum = bsSgcSzAqrwMapper.getTwoNum(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> threeNum = bsSgcSzAqrwMapper.getThreeNum(sysXzqhService.getSubString(adcd), layer,taskId);
List<AqrwDto> list = new ArrayList<>();
for (NumDto numDto : Num) {
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}
aqrwDto.setTotal();
aqrwDto.setRate();
list.add(aqrwDto);
}
return list;
}
public List<AqrwDto> getLevel(String taskId) {
BsSgcSzAqrw szAqrw = bsSgcSzAqrwMapper.selectById(taskId);
String adcd = szAqrw.getAdcd();
SysXzqh byId = sysXzqhService.getById(adcd);
Integer layer = byId.getLayer();
List<AqrwDto> dtoList = this.getList(taskId);
List<NumDto> one = bsSgcSzAqrwMapper.getOne(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> two = bsSgcSzAqrwMapper.getTwo(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> three = bsSgcSzAqrwMapper.getThree(sysXzqhService.getSubString(adcd), layer,taskId);
for (AqrwDto aqrwDto : dtoList) {
for (NumDto numDto : one) {
if (numDto.getName().equals(aqrwDto.getAdcdName())) {
aqrwDto.setOne(numDto.getNum());
}
}
for (NumDto numDto : two) {
if (numDto.getName().equals(aqrwDto.getAdcdName())) {
aqrwDto.setTwo(numDto.getNum());
}
}
for (NumDto numDto : three) {
if (numDto.getName().equals(aqrwDto.getAdcdName())) {
aqrwDto.setThree(numDto.getNum());
}
}
}
return dtoList;
}
}

70
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java

@ -3,9 +3,12 @@ package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzFxzz;
import com.kms.yg.sz.domain.BsSgcSzFzr;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper;
import com.kms.yg.sz.mapper.BsSgcSzFzrMapper;
import com.shuili.common.core.domain.SearchParam;
@ -13,6 +16,8 @@ import com.shuili.common.core.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -32,6 +37,9 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
@Autowired
private BsSgcSzFxzzMapper bsSgcSzFxzzMapper;
@Autowired
private SysXzqhService sysXzqhService;
public IPage selectPage(SearchParam<BsSgcSzFzr> sp, String adcd) {
@ -40,11 +48,11 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
if (projectInfo != null) {
String projectName = projectInfo.getWagaName();
String projectType = projectInfo.getWagaType();
// String projectType = projectInfo.getWagaType();
queryWrapper.eq(projectInfo.getWagaId()!=null,"waga_id", projectInfo.getWagaId());
queryWrapper.like(projectName != null, "waga_name", projectName);
queryWrapper.like(projectType != null, "waga_type", projectType);
// queryWrapper.like(projectType != null, "waga_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
}
@ -67,4 +75,62 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
}
public IPage selectPage(SearchParam<BsSgcSzFzr> sp) {
BsSgcSzFzr data = sp.getData();
Map<String, Object> params = sp.getParams();
List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWagaId(), sysXzqhService.getSubString(data.getAdcd()),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzFzr> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());
return page;
}
public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
//获取政府责任人
List<PieDto> listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh));
//获取主管部门责任人
List<PieDto> listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh));
//获取管理单位责任人
List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh));
List<PieDto> pieDtos = new ArrayList<>();
pieDtos.addAll(listType1);
pieDtos.addAll(listType2);
pieDtos.addAll(listType3);
HashMap<String, HashMap<String,String>> map = new HashMap<>();
for (int i = 0; i < pieDtos.size(); i++) {
List<HashMap<String, String>> hashMaps = new ArrayList<>();
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
}
}
map.put(pieDtos.get(i).getName(), hashMap);
}
return map;
}
}

34
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java

@ -1,9 +1,18 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.sz.mapper.BsSgcSzQqhjMapper;
import com.kms.yg.sz.domain.BsSgcSzQqhj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 水闸确权划界Service接口
*
@ -11,6 +20,29 @@ import org.springframework.stereotype.Service;
* @date 2024-01-16
*/
@Service
public class BsSgcSzQqhjService extends BaseService<BsSgcSzQqhjMapper, BsSgcSzQqhj>{
public class BsSgcSzQqhjService extends BaseService<BsSgcSzQqhjMapper, BsSgcSzQqhj> {
@Autowired
private BsSgcSzQqhjMapper bsSgcSzQqhjMapper;
@Autowired
private SysXzqhService sysXzqhService;
public IPage selectPage(SearchParam<BsSgcSzQqhj> sp) {
BsSgcSzQqhj data = sp.getData();
Map<String, Object> params = sp.getParams();
List<BsSgcSzQqhj> list = bsSgcSzQqhjMapper.getList(data.getId(),data.getWagaName(),data.getWagaType(),
sysXzqhService.getSubString(data.getAdcd()),(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzQqhj> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());
return page;
}
}

65
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java

@ -3,15 +3,21 @@ package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzBzbp;
import com.kms.yg.sz.domain.BsSgcSzGcda;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -23,11 +29,14 @@ import java.util.Map;
* @date 2024-01-16
*/
@Service
public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, BsSgcSzSafeJbxx>{
public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, BsSgcSzSafeJbxx> {
@Resource
private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;
@Autowired
private SysXzqhService sysXzqhService;
public IPage selectPage(SearchParam<BsSgcSzSafeJbxx> sp, String adcd) {
@ -38,16 +47,16 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
String projectName = projectInfo.getWagaName();
String projectType = projectInfo.getWagaType();
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
queryWrapper.like(projectName != null, "waga_name", projectName);
queryWrapper.like(projectType != null && projectType!="", "waga_type", projectType);
queryWrapper.like(projectType != null && projectType != "", "waga_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
}
Map<String, Object> params = sp.getParams();
if (params!=null) {
if (params != null) {
//create_time
if (params.get("orderBy") != null) {
String orderBy = (String) params.get("orderBy");
@ -56,9 +65,55 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
}
Page<BsSgcSzSafeJbxx> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<BsSgcSzSafeJbxx> page = new Page<>(sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzSafeJbxx> infoPage = bsSgcSzSafeJbxxMapper.selectPage(page, queryWrapper);
return infoPage;
}
public List<PieDto> getPie(Integer layer, String xzqh) {
return bsSgcSzSafeJbxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh));
}
public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
//获取未登记的
List<PieDto> listNo = bsSgcSzSafeJbxxMapper.getNo(layer, sysXzqhService.getSubString(xzqh));
//获取已登记的
List<PieDto> listFin = bsSgcSzSafeJbxxMapper.getFin(layer, sysXzqhService.getSubString(xzqh));
List<PieDto> pieDtos = new ArrayList<>();
pieDtos.addAll(listNo);
pieDtos.addAll(listFin);
for (PieDto pieDto : pieDtos) {
if (!pieDto.getStatus().equals("0")) {
pieDto.setStatus("1");
}
}
HashMap<String, HashMap<String,String>> map = new HashMap<>();
for (int i = 0; i < pieDtos.size(); i++) {
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getStatus().equals(pieDtos.get(i).getStatus())) {
// hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(j).getStatus(), pieDtos.get(j).getNum());
}
}
map.put(pieDtos.get(i).getName(), hashMap);
}
return map;
}
}

6
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java

@ -1,5 +1,6 @@
package com.kms.yg.sz.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
@ -41,12 +42,17 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
for (BsSgcSzSzrw record : records) {
String wagaId = record.getWagaId();
BsSgcSzSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectById(wagaId);
if (ObjectUtil.isNull(bsSgcSzSafeJbxx)) {
continue;
}
SzrwDto szrwDto = new SzrwDto();
szrwDto.setId(record.getId());
szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName());
szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
szrwDto.setStatus(record.getStatus());
szrwDto.setRemark(record.getRemark());
szrwDto.setPlanTime(record.getPlanTime());
szrwDto.setCompletionTime(record.getCompletionTime());

42
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java

@ -1,9 +1,18 @@
package com.kms.yg.sz.service;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.dto.HistogramDto;
import com.kms.yg.sz.domain.dto.PieDto;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper;
import com.kms.yg.sz.domain.BsSgcSzYhxx;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
* 水闸隐患信息Service接口
*
@ -11,6 +20,37 @@ import org.springframework.stereotype.Service;
* @date 2024-01-16
*/
@Service
public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYhxx>{
public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYhxx> {
@Autowired
private BsSgcSzYhxxMapper bsSgcSzYhxxMapper;
@Autowired
private SysXzqhService sysXzqhService;
public List<PieDto> getPie(Integer layer, String xzqh) {
return bsSgcSzYhxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh));
}
public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
List<PieDto> list = bsSgcSzYhxxMapper.getHistogram(layer, xzqh);
HistogramDto dto = new HistogramDto();
HashMap<String, HashMap<String,String>> map = new HashMap<>();
for (int i = 0; i < list.size(); i++) {
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(list.get(i).getStatus(), list.get(i).getNum());
for (int j = 0; j < list.size(); j++) {
if (list.get(j).getName().equals(list.get(i).getName()) && !list.get(j).getStatus().equals(list.get(i).getStatus())) {
hashMap.put(list.get(j).getStatus(), list.get(j).getNum());
}
}
map.put(list.get(i).getName(), hashMap);
}
return map;
}
}

36
shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml

@ -34,15 +34,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="beginDate" column="begin_date" />
<result property="endDate" column="end_date" />
</resultMap>
<sql id="selectDeptVo">
select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors,
d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag,
select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors,
d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag,
d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background,
d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date
from sys_dept d
</sql>
<select id="selectDeptList" parameterType="com.shuili.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
order by d.parent_id, d.order_num
</select>
<select id="selectDeptListByRoleId" parameterType="String" resultType="Integer">
select d.id, d.parent_id
from sys_dept d
@ -71,34 +71,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and d.id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.id = rd.dept_id and rd.role_id = #{roleId})
order by d.parent_id, d.order_num
</select>
<select id="selectDeptById" parameterType="String" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where id = #{id}
</select>
<select id="checkDeptExistUser" parameterType="String" resultType="int">
select count(1) from sys_user where id = #{id} and del_flag = '0'
</select>
<select id="hasChildByDeptId" parameterType="String" resultType="int">
select count(1) from sys_dept
where del_flag = '0' and parent_id = #{id} limit 1
</select>
<select id="selectChildrenDeptById" parameterType="String" resultMap="SysDeptResult">
select * from sys_dept where find_in_set(#{id}, ancestors)
</select>
<select id="selectNormalChildrenDeptById" parameterType="String" resultType="int">
select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{id}, ancestors)
</select>
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where dept_name=#{deptName} and parent_id = #{parentId} limit 1
</select>
<insert id="insertDept" parameterType="com.shuili.common.core.domain.entity.SysDept">
insert into sys_dept(
<if test="id != null and id != ''">id,</if>
@ -124,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pcBackground != null and pcBackground != ''">pc_background,</if>
<if test="adminName != null and adminName != ''">admin_name,</if>
<if test="adminLogo != null and adminLogo != ''">admin_logo,</if>
<if test="xzqhId != null and adminLogo != ''">xzqh_id,</if>
create_time
)values(
<if test="id != null and id != ''">#{id},</if>
@ -149,10 +150,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pcBackground != null and pcBackground != ''">#{pcBackground},</if>
<if test="adminName != null and adminName != ''">#{adminName},</if>
<if test="adminLogo != null and adminLogo != ''">#{adminLogo},</if>
<if test="xzqhId != null and adminLogo != ''">#{xzqhId},</if>
sysdate()
)
</insert>
<update id="updateDept" parameterType="com.shuili.common.core.domain.entity.SysDept">
update sys_dept
<set>
@ -180,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</set>
where id = #{id}
</update>
<update id="updateDeptChildren" parameterType="java.util.List">
update sys_dept set ancestors =
<foreach collection="depts" item="item" index="index"
@ -193,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.id}
</foreach>
</update>
<update id="updateDeptStatus" parameterType="com.shuili.common.core.domain.entity.SysDept">
update sys_dept a
<set>
@ -203,9 +205,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</set>
where FIND_IN_SET(a.id,#{ancestors})
</update>
<delete id="deleteDeptById" parameterType="String">
delete from sys_dept where id = #{id}
</delete>
</mapper>
</mapper>

30
shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.system.mapper.SysXzqhMapper">
<!--<resultMap type="SysXzqh" id="SysXzqh">
<result property="name" column="name" />
<result property="xzqhdm" column="XZQHDM" />
<result property="num" column="num"/>
</resultMap>
<select id="getArea" resultMap="SysXzqh">
SELECT name,SUBSTRING(XZQHDM, 1, 4) as XZQHDM
FROM sys_xzqh
WHERE XZQHDM LIKE '44%'
GROUP BY SUBSTRING(XZQHDM, 1, 4);
</select>-->
<sql id="xzqhCondition">
<if test="adcd!=null and adcd !=''">
and adcd like concat(#{adcd},'%')
</if>
<if test="id!=null and id!=''">
and id=#{id}
</if>
</sql>
</mapper>

119
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzAqrwMapper">
<sql id="info">
SELECT sx.`NAME`,
COUNT(1) num
FROM bs_sgc_sz_szrw ss
LEFT JOIN bs_sgc_sz_safe_jbxx sj ON sj.id = ss.WAGA_ID
LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
</sql>
<resultMap id="NumDto" type="NumDto">
<result property="name" column="name"/>
<result property="num" column="num"/>
</resultMap>
<select id="getZeroNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and ss.`status`="0"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getOneNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and ss.`status`="1"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getTwoNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and ss.`status`="2"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getThreeNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and ss.`status`="3"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId}
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getOne" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="0"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getTwo" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="1"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getThree" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="2"
<if test="layer==1">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
</mapper>

122
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@ -0,0 +1,122 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzFzrMapper">
<sql id="info">
select sj.waga_name,
sf.*
from bs_sgc_sz_fzr sf
left join bs_sgc_sz_safe_jbxx sj on sf.waga_id = sj.id
</sql>
<sql id="getHistogram">
select sx.name,
count(1) num,
sf.type
from bs_sgc_sz_fzr sf
left join bs_sgc_sz_safe_jbxx sj on sf.waga_id = sj.id
left join sys_xzqh sx on sj.adcd=sx.xzqhdm
</sql>
<resultMap type="pieDto" id="pieDto">
<result property="name" column="name"/>
<result property="num" column="num"/>
<result property="type" column="type"/>
</resultMap>
<resultMap type="BsSgcSzFzr" id="BsSgcSzFzr">
<id property="id" column="id" />
<result property="wagaName" column="waga_name"/>
<result property="name" column="name"/>
<result property="unit" column="unit"/>
<result property="duties" column="duties"/>
<result property="phone" column="phone"/>
<result property="type" column="type"/>
<result property="competentDepartment" column="competent_department"/>
<result property="competentDepartmentDuties" column="competent_department_duties"/>
<result property="effectiveDate" column="effective_date"/>
<result property="createTime" column="create_time"/>
</resultMap>
<!--<select id="selectList1" resultMap="Result">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
SELECT sluice_name, adcd, COUNT(1) number,sluice_code
FROM bs_sgc_sz_bzbp
<where>
<if test="sluiceName != null and sluiceName != ''">
sluice_name like concat('%', #{sluiceName}, '%')
</if>
<if test="adcd != null and adcd != ''">
and adcd like concat(#{adcd},'%')
</if>
</where>
GROUP BY sluice_code
ORDER BY create_time DESC
LIMIT #{pageNum}, #{pageSize}
</select>-->
<select id="getList" resultMap="BsSgcSzFzr">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaId!=null and wagaId!=''">
and waga_id =#{wagaId}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getType1" resultMap="pieDto">
<include refid="getHistogram"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sf.type='0'
</if>
</select>
<select id="getType2" resultMap="pieDto">
<include refid="getHistogram"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sf.type='1'
</if>
</select>
<select id="getType3" resultMap="pieDto">
<include refid="getHistogram"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sf.type='2'
</if>
</select>
</mapper>

44
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzQqhjMapper">
<sql id="info">
select sj.waga_name,
sj.waga_code,
sj.waga_type,
sj.ENG_SCAL,
sj.adcd,
sq.*
from bs_sgc_sz_qqhj sq
left join bs_sgc_sz_safe_jbxx sj on sq.waga_id = sj.id
</sql>
<resultMap type="BsSgcSzQqhj" id="BsSgcSzQqhj">
<id property="id" column="id" />
<result property="wagaName" column="waga_name"/>
<result property="wagaCode" column="waga_code"/>
<result property="adcd" column="adcd"/>
<result property="engScal" column="ENG_SCAL"/>
<result property="wagaType" column="waga_type"/>
<result property="createTime" column="create_time"/>
</resultMap>
<select id="getList" resultMap="BsSgcSzQqhj">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaName!=null and wagaName!=''">
and waga_name like concat('%',#{wagaName},'%')
</if>
<if test="wagaType!=null and wagaType!=''">
and waga_type=#{wagaType}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
</select>
</mapper>

74
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper">
<sql id="info">
select sx.name,
count(1) num,
sj.`status`
from bs_sgc_sz_safe_jbxx sj
left join sys_xzqh sx on sj.adcd=sx.xzqhdm
</sql>
<resultMap type="pieDto" id="pieDto">
<result property="name" column="name"/>
<result property="num" column="num"/>
<result property="status" column="status"/>
</resultMap>
<select id="getPie" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd}
</if>
</select>
<select id="getNo" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status='0'
</if>
</select>
<select id="getFin" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if>
</select>
</mapper>

92
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzYhxxMapper">
<sql id="info">
select sy.`status`,
count(1) num,
sx.`name`
from bs_sgc_sz_yhxx sy
left join bs_sgc_sz_safe_jbxx sj on sj.id=sy.waga_id
left join sys_xzqh sx on sj.adcd=sx.xzqhdm
</sql>
<resultMap type="pieDto" id="pieDto">
<result property="status" column="status"/>
<result property="num" column="num"/>
<result property="name" column="name"/>
</resultMap>
<select id="getPie" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sy.`status`
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sy.`status`
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} GROUP BY sy.`status`
</if>
</select>
<select id="getNo" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd}
</if>
</select>
<select id="getFin" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if>
</select>
<select id="getHistogram" resultMap="pieDto">
select * from (
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if> ) t GROUP BY t.`status`
</select>
</mapper>
Loading…
Cancel
Save