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

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

# Conflicts:
#	shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
master_tdsql
hxh 4 months ago
parent
c4b00ed036 cd206d1a9d
commit
c3c3efd8fc
4 changed files with 82 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
  2. 1
      shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
  3. 34
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  4. 47
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

15
shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
View File

@ -50,6 +50,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@ -229,6 +230,10 @@ public class SysLoginController extends BaseController {
*
* @return 用户信息
*/
@Autowired
private SysDeptService deptService;
@ApiOperation("获取挡路用户信息")
@GetMapping("getInfo")
public AjaxResult getInfo() {
@ -241,10 +246,15 @@ public class SysLoginController extends BaseController {
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success();
List<String> roleIds = new ArrayList<>();
for (String role : roles) {
roleIds.add(role);
}
SysDept sysDept = deptService.get(user.getDeptId());
user.setDept(sysDept);
user.setRoleIds(roleIds.toArray(new String[roles.size()]));
String cicd = "";
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.getById(deptId);
if (sysDept != null) {
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
@ -252,6 +262,7 @@ public class SysLoginController extends BaseController {
cicd = xzqh.getXzqhdm();
}
}
userService.updateWithReids(user);
ajax.put("user", user);
ajax.put("roles", roles);

1
shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
View File

@ -29,7 +29,6 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
public String getSubString(String adcd) {
SysXzqh sysXzqh = sysXzqhMapper.selectOne(Wrappers.lambdaQuery(SysXzqh.class)
.eq(SysXzqh::getXzqhdm, adcd));

34
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
View File

@ -9,6 +9,7 @@ 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.BaseEntityUtils;
import com.kms.common.utils.UserUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
@ -18,6 +19,8 @@ import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDept;
import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.enums.BusinessType;
import com.shuili.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
@ -93,10 +96,35 @@ public class BsSgcDfSafeJbxxController extends BaseController {
* 查询水闸安全管理基本信息列表
*/
@PostMapping("/list")
@ApiOperation("水闸安全管理基本信息列表")
@ApiOperation("堤防管理基本信息列表")
public IPage list(@RequestBody SearchParam<BsSgcDfSafeJbxx> sp) {
BsSgcDfSafeJbxx data = sp.getData();
Page<BsSgcDfSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
SysUser sysUser = UserUtils.getUser();
String[] roleIds = sysUser.getRoleIds();
SysDept dept = sysUser.getDept();
String xzqhId = dept.getXzqhId();
String name = dept.getName();
boolean isGLDW=false;
for (String roleId:roleIds){
if (roleId.equals("Yw00352")){
isGLDW=true;
break;
}
}
Page<BsSgcDfSafeJbxx> page=new Page<>();
if (isGLDW){
page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
.ne(BsSgcDfSafeJbxx::getStatus, "0")
.eq(BsSgcDfSafeJbxx::getMnun,name)
.eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
.eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
.isNull(BsSgcDfSafeJbxx::getExprDate)
.orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
.orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
}else {
page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
.ne(BsSgcDfSafeJbxx::getStatus, "0")
.eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
@ -105,7 +133,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
.likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
.orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
}
return page;
}

47
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
View File

@ -4,6 +4,7 @@ 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.common.utils.BaseEntityUtils;
import com.kms.common.utils.UserUtils;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
@ -13,6 +14,8 @@ import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDept;
import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.enums.BusinessType;
import com.shuili.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
@ -81,6 +84,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
@Autowired
SysDeptService SysDeptService;
/**
* 查询水闸安全管理基本信息列表
@ -89,17 +94,41 @@ public class BsSgcSzSafeJbxxController extends BaseController {
@ApiOperation("水闸安全管理基本信息列表")
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()))
.isNull(BsSgcSzSafeJbxx::getExprDate)
SysUser sysUser = UserUtils.getUser();
String[] roleIds = sysUser.getRoleIds();
SysDept dept = sysUser.getDept();
String xzqhId = dept.getXzqhId();
String name = dept.getName();
boolean isGLDW=false;
for (String roleId:roleIds){
if (roleId.equals("Yw00352")){
isGLDW=true;
break;
}
}
Page<BsSgcSzSafeJbxx> page=new Page<>();
if (isGLDW){
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(BsSgcSzSafeJbxx::getMnun,name)
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.isNull(BsSgcSzSafeJbxx::getExprDate)
.orderByAsc(BsSgcSzSafeJbxx::getEngScal));
}else {
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()))
.isNull(BsSgcSzSafeJbxx::getExprDate)
// .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)
.orderByAsc(BsSgcSzSafeJbxx::getEngScal));
.orderByAsc(BsSgcSzSafeJbxx::getEngScal));
}
return page;
}

Write Preview
Loading…
Cancel
Save