From 564c1252cd29c0c6cd317a6e8a59dde3237535c6 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 15 Jul 2024 10:49:30 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E5=85=BB=E6=8A=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E5=B8=A6=E4=B8=8A=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/service/DfYhRecordService.java | 10 ++++++++-- .../com/kms/yxgh/sz/service/SzYhRecordService.java | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index ccf40dea..a627d7fe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -120,8 +120,14 @@ public class DfYhRecordService extends BaseService } public IPage search(SearchParam sp) { - Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - return this.getBaseMapper().searchPage(page, Optional.ofNullable(sp.getData()).orElse(new DfYhRecordSearchDto())); + IPage page = new Page<>(sp.getPageNum(), sp.getPageSize()); + page = this.getBaseMapper().searchPage(page, Optional.ofNullable(sp.getData()).orElse(new DfYhRecordSearchDto())); + page.getRecords().forEach(dto -> { + if (dto != null) { + dto.setPlan(dfYhPlanService.getDetailById(dto.getPlanId())); + } + }); + return page; } ///更新状态 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java index 6abb3423..13e29ab5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -121,8 +121,12 @@ public class SzYhRecordService extends BaseService } public IPage search(SearchParam sp) { - Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - return this.getBaseMapper().searchPage(page, Optional.ofNullable(sp.getData()).orElse(new SzYhRecordSearchDto())); + IPage page = new Page<>(sp.getPageNum(), sp.getPageSize()); + page = this.getBaseMapper().searchPage(page, Optional.ofNullable(sp.getData()).orElse(new SzYhRecordSearchDto())); + page.getRecords().forEach(dto -> { + dto.setPlan(szYhPlanService.getDetailById(dto.getPlanId())); + }); + return page; } ///更新状态 From 23e2f22c970bd6d27fe14e70ee76e3100c235921 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 15 Jul 2024 11:02:15 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20id=E4=BC=A0=E9=94=99=EF=BC=8C?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/controller/DfYhRecordController.java | 2 +- .../main/java/com/kms/yxgh/df/service/DfYhRecordService.java | 2 +- .../java/com/kms/yxgh/sz/controller/SzYhRecordController.java | 3 ++- .../main/java/com/kms/yxgh/sz/service/SzYhRecordService.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java index f29962d2..113e20ee 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhRecordController.java @@ -53,7 +53,7 @@ public class DfYhRecordController extends ApprovalAbstractController getInfo(@PathVariable("id") String id) { DfYhRecordDetailDto detailById = dfYhRecordService.getDetailById(id); - if (StringUtils.isNotEmpty(detailById.getPlanId())) { + if (detailById != null && StringUtils.isNotEmpty(detailById.getPlanId())) { detailById.setPlan(dfYhPlanService.getDetailById(detailById.getPlanId())); } return Response.ok(detailById); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index a627d7fe..8e31aeca 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -53,7 +53,7 @@ public class DfYhRecordService extends BaseService } return dto; } - return null; + throw new DfException("源数据不存在，请确认id值是否正确"); } @Transactional(rollbackFor = Exception.class) diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java index eb84e33c..b04c1f9a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhRecordController.java @@ -11,6 +11,7 @@ import com.kms.yxgh.sz.service.SzYhRecordService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +53,7 @@ public class SzYhRecordController extends ApprovalAbstractController getInfo(@PathVariable("id") String id) { SzYhRecordDetailDto detailById = szYhRecordService.getDetailById(id); - if (detailById.getPlanId() != null) { + if (detailById != null && StringUtils.isNotEmpty(detailById.getPlanId())) { detailById.setPlan(szYhPlanService.getDetailById(detailById.getPlanId())); } return Response.ok(szYhRecordService.getDetailById(id)); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java index 13e29ab5..2ef2353d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -69,7 +69,7 @@ public class SzYhRecordService extends BaseService dto.setId(szYhRecord.getId()); return dto; } - return null; + throw new SzException("源数据不存在，请确认id值是否正确"); } From 31939ad457a0ed550210549fee4ab85275335165 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 15 Jul 2024 18:50:27 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E5=A0=A4?= =?UTF-8?q?=E9=98=B2=E3=80=81=E6=B0=B4=E9=97=B8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/yxgh/DfYhRecordMapper.xml | 2 +- .../src/main/resources/mapper/yxgh/SzYhRecordMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml index 4e03d936..562cda05 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml @@ -33,7 +33,7 @@ status, ts.operator operator, ts.comment comment, ts.doc ts_doc, jl.id jl_id, jl.create_time finished_time, - yh.id plan_id,yh.dike_code dike_code, yh.dike_name dike_name, yh.name plan_name, yh.start_date start_date, + yh.id plan_id,jl.dike_code dike_code, jl.dike_name dike_name, jl.dike_type, yh.name plan_name, yh.start_date start_date, yh.end_date end_date, yh.supplement supplement, yh.doc doc, yh.engineering_unit engineering_unit, yh.responsible_person diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordMapper.xml index a479ed61..8b7211ae 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordMapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordMapper.xml @@ -33,7 +33,7 @@ status, ts.operator operator, ts.comment comment, ts.doc ts_doc, jl.id jl_id, jl.create_time finished_time, - yh.id plan_id,yh.waga_code waga_code, yh.waga_name waga_name, yh.name plan_name, yh.start_date start_date, + yh.id plan_id,jl.waga_code waga_code, jl.waga_name waga_name,jl.waga_type waga_type, yh.name plan_name, yh.start_date start_date, yh.end_date end_date, yh.supplement supplement, yh.doc doc, yh.engineering_unit engineering_unit, yh.responsible_person From 50ef68a4a091cea488bab74aa26e86804956f82a Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 15 Jul 2024 19:07:02 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/web/utils/WaterRequestUtil.java | 2 +- .../com/kms/yxgh/common/ApprovalTypeEnum.java | 9 +++ .../common/controller/ApprovalController.java | 66 +++++++++++++++++++ .../com/kms/yxgh/common/domain/ObjRoles.java | 16 +++++ .../java/com/kms/yxgh/common/dto/IAdcd.java | 14 ++++ .../com/kms/yxgh/common/dto/OperatorDto.java | 4 ++ .../common/mapper/ApprovalObjRolesMapper.java | 29 ++++++++ .../service/ApprovalBusinessService.java | 3 +- .../service/ApprovalObjRolesService.java | 12 ++++ .../yxgh/common/service/ApprovalService.java | 24 ++++++- .../DefaultApprovalBusinessService.java | 28 ++++++++ .../kms/yxgh/df/dto/DfRecordSearchDto.java | 3 +- .../kms/yxgh/df/dto/DfYhPlanSearchDto.java | 3 +- .../kms/yxgh/df/dto/DfYhRecordSearchDto.java | 3 +- .../kms/yxgh/df/mapper/DfYhPlanMapper.java | 4 +- .../kms/yxgh/df/mapper/DfYhRecordMapper.java | 4 +- .../kms/yxgh/df/service/DfYhPlanService.java | 19 +----- .../yxgh/df/service/DfYhRecordService.java | 17 +---- .../kms/yxgh/sz/dto/SzYhPlanSearchDto.java | 3 +- .../kms/yxgh/sz/dto/SzYhRecordSearchDto.java | 3 +- .../kms/yxgh/sz/mapper/SzYhPlanMapper.java | 5 +- .../kms/yxgh/sz/mapper/SzYhRecordMapper.java | 4 +- .../kms/yxgh/sz/service/SzYhPlanService.java | 19 +----- .../yxgh/sz/service/SzYhRecordService.java | 24 ++----- sql/sy/v1.4.0/增量脚本/v1.4.0-update.sql | 11 ++++ 25 files changed, 245 insertions(+), 84 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/controller/ApprovalController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/domain/ObjRoles.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalObjRolesService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/service/DefaultApprovalBusinessService.java diff --git a/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java b/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java index c6d1954a..f51c6de8 100644 --- a/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java +++ b/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java @@ -283,7 +283,7 @@ public class WaterRequestUtil { log.info("--------请求获取门户角色信息,请求地址为:{}", roleUrl); HashMap hashMap = new HashMap<>(); hashMap.put("page", 1); - hashMap.put("size", 100); + hashMap.put("size", 1000); hashMap.put("systemCode", systemCode); HttpRequest get = createPost(roleUrl, roleServiceId, roleAppsecret); String body; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java index 2ed6af3d..93f07917 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java @@ -24,4 +24,13 @@ public enum ApprovalTypeEnum { this.service = SpringUtils.getBean(service); } + public static ApprovalTypeEnum getApprovalTypeEnum(String value) { + for (ApprovalTypeEnum approvalTypeEnum : ApprovalTypeEnum.values()) { + if (approvalTypeEnum.getValue().equals(value)) { + return approvalTypeEnum; + } + } + return null; + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/controller/ApprovalController.java b/shuili-system/src/main/java/com/kms/yxgh/common/controller/ApprovalController.java new file mode 100644 index 00000000..4bae9142 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/controller/ApprovalController.java @@ -0,0 +1,66 @@ +package com.kms.yxgh.common.controller; + +import com.kms.yxgh.base.Response; +import com.kms.yxgh.common.ApprovalTypeEnum; +import com.kms.yxgh.common.service.ApprovalService; +import com.shuili.common.core.domain.entity.SysRole; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.Data; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +@AllArgsConstructor +@RequestMapping("/run/approval") +@Api(tags = "审批相关") +public class ApprovalController { + + private final ApprovalService approvalService; + + @GetMapping("/objs") + @ApiOperation("审批对象列表") + public Response> getApprovalObjList() { + return Response.ok(Arrays.stream(ApprovalTypeEnum.values()).map(e -> { + ApprovalObjDto dto = new ApprovalObjDto(); + dto.setCode(e.getValue()); + dto.setName(e.getName()); + return dto; + }).collect(Collectors.toList())); + } + + @GetMapping("/objs/{type}/roles") + @ApiOperation("审批对象角色列表") + public Response> getApprovalObjRoles(@PathVariable("type") String type) { + ApprovalTypeEnum approvalTypeEnum = ApprovalTypeEnum.getApprovalTypeEnum(type); + if (approvalTypeEnum == null) { + return Response.ok(); + } + return Response.ok(approvalService.roles(approvalTypeEnum)); + } + + @PutMapping("/objs/{type}/roles") + @ApiOperation("设置审批对象角色列表") + public Response updateApprovalObjRoles(@PathVariable("type") String type, @RequestBody List roleIds) { + ApprovalTypeEnum approvalTypeEnum = ApprovalTypeEnum.getApprovalTypeEnum(type); + if (approvalTypeEnum != null) { + approvalService.updateRoles(approvalTypeEnum, roleIds); + } + return Response.ok(); + } + + @Data + @ApiModel("审批对象") + public static class ApprovalObjDto { + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("编码") + private String code; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/domain/ObjRoles.java b/shuili-system/src/main/java/com/kms/yxgh/common/domain/ObjRoles.java new file mode 100644 index 00000000..7fd712c8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/domain/ObjRoles.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@TableName("bs_sgc_sp_objrole") +@Data +@ApiModel("审批对象执行角色") +public class ObjRoles extends SyBaseEntity { + + private String objType; + private String roleId; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java new file mode 100644 index 00000000..c0811aa4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java @@ -0,0 +1,14 @@ +package com.kms.yxgh.common.dto; + +public interface IAdcd { + + String getAdcd(); + + default String getAdcdQx() { + String adcd = getAdcd(); + if (adcd == null) { + return null; + } + return adcd.replaceAll("00(00)?$", ""); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java index be2d3486..026e38e2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java @@ -2,10 +2,14 @@ package com.kms.yxgh.common.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @ApiModel("操作人员") @Data +@AllArgsConstructor +@NoArgsConstructor public class OperatorDto { @ApiModelProperty("主键") diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java new file mode 100644 index 00000000..9c593175 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java @@ -0,0 +1,29 @@ +package com.kms.yxgh.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.common.domain.ObjRoles; +import com.shuili.common.core.domain.entity.SysRole; +import com.shuili.common.core.domain.entity.SysUser; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +public interface ApprovalObjRolesMapper extends BaseMapper { + + + @Select("select r.* from bs_sgc_sp_objrole o left join sys_role r on o.role_id = r.id where o.obj_type = #{objType}") + List getRolesByObjType(@Param("objType") String objType); + + + @Select("SELECT su.*" + + "FROM sys_user su" + + "JOIN sys_user_role sur ON su.id = sur.user_id" + + "JOIN bs_sgc_sp_objrole so ON sur.role_id = so.role_id" + + "WHERE so.obj_type = #{objType}") + List getUsers(@Param("objType") String objType); + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalBusinessService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalBusinessService.java index e7a7bc33..eb90525c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalBusinessService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalBusinessService.java @@ -2,6 +2,7 @@ package com.kms.yxgh.common.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.common.ApprovalStatusEnum; +import com.kms.yxgh.common.ApprovalTypeEnum; import com.kms.yxgh.common.dto.ApprovalDetailDto; import com.kms.yxgh.common.dto.ApprovalSearchDto; import com.kms.yxgh.common.dto.OperatorDto; @@ -25,7 +26,7 @@ public interface ApprovalBusinessService { * @param formId 业务表单id * @return 审批人列表 */ - List getOperatorList(String formId); + List getOperatorList(String formId, ApprovalTypeEnum approvalType); /** * 更新业务表达状态 diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalObjRolesService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalObjRolesService.java new file mode 100644 index 00000000..1e3a6774 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalObjRolesService.java @@ -0,0 +1,12 @@ +package com.kms.yxgh.common.service; + +import com.kms.yxgh.common.domain.ObjRoles; +import com.kms.yxgh.common.mapper.ApprovalObjRolesMapper; +import com.shuili.common.core.service.BaseService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +public class ApprovalObjRolesService extends BaseService { +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java index 690e2004..ce53335c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java @@ -10,10 +10,12 @@ import com.kms.yxgh.common.ApprovalStatusEnum; import com.kms.yxgh.common.ApprovalTypeEnum; import com.kms.yxgh.common.domain.ApprovalOperator; import com.kms.yxgh.common.domain.ApprovalTask; +import com.kms.yxgh.common.domain.ObjRoles; import com.kms.yxgh.common.dto.ApprovalCommentDto; import com.kms.yxgh.common.dto.ApprovalDetailDto; import com.kms.yxgh.common.dto.DocDto; import com.kms.yxgh.common.dto.OperatorDto; +import com.shuili.common.core.domain.entity.SysRole; import com.shuili.common.core.domain.entity.SysUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -30,6 +32,7 @@ public class ApprovalService { private final ApprovalTaskService approvalTaskService; private final ApprovalOperatorService approvalOperatorService; + private final ApprovalObjRolesService approvalObjRolesService; @Transactional(rollbackFor = Exception.class) @@ -48,7 +51,7 @@ public class ApprovalService { approvalTask.setStatus(ApprovalStatusEnum.WAITING.getValue()); approvalTaskService.save(approvalTask); String taskId = approvalTask.getId(); - List operatorDtoList = service.getOperatorList(formId); + List operatorDtoList = service.getOperatorList(formId, approvalType); if (CollectionUtil.isNotEmpty(operatorDtoList)) { List approvalOperators = operatorDtoList.stream().map(operatorDto -> { ApprovalOperator approvalOperator = new ApprovalOperator(); @@ -155,4 +158,23 @@ public class ApprovalService { service.updateApprovalStatus(formId, ApprovalStatusEnum.SUBMITTING); } } + + public List roles(ApprovalTypeEnum approvalTypeEnum) { + return approvalObjRolesService.getBaseMapper().getRolesByObjType(approvalTypeEnum.getValue()); + } + + @Transactional(rollbackFor = Exception.class) + public void updateRoles(ApprovalTypeEnum approvalTypeEnum, List roleIds) { + if (CollectionUtil.isNotEmpty(roleIds)) { + approvalObjRolesService.remove(Wrappers.lambdaQuery() + .eq(ObjRoles::getObjType, approvalTypeEnum.getValue())); + List objRolesList = roleIds.stream().map(roleId -> { + ObjRoles objRoles = new ObjRoles(); + objRoles.setObjType(approvalTypeEnum.getValue()); + objRoles.setRoleId(roleId); + return objRoles; + }).collect(Collectors.toList()); + approvalObjRolesService.saveBatch(objRolesList); + } + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/DefaultApprovalBusinessService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/DefaultApprovalBusinessService.java new file mode 100644 index 00000000..47d58a6e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/DefaultApprovalBusinessService.java @@ -0,0 +1,28 @@ +package com.kms.yxgh.common.service; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.common.ApprovalTypeEnum; +import com.kms.yxgh.common.dto.OperatorDto; +import com.shuili.common.core.domain.BaseEntity; +import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.core.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +public abstract class DefaultApprovalBusinessService, T extends BaseEntity, S, V> extends BaseService implements ApprovalBusinessService { + + @Autowired + private ApprovalObjRolesService approvalObjRolesService; + + @Override + public List getOperatorList(String formId, ApprovalTypeEnum approvalType) { + List users = approvalObjRolesService.getBaseMapper().getUsers(approvalType.getValue()); + return Optional.ofNullable(users) + .map(us -> us.stream().map(u -> new OperatorDto(u.getId(), u.getId(), u.getNickName())).collect(Collectors.toList())) + .orElse(Collections.emptyList()); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java index 2a3fa7da..f10cbb92 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java @@ -1,5 +1,6 @@ package com.kms.yxgh.df.dto; +import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +18,7 @@ import java.util.List; @Data @ApiModel("堤防巡视检查记录检索条件") -public class DfRecordSearchDto { +public class DfRecordSearchDto implements IAdcd { @ApiModelProperty("行政区划") private String adcd; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java index cae883ab..70df5522 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java @@ -1,6 +1,7 @@ package com.kms.yxgh.df.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.util.Date; @Data @ApiModel("堤防维修养护计划查询条件") -public class DfYhPlanSearchDto { +public class DfYhPlanSearchDto implements IAdcd { @ApiModelProperty("id") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java index f96c7d0d..103f1439 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java @@ -1,6 +1,7 @@ package com.kms.yxgh.df.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.util.Date; @Data @ApiModel("堤防养护记录查询") -public class DfYhRecordSearchDto { +public class DfYhRecordSearchDto implements IAdcd { @ApiModelProperty("行政区划") private String adcd; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java index 643acdaa..f12e2b69 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java @@ -45,8 +45,8 @@ public interface DfYhPlanMapper extends BaseMapper { "", "AND yh.name LIKE CONCAT('%',#{dto.name},'%') ", "", - "", - "AND jb.adcd LIKE CONCAT(#{dto.adcd},'%') ", + "", + "AND jb.adcd LIKE CONCAT(#{dto.adcdQx},'%') ", "", "", "AND jb.dike_name LIKE CONCAT('%',#{dto.dikeName},'%') ", diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java index 9aa99159..c11a73e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java @@ -56,8 +56,8 @@ public interface DfYhRecordMapper extends BaseMapper { "" + "AND jh.name LIKE CONCAT('%',#{searchDto.name},'%') " + "" + - "" + - "AND df.adcd LIKE CONCAT(#{searchDto.adcd},'%') " + + "" + + "AND df.adcd LIKE CONCAT(#{searchDto.adcdQx},'%') " + "" + "" + "AND yhjl.status = #{searchDto.status} " + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java index 269b0f7d..8f917efa 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java @@ -10,21 +10,18 @@ import com.kms.system.service.SysUserService; import com.kms.yxgh.base.DfException; import com.kms.yxgh.common.ApprovalStatusEnum; import com.kms.yxgh.common.dto.*; -import com.kms.yxgh.common.service.ApprovalBusinessService; +import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.df.domain.DfYhPlan; import com.kms.yxgh.df.dto.DfYhPlanDetailDto; import com.kms.yxgh.df.dto.DfYhPlanSearchDto; import com.kms.yxgh.df.mapper.DfYhPlanMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysUser; -import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -36,7 +33,7 @@ import java.util.Optional; */ @Service @AllArgsConstructor -public class DfYhPlanService extends BaseService implements ApprovalBusinessService { +public class DfYhPlanService extends DefaultApprovalBusinessService { private final SysUserService sysUserService; @@ -133,18 +130,6 @@ public class DfYhPlanService extends BaseService imple return this.getBaseMapper().approvalSearchPage(page, sp.getData()); } - @Override - public List getOperatorList(String formId) { - SysUser user = sysUserService.getById("1"); - if (user != null) { - OperatorDto operatorDto = new OperatorDto(); - operatorDto.setUid(user.getId()); - operatorDto.setName(user.getNickName()); - return Collections.singletonList(operatorDto); - } - return Collections.emptyList(); - } - @Override public void updateApprovalStatus(String formId, ApprovalStatusEnum status) { Wrapper wp = Wrappers.lambdaUpdate() diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index 8e31aeca..ed241466 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -10,7 +10,7 @@ import com.kms.system.service.SysUserService; import com.kms.yxgh.base.DfException; import com.kms.yxgh.common.ApprovalStatusEnum; import com.kms.yxgh.common.dto.*; -import com.kms.yxgh.common.service.ApprovalBusinessService; +import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.df.domain.DfYhRecord; import com.kms.yxgh.df.dto.DfYhRecordApprovalDto; import com.kms.yxgh.df.dto.DfYhRecordDetailDto; @@ -19,7 +19,6 @@ import com.kms.yxgh.df.mapper.DfYhRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; -import com.shuili.common.core.service.BaseService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,7 +35,7 @@ import java.util.Optional; */ @AllArgsConstructor @Service -public class DfYhRecordService extends BaseService implements ApprovalBusinessService { +public class DfYhRecordService extends DefaultApprovalBusinessService { private final DfYhPlanService dfYhPlanService; private final SysUserService sysUserService; @@ -144,18 +143,6 @@ public class DfYhRecordService extends BaseService return this.getBaseMapper().approvalSearchPage(page, sp.getData()); } - @Override - public List getOperatorList(String formId) { - SysUser user = sysUserService.getById("1"); - if (user != null) { - OperatorDto operatorDto = new OperatorDto(); - operatorDto.setUid(user.getId()); - operatorDto.setName(user.getNickName()); - return Collections.singletonList(operatorDto); - } - return Collections.emptyList(); - } - @Override public void updateApprovalStatus(String formId, ApprovalStatusEnum status) { Wrapper wp = Wrappers.lambdaUpdate() diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java index e2ca3fd0..80304c80 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java @@ -1,6 +1,7 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +17,7 @@ import java.util.Date; */ @Data @ApiModel("水闸维修养护计划检索") -public class SzYhPlanSearchDto { +public class SzYhPlanSearchDto implements IAdcd { @ApiModelProperty("id") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordSearchDto.java index 44fea3f0..ff0c2fed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordSearchDto.java @@ -1,6 +1,7 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ import java.util.Date; @Data @ApiModel("水闸养护记录查询") -public class SzYhRecordSearchDto { +public class SzYhRecordSearchDto implements IAdcd { @ApiModelProperty("行政区划") private String adcd; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java index 7f9c1463..09cf4722 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.dto.ApprovalDetailDto; import com.kms.yxgh.common.dto.ApprovalSearchDto; import com.kms.yxgh.common.mapper.handler.DocHandler; -import com.kms.yxgh.common.mapper.handler.ListDocHandler; import com.kms.yxgh.common.mapper.handler.ListSupplementHandler; import com.kms.yxgh.common.mapper.handler.OperatorHandler; import com.kms.yxgh.sz.domain.SzYhPlan; @@ -46,8 +45,8 @@ public interface SzYhPlanMapper extends BaseMapper { "", "AND yh.name LIKE CONCAT('%',#{dto.name},'%') ", "", - "", - "AND jb.adcd LIKE CONCAT(#{dto.adcd},'%') ", + "", + "AND jb.adcd LIKE CONCAT(#{dto.adcdQx},'%') ", "", "", "AND jb.waga_name LIKE CONCAT('%',#{dto.wagaName},'%') ", diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java index 0f358dd1..3142ffdb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java @@ -57,8 +57,8 @@ public interface SzYhRecordMapper extends BaseMapper { "" + "AND jh.name LIKE CONCAT('%',#{searchDto.name},'%') " + "" + - "" + - "AND df.adcd LIKE CONCAT(#{searchDto.adcd},'%') " + + "" + + "AND df.adcd LIKE CONCAT(#{searchDto.adcdQx},'%') " + "" + "" + "AND yhjl.status = #{searchDto.status} " + diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java index e0246f47..ff3c6945 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java @@ -12,21 +12,18 @@ import com.kms.yxgh.base.DfException; import com.kms.yxgh.base.SzException; import com.kms.yxgh.common.ApprovalStatusEnum; import com.kms.yxgh.common.dto.*; -import com.kms.yxgh.common.service.ApprovalBusinessService; +import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.sz.domain.SzYhPlan; import com.kms.yxgh.sz.dto.SzYhPlanDetailDto; import com.kms.yxgh.sz.dto.SzYhPlanSearchDto; import com.kms.yxgh.sz.mapper.SzYhPlanMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysUser; -import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collections; import java.util.List; /** @@ -37,7 +34,7 @@ import java.util.List; */ @Service @AllArgsConstructor -public class SzYhPlanService extends BaseService implements ApprovalBusinessService { +public class SzYhPlanService extends DefaultApprovalBusinessService { private final BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; private final SysUserService sysUserService; @@ -133,18 +130,6 @@ public class SzYhPlanService extends BaseService imple return this.getBaseMapper().approvalSearchPage(page, sp.getData()); } - @Override - public List getOperatorList(String formId) { - SysUser user = sysUserService.getById("1"); - if (user != null) { - OperatorDto operatorDto = new OperatorDto(); - operatorDto.setUid(user.getId()); - operatorDto.setName(user.getNickName()); - return Collections.singletonList(operatorDto); - } - return Collections.emptyList(); - } - @Override public void updateApprovalStatus(String formId, ApprovalStatusEnum status) { Wrapper wp = Wrappers.lambdaUpdate() diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java index 2ef2353d..acf14a05 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -10,8 +10,11 @@ import com.kms.system.service.SysUserService; import com.kms.yxgh.base.DfException; import com.kms.yxgh.base.SzException; import com.kms.yxgh.common.ApprovalStatusEnum; -import com.kms.yxgh.common.dto.*; -import com.kms.yxgh.common.service.ApprovalBusinessService; +import com.kms.yxgh.common.dto.ApprovalDetailDto; +import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.dto.DocDto; +import com.kms.yxgh.common.dto.SupplementDto; +import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.sz.domain.SzYhRecord; import com.kms.yxgh.sz.dto.SzYhRecordApprovalDto; import com.kms.yxgh.sz.dto.SzYhRecordDetailDto; @@ -19,13 +22,10 @@ import com.kms.yxgh.sz.dto.SzYhRecordSearchDto; import com.kms.yxgh.sz.mapper.SzYhRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysUser; -import com.shuili.common.core.service.BaseService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -37,7 +37,7 @@ import java.util.Optional; */ @AllArgsConstructor @Service -public class SzYhRecordService extends BaseService implements ApprovalBusinessService { +public class SzYhRecordService extends DefaultApprovalBusinessService { private final SzYhPlanService szYhPlanService; private final SysUserService sysUserService; @@ -143,18 +143,6 @@ public class SzYhRecordService extends BaseService return this.getBaseMapper().approvalSearchPage(page, sp.getData()); } - @Override - public List getOperatorList(String formId) { - SysUser user = sysUserService.getById("1"); - if (user != null) { - OperatorDto operatorDto = new OperatorDto(); - operatorDto.setUid(user.getId()); - operatorDto.setName(user.getNickName()); - return Collections.singletonList(operatorDto); - } - return Collections.emptyList(); - } - @Override public void updateApprovalStatus(String formId, ApprovalStatusEnum status) { Wrapper wp = Wrappers.lambdaUpdate() diff --git a/sql/sy/v1.4.0/增量脚本/v1.4.0-update.sql b/sql/sy/v1.4.0/增量脚本/v1.4.0-update.sql index 0eb50cfb..43238f80 100644 --- a/sql/sy/v1.4.0/增量脚本/v1.4.0-update.sql +++ b/sql/sy/v1.4.0/增量脚本/v1.4.0-update.sql @@ -47,6 +47,17 @@ CREATE TABLE `bs_sgc_sp_operator` ( PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='审批执行人表'; +CREATE TABLE `bs_sgc_sp_objrole` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '审批对象角色编号', + `ROLE_ID` int NOT NULL COMMENT '角色ID', + `OBJ_TYPE` varchar(50) NOT NULL COMMENT '对象类型', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='审批对象角色表'; + ALTER TABLE `bs_sgc_sz_yhjh` ADD `WAGA_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '水闸名称'; ALTER TABLE `bs_sgc_sz_yhjh` ADD `WAGA_TYPE` int COMMENT '水闸类型'; ALTER TABLE `bs_sgc_sz_yhjh` ADD `TYPE` int DEFAULT NULL COMMENT '维修养护类型'; From 7999eea7aa9c03f0b3f529481f8a43fab33484fb Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 15 Jul 2024 19:29:43 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E8=A1=8C=E6=94=BF=E8=A7=84=E5=88=92=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 74 ++-- .../controller/system/SysXzqhController.java | 37 +- .../resources/mapper/system/SysDeptMapper.xml | 364 +++++++++--------- 3 files changed, 225 insertions(+), 250 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java index 85d139d9..865d79c8 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java @@ -11,6 +11,7 @@ import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.FastDfsUtil; import com.shuili.common.utils.StringUtils; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -27,8 +28,7 @@ import java.util.List; */ @RestController @RequestMapping("/system/dept") -public class SysDeptController extends BaseController -{ +public class SysDeptController extends BaseController { @Autowired private SysDeptService deptService; @@ -41,8 +41,7 @@ public class SysDeptController extends BaseController @SaCheckLogin @GetMapping("/list") @SaCheckPermission(value = "system:dept:list") - public AjaxResult list(SysDept dept) - { + public AjaxResult list(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(depts); } @@ -53,16 +52,13 @@ public class SysDeptController extends BaseController @SaCheckLogin @GetMapping("/list/exclude/{deptId}") @SaCheckPermission(value = "system:dept:list") - public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) String deptId) - { + public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) String deptId) { List depts = deptService.selectDeptList(new SysDept()); Iterator it = depts.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { SysDept d = (SysDept) it.next(); if (d.getId().equals(deptId) - || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) - { + || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) { it.remove(); } } @@ -75,10 +71,9 @@ public class SysDeptController extends BaseController @SaCheckLogin @GetMapping(value = "/{deptId}") @SaCheckPermission(value = "system:dept:query") - public AjaxResult getInfo(@PathVariable String deptId) - { - SysDept selectDeptById = deptService.get(deptId); - return AjaxResult.success(selectDeptById); + public AjaxResult getInfo(@PathVariable String deptId) { + SysDept selectDeptById = deptService.get(deptId); + return AjaxResult.success(selectDeptById); } /** @@ -86,15 +81,14 @@ public class SysDeptController extends BaseController */ @SaCheckLogin @PostMapping("/uploadLogo") - public AjaxResult uploadLogo(@RequestParam("avatarfile") MultipartFile file) - { + public AjaxResult uploadLogo(@RequestParam("avatarfile") MultipartFile file) { try { String uploadFile = fastUtil.uploadFile(file); // String uploadFile = "group1/M00/05/27/wKgBFGCvaeiAPWu5AADSPy2Q2g0276.jpg"; AjaxResult ajax = AjaxResult.success(); ajax.put("logoUrl", uploadFile); return ajax; - } catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return AjaxResult.error("上传图片异常，请联系管理员"); } @@ -104,8 +98,7 @@ public class SysDeptController extends BaseController * 获取部门下拉树列表 */ @GetMapping("/treeselect") - public AjaxResult treeselect(SysDept dept) - { + public AjaxResult treeselect(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); } @@ -114,8 +107,7 @@ public class SysDeptController extends BaseController * 加载对应角色部门列表树 */ @GetMapping(value = "/roleDeptTreeselect/{roleId}") - public AjaxResult roleDeptTreeselect(@PathVariable("roleId") String roleId) - { + public AjaxResult roleDeptTreeselect(@PathVariable("roleId") String roleId) { List depts = deptService.selectDeptList(new SysDept()); AjaxResult ajax = AjaxResult.success(); ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); @@ -130,40 +122,33 @@ public class SysDeptController extends BaseController @Log(title = "部门管理", businessType = BusinessType.INSERT) @SaCheckPermission(value = "system:dept:add") @PostMapping - public AjaxResult add(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult add(@Validated @RequestBody SysDept dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } dept.setParentId("100"); int i = deptService.insertDept(dept); - return toAjax(i>0); + return toAjax(i > 0); } /** - * 修改部门 + * 修改部门 */ @SaCheckLogin @Log(title = "部门管理", businessType = BusinessType.UPDATE) @SaCheckPermission(value = "system:dept:edit") @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + @ApiOperation("部门修改") + public AjaxResult edit(@Validated @RequestBody SysDept dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); - } - else if (dept.getParentId().equals(dept.getId())) - { + } else if (dept.getParentId().equals(dept.getId())) { return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); - } - else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) - && deptService.selectNormalChildrenDeptById(dept.getId()) > 0) - { + } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) + && deptService.selectNormalChildrenDeptById(dept.getId()) > 0) { return AjaxResult.error("该部门包含未停用的子部门！"); } - return toAjax(deptService.updateDept(dept)>0); + return toAjax(deptService.updateDept(dept) > 0); } /** @@ -173,17 +158,14 @@ public class SysDeptController extends BaseController @Log(title = "部门管理", businessType = BusinessType.DELETE) @SaCheckPermission(value = "system:dept:remove") @DeleteMapping("/{deptId}") - public AjaxResult remove(@PathVariable String deptId) - { - if (deptService.hasChildByDeptId(deptId)) - { + public AjaxResult remove(@PathVariable String deptId) { + if (deptService.hasChildByDeptId(deptId)) { return AjaxResult.error("存在下级部门,不允许删除"); } - if (deptService.checkDeptExistUser(deptId)) - { + if (deptService.checkDeptExistUser(deptId)) { return AjaxResult.error("部门存在用户,不允许删除"); } - return toAjax(deptService.deleteDeptById(deptId)>0); + return toAjax(deptService.deleteDeptById(deptId) > 0); } diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 4af32287..52c4c4c9 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -25,8 +25,6 @@ import java.util.Arrays; import java.util.List; - - /** * 行政区划Controller * @@ -36,8 +34,7 @@ import java.util.List; @RestController @RequestMapping("/xzqh/xzqh") @Api(tags = "行政区划") -public class SysXzqhController extends BaseController -{ +public class SysXzqhController extends BaseController { @Autowired private SysXzqhService sysXzqhService; @@ -63,10 +60,9 @@ public class SysXzqhController extends BaseController } - - @GetMapping("/common") - public AjaxResult common(){ + @ApiOperation("通用行政区划") + public AjaxResult common() { SysUser user = UserUtils.getUser(); String deptId = user.getDeptId(); SysDept sysDept = sysDeptService.getById(deptId); @@ -76,19 +72,20 @@ public class SysXzqhController extends BaseController /*if (userName.equals("admin")) { List list = sysXzqhService.list(); return AjaxResult.success(list); - }else */if (xzqh.getLayer()==1) { + }else */ + if (xzqh.getLayer() == 1) { String substring = xzqh.getXzqhdm().substring(0, 2); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", substring); List list = sysXzqhService.list(queryWrapper); return AjaxResult.success(list); - } else if (xzqh.getLayer()==2) { + } else if (xzqh.getLayer() == 2) { String substring = xzqh.getXzqhdm().substring(0, 4); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", substring); List list = sysXzqhService.list(queryWrapper); return AjaxResult.success(list); - }else { + } else { return AjaxResult.success(xzqh); } } @@ -98,8 +95,7 @@ public class SysXzqhController extends BaseController */ @PostMapping("/list") @ApiOperation("行政区划列表") - public IPage list(@RequestBody SearchParam sp) - { + public IPage list(@RequestBody SearchParam sp) { return sysXzqhService.selectPage(sp); } @@ -109,8 +105,7 @@ public class SysXzqhController extends BaseController @Log(title = "行政区划导出", businessType = BusinessType.EXPORT) @PostMapping("/export") @ApiOperation("行政区划导出") - public AjaxResult export(@RequestBody SysXzqh sysXzqh) - { + public AjaxResult export(@RequestBody SysXzqh sysXzqh) { List list = sysXzqhService.listByIds(sysXzqh.getIds()); ExcelUtil util = new ExcelUtil<>(SysXzqh.class); return util.exportExcel(list, "xzqh"); @@ -121,8 +116,7 @@ public class SysXzqhController extends BaseController */ @ApiOperation(" 行政区划详情") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return AjaxResult.success(sysXzqhService.getById(id)); } @@ -132,8 +126,7 @@ public class SysXzqhController extends BaseController @Log(title = "行政区划新增", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("行政区划新增") - public AjaxResult add(@RequestBody SysXzqh sysXzqh) - { + public AjaxResult add(@RequestBody SysXzqh sysXzqh) { BaseEntityUtils.preInsert(sysXzqh); return toAjax(sysXzqhService.save(sysXzqh)); } @@ -144,8 +137,7 @@ public class SysXzqhController extends BaseController @ApiOperation("行政区划修改") @Log(title = "行政区划修改", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody SysXzqh sysXzqh) - { + public AjaxResult edit(@RequestBody SysXzqh sysXzqh) { return toAjax(sysXzqhService.updateById(sysXzqh)); } @@ -154,9 +146,8 @@ public class SysXzqhController 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(sysXzqhService.removeByIds(Arrays.asList(ids))); } } diff --git a/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml b/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml index 81287bed..e2e89cf6 100644 --- a/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -1,41 +1,41 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, @@ -43,171 +43,173 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dept d - where d.del_flag = '0' - AND parent_id = #{parentId} - - - AND dept_name like concat('%', #{deptName}, '%') - - - AND dept_name =#{searchValue} - - - AND status = #{status} - - - ${params.dataScope} - order by d.parent_id, d.order_num + AND parent_id = #{parentId} + + + AND dept_name like concat('%', #{deptName}, '%') + + + AND dept_name =#{searchValue} + + + AND status = #{status} + + + ${params.dataScope} + order by d.parent_id, d.order_num + 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 + + + where id = #{id} + + select count(1) from sys_user where id = #{id} and del_flag = '0' + - + - + - + - + - insert into sys_dept( - id, - data_type, - begin_date, - end_date, - ip_end, - ip_start, - is_comment, - is_download, - parent_id, - dept_name, - ancestors, - order_num, - leader, - phone, - email, - status, - tag, - create_uid, - name, - pc_logo, - pc_background, - admin_name, - admin_logo, - xzqh_id, - create_time - )values( - #{id}, - #{dataType}, - #{beginDate}, - #{endDate}, - #{ipEnd}, - #{ipStart}, - #{isComment}, - #{isDownload}, - #{parentId}, - #{deptName}, - #{ancestors}, - #{orderNum}, - #{leader}, - #{phone}, - #{email}, - #{status}, - #{tag}, - #{createUid}, - #{name}, - #{pcLogo}, - #{pcBackground}, - #{adminName}, - #{adminLogo}, - #{xzqhId}, - sysdate() - ) - - - - update sys_dept - - parent_id = #{parentId}, - data_type = #{dataType},begin_date = #{beginDate},end_date = #{endDate}, - dept_name = #{deptName}, - is_comment = #{isComment}, - is_download = #{isDownload}, - ancestors = #{ancestors}, - order_num = #{orderNum}, - leader = #{leader}, - phone = #{phone}, - email = #{email}, - status = #{status}, - tag = #{tag}, - update_uid = #{updateUid}, - name = #{name}, - pc_logo = #{pcLogo}, - pc_background = #{pcBackground}, - admin_name = #{adminName}, - admin_logo = #{adminLogo}, - ip_end = #{ipEnd}, - ip_start = #{ipStart}, - update_time = sysdate() - - where id = #{id} - - - - update sys_dept set ancestors = - - when #{item.id} then #{item.ancestors} - - where id in - - #{item.id} - - - - - update sys_dept a - - a.status = #{status}, - a.update_uid = #{updateUid}, - a.update_time = sysdate() + insert into sys_dept( + id, + data_type, + begin_date, + end_date, + ip_end, + ip_start, + is_comment, + is_download, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + tag, + create_uid, + name, + pc_logo, + pc_background, + admin_name, + admin_logo, + xzqh_id, + create_time + )values( + #{id}, + #{dataType}, + #{beginDate}, + #{endDate}, + #{ipEnd}, + #{ipStart}, + #{isComment}, + #{isDownload}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{tag}, + #{createUid}, + #{name}, + #{pcLogo}, + #{pcBackground}, + #{adminName}, + #{adminLogo}, + #{xzqhId}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + data_type = #{dataType},begin_date = #{beginDate},end_date = #{endDate}, + dept_name = #{deptName}, + is_comment = #{isComment}, + xzqh_id = #{xzqhId}, + is_download = #{isDownload}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + tag = #{tag}, + update_uid = #{updateUid}, + name = #{name}, + pc_logo = #{pcLogo}, + pc_background = #{pcBackground}, + admin_name = #{adminName}, + admin_logo = #{adminLogo}, + ip_end = #{ipEnd}, + ip_start = #{ipStart}, + update_time = sysdate() + + where id = #{id} + + + + update sys_dept set ancestors = + + when #{item.id} then #{item.ancestors} + + where id in + + #{item.id} + + + + + update sys_dept a + + a.status = #{status}, + a.update_uid = #{updateUid}, + a.update_time = sysdate() - where FIND_IN_SET(a.id,#{ancestors}) - + where FIND_IN_SET(a.id,#{ancestors}) + - - delete from sys_dept where id = #{id} - + + delete from sys_dept where id = #{id} + From 2ffa54afd06491310ce6d82db71d406f1bb0234b Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 16 Jul 2024 09:37:22 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85api=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysRoleController.java | 59 ++++++++----------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java index 875bc469..ab7dc388 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java @@ -15,6 +15,7 @@ import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysRole; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,8 +29,7 @@ import java.util.List; */ @RestController @RequestMapping("/system/role") -public class SysRoleController extends BaseController -{ +public class SysRoleController extends BaseController { @Autowired private SysRoleService roleService; @Autowired @@ -44,19 +44,21 @@ public class SysRoleController extends BaseController //获取所有的角色 @GetMapping("listAll") - public AjaxResult listAll(){ + @ApiOperation("获取所有的角色") + public AjaxResult listAll() { return AjaxResult.success(roleService.list()); } @PostMapping("/list") - public IPage list(@RequestBody SearchParam sp) - { + @ApiOperation("角色列表") + public IPage list(@RequestBody SearchParam sp) { return roleService.selectPage(sp); } /** * 角色导出 + * * @param role * @return */ @@ -64,8 +66,7 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.EXPORT) @SaCheckPermission(value = "system:role:export") @PostMapping("/export") - public AjaxResult export(@RequestBody SysRole role) - { + public AjaxResult export(@RequestBody SysRole role) { List list = roleService.listByIds(role.getIds()); ExcelUtil util = new ExcelUtil(SysRole.class); return util.exportExcel(list, "角色数据"); @@ -77,8 +78,7 @@ public class SysRoleController extends BaseController @SaCheckLogin @SaCheckPermission(value = "system:role:query") @GetMapping(value = "/{roleId}") - public AjaxResult getInfo(@PathVariable String roleId) - { + public AjaxResult getInfo(@PathVariable String roleId) { /** * 1.角色详情 * 2.角色相关的菜单 @@ -104,17 +104,13 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.INSERT) @SaCheckPermission(value = "system:role:add") @PostMapping - public AjaxResult add(@Validated @RequestBody SysRole role) - { - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + public AjaxResult add(@Validated @RequestBody SysRole role) { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); } - return toAjax(roleService.insertRole(role)>0); + return toAjax(roleService.insertRole(role) > 0); } @@ -125,20 +121,15 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.UPDATE) @SaCheckPermission(value = "system:role:edit") @PutMapping - public AjaxResult edit(@Validated @RequestBody SysRole role) - { + public AjaxResult edit(@Validated @RequestBody SysRole role) { roleService.checkRoleAllowed(role); - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); } - if (roleService.updateRole(role) > 0) - { + if (roleService.updateRole(role) > 0) { // 更新缓存用户权限 // SysUser user = UserUtils.getUser(); @@ -160,10 +151,9 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.UPDATE) @SaCheckPermission(value = "system:role:edit") @PutMapping("/dataScope") - public AjaxResult dataScope(@RequestBody SysRole role) - { + public AjaxResult dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); - return toAjax(roleService.authDataScope(role)>0); + return toAjax(roleService.authDataScope(role) > 0); } /** @@ -173,8 +163,7 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.UPDATE) @SaCheckPermission(value = "system:role:edit") @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysRole role) - { + public AjaxResult changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); return toAjax(roleService.updateRoleStatus(role) > 0); } @@ -186,17 +175,15 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.DELETE) @SaCheckPermission(value = "system:role:remove") @DeleteMapping("/{roleIds}") - public AjaxResult remove(@PathVariable String[] roleIds) - { - return toAjax(roleService.deleteRoleByIds(roleIds) >0); + public AjaxResult remove(@PathVariable String[] roleIds) { + return toAjax(roleService.deleteRoleByIds(roleIds) > 0); } /** * 获取角色选择框列表 */ @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { return AjaxResult.success(roleService.selectRoleAll()); } } From d05799a953ae6d2345f105d26f5d8a9c4b471239 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 16 Jul 2024 09:48:10 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=81=E8=B7=AF=E7=BA=BF=E5=8C=BA=E5=9F=9F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/dto/DfCheckingLineSearchDto.java | 3 +- .../yxgh/df/mapper/DfCheckingLineMapper.java | 4 +- .../kms/yxgh/df/mapper/DfRecordMapper.java | 52 +++++++++++++++++++ .../kms/yxgh/df/service/DfRecordService.java | 36 ++++--------- 4 files changed, 66 insertions(+), 29 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java index 39a0ba67..bed5fa76 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java @@ -1,5 +1,6 @@ package com.kms.yxgh.df.dto; +import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,7 +9,7 @@ import java.util.List; @Data @ApiModel("堤防巡视检查路线查询") -public class DfCheckingLineSearchDto { +public class DfCheckingLineSearchDto implements IAdcd { @ApiModelProperty("堤防编码") private String dikeCode; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java index 22fcd9d2..00907a75 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java @@ -42,8 +42,8 @@ public interface DfCheckingLineMapper extends BaseMapper { "", "and df.dike_type = #{dto.dikeType} ", "", - "", - "and df.adcd like concat(#{dto.adcd}, '%') ", + "", + "and df.adcd like concat(#{dto.adcdQx}, '%') ", "", "", "and line.name like concat('%', #{dto.lineName}, '%') ", diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java index 63ab6433..d9c6e264 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -1,7 +1,10 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.df.domain.DfRecord; +import com.kms.yxgh.df.dto.DfRecordSearchDto; +import com.kms.yxgh.df.dto.DfRecordSimpleDto; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @@ -20,4 +23,53 @@ public interface DfRecordMapper extends BaseMapper { @Select("SELECT MAX(create_time) FROM bs_sgc_df_xsjhjl WHERE dike_code = #{dikeCode} ") Date getLastInsertTimeByDikeCode(@Param("dikeCode") String dikeCode); + + @Select("") + IPage search(IPage page, @Param("dto") DfRecordSearchDto dto); + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 30fe2881..809dcc96 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -56,32 +56,16 @@ public class DfRecordService extends BaseService { public IPage search(SearchParam sp) { IPage page = new Page<>(sp.getPageNum(), sp.getPageSize()); DfRecordSearchDto searchDto = sp.getData(); - Wrapper wp = Wrappers.lambdaQuery() - .like(StringUtils.isNotBlank(searchDto.getDikeName()), DfRecord::getDikeName, searchDto.getDikeName()) - .eq(StringUtils.isNotBlank(searchDto.getStatus()), DfRecord::getStatus, searchDto.getStatus()) - .eq(StringUtils.isNotBlank(searchDto.getHandleStatus()), DfRecord::getHandleStatus, searchDto.getHandleStatus()) - .eq(StringUtils.isNotBlank(searchDto.getDikeType()), DfRecord::getDikeType, searchDto.getDikeType()) - .like(StringUtils.isNotBlank(searchDto.getLineName()), DfRecord::getLineName, searchDto.getLineName()) - .eq(StringUtils.isNotBlank(searchDto.getLineType()), DfRecord::getLineType, searchDto.getLineType()) - .eq(StringUtils.isNotBlank(searchDto.getDutyHolderType()), DfRecord::getDutyHolderType, searchDto.getDutyHolderType()) - .orderByDesc(DfRecord::getEndDate); - page = page(page, wp); - if (CollectionUtil.isNotEmpty(page.getRecords())) { - List records = page.getRecords().stream().map(r -> { - DfRecordSimpleDto dto = BeanCopyUtils.copy(r, DfRecordSimpleDto.class); - if (dto != null) { - dto.setCreateName(userService.userName(dto.getCreateUid())); - dto.setOperators(planOperatorMapper.selectOperatorBySubPlanId(r.getSubPlanId())); - } - return dto; - }).collect(Collectors.toList()); - Page recordSearchDtoPage = new Page<>(page.getCurrent(), page.getSize(), - page.getTotal()); - recordSearchDtoPage.setRecords(records); - return recordSearchDtoPage; - } else { - return new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); - } + IPage records = this.getBaseMapper().search(page, searchDto); + records.getRecords().forEach(r -> { + DfRecordSimpleDto dto = BeanCopyUtils.copy(r, DfRecordSimpleDto.class); + if (dto != null) { + dto.setCreateName(userService.userName(dto.getCreateUid())); + dto.setOperators(planOperatorMapper.selectOperatorBySubPlanId(r.getSubPlanId())); + } + }); + return records; + } @Transactional(rollbackFor = Exception.class) From 0abad8b29e31d579757921f3e8125ccae0dea92a Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 16 Jul 2024 15:11:41 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java index 9c593175..81ece3a6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java @@ -21,8 +21,8 @@ public interface ApprovalObjRolesMapper extends BaseMapper { @Select("SELECT su.*" + "FROM sys_user su" + - "JOIN sys_user_role sur ON su.id = sur.user_id" + - "JOIN bs_sgc_sp_objrole so ON sur.role_id = so.role_id" + + "JOIN sys_user_role sur ON su.id = sur.user_id " + + "JOIN bs_sgc_sp_objrole so ON sur.role_id = so.role_id " + "WHERE so.obj_type = #{objType}") List getUsers(@Param("objType") String objType); From c6122be06add9b2720344efb71e3ef28d78f9e0b Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 16 Jul 2024 15:17:22 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java index 81ece3a6..2ef07b49 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java @@ -19,8 +19,8 @@ public interface ApprovalObjRolesMapper extends BaseMapper { List getRolesByObjType(@Param("objType") String objType); - @Select("SELECT su.*" + - "FROM sys_user su" + + @Select("SELECT su.* " + + "FROM sys_user su " + "JOIN sys_user_role sur ON su.id = sur.user_id " + "JOIN bs_sgc_sp_objrole so ON sur.role_id = so.role_id " + "WHERE so.obj_type = #{objType}") From d9409a280b3c6d231a36436d26d17cd146e4c8b7 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 16 Jul 2024 17:42:44 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E5=A0=A4?= =?UTF-8?q?=E9=98=B2=E3=80=81=E6=B0=B4=E9=97=B8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml | 2 +- shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml index ca2743dc..5344212f 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml @@ -35,7 +35,7 @@ SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status, ts.operator operator, ts.comment comment, ts.doc ts_doc, - yh.id yh_id, yh.dike_code dike_code, yh.dike_name dike_name, yh.name plan_name, yh.start_date start_date, + yh.id yh_id, yh.dike_code dike_code, yh.dike_name dike_name, yh.dike_type dike_type, yh.name plan_name, yh.start_date start_date, yh.end_date end_date, yh.supplement supplement, yh.doc doc, yh.engineering_unit engineering_unit, yh.responsible_person diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml index 3b72f913..414e5504 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhPlanMapper.xml @@ -35,7 +35,7 @@ SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status, ts.operator operator, ts.comment comment, ts.doc ts_doc, - yh.id yh_id, yh.waga_code waga_code, yh.waga_name waga_name, yh.name plan_name, yh.start_date start_date, + yh.id yh_id, yh.waga_code waga_code, yh.waga_name waga_name, yh.waga_type waga_type, yh.name plan_name, yh.start_date start_date, yh.end_date end_date, yh.supplement supplement, yh.doc doc, yh.engineering_unit engineering_unit, yh.responsible_person From d9bd1e36ecdc267c00d0d2f152c68ca29b5972da Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 17 Jul 2024 09:49:46 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java index d9c6e264..c02ca0c8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -39,8 +39,8 @@ public interface DfRecordMapper extends BaseMapper { "r.end_date, " + "r.create_time, " + "r.update_time, " + - "r.create_user, " + - "r.update_user " + + "r.create_uid, " + + "r.update_uid " + "FROM bs_sgc_df_xsjhjl r " + "Left JOIN att_dike_base df ON r.dike_code = df.dike_code and df.expr_date is null " + "where 1=1" +