添加省市区；人员动态模块POJO；修改用户登录对象LoginUser

src/main/java/com/sfa/system/api/RemoteSiteService.java

+package com.sfa.system.api;
+
+import com.sfa.common.core.constant.SecurityConstants;
+import com.sfa.common.core.constant.ServiceNameConstants;
+import com.sfa.common.core.domain.R;
+import com.sfa.system.api.factory.RemoteSiteFallbackFactory;
+import com.sfa.system.api.pojo.response.SiteDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-11-04 19
+ * @describe : 关于地点/区域/位置等查询信息
+ */
+@FeignClient(contextId = "RemoteSiteService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteSiteFallbackFactory.class)
+public interface RemoteSiteService {
+    @PostMapping("/system/site/query/county")
+    public R<SiteDto> getCountyName(@RequestBody SiteDto siteDto, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+}

src/main/java/com/sfa/system/api/domain/MdmCity.java

-package com.sfa.system.api.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 省市区地址表
- * @TableName mdm_city
- */
-@TableName(value ="mdm_city")
-@Data
-public class MdmCity implements Serializable {
-    /**
-     * 省编码
-     */
-    private String provinceNum;
-
-    /**
-     * 省名称
-     */
-    private String provinceName;
-
-    /**
-     * 城市编号
-     */
-    private String cityNum;
-
-    /**
-     * 城市名称
-     */
-    private String cityName;
-
-    /**
-     * 区/县编码
-     */
-    private String countyNum;
-
-    /**
-     * 区/县名称
-     */
-    private String countyName;
-
-    /**
-     * 编码
-     */
-    private String num;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-}
\ No newline at end of file

src/main/java/com/sfa/system/api/domain/SysUser.java

@@ -58,15 +58,15 @@ public class SysUser extends BaseDo
     private String roleName;
 
     /** 岗位编码 */
-    private String postCode;
+    private Long postId;
 
     /** 岗位名称 */
     private String postName;
 
-    /** 规则编号 */
-    private String ruleNum;
+    /** 考勤规则Id */
+    private Long ruleId;
 
-    /** 规则名称 */
+    /** 考勤名称 */
     private String ruleName;
 
     /**

src/main/java/com/sfa/system/api/factory/RemoteSiteFallbackFactory.java

+package com.sfa.system.api.factory;
+
+import com.sfa.common.core.domain.R;
+import com.sfa.system.api.RemoteSiteService;
+import com.sfa.system.api.pojo.response.SiteDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-11-04 19
+ * @describe :
+ */
+@Component
+public class RemoteSiteFallbackFactory implements FallbackFactory<RemoteSiteService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
+
+    @Override
+    public RemoteSiteService create(Throwable throwable)
+    {
+        log.error("地点/区域/位置等查询信息失败:{}", throwable.getMessage());
+        return new RemoteSiteService()
+        {
+            @Override
+            public R<SiteDto> getCountyName(SiteDto siteDto, String source) {
+                return R.fail("地点/区域/位置等查询信息失败:" + throwable.getMessage());
+            }
+        };
+
+    }
+}

src/main/java/com/sfa/system/api/model/LoginUser.java

@@ -28,6 +28,28 @@ public class LoginUser implements Serializable
      */
     private String username;
 
+    /** 考勤规则Id */
+    private Long ruleId;
+
+    /** 考勤名称 */
+    private String ruleName;
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
     /**
      * 登录时间
      */

src/main/java/com/sfa/system/api/pojo/request/UserVo.java

@@ -81,13 +81,13 @@ public class UserVo {
     private String roleName;
 
     /** 岗位编码 */
-    private String postCode;
+    private Long postId;
 
     /** 岗位名称 */
     private String postName;
 
-    /** 规则编号 */
-    private String ruleNum;
+    /** 规则Id */
+    private Long ruleId;
 
     /** 规则名称 */
     private String ruleName;

src/main/java/com/sfa/system/api/pojo/response/SiteDto.java

@@ -2,6 +2,7 @@ package com.sfa.system.api.pojo.response;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  * @date : 2024-10-31 16
  * @describe :
  */
+@Accessors(chain = true)
 @Data
 public class SiteDto implements Serializable {
     /**

src/main/java/com/sfa/system/api/pojo/response/UserDto.java

 package com.sfa.system.api.pojo.response;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.sfa.common.core.annotation.Excel;
 import com.sfa.common.core.annotation.Excels;
 import com.sfa.system.api.domain.SysDept;
@@ -25,7 +23,6 @@ public class UserDto {
 
     /** 用户ID */
     @Excel(name = "用户序号", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.NUMERIC, prompt = "用户编号")
-    @TableId(type = IdType.AUTO)
     private Long userId;
 
     /** 部门ID */
@@ -59,13 +56,13 @@ public class UserDto {
     private String password;
 
     /** 岗位编码 */
-    private String postCode;
+    private String postId;
 
     /** 岗位名称 */
     private String postName;
 
     /** 规则编号 */
-    private String ruleNum;
+    private String ruleId;
 
     /** 规则名称 */
     private String ruleName;