Browse Source

bug修改

master_tdsql
zth 1 month ago
parent
commit
88a9d8dff2
  1. 6
      shuili-admin/pom.xml
  2. 9
      shuili-system/src/main/java/com/kms/common/utils/UserUtils.java
  3. 24
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
  4. 115
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfManateamController.java
  5. 32
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  6. 9
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java
  7. 77
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfManateam.java
  8. 16
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfManateamMapper.java
  9. 16
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfManateamService.java
  10. 11
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
  11. 31
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  12. 3
      shuili-system/src/main/resources/mapper/system/SysUserMapper.xml
  13. 12
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

6
shuili-admin/pom.xml

@ -54,6 +54,12 @@
<artifactId>shuili-system</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-generator</artifactId>
<version>${project.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.springfox/springfox-core -->
<dependency>
<groupId>io.springfox</groupId>

9
shuili-system/src/main/java/com/kms/common/utils/UserUtils.java

@ -3,6 +3,7 @@ package com.kms.common.utils;
import cn.dev33.satoken.stp.StpUtil;
import com.kms.framework.web.service.SysPermissionService;
import com.kms.system.domain.SysXzqh;
import com.kms.system.mapper.SysDeptMapper;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysUserService;
import com.kms.system.service.SysXzqhService;
@ -10,11 +11,14 @@ import com.shuili.common.core.domain.entity.SysDept;
import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.utils.SpringUtils;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Set;
public class UserUtils {
private static SysUserService userService = null;
private static SysPermissionService sysPermissionService = null;
@ -74,8 +78,9 @@ public class UserUtils {
try {
String loginId = StpUtil.getLoginId("-1");
if (StringUtils.isNotEmpty(loginId)) {
return getUserService().getWithRedis(loginId);
// return getUserService().selectUserById(loginId);
SysUser user = getUserService().getWithRedis(loginId);
// return getUserService().getWithRedis(loginId);
return getUserService().selectUserById(loginId);
}
} catch (Exception ignored) {
}

24
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java

@ -1,5 +1,6 @@
package com.kms.yg.df.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.common.utils.BaseEntityUtils;
@ -8,7 +9,9 @@ import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfAqrw;
import com.kms.yg.df.domain.BsSgcDfDfrw;
import com.kms.yg.df.service.BsSgcDfAqrwService;
import com.kms.yg.df.service.BsSgcDfDfrwService;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
@ -47,6 +50,10 @@ public class BsSgcDfAqrwController extends BaseController
@Autowired
private SysDeptService sysDeptService;
@Autowired
private BsSgcDfDfrwService bsSgcDfDfrwService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
@ -83,10 +90,10 @@ public class BsSgcDfAqrwController extends BaseController
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==1) {
if (xzqh.getLayer()==5) {
infoAdcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==2) {
} else if (xzqh.getLayer()==4) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -104,10 +111,10 @@ public class BsSgcDfAqrwController extends BaseController
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer()==1) {
if (xzqh.getLayer()==5) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==2) {
} else if (xzqh.getLayer()==4) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -121,10 +128,10 @@ public class BsSgcDfAqrwController extends BaseController
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==1) {
if (xzqh.getLayer()==5) {
adcd = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer()==2) {
} else if (xzqh.getLayer()==4) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
@ -190,6 +197,11 @@ public class BsSgcDfAqrwController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
for (String id:ids){
LambdaQueryWrapper<BsSgcDfDfrw>lw=new LambdaQueryWrapper<>();
lw.eq(BsSgcDfDfrw::getTaskId,id);
bsSgcDfDfrwService.remove(lw);
}
return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids)));
}
}

115
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfManateamController.java

@ -0,0 +1,115 @@
package com.kms.yg.df.controller;
import java.util.Arrays;
import java.util.List;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.df.domain.BsSgcDfManateam;
import com.kms.yg.df.service.BsSgcDfManateamService;
/**
* 管理团队管理Controller
*
* @author kms
* @date 2025-03-11
*/
@RestController
@RequestMapping("/manateam/manateam")
@Api(tags = "管理团队管理")
public class BsSgcDfManateamController extends BaseController
{
@Autowired
private BsSgcDfManateamService bsSgcDfManateamService;
/**
* 查询管理团队管理列表
*/
@PostMapping("/list")
@ApiOperation("管理团队管理列表")
public IPage list(@RequestBody SearchParam<BsSgcDfManateam> sp)
{
return bsSgcDfManateamService.selectPage(sp);
}
/**
* 导出管理团队管理列表
*/
@Log(title = "管理团队管理导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("管理团队管理导出")
public AjaxResult export(@RequestBody BsSgcDfManateam bsSgcDfManateam)
{
List<BsSgcDfManateam> list = bsSgcDfManateamService.listByIds(bsSgcDfManateam.getIds());
ExcelUtil<BsSgcDfManateam> util = new ExcelUtil<>(BsSgcDfManateam.class);
return util.exportExcel(list, "manateam");
}
/**
* 获取管理团队管理详细信息
*/
@ApiOperation(" 管理团队管理详情")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return AjaxResult.success(bsSgcDfManateamService.getById(id));
}
/**
* 新增管理团队管理
*/
@Log(title = "管理团队管理新增", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("管理团队管理新增")
public AjaxResult add(@RequestBody BsSgcDfManateam bsSgcDfManateam)
{
BaseEntityUtils.preInsert(bsSgcDfManateam);
return toAjax(bsSgcDfManateamService.save(bsSgcDfManateam));
}
/**
* 修改管理团队管理
*/
@ApiOperation("管理团队管理修改")
@Log(title = "管理团队管理修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BsSgcDfManateam bsSgcDfManateam)
{
return toAjax(bsSgcDfManateamService.updateById(bsSgcDfManateam));
}
/**
* 删除管理团队管理
*/
@ApiOperation("管理团队管理删除")
@Log(title = "管理团队管理删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(bsSgcDfManateamService.removeByIds(Arrays.asList(ids)));
}
}

32
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@ -5,9 +5,11 @@ import java.util.*;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.UserUtils;
import com.kms.framework.web.service.SysPermissionService;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
@ -69,6 +71,10 @@ public class BsSgcDfSafeJbxxController extends BaseController {
@Autowired
private SysDeptService sysDeptService;
@Autowired
private SysPermissionService permissionService;
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
@ -116,15 +122,29 @@ public class BsSgcDfSafeJbxxController extends BaseController {
public IPage list(@RequestBody SearchParam<BsSgcDfSafeJbxx> sp) {
BsSgcDfSafeJbxx data = sp.getData();
SysUser sysUser = UserUtils.getUser();
String[] roleIds = sysUser.getRoleIds();
logger.error("user is ",sysUser);
Set<String> roles = permissionService.getRolePermission(sysUser);
SysDept dept = sysUser.getDept();
String xzqhId = dept.getXzqhId();
if(StringUtils.isNotEmpty(sp.getData().getAdcd())){
xzqhId=sp.getData().getAdcd();
String xzqhId=null;
String name =null;
if (dept != null) {
xzqhId = dept.getXzqhId();
if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) {
xzqhId = sp.getData().getAdcd();
}
name = dept.getName();
} else {
logger.error("Dept is null for user: {}", sysUser.getUserName());
// 设置默认值或抛出异常
if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) {
xzqhId = sp.getData().getAdcd();
}else {
xzqhId = "440000000000";
}
name="";
}
String name = dept.getName();
boolean isGLDW=false;
for (String roleId:roleIds){
for (String roleId:roles){
if (roleId.equals("YW00352")){
isGLDW=true;
break;

9
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java

@ -99,6 +99,15 @@ public class BsSgcDfBzbp extends BaseEntity
@TableField(exist = false)
private String number;
@TableField(exist = false)
private String oneType;
@TableField(exist = false)
private String twoType;
@TableField(exist = false)
private String threeType;
@TableField(exist = false)
private String fourType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8")
private Date sortTime;

77
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfManateam.java

@ -0,0 +1,77 @@
package com.kms.yg.df.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 管理团队管理对象 bs_sgc_df_manateam
*
* @author kms
* @date 2025-03-11
*/
@TableName("bs_sgc_df_manateam")
@Data
@ApiModel("管理团队管理")
public class BsSgcDfManateam extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 堤防名称 */
@Excel(name = "堤防名称")
@ApiModelProperty("堤防名称")
private String dikeName;
/** 人员类型 */
@Excel(name = "人员类型")
@ApiModelProperty("人员类型")
private String personType;
/** 堤防代码 */
@Excel(name = "堤防代码")
@ApiModelProperty("堤防代码")
private String dikeCode;
/** 账户或或手机号 */
@Excel(name = "账户或或手机号")
@ApiModelProperty("账户或或手机号")
private String phone;
/** 人员名称 */
@Excel(name = "人员名称")
@ApiModelProperty("人员名称")
private String personName;
/** 身份证号 */
@Excel(name = "身份证号")
@ApiModelProperty("身份证号")
private String idNo;
/** 职务 */
@Excel(name = "职务")
@ApiModelProperty("职务")
private String post;
/** 部门 */
@Excel(name = "部门")
@ApiModelProperty("部门")
private String department;
/** $column.columnComment */
@ApiModelProperty("部门")
private String createUid;
/** $column.columnComment */
@ApiModelProperty("部门")
private String updateUid;
/** $column.columnComment */
@ApiModelProperty("部门")
private String owerDept;
}

16
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfManateamMapper.java

@ -0,0 +1,16 @@
package com.kms.yg.df.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.df.domain.BsSgcDfManateam;
/**
* 管理团队管理Mapper接口
*
* @author kms
* @date 2025-03-11
*/
@Repository
public interface BsSgcDfManateamMapper extends BaseMapper<BsSgcDfManateam> {
}

16
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfManateamService.java

@ -0,0 +1,16 @@
package com.kms.yg.df.service;
import com.shuili.common.core.service.BaseService;
import com.kms.yg.df.mapper.BsSgcDfManateamMapper;
import com.kms.yg.df.domain.BsSgcDfManateam;
import org.springframework.stereotype.Service;
/**
* 管理团队管理Service接口
*
* @author kms
* @date 2025-03-11
*/
@Service
public class BsSgcDfManateamService extends BaseService<BsSgcDfManateamMapper, BsSgcDfManateam>{
}

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

@ -1,5 +1,6 @@
package com.kms.yg.sz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.common.utils.BaseEntityUtils;
@ -8,8 +9,10 @@ import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzAqrw;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.kms.yg.sz.service.BsSgcSzAqrwService;
import com.kms.yg.sz.service.BsSgcSzSzrwService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
@ -47,6 +50,9 @@ public class BsSgcSzAqrwController extends BaseController
@Autowired
private SysDeptService sysDeptService;
@Autowired
private BsSgcSzSzrwService bsSgcSzSzrwService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
@ -190,6 +196,11 @@ public class BsSgcSzAqrwController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
for (String id:ids){
LambdaQueryWrapper<BsSgcSzSzrw> lw=new LambdaQueryWrapper<>();
lw.eq(BsSgcSzSzrw::getTaskId,id);
bsSgcSzSzrwService.remove(lw);
}
return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids)));
}
}

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

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.UserUtils;
import com.kms.framework.web.service.SysPermissionService;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
@ -65,6 +66,9 @@ public class BsSgcSzSafeJbxxController extends BaseController {
@Autowired
private SysDeptService sysDeptService;
@Autowired
private SysPermissionService permissionService;
@GetMapping("/getPie")
@ -116,15 +120,30 @@ public class BsSgcSzSafeJbxxController extends BaseController {
public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
BsSgcSzSafeJbxx data = sp.getData();
SysUser sysUser = UserUtils.getUser();
String[] roleIds = sysUser.getRoleIds();
logger.error("user is",sysUser);
Set<String> roles = permissionService.getRolePermission(sysUser);
SysDept dept = sysUser.getDept();
String xzqhId = dept.getXzqhId();
if(ObjectUtils.isNotEmpty(sp.getData())&&StringUtils.isNotEmpty(sp.getData().getAdcd())){
xzqhId=sp.getData().getAdcd();
String xzqhId=null;
String name =null;
if (dept != null) {
xzqhId = dept.getXzqhId();
if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) {
xzqhId = sp.getData().getAdcd();
}
name = dept.getName();
} else {
logger.error("Dept is null for user: {}", sysUser.getUserName());
// 设置默认值或抛出异常
if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) {
xzqhId = sp.getData().getAdcd();
}else {
xzqhId = "440000000000";
}
name="";
}
String name = dept.getName();
boolean isGLDW=false;
for (String roleId:roleIds){
for (String roleId:roles){
if (roleId.equals("YW00352")){
isGLDW=true;
break;

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

@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pcLogo" column="pc_logo" />
<result property="pcBackground" column="pc_background" />
<result property="adminLogo" column="admin_logo" />
<result property="xzqhId" column="xzqh_id"/>
</resultMap>
<resultMap id="RoleResult" type="com.shuili.common.core.domain.entity.SysRole">
@ -64,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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,
u.real_name,u.card_no,u.department,u.post,u.professional,
d.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,
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
from sys_user u
left join sys_dept d on u.dept_id = d.id

12
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@ -9,14 +9,22 @@
<id property="id" column="id" />
<result property="dikeName" column="embankment_name" />
<result property="adcd" column="adcd" />
<result property="number" column="number" />
<result property="oneType" column="oneType" />
<result property="twoType" column="twoType" />
<result property="threeType" column="threeType" />
<result property="fourType" column="fourType" />
<result property="dikeCode" column="embankment_code" />
</resultMap>
<select id="selectList1" resultMap="Result">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
SELECT embankment_name, adcd, COUNT(1) number,embankment_code
SELECT embankment_name, adcd,
COUNT(CASE WHEN type = 0 THEN 1 END) AS oneType,
COUNT(CASE WHEN type= 1 THEN 1 END) AS twoType,
COUNT(CASE WHEN type = 2 THEN 1 END) AS threeType,
COUNT(CASE WHEN type = 3 THEN 1 END) AS fourType
,embankment_code
FROM bs_sgc_df_bzbp
<where>
<if test="embankmentName != null and embankmentName != ''">

Loading…
Cancel
Save