Browse Source

Merge branch 'refs/heads/master' into release-sy-v1.0.0

# Conflicts:
#	shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
release-sy-v1.0.0
hxh 1 month ago
parent
commit
4dfba17af1
  1. 18
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java
  2. 3
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java
  3. 3
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java
  4. 2
      shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java
  5. 8
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
  6. 10
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
  7. 33
      shuili-system/src/main/java/com/kms/yg/res/controller/AttRessBasesController.java
  8. 21
      shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java
  9. 14
      shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java
  10. 2
      shuili-system/src/main/java/com/kms/yg/res/domain/AttRessBase.java
  11. 4
      shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java
  12. 4
      shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBasesMapper.java
  13. 7
      shuili-system/src/main/java/com/kms/yg/res/service/AttResBasesService.java
  14. 17
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java
  15. 4
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java
  16. 2
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
  17. 2
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java
  18. 1
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java
  19. 8
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
  20. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  21. 10
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java
  22. 2
      shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
  23. 4
      shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml
  24. 8
      shuili-system/src/main/resources/mapper/system/SysUserMapper.xml
  25. 40
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
  26. 35
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
  27. 3
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

18
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java

@ -1,11 +1,16 @@
package com.kms.yg.df.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfBydy;
import com.kms.yg.df.domain.BsSgcDfBydyzb;
import com.kms.yg.df.service.BsSgcDfBydyService;
import com.kms.yg.df.service.BsSgcDfBydyzbService;
import com.kms.yg.sz.domain.BsSgcSzBydy;
import com.kms.yg.sz.domain.BsSgcSzBydyzb;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
@ -35,7 +40,8 @@ public class BsSgcDfBydyzbController extends BaseController
{
@Autowired
private BsSgcDfBydyzbService bsSgcSzBydyzbService;
@Autowired
private BsSgcDfBydyService bsSgcDfBydyService;
@Autowired
private SysXzqhService sysXzqhService;
@ -49,7 +55,15 @@ public class BsSgcDfBydyzbController extends BaseController
@ApiOperation("水闸备用电源主列表")
public IPage list(@RequestBody SearchParam<BsSgcDfBydyzb> sp)
{
return bsSgcSzBydyzbService.selectPage(sp);
IPage<BsSgcDfBydyzb> bsSgcDfBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp);
List<BsSgcDfBydyzb> records = bsSgcDfBydyzbIPage.getRecords();
for (BsSgcDfBydyzb zb:records){
LambdaQueryWrapper<BsSgcDfBydy> lw=new LambdaQueryWrapper<>();
int count = bsSgcDfBydyService.count(lw.eq(BsSgcDfBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
return bsSgcDfBydyzbIPage;
}
/**

3
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java

@ -1,5 +1,6 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
@ -57,4 +58,6 @@ public class BsSgcDfBydyzb extends BaseEntity
@ApiModelProperty("水闸名称")
private String relation;
@TableField(exist = false)
private String total;
}

3
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java

@ -100,6 +100,9 @@ public class BsSgcDfFzr extends BaseEntity
@ApiModelProperty("防汛负责人类型")
private String personType;
@ApiModelProperty("安全负责人类型")
private String safetyType;
/** 类型 */
@Excel(name = "类型")
@ApiModelProperty("类型")

2
shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java

@ -12,6 +12,8 @@ public class DfrwDto {
private String id;
private String taskName;
private String dikeName;
private String dikeType;

8
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java

@ -171,25 +171,25 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}

10
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java

@ -1,12 +1,15 @@
package com.kms.yg.df.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.yg.df.domain.BsSgcDfAqrw;
import com.kms.yg.df.domain.BsSgcDfDfrw;
import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
import com.kms.yg.df.domain.dto.DfrwDto;
import com.kms.yg.df.mapper.BsSgcDfAqrwMapper;
import com.kms.yg.df.mapper.BsSgcDfDfrwMapper;
import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper;
import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper;
@ -34,6 +37,9 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
@Autowired
private BsSgcDfSafeJbxxMapper bsSgcSzSafeJbxxMapper;
@Autowired
private BsSgcDfAqrwMapper bsSgcDfAqrwMapper;
public IPage selectPage(SearchParam<BsSgcDfDfrw> sp) {
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
@ -48,8 +54,12 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
continue;
}
LambdaQueryWrapper<BsSgcDfAqrw>lw=new LambdaQueryWrapper<>();
BsSgcDfAqrw bsSgcDfAqrw = bsSgcDfAqrwMapper.selectOne(lw.eq(BsSgcDfAqrw::getId, record.getTaskId()));
DfrwDto szrwDto = new DfrwDto();
szrwDto.setId(record.getId());
szrwDto.setTaskName(bsSgcDfAqrw.getTaskName());
szrwDto.setDikeName(bsSgcSzSafeJbxx.getDikeName());
szrwDto.setDikeType(bsSgcSzSafeJbxx.getDikeType());
szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());

33
shuili-system/src/main/java/com/kms/yg/res/controller/AttResBaseController.java → shuili-system/src/main/java/com/kms/yg/res/controller/AttRessBasesController.java

@ -3,6 +3,7 @@ package com.kms.yg.res.controller;
import java.util.Arrays;
import java.util.List;
import com.kms.yg.res.service.AttResBasesService;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil;
@ -27,8 +28,8 @@ import com.shuili.common.mybaitsplus.BeanToWrapper;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.domain.AjaxResult;
import com.shuili.common.enums.BusinessType;
import com.kms.yg.res.domain.AttResBase;
import com.kms.yg.res.service.AttResBaseService;
import com.kms.yg.res.domain.AttRessBase;
/**
@ -40,10 +41,10 @@ import com.kms.yg.res.service.AttResBaseService;
@RestController
@RequestMapping("/res/base")
@Api(tags = "水库基本信息")
public class AttResBaseController extends BaseController
public class AttRessBasesController extends BaseController
{
@Autowired
private AttResBaseService attResBaseService;
private AttResBasesService AttRessBaseService;
/**
@ -51,9 +52,9 @@ public class AttResBaseController extends BaseController
*/
@PostMapping("/list")
@ApiOperation("水库基本信息列表")
public IPage list(@RequestBody SearchParam<AttResBase> sp)
public IPage list(@RequestBody SearchParam<AttRessBase> sp)
{
return attResBaseService.selectPage(sp);
return AttRessBaseService.selectPage(sp);
}
/**
@ -62,10 +63,10 @@ public class AttResBaseController extends BaseController
@Log(title = "水库基本信息导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("水库基本信息导出")
public AjaxResult export(@RequestBody AttResBase attResBase)
public AjaxResult export(@RequestBody AttRessBase AttRessBase)
{
List<AttResBase> list = attResBaseService.listByIds(attResBase.getIds());
ExcelUtil<AttResBase> util = new ExcelUtil<>(AttResBase.class);
List<AttRessBase> list = AttRessBaseService.listByIds(AttRessBase.getIds());
ExcelUtil<AttRessBase> util = new ExcelUtil<>(AttRessBase.class);
return util.exportExcel(list, "base");
}
@ -76,7 +77,7 @@ public class AttResBaseController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return AjaxResult.success(attResBaseService.getById(id));
return AjaxResult.success(AttRessBaseService.getById(id));
}
/**
@ -85,10 +86,10 @@ public class AttResBaseController extends BaseController
@Log(title = "水库基本信息新增", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("水库基本信息新增")
public AjaxResult add(@RequestBody AttResBase attResBase)
public AjaxResult add(@RequestBody AttRessBase AttRessBase)
{
BaseEntityUtils.preInsert(attResBase);
return toAjax(attResBaseService.save(attResBase));
BaseEntityUtils.preInsert(AttRessBase);
return toAjax(AttRessBaseService.save(AttRessBase));
}
/**
@ -97,9 +98,9 @@ public class AttResBaseController extends BaseController
@ApiOperation("水库基本信息修改")
@Log(title = "水库基本信息修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AttResBase attResBase)
public AjaxResult edit(@RequestBody AttRessBase AttRessBase)
{
return toAjax(attResBaseService.updateById(attResBase));
return toAjax(AttRessBaseService.updateById(AttRessBase));
}
/**
@ -110,6 +111,6 @@ public class AttResBaseController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(attResBaseService.removeByIds(Arrays.asList(ids)));
return toAjax(AttRessBaseService.removeByIds(Arrays.asList(ids)));
}
}

21
shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java

@ -1,12 +1,19 @@
package com.kms.yg.res.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfBydy;
import com.kms.yg.df.domain.BsSgcDfBydyzb;
import com.kms.yg.res.domain.BsSgcResBydyzb;
import com.kms.yg.res.service.BsSgcResBydyzbService;
import com.kms.yg.sz.domain.BsSgcSzBydy;
import com.kms.yg.sz.domain.BsSgcSzBydyzb;
import com.kms.yg.sz.service.BsSgcSzBydyService;
import com.kms.yg.sz.service.BsSgcSzBydyzbService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
@ -36,6 +43,8 @@ public class BsSgcResBydyzbController extends BaseController
@Autowired
private BsSgcResBydyzbService bsSgcSzBydyzbService;
@Autowired
private BsSgcSzBydyService bsSgcSzBydyService;
@Autowired
private SysXzqhService sysXzqhService;
@ -49,7 +58,17 @@ public class BsSgcResBydyzbController extends BaseController
@ApiOperation("水闸备用电源主列表")
public IPage list(@RequestBody SearchParam<BsSgcResBydyzb> sp)
{
return bsSgcSzBydyzbService.selectPage(sp);
IPage<BsSgcResBydyzb> bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp);
List<BsSgcResBydyzb> records = bsSgcSzBydyzbIPage.getRecords();
for (BsSgcResBydyzb zb:records){
LambdaQueryWrapper<BsSgcSzBydy>lw=new LambdaQueryWrapper<>();
int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
return bsSgcSzBydyzbIPage;
}
/**

14
shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java

@ -8,11 +8,11 @@ import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.res.domain.AttResBase;
import com.kms.yg.res.domain.AttRessBase;
import com.kms.yg.res.domain.BsSgcResFxzz;
import com.kms.yg.res.domain.BsSgcResFxzzDto;
import com.kms.yg.res.domain.BsSgcResFxzzcy;
import com.kms.yg.res.service.AttResBaseService;
import com.kms.yg.res.service.AttResBasesService;
import com.kms.yg.res.service.BsSgcResFxzzService;
import com.kms.yg.res.service.BsSgcResFxzzcyService;
import com.shuili.common.annotation.Log;
@ -46,7 +46,7 @@ public class BsSgcResFxzzController extends BaseController
private BsSgcResFxzzService bsSgcSzFxzzService;
@Autowired
private AttResBaseService bsSgcSzSafeJbxxService;
private AttResBasesService bsSgcSzSafeJbxxService;
@Autowired
private BsSgcResFxzzcyService bsSgcSzFxzzcyService;
@ -99,8 +99,8 @@ public class BsSgcResFxzzController extends BaseController
public AjaxResult add(@RequestBody BsSgcResFxzzDto dto)
{
String dikeCode = dto.getResCode();
AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class)
.eq(AttResBase::getResCode, dikeCode));
AttRessBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttRessBase.class)
.eq(AttRessBase::getResCode, dikeCode));
byId.setRemark("4");
bsSgcSzSafeJbxxService.updateById(byId);
@ -128,8 +128,8 @@ public class BsSgcResFxzzController extends BaseController
public AjaxResult edit(@RequestBody BsSgcResFxzz bsSgcSzFxzz)
{
String dikeCode = bsSgcSzFxzz.getResCode();
AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class)
.eq(AttResBase::getResCode, dikeCode));
AttRessBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttRessBase.class)
.eq(AttRessBase::getResCode, dikeCode));
byId.setRemark("4");
bsSgcSzSafeJbxxService.updateById(byId);
return toAjax(bsSgcSzFxzzService.updateById(bsSgcSzFxzz));

2
shuili-system/src/main/java/com/kms/yg/res/domain/AttResBase.java → shuili-system/src/main/java/com/kms/yg/res/domain/AttRessBase.java

@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("att_res_base")
@Data
@ApiModel("水库基本信息")
public class AttResBase extends BaseEntity
public class AttRessBase extends BaseEntity
{
private static final long serialVersionUID = 1L;

4
shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java

@ -1,5 +1,6 @@
package com.kms.yg.res.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
@ -56,4 +57,7 @@ public class BsSgcResBydyzb extends BaseEntity
@ApiModelProperty("水闸名称")
private String relation;
@TableField(exist = false)
private String total;
}

4
shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBaseMapper.java → shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBasesMapper.java

@ -1,8 +1,8 @@
package com.kms.yg.res.mapper;
import com.kms.yg.res.domain.AttRessBase;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.res.domain.AttResBase;
/**
* 水库基本信息Mapper接口
@ -11,6 +11,6 @@ import com.kms.yg.res.domain.AttResBase;
* @date 2025-03-12
*/
@Repository
public interface AttResBaseMapper extends BaseMapper<AttResBase> {
public interface AttResBasesMapper extends BaseMapper<AttRessBase> {
}

7
shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java → shuili-system/src/main/java/com/kms/yg/res/service/AttResBasesService.java

@ -1,8 +1,9 @@
package com.kms.yg.res.service;
import com.kms.yg.res.domain.AttRessBase;
import com.kms.yg.res.mapper.AttResBasesMapper;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.res.mapper.AttResBaseMapper;
import com.kms.yg.res.domain.AttResBase;
import org.springframework.stereotype.Service;
/**
* 水库基本信息Service接口
@ -11,6 +12,6 @@ import org.springframework.stereotype.Service;
* @date 2025-03-12
*/
@Service
public class AttResBaseService extends BaseService<AttResBaseMapper, AttResBase>{
public class AttResBasesService extends BaseService<AttResBasesMapper, AttRessBase>{
}

17
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java

@ -1,10 +1,13 @@
package com.kms.yg.sz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzBydy;
import com.kms.yg.sz.domain.BsSgcSzBydyzb;
import com.kms.yg.sz.service.BsSgcSzBydyService;
import com.kms.yg.sz.service.BsSgcSzBydyzbService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
@ -35,6 +38,8 @@ public class BsSgcSzBydyzbController extends BaseController
{
@Autowired
private BsSgcSzBydyzbService bsSgcSzBydyzbService;
@Autowired
private BsSgcSzBydyService bsSgcSzBydyService;
@Autowired
private SysXzqhService sysXzqhService;
@ -49,7 +54,17 @@ public class BsSgcSzBydyzbController extends BaseController
@ApiOperation("水闸备用电源主列表")
public IPage list(@RequestBody SearchParam<BsSgcSzBydyzb> sp)
{
return bsSgcSzBydyzbService.selectPage(sp);
IPage<BsSgcSzBydyzb> bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp);
List<BsSgcSzBydyzb> records = bsSgcSzBydyzbIPage.getRecords();
for (BsSgcSzBydyzb zb:records){
LambdaQueryWrapper<BsSgcSzBydy>lw=new LambdaQueryWrapper<>();
int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId()));
zb.setTotal(String.valueOf(count));
}
return bsSgcSzBydyzbIPage;
}
/**

4
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java

@ -1,5 +1,6 @@
package com.kms.yg.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -38,6 +39,9 @@ public class BsSgcSzBydyzb extends BaseEntity
@ApiModelProperty("水闸名称")
private String wagaName;
@TableField(exist = false)
private String total;
/** $column.columnComment */
@Excel(name = "水闸名称")
@ApiModelProperty("水闸名称")

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

@ -100,6 +100,8 @@ public class BsSgcSzFzr extends BaseEntity
@ApiModelProperty("防汛负责人类型")
private String personType;
@ApiModelProperty("安全负责人类型")
private String safetyType;
/** 类型 */
@Excel(name = "类型")
@ApiModelProperty("类型")

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

@ -12,6 +12,8 @@ public class SzrwDto {
private String id;
private String taskName;
private String wagaName;
private String wagaType;

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

@ -36,6 +36,7 @@ public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
List<BsSgcSzFzr> getList(@Param("id") String id,
@Param("wageName") String wageName,
@Param("adcd") String adcd,
@Param("wagaCode")String wagaCode,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);

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

@ -170,25 +170,25 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}

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

@ -77,7 +77,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
Map<String, Object> params = sp.getParams();
List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),
List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),sp.getData().getWagaCode(),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzFzr> page = new Page<>();

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

@ -1,12 +1,15 @@
package com.kms.yg.sz.service;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.yg.sz.domain.BsSgcSzAqrw;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.SzrwDto;
import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper;
import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper;
import com.shuili.common.core.domain.SearchParam;
@ -33,6 +36,8 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
@Autowired
private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;
@Autowired
private BsSgcSzAqrwMapper bsSgcSzAqrwMapper;
public IPage selectPage(SearchParam<BsSgcSzSzrw> sp) {
Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
@ -43,12 +48,17 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
String wagaId = record.getWagaCode();
BsSgcSzSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
.eq(BsSgcSzSafeJbxx::getWagaCode, wagaId));
LambdaQueryWrapper<BsSgcSzAqrw>lw=new LambdaQueryWrapper<>();
BsSgcSzAqrw bsSgcSzAqrw = bsSgcSzAqrwMapper.selectOne(lw.eq(BsSgcSzAqrw::getId, record.getTaskId()));
if (ObjectUtil.isNull(bsSgcSzSafeJbxx)) {
continue;
}
SzrwDto szrwDto = new SzrwDto();
szrwDto.setId(record.getId());
szrwDto.setTaskName(bsSgcSzAqrw.getTaskName());
szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName());
szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());

2
shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java

@ -1,5 +1,3 @@
package com.kms.yxgh.common.enums;
import cn.hutool.core.collection.CollectionUtil;

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

@ -21,7 +21,7 @@
<result property="createTime" column="create_time"/>
<result property="updateUid" column="update_uid"/>
<result property="updateTime" column="update_time"/>
<result property="name" column="name"/>
<!-- <result property="name" column="name"/>-->
<result property="pcLogo" column="pc_logo"/>
<result property="pcBackground" column="pc_background"/>
<result property="adminName" column="admin_name"/>
@ -38,7 +38,7 @@
<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,
d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background,
d.del_flag, d.create_uid, d.create_time, d.pc_logo, d.pc_background,
d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id, d.xzqh_name
from sys_dept d
</sql>

8
shuili-system/src/main/resources/mapper/system/SysUserMapper.xml

@ -23,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateUid" column="update_uid" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="realName" column="real_name" />
<result property="cardNo" column="card_no" />
<result property="department" column="department" />
@ -63,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectUserVo">
select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark,
select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time,
u.real_name,u.card_no,u.department,u.post,u.professional,
d.id,d.xzqh_id,d.parent_id,d.tag as dtag, d.dept_name as ddept_name, d.order_num as dorder_num, d.leader as dleader, d.status as dept_status, d.pc_logo, d.pc_background, d.admin_logo,
r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@ -74,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectUserList" parameterType="com.shuili.common.core.domain.entity.SysUser" resultMap="sysUserResult">
select u.id,u.is_pc_user,u.invitee,u.is_first, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark,
select u.id,u.is_pc_user,u.invitee,u.is_first, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time,
d.dept_name as ddept_name,d.tag as dtag, d.id as did,d.parent_id as dparent_id,
u.real_name,u.card_no,u.department,u.post,u.professional,d.leader,d.is_download,d.is_comment,
d.ip_start,d.ip_end, d.pc_logo, d.pc_background, d.admin_logo
@ -201,7 +200,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginDate != null">login_date,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
<if test="updateUid != null and updateUid != ''">update_uid,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="realName != null">real_name,</if>
<if test="cardNo != null">card_no,</if>
<if test="department != null">department,</if>
@ -226,7 +224,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginIp != null and loginIp != ''">#{loginIp},</if>
<if test="loginDate != null">#{loginDate},</if>
<if test="updateUid != null and updateUid != ''">#{updateUid},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="realName != null">
#{realName},
</if>
@ -264,7 +261,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="isFirst != null">is_first = #{isFirst},</if>
<if test="realName != null">
real_name = #{realName},</if>

40
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml

@ -9,7 +9,7 @@
COUNT(1) num
FROM bs_sgc_df_dfrw ss
LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code
LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6)
LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6) AND RIGHT(sx.XZQHDM, 6) = '000000'
</sql>
@ -22,52 +22,38 @@
<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`='2'
<if test="layer==1">
where task_id =#{taskId} and ss.`status`='3'
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>

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

@ -23,52 +23,37 @@
<select id="getZeroNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and ss.`status`="0"
<if test="layer==5">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==4">
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==5">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==4">
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==5">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==4">
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==5">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==4">
GROUP BY sj.adcd
</if>
</select>
<select id="getNum" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId}
<if test="layer==5">
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==4">
GROUP BY sj.adcd
</if>
</select>

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

@ -68,6 +68,9 @@
<if test="wageName!=null and wageName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wageName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE =#{wagaCode}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};

Loading…
Cancel
Save