新增保存机构同步数据方法

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/Org.java

@@ -60,6 +60,11 @@ public class Org extends BaseEntity {
     private String guid;
 
     /**
+     * 父节点GUID
+     */
+    private String parentGuid;
+
+    /**
      * 路径
      */
     private String path;
@@ -70,6 +75,21 @@ public class Org extends BaseEntity {
     private Integer deleted;
 
     /**
+     * 排序
+     */
+    private Double sort;
+
+    /**
+     * 机构简称
+     */
+    private String shortName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
      * 子机构
      */
     private List<Org> children = new ArrayList<Org>();
@@ -216,6 +236,40 @@ public class Org extends BaseEntity {
         this.deleted = deleted;
     }
 
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+
+    public String getParentGuid() {
+        return parentGuid;
+    }
+
+    public void setParentGuid(String parentGuid) {
+        this.parentGuid = parentGuid;
+    }
+
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
 /*
     public Integer getTemporarilyClosed() {
         return temporarilyClosed;

soc-modules/soc-modules-sync/src/main/java/com/xunmei/Main.java → soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/SocSyncApplication.java

@@ -1,6 +1,7 @@
-package com.xunmei;
+package com.xunmei.sync;
 
-public class Main {
+//同步机构、用户等信息
+public class SocSyncApplication {
     public static void main(String[] args) {
         System.out.println("Hello world!");
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/OrgController.java

@@ -2,6 +2,7 @@ package com.xunmei.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.system.api.domain.Org;
 import org.springframework.web.bind.annotation.*;
 import com.xunmei.system.service.IOrgService;
@@ -15,6 +16,8 @@ import com.xunmei.common.core.web.controller.BaseController;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * OrgController 前端控制器
@@ -102,4 +105,18 @@ public class OrgController extends BaseController {
         orgService.findListByPage(page, org);
         return success(page);
     }
+
+
+    @ApiOperation(value = "批量保存同步机构数据")
+    @InnerAuth
+    @PostMapping("/batchsavesyncorg")
+    public AjaxResult batchSaveSyncOrg(@RequestBody List<Org> orgLit){
+        try {
+            boolean result= orgService.saveOrUpdateBatch(orgLit);
+            return success(result);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
 }