学习资料代码提交,机构表字段删减

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

@@ -1,9 +1,9 @@
 package com.xunmei.system.api.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.StringSerializer;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -32,218 +32,80 @@ import java.util.List;
 public class SysOrg extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * $column.columnComment
-     */
+    @TableId
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long orgExtendId;
 
-    /**
-     * $column.columnComment
-     */
-    @ApiModelProperty(value = "${comment}", notes = "$column.readConverterExp()")
+    @ApiModelProperty(value = "地址")
+    @TableField(value = "address")
     private String address;
 
-    /**
-     * code
-     */
     @ApiModelProperty(value = "code")
+    @TableField(value = "code")
     private String code;
 
-    /**
-     * 设备数量
-     */
-    @ApiModelProperty(value = "设备数量")
-    private Long deviceCount;
-
-    /**
-     * guid
-     */
     @ApiModelProperty(value = "guid")
+    @TableField(value = "guid")
     private String guid;
 
-    /**
-     * 禁用
-     */
     @ApiModelProperty(value = "禁用")
+    @TableField(value = "is_lock")
     private String isLock;
 
-    /**
-     * 负责人
-     */
     @ApiModelProperty(value = "负责人")
+    @TableField(value = "manager")
     private String manager;
 
-    /**
-     * 负责人电话
-     */
     @ApiModelProperty(value = "负责人电话")
+    @TableField(value = "manager_phone")
     private String managerPhone;
 
-    /**
-     * nh名称
-     */
     @ApiModelProperty(value = "nh名称")
+    @TableField(value = "name")
     private String name;
 
-    /**
-     * 上级nh
-     */
     @ApiModelProperty(value = "上级nh")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "parent_id")
     private Long parentId;
 
-    /**
-     * 联系电话
-     */
+    @ApiModelProperty(value = "父节点GUID")
+    @TableField(value = "parent_guid")
+    private String parentGuid;
+
     @ApiModelProperty(value = "联系电话")
+    @TableField(value = "phone")
     private String phone;
 
-    /**
-     * 行政区域编码
-     */
     @ApiModelProperty(value = "行政区域编码")
+    @TableField(value = "city_code")
     private String cityCode;
 
-    /**
-     * 开业年份
-     */
-    @ApiModelProperty(value = "开业年份")
-    private Long openYear;
-
-    /**
-     * 装修年份
-     */
-    @ApiModelProperty(value = "装修年份")
-    private Long fitYear;
-
-    /**
-     * 建筑面积
-     */
-    @ApiModelProperty(value = "建筑面积")
-    private String floorage;
-
-    /**
-     * 员工人数
-     */
-    @ApiModelProperty(value = "员工人数")
-    private Long employee;
-
-    /**
-     * 是否自有产权
-     */
-    @ApiModelProperty(value = "是否自有产权")
-    private Long isOwnRight;
-
-    /**
-     * 是否为租赁场所
-     */
-    @ApiModelProperty(value = "是否为租赁场所")
-    private Long isRent;
-
-    /**
-     * 是否独自占用建筑
-     */
-    @ApiModelProperty(value = "是否独自占用建筑")
-    private Long isOnly;
-
-    /**
-     * 与其他单位共用建筑的，所处的建筑建成年份
-     */
-    @ApiModelProperty(value = "与其他单位共用建筑的，所处的建筑建成年份")
-    private Long buildYear;
-
-    /**
-     * 场所类型
-     */
-    @ApiModelProperty(value = "场所类型")
-    private Long placeType;
-
-    /**
-     * 所在建筑的总高度
-     */
-    @ApiModelProperty(value = "所在建筑的总高度")
-    private Long buildHeight;
-
-    /**
-     * 周边主要社会环境
-     */
-    @ApiModelProperty(value = "周边主要社会环境")
-    private Long social;
-
-    /**
-     * 周边主要自然环境
-     */
-    @ApiModelProperty(value = "周边主要自然环境")
-    private Long naturalEnvir;
-
-    /**
-     * 机构类型
-     */
     @ApiModelProperty(value = "机构类型")
+    @TableField(value = "type")
     private Long type;
 
-    /**
-     * 修改人名称
-     */
-    @ApiModelProperty(value = "修改人名称")
-    private String modifiedName;
-
-    /**
-     * 最后修改人id
-     */
-    @ApiModelProperty(value = "最后修改人id")
-    private Long modifiedId;
-
-    /**
-     * 路径
-     */
     @ApiModelProperty(value = "路径")
+    @TableField(value = "path")
     private String path;
 
-    /**
-     * vmns的id
-     */
-    @ApiModelProperty(value = "vmns的id")
-    private Long vid;
-
-    /**
-     * 层级
-     */
-    @ApiModelProperty(value = "层级")
-    private Long level;
-
-    /**
-     * nh唯一编码
-     */
-    @ApiModelProperty(value = "nh唯一编码")
-    private String oid;
-
-    /**
-     * 父节点GUID
-     */
-    @ApiModelProperty(value = "父节点GUID")
-    private String parentGuid;
-
-    /**
-     * 是否删除
-     */
     @ApiModelProperty(value = "是否删除")
+    @TableField(value = "deleted")
     private Long deleted;
 
-    /**
-     * 排序
-     */
+    @TableField(value = "sort")
     @ApiModelProperty(value = "排序")
     private BigDecimal sort;
+    @ApiModelProperty(value = "天气城市区域编码")
+    @TableField(value = "weather_city_code")
+    private String weatherCityCode;
 
-    /**
-     * 位置信息 1城区2县城3乡镇
-     */
-    @ApiModelProperty(value = "位置信息 1城区2县城3乡镇")
-    private Long location;
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_extend_id")
+    private Long orgExtendId;
+    @ApiModelProperty(value = "机构来源, 0:系统新增 1:fjnx同步")
+    @TableField(value = "source")
+    private Integer source;
     /**
      * 子机构
      */
@@ -253,122 +115,26 @@ public class SysOrg extends BaseEntity {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-
-
                 .append("id", getId())
-
-
                 .append("address", getAddress())
-
-
                 .append("code", getCode())
-
-
-                .append("deviceCount", getDeviceCount())
-
-
                 .append("guid", getGuid())
-
-
                 .append("isLock", getIsLock())
-
-
                 .append("manager", getManager())
-
-
                 .append("managerPhone", getManagerPhone())
-
-
                 .append("name", getName())
-
-
                 .append("parentId", getParentId())
-
-
                 .append("phone", getPhone())
-
-
                 .append("cityCode", getCityCode())
-
-
-                .append("openYear", getOpenYear())
-
-
-                .append("fitYear", getFitYear())
-
-
-                .append("floorage", getFloorage())
-
-
-                .append("employee", getEmployee())
-
-
-                .append("isOwnRight", getIsOwnRight())
-
-
-                .append("isRent", getIsRent())
-
-
-                .append("isOnly", getIsOnly())
-
-
-                .append("buildYear", getBuildYear())
-
-
-                .append("placeType", getPlaceType())
-
-
-                .append("buildHeight", getBuildHeight())
-
-
-                .append("social", getSocial())
-
-
-                .append("naturalEnvir", getNaturalEnvir())
-
-
                 .append("type", getType())
-
-
                 .append("createTime", getCreateTime())
-
-
-                .append("modifiedName", getModifiedName())
-
-
                 .append("updateTime", getUpdateTime())
-
-
-                .append("modifiedId", getModifiedId())
-
-
                 .append("path", getPath())
-
-
-                .append("vid", getVid())
-
-
-                .append("level", getLevel())
-
-
-                .append("oid", getOid())
-
-
                 .append("parentGuid", getParentGuid())
-
-
                 .append("deleted", getDeleted())
-
-
                 .append("sort", getSort())
-
-
-                .append("location", getLocation())
-
-
+                .append("source", getSource())
                 .append("createBy", getCreateBy())
-
-
                 .append("updateBy", getUpdateBy())
                 .toString();
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeptServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xunmei.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -48,7 +49,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     private SysOrgMapper orgMapper;
 
 
-
     /**
      * 查询部门管理数据
      *
@@ -60,6 +60,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public List<SysDept> selectDeptList(SysDept dept) {
         return deptMapper.selectDeptList(dept);
     }
+
     /**
      * 查询部门树结构信息
      *
@@ -68,14 +69,20 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      */
     @Override
     public List<SysOrg> selectDeptTreeList(SysOrg dept) {
-        List<SysOrg> depts = orgMapper.selectList(new QueryWrapper<>(dept));
+        final LambdaQueryWrapper<SysOrg> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysOrg::getDeleted, 0L);
+        wrapper.isNotNull(SysOrg::getParentId);
+        List<SysOrg> depts = orgMapper.selectList(new QueryWrapper<>());
         return recursionMethod(depts);
     }
 
     @Override
     public List<SysDept> selectDeptTreeList(SysDept dept) {
+        final LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysDept::getDelFlag, 0L);
+        wrapper.isNotNull(SysDept::getParentId);
         List<SysDept> sysDepts = deptMapper.selectList(new QueryWrapper<>(dept));
-        return  recursionDept(sysDepts);
+        return recursionDept(sysDepts);
     }
 
 
@@ -89,7 +96,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         List<SysOrg> trees = new ArrayList<>();
         for (SysOrg tree : treeList) {
             // 找出父节点
-            if (ObjectUtil.equal(-1, tree.getParentId())) {
+            if (-1 == tree.getParentId()) {
                 // 调用递归方法填充子节点列表
                 trees.add(findChildren(tree, treeList));
             }
@@ -114,6 +121,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         }
         return trees;
     }
+
     /**
      * dept递归方法
      *
@@ -133,6 +141,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         }
         return tree;
     }
+
     /**
      * 递归方法
      *

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -8,7 +8,6 @@
                 <result property="id" column="id"/>
                 <result property="address" column="address"/>
                 <result property="code" column="code"/>
-                <result property="deviceCount" column="device_count"/>
                 <result property="guid" column="guid"/>
                 <result property="isLock" column="is_lock"/>
                 <result property="manager" column="manager"/>
@@ -17,31 +16,14 @@
                 <result property="parentId" column="parent_id"/>
                 <result property="phone" column="phone"/>
                 <result property="cityCode" column="city_code"/>
-                <result property="openYear" column="open_year"/>
-                <result property="fitYear" column="fit_year"/>
-                <result property="floorage" column="floorage"/>
-                <result property="employee" column="employee"/>
-                <result property="isOwnRight" column="is_own_right"/>
-                <result property="isRent" column="is_rent"/>
-                <result property="isOnly" column="is_only"/>
-                <result property="buildYear" column="build_year"/>
-                <result property="placeType" column="place_type"/>
-                <result property="buildHeight" column="build_height"/>
-                <result property="social" column="social"/>
-                <result property="naturalEnvir" column="natural_envir"/>
                 <result property="type" column="type"/>
                 <result property="createTime" column="create_time"/>
-                <result property="modifiedName" column="modified_name"/>
                 <result property="updateTime" column="update_time"/>
-                <result property="modifiedId" column="modified_id"/>
                 <result property="path" column="path"/>
-                <result property="vid" column="vid"/>
-                <result property="level" column="level"/>
-                <result property="oid" column="oid"/>
                 <result property="parentGuid" column="parent_guid"/>
                 <result property="deleted" column="deleted"/>
                 <result property="sort" column="sort"/>
-                <result property="location" column="location"/>
+                <result property="source" column="source"/>
                 <result property="createBy" column="create_by"/>
                 <result property="updateBy" column="update_by"/>
     </resultMap>