新增组织

snowy-web-app/src/main/java/vip/xiaonuo/Timer/OrgIdVo.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.Timer;
+package vip.xiaonuo.sys.modular.org.entity;
 
 import lombok.Data;
 
@@ -6,4 +6,5 @@ import lombok.Data;
 public class OrgIdVo {
     private String farmId;
     private String name;
+    private String parentId;
 }

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -21,8 +21,9 @@ import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
+import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,6 +36,7 @@ import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
+import vip.xiaonuo.sys.modular.org.entity.OrgIdVo;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.org.enums.SysOrgCategoryEnum;
 import vip.xiaonuo.sys.modular.org.mapper.SysOrgMapper;
@@ -46,6 +48,8 @@ import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import vip.xiaonuo.sys.modular.user.service.SysUserService;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -115,7 +119,28 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
         sysOrg.setCode(RandomUtil.randomString(10));
         this.save(sysOrg);
-
+        if ("0".equals(sysOrgAddParam.getParentId())) {
+        } else {
+            List<SysOrg> sysOrgs = this.list(new QueryWrapper<SysOrg>()
+                    .eq("DELETE_FLAG", "NOT_DELETE").eq("CATEGORY","PASTURE")
+                    .eq("PARENT_ID",sysOrgAddParam.getParentId()));
+            List<OrgIdVo> list = new ArrayList<>();
+            for (SysOrg sysOrg1 : sysOrgs) {
+                OrgIdVo orgIdVo = new OrgIdVo();
+                orgIdVo.setFarmId(sysOrg1.getId());
+                orgIdVo.setName(sysOrg1.getName());
+                orgIdVo.setParentId(sysOrg1.getParentId());
+                list.add(orgIdVo);
+            }
+            String url = "https://farm.ifarmcloud.com/huimvFarmSecureApi/base-farm/getFarm";
+            HashMap<String, String> paramsMap = new HashMap<>();
+            com.alibaba.fastjson.JSONObject jsonObject1 = new JSONObject();
+            jsonObject1.put("list", list);
+            paramsMap.put("Content-Type", "application/json;charset=utf-8");
+            String post = HttpRequest.post(url)
+                    .headerMap(paramsMap, false).body(jsonObject1.toJSONString()).timeout(30 * 1000).execute().body();
+            System.out.println(post);
+        }
         // 发布增加事件
         CommonDataChangeEventCenter.doAddWithData(SysDataTypeEnum.ORG.getValue(), JSONUtil.createArray().put(sysOrg));
     }

snowy-web-app/src/main/java/vip/xiaonuo/Timer/SendOrgId.java

@@ -5,11 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import vip.xiaonuo.common.timer.CommonTimerTaskRunner;
+import vip.xiaonuo.sys.modular.org.entity.OrgIdVo;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.org.mapper.SysOrgMapper;