diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a70b169..0000000 --- a/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# ---> Java -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -# ---> Maven -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -# https://github.com/takari/maven-wrapper#usage-without-binary-jar -.mvn/wrapper/maven-wrapper.jar - -# ---> JetBrains -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -**/.idea/ -**/logs/ \ No newline at end of file diff --git a/src/main/java/com/yxt/user/UserApplication.java b/src/main/java/com/yxt/user/UserApplication.java index 6cfc70e..6e5d661 100644 --- a/src/main/java/com/yxt/user/UserApplication.java +++ b/src/main/java/com/yxt/user/UserApplication.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @author dimengzhe */ @SpringBootApplication(scanBasePackages = { - "com.yxt.goods.config", + "com.yxt.user.config", "com.yxt.common.base.config", "com.yxt.goods" }) diff --git a/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java b/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java index 12f361d..779af32 100644 --- a/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java +++ b/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java @@ -1,4 +1,4 @@ -package com.yxt.goods.apiadmin; +package com.yxt.user.apiadmin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/yxt/user/apiwx/WxHomeRest.java b/src/main/java/com/yxt/user/apiwx/WxHomeRest.java index 35e8be8..9dbbfde 100644 --- a/src/main/java/com/yxt/user/apiwx/WxHomeRest.java +++ b/src/main/java/com/yxt/user/apiwx/WxHomeRest.java @@ -1,4 +1,4 @@ -package com.yxt.goods.apiwx; +package com.yxt.user.apiwx; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/yxt/user/biz/package-info.java b/src/main/java/com/yxt/user/biz/package-info.java index 3692c43..1c86e6a 100644 --- a/src/main/java/com/yxt/user/biz/package-info.java +++ b/src/main/java/com/yxt/user/biz/package-info.java @@ -1,4 +1,4 @@ /** * 宇信通 仓库管理 项目后台逻辑和接口 */ -package com.yxt.goods.biz; \ No newline at end of file +package com.yxt.user.biz; \ No newline at end of file diff --git a/src/main/java/com/yxt/user/config/SaTokenConfigure.java b/src/main/java/com/yxt/user/config/SaTokenConfigure.java index 16b7b6d..aa0d55b 100644 --- a/src/main/java/com/yxt/user/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/user/config/SaTokenConfigure.java @@ -1,4 +1,4 @@ -package com.yxt.goods.config;//package com.yxt.base.config; +package com.yxt.user.config;//package com.yxt.base.config; // //import cn.dev33.satoken.interceptor.SaInterceptor; //import cn.dev33.satoken.stp.StpUtil; diff --git a/src/main/java/com/yxt/user/config/SaTokenGloableException.java b/src/main/java/com/yxt/user/config/SaTokenGloableException.java index 21e3172..0edf964 100644 --- a/src/main/java/com/yxt/user/config/SaTokenGloableException.java +++ b/src/main/java/com/yxt/user/config/SaTokenGloableException.java @@ -1,4 +1,4 @@ -package com.yxt.goods.config; +package com.yxt.user.config; import com.yxt.common.base.config.handler.GlobalExceptionHandler; import com.yxt.common.core.result.ResultBean; diff --git a/src/main/java/com/yxt/user/config/package-info.java b/src/main/java/com/yxt/user/config/package-info.java index 1ba1490..ca2eccf 100644 --- a/src/main/java/com/yxt/user/config/package-info.java +++ b/src/main/java/com/yxt/user/config/package-info.java @@ -1,4 +1,4 @@ /** * 宇信通监管项目-光伏（山海新能源）项目后台逻辑和接口-接口声明 */ -package com.yxt.goods.config; \ No newline at end of file +package com.yxt.user.config; \ No newline at end of file diff --git a/src/main/java/com/yxt/user/feign/package-info.java b/src/main/java/com/yxt/user/feign/package-info.java index 0bb9b53..400fc49 100644 --- a/src/main/java/com/yxt/user/feign/package-info.java +++ b/src/main/java/com/yxt/user/feign/package-info.java @@ -1,4 +1,4 @@ /** * 宇信通监管项目-光伏（山海新能源）项目后台逻辑和接口-接口声明 */ -package com.yxt.goods.feign; \ No newline at end of file +package com.yxt.user.feign; \ No newline at end of file diff --git a/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationFeign.java b/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationFeign.java deleted file mode 100644 index 0f6ef6a..0000000 --- a/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationFeign.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yxt.user.feign.sysorganization; - -import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Project: anrui_portal(门户建设)
- * File: SysOrganizationFeign.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
- * Description: 组织机构表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "组织机构表") -@FeignClient( - contextId = "anrui-portal-SysOrganization", - name = "anrui-portal", - path = "v1/sysorganization") -public interface SysOrganizationFeign { - - @ApiOperation("获取一条记录 根据sid") - @ResponseBody - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); -} \ No newline at end of file diff --git a/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationVo.java b/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationVo.java deleted file mode 100644 index 13f2233..0000000 --- a/src/main/java/com/yxt/user/feign/sysorganization/SysOrganizationVo.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.yxt.user.feign.sysorganization; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * Project: anrui_portal(门户建设)
- * File: SysOrganizationVo.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
- * Description: 组织机构表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") -@Data -public class SysOrganizationVo implements Vo { - @ApiModelProperty("部门/组织名称") - private String name; - - @ApiModelProperty("父(部门/组织) sid") - private String psid; - - @ApiModelProperty("联系电话") - private String linkPhone; - - @ApiModelProperty("联系人") - private String linkPerson; - - @ApiModelProperty("部门sid全路径") - private String orgSidPath; - - @ApiModelProperty("排序") - private Integer sort; - - @ApiModelProperty("地址") - private String addrs; - - @ApiModelProperty("地理位置经纬度") - private String jwd; - - @ApiModelProperty("二维码") - private String qrText; - - @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") - private Integer limitOrgMember; - - @ApiModelProperty("部门编码") - private String orgCode; - @ApiModelProperty("sid") - private String sid; - @ApiModelProperty("子集") - private List children = new ArrayList<>(); - @ApiModelProperty("主管人员名称") - private String zgNames; - @ApiModelProperty("分管人员名称") - private String fgNames; - @ApiModelProperty("主管人员sid") - private String zgStaffSid; - @ApiModelProperty("分管人员sid") - private String fgStaffSid; - @ApiModelProperty("组织简称") - private String orgAbbre; - @ApiModelProperty("是否是部门(0否，1是)") - private Integer isDept; - @ApiModelProperty("组织属性key") - private String orgAttributeKey; - @ApiModelProperty("组织属性value") - private String orgAttributeValue; - @ApiModelProperty("管理层级key") - private String orgLevelKey; - @ApiModelProperty("管理层级value") - private String orgLevelValue; - @ApiModelProperty("其他编码") - private String otherCode; - @ApiModelProperty("主管用户sid") - private String managerSid; -} diff --git a/src/main/java/com/yxt/user/feign/sysstafforg/SysStaffOrgFeign.java b/src/main/java/com/yxt/user/feign/sysstafforg/SysStaffOrgFeign.java deleted file mode 100644 index 3183c09..0000000 --- a/src/main/java/com/yxt/user/feign/sysstafforg/SysStaffOrgFeign.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.user.feign.sysstafforg; - -import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * @description: 人员与机构 - * @author: dimengzhe - * @date: 2024/3/6 - **/ -@FeignClient( - contextId = "anrui-portal-SysStaffOrg", - name = "anrui-portal", - path = "v1/sysstafforg") -public interface SysStaffOrgFeign { - - @GetMapping("/getOrgSidByPath") - @ResponseBody - @ApiOperation("根据用户组织全路径获取用户的分公司sid") - ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); -} diff --git a/src/main/java/com/yxt/user/utils/DoubleUtils.java b/src/main/java/com/yxt/user/utils/DoubleUtils.java index 12db7cd..27f1528 100644 --- a/src/main/java/com/yxt/user/utils/DoubleUtils.java +++ b/src/main/java/com/yxt/user/utils/DoubleUtils.java @@ -1,4 +1,4 @@ -package com.yxt.goods.utils; +package com.yxt.user.utils; import java.math.BigDecimal; diff --git a/src/main/java/com/yxt/user/utils/PinYinUtils.java b/src/main/java/com/yxt/user/utils/PinYinUtils.java index 76f8f92..88b8e0c 100644 --- a/src/main/java/com/yxt/user/utils/PinYinUtils.java +++ b/src/main/java/com/yxt/user/utils/PinYinUtils.java @@ -1,4 +1,4 @@ -package com.yxt.goods.utils; +package com.yxt.user.utils; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; diff --git a/src/main/java/com/yxt/user/utils/StyleUtils.java b/src/main/java/com/yxt/user/utils/StyleUtils.java index 62de4fb..1d7945c 100644 --- a/src/main/java/com/yxt/user/utils/StyleUtils.java +++ b/src/main/java/com/yxt/user/utils/StyleUtils.java @@ -1,4 +1,4 @@ -package com.yxt.goods.utils; +package com.yxt.user.utils; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; diff --git a/src/main/resources/application-devv.yml b/src/main/resources/application-dev.yml similarity index 100% rename from src/main/resources/application-devv.yml rename to src/main/resources/application-dev.yml diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c277bc7..e80d40d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: application: name: ss-common-user profiles: - active: devv + active: dev # active: test # active: pro messages: diff --git a/src/test/java/com/yxt/user/UserApplicationTest.java b/src/test/java/com/yxt/user/UserApplicationTest.java deleted file mode 100644 index 7be053c..0000000 --- a/src/test/java/com/yxt/user/UserApplicationTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yxt.user; - -import cn.hutool.core.util.IdUtil; -import org.junit.Test; - -import java.util.UUID; - -public class UserApplicationTest { - - @Test - public void test() { - System.out.println(IdUtil.nanoId()); - System.out.println(IdUtil.getSnowflakeNextId()); - - UUID uuid = UUID.randomUUID(); - String uniqueID = uuid.toString().replaceAll("-", "").substring(0, 16).replaceAll("\\D", ""); - System.out.println(uniqueID); - } -} - -//do3KW8XIUSyu4vg_zTXdm -// 1727231267909320704 -//uw0AotdmQTlIxKlA2V8_O -// 1727231437887668224