From 13d6882c76b25b71fe1f4977091bb88221c40e00 Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Thu, 6 Feb 2025 22:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=BD=8D=E7=AE=A1=E7=90=86&=20?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/BaseAreaController.java | 1 - .../admin/controller/PositionController.java | 18 ++++++++++++------ .../admin/service/AdminBaseAreaService.java | 8 ++++---- .../common/pojo/vo/TBaseAreaVO.java | 4 ++-- .../main/resources/mapper/TBaseAreaMapper.xml | 2 +- .../resources/mapper/TBasePositionMapper.xml | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java index 82f7bd3c..6762836c 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java @@ -44,7 +44,6 @@ public class BaseAreaController extends ControllerBase { * @return */ @PostMapping("getList") - @MethodInfoMark(value = "获取区域列表" ,menuName = "区域管理") public ApiResult> getList(@RequestBody BaseAreaQuery query){ // return adminBaseAreaService.getList(query); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java index bb87102a..a9997307 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java @@ -3,6 +3,7 @@ package com.nflg.mobilebroken.admin.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.admin.pojo.dto.PositionDetailDTO; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import java.time.LocalDateTime; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -51,7 +53,7 @@ public class PositionController extends ControllerBase { * @return */ @PostMapping("getList") - @MethodInfoMark(value = "获取职位列表", menuName = "职位管理") + public ApiResult> getList(@RequestBody PositionQuery query) { Page result = positionService.getList(new Page<>(query.getPage(), query.getPageSize()), query); @@ -65,16 +67,19 @@ public class PositionController extends ControllerBase { * @return */ @GetMapping("getPositionDetail") - @MethodInfoMark(value = "获取职位明细", menuName = "职位管理") + public ApiResult getPositionDetail(@RequestParam("id") Integer id) { TBasePosition ent = positionService.getById(id); VUtils.trueThrow(null == ent).throwMessage(STATE.ParamErr, "职位不存在"); PositionDetailVO result = Convert.convert(PositionDetailVO.class, ent); List allLanguage = languageService.lambdaQuery().eq(Language::getEnable, true).list(); - List positionLanguage = JSON.parseArray(ent.getPositionLanguage(), PositionLanguageVO.class); - Map positionLanguageMp = positionLanguage.stream() - .collect(Collectors.toMap(PositionLanguageVO::getCode, PositionLanguageVO::getLanguageValue)); + Map positionLanguageMp=new HashMap<>(); + if(StrUtil.isNotBlank(ent.getPositionLanguage())) { + List positionLanguage = JSON.parseArray(ent.getPositionLanguage(), PositionLanguageVO.class); + positionLanguageMp = positionLanguage.stream() + .collect(Collectors.toMap(PositionLanguageVO::getCode, PositionLanguageVO::getLanguageValue)); + } List positionLanguageResult = Convert.toList(PositionLanguageVO.class, allLanguage); for (PositionLanguageVO lan : positionLanguageResult) { if (positionLanguageMp.containsKey(lan.getCode())) { @@ -119,11 +124,12 @@ public class PositionController extends ControllerBase { public ApiResult update(@Valid @RequestBody PositionDetailDTO positionDetailDto) { VUtils.trueThrow(positionDetailDto.getId()<=0).throwMessage(STATE.ParamErr,"编辑时ID不能等于0"); TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto); + ent.setPositionCode(null); ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage())); ent.setDataModifyUserNo(AdminUserUtil.getUserNo()); ent.setDataModifyUserName(AdminUserUtil.getUserName()); ent.setDataModifyTime(LocalDateTime.now()); - positionService.save(ent); + positionService.updateById(ent); return ApiResult.success(true); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java index 75782455..c0c5a627 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java @@ -31,10 +31,10 @@ public class AdminBaseAreaService { public ApiResult> getList(@RequestBody BaseAreaQuery query){ Page result = baseAreaService.getList(new Page<>(query.getPage(),query.getPageSize()), query); - List dataResult = Convert.toList(TBaseAreaVO.class, result); + List dataResult = Convert.toList(TBaseAreaVO.class, result.getRecords()); if(StrUtil.isNotBlank(query.getAreaCodeOrName())){ List allAreaList = Convert.toList(TBaseAreaVO.class,baseAreaService.lambdaQuery().eq(TBaseArea::getAreaState,1).list()) ; - Map collect = allAreaList.stream().collect(Collectors.toMap(TBaseAreaVO::getRowId, Function.identity())); + Map collect = allAreaList.stream().collect(Collectors.toMap(TBaseAreaVO::getId, Function.identity())); List allParents=new ArrayList<>(); for (TBaseAreaVO data:dataResult){ allParents.addAll(getAllParents(data, collect)) ; @@ -51,7 +51,7 @@ public class AdminBaseAreaService { } private void initNodeChildren(TBaseAreaVO node) { - List immediateChildren = findChildDepartmentsByParentId(node.getRowId()); + List immediateChildren = findChildDepartmentsByParentId(node.getId()); node.setChildren(immediateChildren); for (TBaseAreaVO child : immediateChildren) { initNodeChildren(child); @@ -85,7 +85,7 @@ public class AdminBaseAreaService { private List buildTree(List nodes) { // 使用Map存储id到Node的映射，便于快速查找父节点 Map idToNodeMap = nodes.stream() - .collect(Collectors.toMap(TBaseAreaVO::getRowId, Function.identity())); + .collect(Collectors.toMap(TBaseAreaVO::getId, Function.identity())); List roots = new ArrayList<>(); diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java index 89995c3a..80f61f1d 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java @@ -26,7 +26,7 @@ public class TBaseAreaVO implements Serializable { /** * row_id */ - private Long rowId; + private Long id; /** * 区域编码 @@ -41,7 +41,7 @@ public class TBaseAreaVO implements Serializable { /** * 预期名称 */ - private Long areaName; + private String areaName; /** * 状态 diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml index 96401a1c..0f3b8bf4 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml @@ -21,7 +21,7 @@ update t_base_area set area_state=0 , data_modify_time=now(), data_modify_user_no=#{userNo}, data_modify_user_name=#{userName} where id in - + #{item} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml index e02906eb..7feb4c9d 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml @@ -4,7 +4,7 @@ - and position_code=#{positionCode} + and position_code=#{query.positionCode} and position_name=#{query.positionName}