From f60dba6aa77ab0c7861e7011e8018d7ce39cc025 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Mon, 30 Dec 2024 18:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8C=87=E8=A1=8C=E3=80=81=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=AF=B9=E8=B1=A1=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sensitiveperception/ScoreController.java | 5 -- .../system/DepartMapingController.java | 83 +++++++++++++++++++ .../pojo/entity/SupExternalDepart.java | 2 + .../pojo/param/DepartMapingQueryParam.java | 20 +++++ .../pojo/param/NegativeTaskQueryParam.java | 2 + .../service/NegativeTaskService.java | 1 + 6 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/controller/system/DepartMapingController.java create mode 100644 src/main/java/com/biutag/supervision/pojo/param/DepartMapingQueryParam.java diff --git a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java index ad4ad04..8c7b6a1 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java @@ -93,11 +93,6 @@ public class ScoreController { if (Objects.isNull(size)) { size = 1000000; } - try { - updateDepartScore(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } List riskPersonals = riskPersonalService.page(Page.of(1, size), new LambdaQueryWrapper().eq(RiskPersonal::getDel, AppConstants.UN_DEL) ).getRecords(); log.info("{}条数据正在打分", riskPersonals.size()); diff --git a/src/main/java/com/biutag/supervision/controller/system/DepartMapingController.java b/src/main/java/com/biutag/supervision/controller/system/DepartMapingController.java new file mode 100644 index 0000000..c82fcc3 --- /dev/null +++ b/src/main/java/com/biutag/supervision/controller/system/DepartMapingController.java @@ -0,0 +1,83 @@ +package com.biutag.supervision.controller.system; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.entity.SupDepart; +import com.biutag.supervision.pojo.entity.SupExternalDepart; +import com.biutag.supervision.pojo.param.DepartMapingQueryParam; +import com.biutag.supervision.service.SupDepartService; +import com.biutag.supervision.service.SupExternalDepartService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; + +/** + * @author wxc + * @date 2024/12/30 + */ +@RequiredArgsConstructor +@RequestMapping("depart/maping") +@RestController +public class DepartMapingController { + + private final SupExternalDepartService externalDepartService; + + private final SupDepartService departService; + + @GetMapping("{source}") + public Result> list(@PathVariable String source, DepartMapingQueryParam queryParam) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(SupExternalDepart::getSource, source) + .like(StrUtil.isNotBlank(queryParam.getExternalId()), SupExternalDepart::getExternalId, queryParam.getExternalId()) + .like(StrUtil.isNotBlank(queryParam.getExternalName()), SupExternalDepart::getExternalName, queryParam.getExternalName()) + .eq(StrUtil.isNotBlank(queryParam.getInternalId()), SupExternalDepart::getInternalId, queryParam.getInternalId()); + Page page = externalDepartService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); + return Result.success(page); + } + + @PostMapping + public Result add(@RequestBody SupExternalDepart data) { + if (externalDepartService.exists(new LambdaQueryWrapper() + .eq(SupExternalDepart::getSource, data.getSource()).eq(SupExternalDepart::getExternalId, data.getExternalId()))) { + throw new RuntimeException(String.format("%s 单位编码【%s】已存在", data.getSource(), data.getExternalId())); + } + data.setUpdateTime(LocalDateTime.now()); + data.setCreateTime(LocalDateTime.now()); + SupDepart depart = departService.getById(data.getInternalId()); + + data.setInternalName(depart.getName()); + data.setInternalShortName(depart.getShortName()); + data.setPid(depart.getPid()); + data.setLevel(depart.getLevel()); + externalDepartService.save(data); + return Result.success(); + } + + @PutMapping + public Result update(@RequestBody SupExternalDepart data) { + if (externalDepartService.exists(new LambdaQueryWrapper() + .eq(SupExternalDepart::getSource, data.getSource()).eq(SupExternalDepart::getExternalId, data.getExternalId()) + .ne(SupExternalDepart::getId, data.getId()))) { + throw new RuntimeException(String.format("%s 单位编码【%s】已存在", data.getSource(), data.getExternalId())); + } + data.setUpdateTime(LocalDateTime.now()); + SupDepart depart = departService.getById(data.getInternalId()); + data.setInternalName(depart.getName()); + data.setInternalShortName(depart.getShortName()); + data.setPid(depart.getPid()); + data.setLevel(depart.getLevel()); + externalDepartService.updateById(data); + return Result.success(); + } + + @DeleteMapping("{id}") + public Result del(@PathVariable String id) { + externalDepartService.removeById(id); + return Result.success(); + } + +} diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java b/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java index 22f9493..766f289 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java @@ -3,6 +3,7 @@ package com.biutag.supervision.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.Setter; @@ -58,6 +59,7 @@ public class SupExternalDepart { // 更新时间 @TableField("update_time") + @JsonFormat(pattern="yyyy-MM-dd HH:mm") private LocalDateTime updateTime; } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/param/DepartMapingQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DepartMapingQueryParam.java new file mode 100644 index 0000000..80ed5cc --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/param/DepartMapingQueryParam.java @@ -0,0 +1,20 @@ +package com.biutag.supervision.pojo.param; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author wxc + * @date 2024/12/30 + */ +@Setter +@Getter +public class DepartMapingQueryParam extends BasePage { + + private String externalId; + + // 外部单位名称 + private String externalName; + + private String internalId; +} diff --git a/src/main/java/com/biutag/supervision/pojo/param/NegativeTaskQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/NegativeTaskQueryParam.java index 96c0c10..544071c 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/NegativeTaskQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeTaskQueryParam.java @@ -14,6 +14,8 @@ public class NegativeTaskQueryParam extends BasePage { private String taskName; + private String source; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private List crtTime = new ArrayList<>(); diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java index 5d021bd..d686536 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java @@ -50,6 +50,7 @@ public class NegativeTaskService extends ServiceImpl page(NegativeTaskQueryParam param) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(NegativeTask::getCategory, NegativeTaskCategoryEnum.EXPORT.getValue()) + .eq(StrUtil.isNotBlank(param.getSource()), NegativeTask::getSource, param.getSource()) .like(StrUtil.isNotBlank(param.getTaskName()), NegativeTask::getTaskName, param.getTaskName()) .orderByDesc(NegativeTask::getCrtTime); if (param.getCrtTime().size() == 2) {