init

common/common-core/src/main/java/com/hdkj/lt/core/bizms/mp/ArgTableNameHandler.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.core.bizms.mp;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TableNameHandler;
-import com.jxdinfo.hussar.core.util.SpringContextHolder;
+import com.hdkj.lt.core.hussar.SpringContextHolder;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 

common/common-core/src/main/java/com/hdkj/lt/core/hussar/SpringContextHolder.java

@@ -0,0 +1,38 @@
+package com.hdkj.lt.core.hussar;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextHolder implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        SpringContextHolder.applicationContext = applicationContext;
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return applicationContext.getBean(clazz);
+    }
+
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return applicationContext.getBean(name, clazz);
+    }
+
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
+    // 获取当前环境
+    public static String getActiveProfile() {
+        return applicationContext.getEnvironment().getActiveProfiles()[0];
+    }
+}

common/common-core/src/main/java/com/hdkj/lt/core/log/exception/ExceptionErrorLogCast.java

@@ -4,7 +4,7 @@ import com.hdkj.lt.base.constants.ErrorLogConstant;
 import com.hdkj.lt.base.exception.BusinessException;
 import com.hdkj.lt.core.log.model.param.ErrorLogParam;
 import com.hdkj.lt.core.log.service.FhzgLogInfoService;
-import com.jxdinfo.hussar.core.util.SpringContextHolder;
+import com.hdkj.lt.core.hussar.SpringContextHolder;
 import org.apache.commons.lang3.StringUtils;
 
 /**

common/common-core/src/main/java/com/hdkj/lt/core/plugins/request/AutowiredIscIdQueryParam.java

@@ -2,7 +2,7 @@ package com.hdkj.lt.core.plugins.request;
 
 import com.hdkj.lt.core.sys.model.po.SysUser;
 import com.hdkj.lt.core.sys.service.ISysUserService;
-import com.jxdinfo.hussar.core.util.SpringContextHolder;
+import com.hdkj.lt.core.hussar.SpringContextHolder;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/HussarMapper.java

@@ -0,0 +1,11 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.hdkj.lt.core.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface HussarMapper<T> extends BaseMapper<T> {
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysDictMapper.java

@@ -1,6 +1,6 @@
 package com.hdkj.lt.core.sys.dao;
 
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysDictTypeMapper.java

@@ -1,6 +1,6 @@
 package com.hdkj.lt.core.sys.dao;
 
-import com.jxdinfo.hussar.general.dict.model.DicType;
+import com.hdkj.lt.core.sys.model.po.DicType;
 import com.jxdinfo.hussar.support.mp.base.mapper.HussarMapper;
 import org.apache.ibatis.annotations.Mapper;
 

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysRolesMapper.java

@@ -1,6 +1,6 @@
 package com.hdkj.lt.core.sys.dao;
 
-import com.jxdinfo.hussar.authorization.permit.model.SysRoles;
+import com.hdkj.lt.core.sys.model.po.SysRoles;
 import com.jxdinfo.hussar.support.mp.base.mapper.HussarMapper;
 import org.apache.ibatis.annotations.Mapper;
 

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysStruMapper.java

@@ -3,7 +3,7 @@ package com.hdkj.lt.core.sys.dao;
 import com.hdkj.lt.core.sys.model.dto.OrgInfoDto;
 import com.hdkj.lt.core.sys.model.dto.UnitQueryDTO;
 import com.hdkj.lt.core.sys.model.po.SysStru;
-import com.jxdinfo.hussar.authorization.organ.vo.OrganizationBo;
+import com.hdkj.lt.core.sys.model.po.OrganizationBo;
 import com.jxdinfo.hussar.support.mp.base.mapper.HussarMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysUserRoleMapper.java

@@ -1,6 +1,6 @@
 package com.hdkj.lt.core.sys.dao;
 
-import com.jxdinfo.hussar.authorization.permit.model.SysUserRole;
+import com.hdkj.lt.core.sys.model.po.SysUserRole;
 import com.jxdinfo.hussar.support.mp.base.mapper.HussarMapper;
 import org.apache.ibatis.annotations.Mapper;
 

common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/SysStruMapper.xml

@@ -61,7 +61,7 @@
         ORDER BY STRU_TYPE, STRU_SEQ, STRU_ORDER
     </select>
 
-    <select id="selectOrganByIds" resultType="com.jxdinfo.hussar.authorization.organ.vo.OrganizationBo">
+    <select id="selectOrganByIds" resultType="com.hdkj.lt.core.sys.model.po.OrganizationBo">
         SELECT
         s.STRU_ID AS id,
         s.PARENT_ID AS parentId,

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/po/DicSingle.java

@@ -0,0 +1,66 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.hdkj.lt.core.sys.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hdkj.lt.base.model.entity.FhzgBaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("数据字典表")
+@TableName("SYS_DICT_SINGLE")
+@Data
+public class DicSingle extends FhzgBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键ID")
+    @TableId(
+            value = "DICT_ID",
+            type = IdType.ASSIGN_ID
+    )
+    private Long id;
+    @ApiModelProperty("类型(sys_dict_type外键)")
+    @TableField("TYPE_ID")
+    private Long typeId;
+    @ApiModelProperty("编码值")
+    @TableField("VALUE")
+    private String value;
+    @ApiModelProperty("编码名称")
+    @TableField("LABEL")
+    private String label;
+    @ApiModelProperty("排序")
+    @TableField("SORT")
+    private Integer sort;
+    @ApiModelProperty("备用字段1")
+    @TableField("BAK_1")
+    private String bak1;
+    @ApiModelProperty("备用字段2")
+    @TableField("BAK_2")
+    private String bak2;
+    @ApiModelProperty("备用字段3")
+    @TableField("BAK_3")
+    private String bak3;
+    @ApiModelProperty("父级主键ID")
+    @TableField("PARENT_ID")
+    private Long parentId;
+    @ApiModelProperty("字典类别名称")
+    @TableField(
+            exist = false
+    )
+    private String typeName;
+    @ApiModelProperty("字典类别描述")
+    @TableField(
+            exist = false
+    )
+    private String typeDesc;
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/po/DicType.java

@@ -0,0 +1,52 @@
+
+
+package com.hdkj.lt.core.sys.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hdkj.lt.base.model.entity.FhzgBaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("数据字典类型表")
+@TableName("SYS_DICT_TYPE")
+@Data
+public class DicType extends FhzgBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键ID")
+    @TableId(
+            value = "TYPE_ID",
+            type = IdType.ASSIGN_ID
+    )
+    private Long id;
+    @ApiModelProperty("父节点ID")
+    @TableField("PARENT_ID")
+    private Long parentId;
+    @ApiModelProperty("类别名")
+    @TableField("TYPE_NAME")
+    private String typeName;
+    @ApiModelProperty("类别描述")
+    @TableField("TYPE_DESCRIPTION")
+    private String typeDescription;
+    @ApiModelProperty("编辑类型(系统sys/业务biz)")
+    @TableField("RANGE_TYPE")
+    private String rangeType;
+    @ApiModelProperty("排序")
+    @TableField("SORT")
+    private Integer sort;
+    @ApiModelProperty("备用字段1")
+    @TableField("BAK_1")
+    private String bak1;
+    @ApiModelProperty("备用字段2")
+    @TableField("BAK_2")
+    private String bak2;
+    @ApiModelProperty("备用字段3")
+    @TableField("BAK_3")
+    private String bak3;
+
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/po/OrganizationBo.java

@@ -0,0 +1,116 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.hdkj.lt.core.sys.model.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("组织机构详情")
+public class OrganizationBo {
+    @ApiModelProperty("主键")
+    private Long id;
+    @ApiModelProperty("组织机构编码")
+    private String organCode;
+    @ApiModelProperty("组织机构名称")
+    private String organName;
+    @ApiModelProperty("组织机构类型")
+    private String organType;
+    @ApiModelProperty("组织机构类型名称")
+    private String organTypeName;
+    @ApiModelProperty("上级组织机构主键")
+    private Long parentId;
+    @ApiModelProperty("上级组织机构编码")
+    private String parentOrganCode;
+    @ApiModelProperty("上级组织机构名称")
+    private String parentOrganName;
+    @ApiModelProperty("上级组织机构类型")
+    private String parentOrganType;
+    @ApiModelProperty("上级组织机构类型名称")
+    private String parentOrganTypeName;
+
+    public OrganizationBo() {
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrganName() {
+        return this.organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getOrganType() {
+        return this.organType;
+    }
+
+    public void setOrganType(String organType) {
+        this.organType = organType;
+    }
+
+    public String getOrganTypeName() {
+        return this.organTypeName;
+    }
+
+    public void setOrganTypeName(String organTypeName) {
+        this.organTypeName = organTypeName;
+    }
+
+    public Long getParentId() {
+        return this.parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentOrganName() {
+        return this.parentOrganName;
+    }
+
+    public void setParentOrganName(String parentOrganName) {
+        this.parentOrganName = parentOrganName;
+    }
+
+    public String getParentOrganType() {
+        return this.parentOrganType;
+    }
+
+    public void setParentOrganType(String parentOrganType) {
+        this.parentOrganType = parentOrganType;
+    }
+
+    public String getParentOrganTypeName() {
+        return this.parentOrganTypeName;
+    }
+
+    public void setParentOrganTypeName(String parentOrganTypeName) {
+        this.parentOrganTypeName = parentOrganTypeName;
+    }
+
+    public String getOrganCode() {
+        return this.organCode;
+    }
+
+    public void setOrganCode(String organCode) {
+        this.organCode = organCode;
+    }
+
+    public String getParentOrganCode() {
+        return this.parentOrganCode;
+    }
+
+    public void setParentOrganCode(String parentOrganCode) {
+        this.parentOrganCode = parentOrganCode;
+    }
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/po/SysRoles.java

@@ -0,0 +1,55 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.hdkj.lt.core.sys.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hdkj.lt.base.model.entity.FhzgBaseEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("角色表")
+@TableName("SYS_ROLES")
+@Data
+public class SysRoles extends FhzgBaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("角色编码")
+    @TableId(
+            value = "ROLE_ID",
+            type = IdType.ASSIGN_ID
+    )
+    private Long id;
+    @ApiModelProperty("角色权限名称")
+    @TableField("ROLE_PERMISSION")
+    private String rolePermission;
+    @ApiModelProperty("角色名称")
+    @TableField("ROLE_NAME")
+    private String roleName;
+    @ApiModelProperty("角色的业务含义")
+    @TableField("ROLE_ALIAS")
+    private String roleAlias;
+    @ApiModelProperty("角色所属的公司")
+    @TableField("CORPORATION_ID")
+    private Long corporationId;
+    @ApiModelProperty("排序")
+    @TableField("ROLE_ORDER")
+    private Integer roleOrder;
+    @ApiModelProperty("是否是系统角色")
+    @TableField("IS_SYS")
+    private String isSys;
+    @ApiModelProperty("角色分组编码")
+    @TableField("GROUP_ID")
+    private Long groupId;
+    @ApiModelProperty("数据权限类型")
+    @TableField("DATA_SCOPE_TYPE")
+    private String dataScopeType;
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/po/SysUserRole.java

@@ -0,0 +1,42 @@
+
+
+package com.hdkj.lt.core.sys.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hdkj.lt.base.model.entity.FhzgBaseEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel("用户角色对应表")
+@TableName("SYS_USER_ROLE")
+@Data
+public class SysUserRole implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("用户编码")
+    @TableField("USER_ID")
+    private Long userId;
+    @ApiModelProperty("授予的角色编码")
+    @TableField("GRANTED_ROLE")
+    private Long grantedRole;
+    @ApiModelProperty("是否允许权限授权")
+    @TableField("ADMIN_OPTION")
+    private String adminOption;
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+    @ApiModelProperty("最后一次修改时间")
+    @TableField("LAST_TIME")
+    private LocalDateTime lastTime;
+    @ApiModelProperty("创建人")
+    @TableField("CREATOR")
+    private Long creator;
+    @ApiModelProperty("最后一次修改人")
+    @TableField("LAST_EDITOR")
+    private Long lastEditor;
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/vo/DicLevelTreeVo.java

@@ -0,0 +1,21 @@
+
+package com.hdkj.lt.core.sys.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiModel("查询多级字典vo")
+@Data
+public class DicLevelTreeVo {
+    private Long id;
+    private String label;
+    private String value;
+    private List<DicLevelTreeVo> childrenList;
+    private Long parentId;
+    private Integer sort;
+    private Long typeId;
+
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/vo/DicVo.java

@@ -0,0 +1,19 @@
+
+package com.hdkj.lt.core.sys.model.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("查询字典vo")
+@Data
+public class DicVo implements Serializable {
+    @ApiModelProperty("字典名")
+    private String label;
+    @ApiModelProperty("字典值")
+    private String value;
+
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/vo/DictVo.java

@@ -0,0 +1,22 @@
+
+package com.hdkj.lt.core.sys.model.vo;
+
+
+import com.hdkj.lt.core.sys.model.po.DicSingle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel("批量查询字典vo")
+@Data
+public class DictVo implements Serializable {
+    @ApiModelProperty("字典类型名称")
+    private String typeName;
+    @ApiModelProperty("数据字典集合")
+    private List<DicSingle> singleList;
+
+
+}

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysDictService.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.core.sys.service;
 
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
-import com.jxdinfo.hussar.general.dict.vo.DicLevelTreeVo;
-import com.jxdinfo.hussar.general.dict.vo.DicVo;
-import com.jxdinfo.hussar.general.dict.vo.DictVo;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
+import com.hdkj.lt.core.sys.model.vo.DicLevelTreeVo;
+import com.hdkj.lt.core.sys.model.vo.DicVo;
+import com.hdkj.lt.core.sys.model.vo.DictVo;
 
 import java.util.List;
 import java.util.Map;
@@ -37,6 +37,7 @@ public interface ISysDictService {
 
     /**
      * 接口获取字典信息根据字典编码
+     *
      * @param typeNames
      * @return
      */
@@ -44,6 +45,7 @@ public interface ISysDictService {
 
     /**
      * 获取字典描述
+     *
      * @param dictMap
      * @param dictType
      * @param dictValue
@@ -53,6 +55,7 @@ public interface ISysDictService {
 
     /**
      * 接口查询多级字典根据字典编码
+     *
      * @param typeName
      * @return
      */
@@ -70,6 +73,7 @@ public interface ISysDictService {
 
     /**
      * 将其他拼接字典值描述转换英文分号拼接
+     *
      * @param valueStr
      * @param typeName
      * @param splitStr
@@ -79,6 +83,7 @@ public interface ISysDictService {
 
     /**
      * 字典值排序后的首个字典值
+     *
      * @param dictSingles
      * @param value
      * @return
@@ -87,6 +92,7 @@ public interface ISysDictService {
 
     /**
      * 根据字典值编码获取字典名称为key的字典值键值对对象
+     *
      * @param typeNames
      * @return
      */

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysDictTypeService.java

@@ -1,7 +1,8 @@
 package com.hdkj.lt.core.sys.service;
 
-import com.jxdinfo.hussar.general.dict.model.DicType;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hdkj.lt.core.sys.model.po.DicType;
+
 
 /**
  * @Description:
@@ -9,5 +10,5 @@ import com.jxdinfo.hussar.support.mp.base.service.HussarService;
  * @Create: 2024/04/03 13:40
  * @Version: 1.0
  */
-public interface ISysDictTypeService extends HussarService<DicType> {
+public interface ISysDictTypeService extends IService<DicType> {
 }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysOrganService.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.core.sys.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hdkj.lt.core.sys.model.po.SysOrgan;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
@@ -14,7 +14,7 @@ import java.util.Set;
  * @Create: 2024/03/28 13:53
  * @Version: 1.0
  */
-public interface ISysOrganService extends HussarService<SysOrgan> {
+public interface ISysOrganService extends IService<SysOrgan> {
 
     /**
      * 将组织机构信息全部放入缓存中

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysRolesService.java

@@ -1,7 +1,8 @@
 package com.hdkj.lt.core.sys.service;
 
-import com.jxdinfo.hussar.authorization.permit.model.SysRoles;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hdkj.lt.core.sys.model.po.SysRoles;
+
 
 import java.util.Collection;
 import java.util.Map;
@@ -13,7 +14,7 @@ import java.util.Set;
  * @description :
  * @createTime : 2024/5/27 10:00
  */
-public interface ISysRolesService extends HussarService<SysRoles> {
+public interface ISysRolesService extends IService<SysRoles> {
 
     /**
      * 将角色信息全部放入缓存中

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysStruService.java

@@ -1,11 +1,11 @@
 package com.hdkj.lt.core.sys.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hdkj.lt.core.sys.model.dto.OrgInfoDto;
 import com.hdkj.lt.core.sys.model.dto.StruTreeCacheDTO;
 import com.hdkj.lt.core.sys.model.dto.UnitQueryDTO;
 import com.hdkj.lt.core.sys.model.po.SysStru;
-import com.jxdinfo.hussar.authorization.organ.vo.OrganizationBo;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
+import com.hdkj.lt.core.sys.model.po.OrganizationBo;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
@@ -19,7 +19,7 @@ import java.util.Set;
  * @Create: 2023/12/07 17:08
  * @Version: 1.0
  */
-public interface ISysStruService extends HussarService<SysStru> {
+public interface ISysStruService extends IService<SysStru> {
 
     /**
      * 将组织机构信息全部放入缓存中
@@ -60,6 +60,7 @@ public interface ISysStruService extends HussarService<SysStru> {
 
     /**
      * 根据机构组织机构详情
+     *
      * @param parentId
      * @return
      */
@@ -67,6 +68,7 @@ public interface ISysStruService extends HussarService<SysStru> {
 
     /**
      * 获取下级班组机构信息
+     *
      * @param struId
      * @return
      */
@@ -85,10 +87,12 @@ public interface ISysStruService extends HussarService<SysStru> {
      * 根据struId查询组织树
      */
     StruTreeCacheDTO getStruTreeByCache(Long struId);
+
     /**
      * 刷新缓存的组织树
      */
     Map<Long, StruTreeCacheDTO> refreshStruTreeByCache();
+
     /**
      * 查询数据库中的组织树
      */

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysUserRoleService.java

@@ -1,7 +1,8 @@
 package com.hdkj.lt.core.sys.service;
 
-import com.jxdinfo.hussar.authorization.permit.model.SysUserRole;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hdkj.lt.core.sys.model.po.SysUserRole;
+
 
 /**
  * @Description:
@@ -9,5 +10,5 @@ import com.jxdinfo.hussar.support.mp.base.service.HussarService;
  * @Create: 2024/06/20 14:45
  * @Version: 1.0
  */
-public interface ISysUserRoleService extends HussarService<SysUserRole> {
+public interface ISysUserRoleService extends IService<SysUserRole> {
 }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysUserService.java

@@ -1,9 +1,10 @@
 package com.hdkj.lt.core.sys.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hdkj.lt.core.sys.model.dto.UserQueryDTO;
 import com.hdkj.lt.core.sys.model.po.SysUser;
-import com.jxdinfo.hussar.authorization.permit.model.SysRoles;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
+import com.hdkj.lt.core.sys.model.po.SysRoles;
+
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -18,7 +19,7 @@ import java.util.Set;
  * @Create: 2024/02/20 9:35
  * @Version: 1.0
  */
-public interface ISysUserService extends HussarService<SysUser> {
+public interface ISysUserService extends IService<SysUser> {
 
     /**
      * 将用户信息全部放入缓存中

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/MapOrgMappingService.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.core.sys.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hdkj.lt.core.sys.model.po.MapOrgMapping;
-import com.jxdinfo.hussar.support.mp.base.service.HussarService;
 
-public interface MapOrgMappingService extends HussarService<MapOrgMapping> {
+public interface MapOrgMappingService extends IService<MapOrgMapping> {
 }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/MapOrgMappingServiceImpl.java

@@ -1,11 +1,11 @@
 package com.hdkj.lt.core.sys.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.core.sys.dao.MapOrgMappingMapper;
 import com.hdkj.lt.core.sys.model.po.MapOrgMapping;
 import com.hdkj.lt.core.sys.service.MapOrgMappingService;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
 import org.springframework.stereotype.Service;
 
 @Service
-public class MapOrgMappingServiceImpl extends HussarServiceImpl<MapOrgMappingMapper, MapOrgMapping> implements MapOrgMappingService {
+public class MapOrgMappingServiceImpl extends ServiceImpl<MapOrgMappingMapper, MapOrgMapping> implements MapOrgMappingService {
 }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDictServiceImpl.java

@@ -9,12 +9,12 @@ import com.hdkj.lt.base.constants.SymbolConstants;
 import com.hdkj.lt.core.sys.service.ISysDictService;
 import com.hdkj.lt.core.sys.service.ISysDictTypeService;
 import com.hdkj.lt.utils.cache.RedisRepository;
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
-import com.jxdinfo.hussar.general.dict.model.DicType;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicType;
 import com.jxdinfo.hussar.general.dict.service.ISysDicRefService;
-import com.jxdinfo.hussar.general.dict.vo.DicLevelTreeVo;
-import com.jxdinfo.hussar.general.dict.vo.DicVo;
-import com.jxdinfo.hussar.general.dict.vo.DictVo;
+import com.hdkj.lt.core.sys.model.vo.DicLevelTreeVo;
+import com.hdkj.lt.core.sys.model.vo.DicVo;
+import com.hdkj.lt.core.sys.model.vo.DictVo;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDictTypeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.core.sys.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.core.sys.dao.SysDictTypeMapper;
 import com.hdkj.lt.core.sys.service.ISysDictTypeService;
-import com.jxdinfo.hussar.general.dict.model.DicType;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
+import com.hdkj.lt.core.sys.model.po.DicType;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @Version: 1.0
  */
 @Service
-public class SysDictTypeServiceImpl extends HussarServiceImpl<SysDictTypeMapper, DicType> implements ISysDictTypeService {
+public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, DicType> implements ISysDictTypeService {
 }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysOrganServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hdkj.lt.core.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.hdkj.lt.base.constants.RedisKeyConstants;
@@ -9,7 +10,6 @@ import com.hdkj.lt.core.sys.dao.SysOrganMapper;
 import com.hdkj.lt.core.sys.model.po.SysOrgan;
 import com.hdkj.lt.core.sys.service.ISysOrganService;
 import com.hdkj.lt.utils.cache.RedisRepository;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
-public class SysOrganServiceImpl extends HussarServiceImpl<SysOrganMapper, SysOrgan> implements ISysOrganService {
+public class SysOrganServiceImpl extends ServiceImpl<SysOrganMapper, SysOrgan> implements ISysOrganService {
 
     private final RedisRepository redisRepository;
 

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysRolesServiceImpl.java

@@ -1,13 +1,13 @@
 package com.hdkj.lt.core.sys.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.hdkj.lt.base.constants.RedisKeyConstants;
 import com.hdkj.lt.core.sys.dao.SysRolesMapper;
 import com.hdkj.lt.core.sys.service.ISysRolesService;
 import com.hdkj.lt.utils.cache.RedisRepository;
-import com.jxdinfo.hussar.authorization.permit.model.SysRoles;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
+import com.hdkj.lt.core.sys.model.po.SysRoles;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
-public class SysRolesServiceImpl extends HussarServiceImpl<SysRolesMapper, SysRoles> implements ISysRolesService {
+public class SysRolesServiceImpl extends ServiceImpl<SysRolesMapper, SysRoles> implements ISysRolesService {
 
     private final RedisRepository redisRepository;
 

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysStruServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.StopWatch;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -19,8 +20,7 @@ import com.hdkj.lt.core.sys.service.ISysDictService;
 import com.hdkj.lt.core.sys.service.ISysStruService;
 import com.hdkj.lt.utils.cache.RedisRepository;
 import com.hdkj.lt.utils.tree.TreeBuilder;
-import com.jxdinfo.hussar.authorization.organ.vo.OrganizationBo;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
+import com.hdkj.lt.core.sys.model.po.OrganizationBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @AllArgsConstructor
-public class SysStruServiceImpl extends HussarServiceImpl<SysStruMapper, SysStru> implements ISysStruService {
+public class SysStruServiceImpl extends ServiceImpl<SysStruMapper, SysStru> implements ISysStruService {
 
     private final RedisRepository redisRepository;
 
@@ -67,15 +67,13 @@ public class SysStruServiceImpl extends HussarServiceImpl<SysStruMapper, SysStru
     }
 
     /**
-     *
      * @author luorui
      * @date 2025/7/17 11:26
      * @discription 从缓存中取，如果缓存中没有取到则查询数据库刷新全量组织树，并返回查询结果
-     *
      **/
     @Override
     public StruTreeCacheDTO getStruTreeByCache(@Nonnull Long struId) {
-        if(!redisRepository.exists(RedisKeyConstants.CACHE_KEY_STRU_TREE_HASH)){
+        if (!redisRepository.exists(RedisKeyConstants.CACHE_KEY_STRU_TREE_HASH)) {
             //如果缓存没有加载
             Map<Long, StruTreeCacheDTO> treeMap = refreshStruTreeByCache();
             return treeMap.get(struId);
@@ -114,10 +112,10 @@ public class SysStruServiceImpl extends HussarServiceImpl<SysStruMapper, SysStru
     public Map<Long, StruTreeCacheDTO> getStruFullTree() {
         List<SysStru> struList = baseMapper.getStruList();
         List<StruTreeCacheDTO> struTreeVOList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(struList)){
-            struList.forEach(e->{
+        if (CollUtil.isNotEmpty(struList)) {
+            struList.forEach(e -> {
                 StruTreeCacheDTO struTreeCacheDTO = new StruTreeCacheDTO();
-                BeanUtil.copyProperties(e,struTreeCacheDTO);
+                BeanUtil.copyProperties(e, struTreeCacheDTO);
                 struTreeVOList.add(struTreeCacheDTO);
             });
         }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysUserRoleServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.core.sys.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.core.sys.dao.SysUserRoleMapper;
 import com.hdkj.lt.core.sys.service.ISysUserRoleService;
-import com.jxdinfo.hussar.authorization.permit.model.SysUserRole;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
+import com.hdkj.lt.core.sys.model.po.SysUserRole;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @Version: 1.0
  */
 @Service
-public class SysUserRoleServiceImpl extends HussarServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
 }

common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hdkj.lt.core.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.hdkj.lt.base.constants.RedisKeyConstants;
@@ -15,12 +16,11 @@ import com.hdkj.lt.core.sys.service.ISysStruService;
 import com.hdkj.lt.core.sys.service.ISysUserRoleService;
 import com.hdkj.lt.core.sys.service.ISysUserService;
 import com.hdkj.lt.utils.cache.RedisRepository;
-import com.jxdinfo.hussar.authorization.permit.model.SysRoles;
-import com.jxdinfo.hussar.authorization.permit.model.SysUserRole;
+import com.hdkj.lt.core.sys.model.po.SysRoles;
+import com.hdkj.lt.core.sys.model.po.SysUserRole;
 import com.jxdinfo.hussar.common.security.BaseSecurityUtil;
 import com.jxdinfo.hussar.common.security.SecurityUser;
-import com.jxdinfo.hussar.support.cache.util.HussarCacheUtil;
-import com.jxdinfo.hussar.support.mp.base.service.impl.HussarServiceImpl;
+//import com.jxdinfo.hussar.support.cache.util.HussarCacheUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @AllArgsConstructor
-public class SysUserServiceImpl extends HussarServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
     public static final String ATTRIBUTE_USER_ROLE_TYPE = "USER_ROLE_TYPE";
 
@@ -65,15 +65,25 @@ public class SysUserServiceImpl extends HussarServiceImpl<SysUserMapper, SysUser
         });
     }
 
+//    @Override
+//    public SysUser getCacheOne(@Nonnull Long userId) {
+//        String key = RedisKeyConstants.CACHE_KEY_USERS_INDIES + SymbolConstants.COLON_EN + userId;
+//        SysUser sysUser = HussarCacheUtil.get(RedisKeyConstants.CACHE_KEY_USERS_INDIES, key);
+//        if (Objects.isNull(sysUser) || StringUtils.isBlank(sysUser.getIscId())) {
+//            sysUser = super.getById(userId);
+//            HussarCacheUtil.put(RedisKeyConstants.CACHE_KEY_USERS_INDIES, key, sysUser);
+//        }
+//        return sysUser;
+//    }
+
+    @Override
+    public void putAllToCache() {
+
+    }
+
     @Override
     public SysUser getCacheOne(@Nonnull Long userId) {
-        String key = RedisKeyConstants.CACHE_KEY_USERS_INDIES + SymbolConstants.COLON_EN + userId;
-        SysUser sysUser = HussarCacheUtil.get(RedisKeyConstants.CACHE_KEY_USERS_INDIES, key);
-        if (Objects.isNull(sysUser) || StringUtils.isBlank(sysUser.getIscId())) {
-            sysUser = super.getById(userId);
-            HussarCacheUtil.put(RedisKeyConstants.CACHE_KEY_USERS_INDIES, key, sysUser);
-        }
-        return sysUser;
+        return null;
     }
 
     @Override

common/common-core/src/main/java/com/hdkj/lt/core/ws/config/WebSocketConfiguration.java

@@ -3,7 +3,7 @@ package com.hdkj.lt.core.ws.config;
 import com.hdkj.lt.base.constants.SystemGlobalConstant;
 import com.hdkj.lt.core.ws.interceptor.ServletWebSocketInterceptor;
 import com.hdkj.lt.core.ws.handler.AbstractDefaultWebSocketHandler;
-import com.jxdinfo.hussar.core.util.SpringContextHolder;
+import com.hdkj.lt.core.hussar.SpringContextHolder;
 import org.reflections.Reflections;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

common/common-core/src/main/java/com/hdkj/lt/utils/poi/WordUtils.java

@@ -7,7 +7,7 @@ import com.deepoove.poi.data.SeriesRenderData;
 import com.deepoove.poi.util.PoitlIOUtils;
 import com.hdkj.lt.base.exception.ExceptionCast;
 import com.hdkj.lt.utils.file.FileUtils;
-import com.jxdinfo.hussar.core.util.SpringContextHolder;
+import com.hdkj.lt.core.hussar.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.fileupload.disk.DiskFileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;

common/common-core/src/main/java/com/hdkj/lt/utils/sys/DictUtils.java

@@ -1,6 +1,6 @@
 package com.hdkj.lt.utils.sys;
 
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultTransferSchemeEvaluationIndexServiceImpl.java

@@ -15,7 +15,7 @@ import com.hdkj.lt.core.bizms.modle.dto.TransferSchemeEvaluationReqDTO;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferStrategyConfigDetail;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferSchemeEvaluationIndex;
 import com.hdkj.lt.core.sys.dao.SysDictMapper;
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultTransferSchemeStrategyScoreServiceImpl.java

@@ -22,7 +22,7 @@ import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferScheme;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferSchemeStrategyScore;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferStrategyConfigDetail;
 import com.hdkj.lt.core.sys.dao.SysDictMapper;
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FhzgPlanPowerCutServiceImpl.java

@@ -27,7 +27,7 @@ import com.hdkj.lt.core.sys.dao.SysDictMapper;
 import com.hdkj.lt.feign.IPlanCreateClient;
 import com.hdkj.lt.modle.dto.jsty.AllSwitchInfoListDTO;
 import com.hdkj.lt.modle.dto.plan.PlanCreateSwitchDTO;
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import com.hdkj.hussar.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FhzgPlanTransferSchemeEvaluationIndexServiceImpl.java

@@ -15,7 +15,7 @@ import com.hdkj.lt.bf.mapper.FhzgPlanTransferSchemeEvaluationIndexMapper;
 import com.hdkj.lt.bf.service.FhzgPlanStrategyService;
 import com.hdkj.lt.bf.service.IFhzgPlanTransferSchemeEvaluationIndexService;
 import com.hdkj.lt.core.sys.dao.SysDictMapper;
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FhzgPlanTransferSchemeStrategyScoreServiceImpl.java

@@ -17,7 +17,7 @@ import com.hdkj.lt.bf.service.FhzgPlanTransferSchemeService;
 import com.hdkj.lt.bf.service.IFhzgPlanTransferSchemeStrategyScoreService;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import com.hdkj.lt.core.sys.dao.SysDictMapper;
-import com.jxdinfo.hussar.general.dict.model.DicSingle;
+import com.hdkj.lt.core.sys.model.po.DicSingle;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;