Merge remote-tracking branch 'origin/master'

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<RiskPersonal> riskPersonals = riskPersonalService.page(Page.of(1, size), new LambdaQueryWrapper<RiskPersonal>().eq(RiskPersonal::getDel, AppConstants.UN_DEL)
                 ).getRecords();
         log.info("{}条数据正在打分", riskPersonals.size());

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<Page<SupExternalDepart>> list(@PathVariable String source, DepartMapingQueryParam queryParam) {
+        LambdaQueryWrapper<SupExternalDepart> 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<SupExternalDepart> page = externalDepartService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
+        return Result.success(page);
+    }
+
+    @PostMapping
+    public Result<Void> add(@RequestBody SupExternalDepart data) {
+        if (externalDepartService.exists(new LambdaQueryWrapper<SupExternalDepart>()
+                .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<Void> update(@RequestBody SupExternalDepart data) {
+        if (externalDepartService.exists(new LambdaQueryWrapper<SupExternalDepart>()
+                .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<Void> del(@PathVariable String id) {
+        externalDepartService.removeById(id);
+        return Result.success();
+    }
+
+}

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;
 
 }

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;
+}

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<Date> crtTime = new ArrayList<>();
 

src/main/java/com/biutag/supervision/service/NegativeTaskService.java

@@ -50,6 +50,7 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
     public Page<NegativeTask> page(NegativeTaskQueryParam param) {
         LambdaQueryWrapper<NegativeTask> queryWrapper = new LambdaQueryWrapper<NegativeTask>()
                 .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) {