调整组织机构懒加载接口

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java

@@ -53,12 +53,7 @@ public class EquipmentSizeDto {
     /**
      * 类别汇总名称
      */
-    private String typeAllName;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
+    private String combinedTypes;
     /**
      * 更新时间
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrgDto.java

@@ -12,5 +12,6 @@ public class OrgDto {
     private String areaName;
     private String levelFlag;
     private String dName;
+    private Boolean isLeaf;
 
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrgReq.java

@@ -12,6 +12,7 @@ public class QueryOrgReq {
     private String parentId;
     private Integer isDepartment;
     private Integer level;
+    private Integer delFlag;
 }
 
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrgReq.java

@@ -14,7 +14,7 @@ public class UpdateOrgReq {
      * 状态
      */
     @NotNull(message = "状态不能为空", groups = {ValidationApi.updateStatus.class})
-    private Integer statusFlag;
+    private Integer delFlag;
     /**
      * 组织机构列表
      */

jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java

@@ -27,6 +27,4 @@ public interface PubOrgService extends IService<PubOrg> {
 
     //根据组织机构id查询出组织机构是否存在
     PubOrg PubOrgExist(Long id);
-
-
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

@@ -234,7 +234,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
             List<PubOrg> st = list(wp);
             st.forEach(p->
             {
-                p.setStatusFlag(req.getStatusFlag());
+                p.setDelFlag(req.getDelFlag());
 
             });
            return   this.updateBatchById(st);
@@ -329,12 +329,22 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         list.forEach(p->{
             OrgDto org=new OrgDto();
             BeanPlusUtil.copyProperties(p, org);
-
+            // 判断是否有子节点
+            boolean hasChildren = hasChildren(req.getDelFlag(),p.getOrgId());
+            org.setIsLeaf(!hasChildren);
             orgs.add(org);
         });
         return orgs;
     }
+    // 判断是否有子节点的方法
+    private boolean hasChildren(Integer Del, Long parentId) {
 
+        LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PubOrg::getOrgParentId, parentId);
+        wrapper.eq(ObjectUtil.isNotNull(Del),PubOrg::getDelFlag, Del);
+        Long count = this.count(wrapper);
+        return count > 0;
+    }
     public List<OrgDto> getOrgList(QueryOrgReq req) {
         LambdaQueryWrapper<PubOrg> wp= this.createWrapper(req);
         List<PubOrg> list = this.list(wp);
@@ -356,6 +366,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         wrapper.eq(ObjectUtil.isNotEmpty(req.getIsDepartment()), PubOrg::getIsDepartment, req.getIsDepartment());
         //根据业务编码查询
         wrapper.eq(ObjectUtil.isNotEmpty(req.getLevel()), PubOrg::getLevelFlag, req.getLevel());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getDelFlag()), PubOrg::getDelFlag, req.getDelFlag());
         wrapper.eq(ObjectUtil.isNotEmpty(req.getParentId()), PubOrg::getOrgParentId,req.getParentId()  );
         wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgCode()), PubOrg::getOrgCode, req.getOrgCode());
 

jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml

@@ -13,7 +13,8 @@
     t1.code AS code,
     t3.name AS type3Name,
     t4.name AS type2name,
-    t5.name AS type1Name
+    t5.name AS type1Name,
+    CONCAT_WS(' / ', t5.name, t4.name, t3.name) AS combinedTypes
     FROM
       `base_equipment_size` t1
         LEFT JOIN `base_equipment_type` t2 ON t1.type_id = t2.id

jyzb-boot/src/main/resources/application-local.yml.orig

+scanner:
+  open: false
+
+# 配置第三方请求
+junmp:
+  swagger:
+    base-package: com.junmp
+  id:
+    worker-id: 1
+    data-center-id: 1
+    epoch: 1656036996843
+    max: 9999
+  log:
+    type: db
+  ds: true #是否多数据源
+
+knife4j:
+  enable: true
+  setting:
+    enableDebug: false
+#  basic:
+#    enable: true
+#    username: ning
+#    password: ning
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+<<<<<<< HEAD
+    url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+=======
+    url: jdbc:mysql://192.168.3.128/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+>>>>>>> ce2cec735d8197f0f6b77fb7df738d825354bd3c
+    username: junmp
+    password: 123456
+
+  redis:
+    #host: 192.168.3.188
+    host: 192.168.3.188
+    port: 6379
+    database: 1
+    password:
+
+      flowable:
+        dmn:
+          enabled: false
+        cmmn:
+          enabled: false
+        idm:
+          enabled: false
+        async-history-executor-activate: false
+        async-executor-activate: false
+        check-process-definitions: false
+        content:
+          enabled: false
+        app:
+          enabled: false
+        eventregistry:
+          enabled: false
+
+#mybatis plus 设置
+mybatis-plus:
+  configuration:
+    cache-enabled: true
+    lazy-loading-enabled: true
+    multiple-result-sets-enabled: true
+    map-underscore-to-camel-case: true #开启驼峰命名
+  global-config:
+    banner: false
+    enable-sql-runner: true
+    db-config:
+      id-type: assign_id
+      table-underline: true
+#  mapper-locations: classpath*:com/junmp/junmpProcess/mapper/**/xml/*Mapper.xml
+      mapper-locations: classpath*:/mapper/**/*Mapper.xml
+flowable:
+  dmn:
+    enabled: false
+  cmmn:
+    enabled: false
+  idm:
+    enabled: false
+  async-history-executor-activate: false
+  async-executor-activate: false
+  check-process-definitions: false
+  content:
+    enabled: false
+  app:
+    enabled: false
+  eventregistry:
+    enabled: false
+
+com:
+  mqtt:
+    url: tcp://broker.emqx.io:1883  #这里要写 tcp://  不能是 mqtt,不然不是合法的 schema，源码中有
+    clientId: mqtt_test_spring
+    topics: iot/#,home/#
+    username: admin
+    password: public
+    timeout: 10
+    keepalive: 20
\ No newline at end of file