部门新增所属区域字段。

imcs-bt-be/imcs-authority-controller/src/main/java/com/github/zuihou/authority/controller/core/OrgController.java

@@ -36,15 +36,14 @@ import static com.github.zuihou.utils.StrPool.*;
  * @author zuihou
  * @date 2019-07-22
  */
-@Slf4j
-@RestController
-@RequestMapping("/org")
-@Api(value = "Org", tags = "组织")
 @PreAuth(replace = "org:")
-public class OrgController extends SuperCacheController<OrgService, Long, Org, Org, OrgSaveDTO, OrgUpdateDTO> {
-
+@Api(value = "Org", tags = "组织")
+@RestController @RequestMapping("/org") @Slf4j
+public class OrgController extends SuperCacheController<OrgService, Long, Org, Org, OrgSaveDTO, OrgUpdateDTO>
+{
     @Override
-    public R<Org> handlerSave(OrgSaveDTO model) {
+    public R<Org> handlerSave(OrgSaveDTO model)
+    {
         Org org = BeanPlusUtil.toBean(model, Org.class);
         fillOrg(org);
         this.baseService.save(org);
@@ -52,32 +51,38 @@ public class OrgController extends SuperCacheController<OrgService, Long, Org, O
     }
 
     @Override
-    public R<Org> handlerUpdate(OrgUpdateDTO model) {
+    public R<Org> handlerUpdate(OrgUpdateDTO model)
+    {
         Org org = BeanPlusUtil.toBean(model, Org.class);
         fillOrg(org);
         this.baseService.updateAllById(org);
         return success(org);
     }
 
-    private Org fillOrg(Org org) {
-        if (org.getParentId() == null || org.getParentId() <= 0) {
+    private Org fillOrg(Org org)
+    {
+        if (org.getParentId() == null || org.getParentId() <= 0)
+        {
             org.setParentId(DEF_PARENT_ID);
             org.setTreePath(DEF_ROOT_PATH);
-        } else {
+        }
+        else
+        {
             Org parent = this.baseService.getByIdCache(org.getParentId());
             BizAssert.notNull(parent, "父组织不能为空");
 
             org.setTreePath(StringUtils.join(parent.getTreePath(), parent.getId(), DEF_ROOT_PATH));
         }
+
         return org;
     }
 
     @Override
-    public R<Boolean> handlerDelete(List<Long> ids) {
+    public R<Boolean> handlerDelete(List<Long> ids)
+    {
         return this.success(baseService.remove(ids));
     }
 
-
     /**
      * 查询系统所有的组织树
      *
@@ -90,44 +95,47 @@ public class OrgController extends SuperCacheController<OrgService, Long, Org, O
     @GetMapping("/tree")
     @SysLog("查询系统所有的组织树")
     public R<List<Org>> tree(@RequestParam(value = "name", required = false) String name,
-                             @RequestParam(value = "status", required = false) Boolean status) {
+                             @RequestParam(value = "status", required = false) Boolean status)
+    {
         List<Org> list = this.baseService.list(Wraps.<Org>lbQ()
                 .like(Org::getLabel, name).eq(Org::getStatus, status).orderByAsc(Org::getSortValue));
         return this.success(TreeUtil.buildTree(list));
     }
 
-
     @Override
-    public R<Boolean> handlerImport(List<Map<String, String>> list) {
-        List<Org> userList = list.stream().map((map) -> {
-            Org item = new Org();
-            item.setDescribe(map.getOrDefault("描述", EMPTY));
-            item.setLabel(map.getOrDefault("名称", EMPTY));
-            item.setAbbreviation(map.getOrDefault("简称", EMPTY));
-            item.setStatus(Convert.toBool(map.getOrDefault("状态", EMPTY)));
-            return item;
-        }).collect(Collectors.toList());
+    public R<Boolean> handlerImport(List<Map<String, String>> list)
+    {
+        List<Org> userList = list.stream()
+          .map((map) ->
+          {
+              Org item = new Org();
+              item.setDescribe(map.getOrDefault("描述", EMPTY));
+              item.setLabel(map.getOrDefault("名称", EMPTY));
+              item.setAbbreviation(map.getOrDefault("简称", EMPTY));
+              item.setStatus(Convert.toBool(map.getOrDefault("状态", EMPTY)));
+              return item;
+          })
+          .collect(Collectors.toList());
 
         return R.success(baseService.saveBatch(userList));
     }
 
-
     @ApiOperation(value = "查询系统所有的部门树及部门对应的人", notes = "查询系统所有的部门树及部门对应的人")
     @PostMapping("/treeAndUser")
     @SysLog("查询系统所有的部门树及部门对应的人")
-    public R<List<Org>> treeAndUser(@RequestBody Org org) {
-
+    public R<List<Org>> treeAndUser(@RequestBody Org org)
+    {
         //return this.success(TreeUtil.buildTree(list));
         return this.success(baseService.treeAndUser(org));
     }
 
-
     @ApiOperation(value = "查询树形部门", notes = "查询树形部门")
     @PostMapping("/list")
     @SysLog("查询树形部门")
-    public R<List<Org>> list(@RequestBody Org org) {
+    public R<List<Org>> list(@RequestBody Org org)
+    {
         BaseContextHandler.setTenant("0000");
         List<Org> list = this.baseService.list(Wraps.<Org>lbQ().eq(Org::getStatus, true));
         return this.success(TreeUtil.buildTree(list));
     }
-}
+}

imcs-bt-be/imcs-authority-entity/src/main/java/com/github/zuihou/authority/dto/core/OrgSaveDTO.java

@@ -6,6 +6,7 @@ import lombok.*;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -64,4 +65,10 @@ public class OrgSaveDTO implements Serializable {
     @Length(max = 255, message = "描述长度不能超过255")
     private String describe;
 
+    /**
+     * 所属区域ID
+     */
+    @NotNull(message = "请选择所属区域")
+    @ApiModelProperty(value = "所属区域ID")
+    private Long regionId;
 }

imcs-bt-be/imcs-authority-entity/src/main/java/com/github/zuihou/authority/dto/core/OrgUpdateDTO.java

@@ -27,8 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = false)
 @Builder
 @ApiModel(value = "OrgUpdateDTO", description = "组织")
-public class OrgUpdateDTO implements Serializable {
-
+public class OrgUpdateDTO implements Serializable
+{
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
@@ -70,4 +70,10 @@ public class OrgUpdateDTO implements Serializable {
     @Length(max = 255, message = "描述长度不能超过255")
     private String describe;
 
-}
+    /**
+     * 所属区域ID
+     */
+    @NotNull(message = "请选择所属区域")
+    @ApiModelProperty(value = "所属区域ID")
+    private Long regionId;
+}

imcs-bt-be/imcs-authority-entity/src/main/java/com/github/zuihou/authority/entity/core/Org.java

@@ -3,7 +3,6 @@ package com.github.zuihou.authority.entity.core;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.zuihou.authority.entity.auth.User;
 import com.github.zuihou.base.entity.TreeEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,15 +12,11 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
-import java.util.List;
 
 import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 
 /**
- * <p>
- * 实体类
- * 组织
- * </p>
+ * 组织实体类
  *
  * @author zuihou
  * @since 2019-10-20
@@ -34,8 +29,8 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 @Accessors(chain = true)
 @TableName("c_core_org")
 @ApiModel(value = "Org", description = "组织")
-public class Org extends TreeEntity<Org, Long> {
-
+public class Org extends TreeEntity<Org, Long>
+{
     private static final long serialVersionUID = 1L;
 
     @Excel(name = "名称", width = 50)
@@ -50,7 +45,6 @@ public class Org extends TreeEntity<Org, Long> {
     @Excel(name = "简称", width = 30)
     private String abbreviation;
 
-
     /**
      * 树结构
      */
@@ -82,9 +76,16 @@ public class Org extends TreeEntity<Org, Long> {
     @ApiModelProperty(value = "企业id")
     @TableField("com_id")
     @Excel(name = "企业id")
-    @NotNull(message = "请选择企业id")
+    @NotNull(message = "请选择企业")
     private Long comId;
 
+    /**
+     * 所属区域id
+     */
+    @ApiModelProperty(value = "所属区域")
+    @NotNull(message = "请选择所属区域")
+    private Long regionId;
+
     @TableField(exist = false)
     private Boolean disabled;
 
@@ -94,7 +95,8 @@ public class Org extends TreeEntity<Org, Long> {
     @Builder
     public Org(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,
                String label, String abbreviation, Long parentId, String treePath, Integer sortValue,
-               Boolean status, String describe) {
+               Boolean status, String describe, Long regionId)
+    {
         this.id = id;
         this.createTime = createTime;
         this.createUser = createUser;
@@ -107,6 +109,6 @@ public class Org extends TreeEntity<Org, Long> {
         this.sortValue = sortValue;
         this.status = status;
         this.describe = describe;
+        this.regionId = regionId;
     }
-
-}
+}

imcs-bt-be/imcs-authority-server/src/main/resources/application-dev.yml

@@ -7,24 +7,24 @@ zuihou:
   redis:
     ip: 127.0.0.1
     port: 6379
-    password: 123456
+    password:
     database: 0
   rabbitmq:
-    enabled: true
+    enabled: false
     ip: 127.0.0.1
     port: 5672
     username: guest
     password: guest
   mysql:
-#    ip: 106.14.142.95
+    ip: 106.14.142.95
 #    port: 3306
-    ip: 127.0.0.1
-    pord: 3306
+#    ip: 127.0.0.1
+    port: 3306
     driverClassName: com.mysql.cj.jdbc.Driver
     database: zuihou_defaults_bt
     username: root
-#    password: Casc@imcs
-    password: 123456
+    password: Casc@imcs
+#    password: 123456
     url: jdbc:mysql://${zuihou.mysql.ip}:${zuihou.mysql.port}/${zuihou.mysql.database}?serverTimezone=CTT&characterEncoding=utf8&useUnicode=true&useSSL=false&autoReconnect=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   database:
     isNotWrite: false