From da95c7ff9603dd8a9270e1f6819b7ac8a485cd4f Mon Sep 17 00:00:00 2001 From: "zhoukaihong@idcos.com" Date: Sat, 13 Sep 2025 11:41:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9C=BA=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=9C=BA=E6=9E=84=E5=BA=8F=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaea/business/enums/SourceFlagEnum.java | 47 ++++++++++++++++++++++ .../accessuser/controller/dto/GaeaUserDto.java | 9 +++++ .../modules/accessuser/dao/entity/AccessUser.java | 8 ++++ .../service/impl/AccessUserServiceImpl.java | 6 +++ .../modules/report/controller/dto/ReportDto.java | 8 ++++ .../report/controller/param/ReportParam.java | 10 +++++ .../business/modules/report/dao/entity/Report.java | 9 +++++ 7 files changed, 97 insertions(+) create mode 100644 src/main/java/com/anjiplus/template/gaea/business/enums/SourceFlagEnum.java diff --git a/src/main/java/com/anjiplus/template/gaea/business/enums/SourceFlagEnum.java b/src/main/java/com/anjiplus/template/gaea/business/enums/SourceFlagEnum.java new file mode 100644 index 0000000..06eab16 --- /dev/null +++ b/src/main/java/com/anjiplus/template/gaea/business/enums/SourceFlagEnum.java @@ -0,0 +1,47 @@ +package com.anjiplus.template.gaea.business.enums; +public enum SourceFlagEnum { + YYJH(1,"机构养老"), + JJYL(2,"居家"), + ; + + private int codeValue; + private String codeDesc; + + private SourceFlagEnum(int codeValue, String codeDesc) { + this.codeValue = codeValue; + this.codeDesc = codeDesc; + } + + public int getCodeValue(){ return this.codeValue;} + + public String getCodeDesc(){ return this.codeDesc;} + + //根据codeValue获取枚举 + public static SourceFlagEnum parseFromCodeValue(int codeValue){ + for (SourceFlagEnum e : SourceFlagEnum.values()){ + if(e.codeValue == codeValue){ return e;} + } + return null; + } + + //根据codeValue获取描述 + public static String getCodeDescByCodeValue(int codeValue){ + SourceFlagEnum enumItem = parseFromCodeValue(codeValue); + return enumItem == null ? "" : enumItem.getCodeDesc(); + } + + //验证codeValue是否有效 + public static boolean validateCodeValue(int codeValue){ return parseFromCodeValue(codeValue)!=null;} + + //列出所有值字符串 + public static String getString(){ + StringBuffer buffer = new StringBuffer(); + for (SourceFlagEnum e : SourceFlagEnum.values()){ + buffer.append(e.codeValue).append("--").append(e.getCodeDesc()).append(", "); + } + buffer.deleteCharAt(buffer.lastIndexOf(",")); + return buffer.toString().trim(); + } + + +} diff --git a/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java b/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java index 7b184b9..7873c31 100644 --- a/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java +++ b/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java @@ -24,4 +24,13 @@ public class GaeaUserDto { /** 用户所拥有的权限合集 */ private List authorities; + + /** 机构代码 */ + private String jgdm; + + /** 机构序号 */ + private String jgxh; + + /** 1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */ + private Integer source; } diff --git a/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java b/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java index d388619..70ab90d 100644 --- a/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java +++ b/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java @@ -45,4 +45,12 @@ public class AccessUser extends GaeaBaseEntity { /** 最后一次登陆时间 */ private Date lastLoginTime; + /** 机构代码 */ + private String jgdm; + + /** 机构序号 */ + private String jgxh; + + /** 1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */ + private Integer source; } diff --git a/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java b/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java index 7f1dd6a..a07480a 100644 --- a/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java +++ b/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java @@ -240,6 +240,9 @@ public class AccessUserServiceImpl implements AccessUserService { accessUser.setUpdateTime(new Date()); accessUser.setUpdateBy(BusinessConstant.USER_ADMIN); accessUser.setVersion(1); + accessUser.setJgdm(gaeaUserDto.getJgdm()); + accessUser.setJgxh(gaeaUserDto.getJgxh()); + accessUser.setSource(gaeaUserDto.getSource()); insert(accessUser); //创建用户角色 AccessUserDto accessUserDto = new AccessUserDto(); @@ -293,6 +296,9 @@ public class AccessUserServiceImpl implements AccessUserService { gaeaUser.setLoginName(loginName); gaeaUser.setRealName(accessUser.getRealName()); gaeaUser.setToken(token); + gaeaUser.setJgdm(accessUser.getJgdm()); + gaeaUser.setJgxh(accessUser.getJgxh()); + gaeaUser.setSource(accessUser.getSource()); String gaeaUserStr = JSONObject.toJSONString(gaeaUser); cacheHelper.stringSetExpire(userKey, gaeaUserStr, 3600); diff --git a/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java b/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java index 84e8d1c..813da88 100644 --- a/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java +++ b/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java @@ -56,4 +56,12 @@ public class ReportDto extends GaeaBaseDTO implements Serializable { /** 下载次数 */ private Long downloadCount; + /** 机构代码 */ + private String jgdm; + + /** 机构序号 */ + private String jgxh; + + /** 1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */ + private Integer source; } diff --git a/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java b/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java index 87c066a..5303378 100644 --- a/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java +++ b/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java @@ -32,5 +32,15 @@ public class ReportParam extends PageParam implements Serializable{ @Query(QueryEnum.EQ) private String reportType; + /** 机构代码 */ + @Query(QueryEnum.EQ) + private String jgdm; + + /** 机构序号 */ + @Query(QueryEnum.EQ) + private String jgxh; + /** 1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */ + @Query(QueryEnum.EQ) + private Integer source; } diff --git a/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java b/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java index 33d1b80..30f2135 100644 --- a/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java +++ b/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java @@ -46,4 +46,13 @@ public class Report extends GaeaBaseEntity { /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */ private Integer deleteFlag; + + /** 机构代码 */ + private String jgdm; + + /** 机构序号 */ + private String jgxh; + + /** 1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */ + private Integer source; }