459242451@qq.com 3 лет назад
Родитель
Сommit
4e6d7ddde1

+ 27 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,6 +1,10 @@
 package com.ruoyi.web.controller.system;
 
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -14,6 +18,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -148,4 +154,25 @@ public class SysDeptController extends BaseController
         }
         return toAjax(deptService.deleteDeptById(deptId));
     }
+
+    @PostMapping("/syncUc")
+    public void syncUc() {
+        List<JSONObject> list = deptService.queryTUcDept();
+        List<SysDept> sysDepts = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            SysDept sysDept = new SysDept();
+            sysDept.setDeptId(jsonObject.getStr("deptId"));
+            sysDept.setParentId(StrUtil.isBlank(jsonObject.getStr("parentId")) ? "0":jsonObject.getStr("parentId"));
+            sysDept.setDeptName(jsonObject.getStr("deptName"));
+            sysDept.setCreateBy("system");
+            sysDept.setUpdateBy("system");
+            sysDept.setCreateTime(new Date());
+            sysDept.setUpdateTime(new Date());
+            sysDept.setOrgId(jsonObject.getStr("orgId"));
+            sysDept.setDeptShortName(jsonObject.getStr("deptShortName"));
+            sysDepts.add(sysDept);
+        }
+        deptService.saveBatch(sysDepts);
+
+    }
 }

+ 8 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -126,4 +126,12 @@ public class SysDept implements Serializable {
 
     private String otherId;
 
+    private String code;
+
+    private String description;
+
+    private String deptShortName;
+
+    private String orgId;
+
 }

+ 2 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -108,6 +108,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
             .antMatchers("/webjars/**").anonymous()
             .antMatchers("/*/api-docs").anonymous()
             .antMatchers("/druid/**").anonymous()
+            // 测试相关
+            .antMatchers("/system/dept/syncUc").anonymous()
             // Spring Boot Actuator 的安全配置
             .antMatchers("/actuator").anonymous()
             .antMatchers("/actuator/**").anonymous()

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.mapper;
 
+import cn.hutool.json.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -38,4 +40,6 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept> {
 	 */
 	public int updateDeptChildren(@Param("depts") List<SysDept> depts);
 
+	@Select("select * from t_uc_dept")
+    List<JSONObject> queryTUcDept();
 }

+ 3 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -114,4 +115,6 @@ public interface ISysDeptService extends IService<SysDept> {
      * @return 结果
      */
     public int deleteDeptById(String deptId);
+
+    List<JSONObject> queryTUcDept();
 }

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.annotation.DataScope;
@@ -307,4 +308,9 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
     private boolean hasChild(List<SysDept> list, SysDept t) {
         return getChildList(list, t).size() > 0;
     }
+
+    @Override
+    public List<JSONObject> queryTUcDept() {
+        return baseMapper.queryTUcDept();
+    }
 }