diff --git a/pom.xml b/pom.xml
index f47a91dd..eed79625 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
3.3.5
- 1.2.83
+ 2.0.62
8.7.3-20251210
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enforcement/impl/AppEnfLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enforcement/impl/AppEnfLoginServiceImpl.java
index 21bfed3a..47464e45 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enforcement/impl/AppEnfLoginServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enforcement/impl/AppEnfLoginServiceImpl.java
@@ -120,6 +120,7 @@ public class AppEnfLoginServiceImpl implements IAppEnfLoginService {
}
// 如果没有执法证件号, 则再次判断是否为公安
+ String areacode = "";
if (!sysUser.getLawOfficer()) {
if(bureauDept != null){//获取执法部门ID
SysDeptVo bureauDeptDetail = deptMapper.selectVoById(bureauDept.getDeptId());
@@ -129,6 +130,7 @@ public class AppEnfLoginServiceImpl implements IAppEnfLoginService {
} else {
sysUser.setLawOfficer(false);
}
+ areacode = bureauDeptDetail.getAreaNode();
}
}
}
@@ -157,6 +159,7 @@ public class AppEnfLoginServiceImpl implements IAppEnfLoginService {
result.put("bureauUnitName", bureauDept != null ? bureauDept.getDeptName() : "");
result.put("lawOfficer", sysUser.getLawOfficer());
result.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey());
+ result.put("areacode",areacode);
return R.ok(result);
}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/thirdparty/ISIQService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/thirdparty/ISIQService.java
index fb22731f..5ba7bbde 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/thirdparty/ISIQService.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/thirdparty/ISIQService.java
@@ -21,6 +21,11 @@ public interface ISIQService {
*/
SIQTemplateVo getTemplateById(String templateId);
+
+ /**
+ * 发送消息
+ * @param paramBo
+ */
void sendMsg(SIQMsgParamBo paramBo);
/**
diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
index d7236860..0468a944 100644
--- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
+++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
@@ -144,4 +144,11 @@ public class SysDeptVo implements Serializable {
* 删除标志(0代表存在 2代表删除)
*/
private String delFlag;
+
+ /**
+ * 区域编号
+ */
+ private String areaNode;
+
+
}
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/controller/AuthController.java b/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/controller/AuthController.java
index a63e6cf5..9f20f301 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/controller/AuthController.java
@@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.zdxt.enforcementcode.common.util.DataFilterUtil;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,9 @@ import org.dromara.common.sse.utils.SseMessageUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.bo.SysTenantBo;
import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysTenantVo;
+import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.service.ISysClientService;
import org.dromara.system.service.ISysConfigService;
import org.dromara.system.service.ISysSocialService;
@@ -45,6 +48,7 @@ import org.dromara.web.domain.vo.TenantListVo;
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.dromara.web.service.SysRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -79,6 +83,8 @@ public class AuthController {
private final ScheduledExecutorService scheduledExecutorService;
+ @Autowired
+ private SysDeptMapper deptMapper;
/**
* 登录方法
*
@@ -124,6 +130,14 @@ public class AuthController {
String plainJson = JsonUtils.toJsonString(credentialMap);
loginVo.setV1SystemCredential(EncryptUtils.encryptByAes(plainJson, aesKey));
+ SysDeptVo bureauDept = DataFilterUtil.getUserBureauDept(loginUser.getUserId());
+ if(bureauDept != null){
+ SysDeptVo bureauDeptDetail = deptMapper.selectVoById(bureauDept.getDeptId());
+ if(bureauDeptDetail != null){
+ String areacode = bureauDeptDetail.getAreaNode();
+ loginVo.setAreacode(areacode);
+ }
+ }
System.out.println(JsonUtils.toJsonString(loginUser));
return R.ok(loginVo);
}
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java
index 64e03c4b..df9fab9d 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java
+++ b/zdxt-web-server/zdxt-admin-web-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java
@@ -57,4 +57,8 @@ public class LoginVo {
@JsonProperty("v1_system_credential")
private String v1SystemCredential;
+ /**
+ * 区域编码
+ */
+ private String areacode;
}