From 7dfbbe979856e46e60cb3b3c9e84dffcc56ea6fb Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 12 Jun 2025 14:13:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OrgApplyInfoApiEntity.java | 6 ++++ .../orgapplyinfo/entity/OrgApplyInfo.java | 16 +++++++++++ .../java/com/nu/modules/common/CommonApi.java | 28 +++++++++++++++++++ .../DocumentRecognitionApi.java | 1 + .../api/VersionManageApi.java | 2 ++ .../api/VersionManageApiBK.java | 2 ++ .../java/com/nu/modules/proxy/ProxyApi.java | 1 + .../modules/systeminfo/api/SystemInfoApi.java | 2 ++ .../orgapplyinfo/api/OrgApplyInfoApi.java | 2 ++ .../common/system/vo/SysCategoryModel.java | 10 +++++++ .../jeecg/common/system/api/ISysBaseAPI.java | 6 ++++ .../modules/system/entity/SysCategory.java | 5 ++++ .../system/service/impl/SysBaseApiImpl.java | 10 +++++++ pom.xml | 4 +-- 14 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/common/CommonApi.java diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java index 8616610..3929c88 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java @@ -102,4 +102,10 @@ public class OrgApplyInfoApiEntity implements Serializable { private String orgPropertyType; /**机构建筑面积*/ private Double orgBuildingArea; + /**机构省份 sys_category.id*/ + private java.lang.String orgProvince; + /**机构城市 sys_category.id*/ + private java.lang.String orgCity; + /**机构区域 sys_category.id*/ + private java.lang.String orgDistrict; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java index b59822f..3632017 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java @@ -181,4 +181,20 @@ public class OrgApplyInfo implements Serializable { @Excel(name = "机构建筑面积", width = 15) @ApiModelProperty(value = "机构建筑面积") private java.lang.Double orgBuildingArea; + /**机构省份 sys_category.id*/ + @Excel(name = "机构省份", width = 15) + @ApiModelProperty(value = "机构省份") + @Dict(dictTable = "sys_category",dicCode = "id",dicText = "name") + private java.lang.String orgProvince; + /**机构城市 sys_category.id*/ + @Excel(name = "机构城市", width = 15) + @ApiModelProperty(value = "机构城市") + @Dict(dictTable = "sys_category",dicCode = "id",dicText = "name") + private java.lang.String orgCity; + /**机构区域 sys_category.id*/ + @Excel(name = "机构区域", width = 15) + @ApiModelProperty(value = "机构区域") + @Dict(dictTable = "sys_category",dicCode = "id",dicText = "name") + private java.lang.String orgDistrict; + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/CommonApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/CommonApi.java new file mode 100644 index 0000000..ea4c521 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/CommonApi.java @@ -0,0 +1,28 @@ +package com.nu.modules.common; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.api.ISysBaseAPI; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 通用接口 + * + * @author zmy + * @Date 2025-6-12 10:42:44 + */ +@RestController +@RequestMapping("/api/common") +public class CommonApi { + + @Autowired + private ISysBaseAPI sysBaseAPI; + + @GetMapping("/queryAreaDict") + public Result queryAreaDict(@RequestParam("id") String id) { + return Result.ok(sysBaseAPI.queryCategoryByPid(id)); + } +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/documentrecognition/DocumentRecognitionApi.java b/nursing-unit-api/src/main/java/com/nu/modules/documentrecognition/DocumentRecognitionApi.java index 944ffc0..3fbcae7 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/documentrecognition/DocumentRecognitionApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/documentrecognition/DocumentRecognitionApi.java @@ -3,6 +3,7 @@ package com.nu.modules.documentrecognition; import com.aliyun.sdk.service.ocr_api20210707.models.*; import com.nu.modules.aliyun.documentrecognition.DocumentRecognitionUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApi.java index b8fa816..9704d69 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApi.java @@ -5,6 +5,7 @@ import com.nu.modules.pad.appversionconfig.entity.AppConfig; import com.nu.modules.pad.appversionconfig.entity.R; import com.nu.modules.pad.appversionconfig.entity.VersionInfo; import com.nu.modules.pad.appversionconfig.service.IAppConfigService; +import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,6 +30,7 @@ public class VersionManageApi { * @param code 应用版本号 * @return */ + @AutoLog(value = "APP版本更新检测") @RequestMapping("/versionUpdate") public R check(String platform,String name,String version,String code) { Map map = new HashMap<>(); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApiBK.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApiBK.java index 48c70cb..23643cf 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApiBK.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/appversionconfig/api/VersionManageApiBK.java @@ -5,6 +5,7 @@ import com.nu.modules.pad.appversionconfig.entity.AppConfig; import com.nu.modules.pad.appversionconfig.entity.R; import com.nu.modules.pad.appversionconfig.entity.VersionInfo; import com.nu.modules.pad.appversionconfig.service.IAppConfigService; +import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,6 +30,7 @@ public class VersionManageApiBK { * @param code 应用版本号 * @return */ + @AutoLog(value = "APP版本更新检测") @RequestMapping("/versionUpdate") public R check(String platform,String name,String version,String code) { Map map = new HashMap<>(); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java b/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java index 5b23466..8204e42 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java @@ -1,5 +1,6 @@ package com.nu.modules.proxy; +import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/systeminfo/api/SystemInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/systeminfo/api/SystemInfoApi.java index 2cab6c0..076012e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/systeminfo/api/SystemInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/systeminfo/api/SystemInfoApi.java @@ -1,7 +1,9 @@ package com.nu.modules.systeminfo.api; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.api.ISysBaseAPI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index dfb460f..3d2fe38 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -4,6 +4,7 @@ import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi; import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,6 +22,7 @@ public class OrgApplyInfoApi { * @param orgApplyInfoApiEntity * @return */ + @AutoLog(value = "新增/编辑机构加盟申请信息") @PostMapping("/save") public Result save(@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java index 5499bef..809582e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java @@ -17,6 +17,8 @@ public class SysCategoryModel { private java.lang.String name; /**类型编码*/ private java.lang.String code; + /**name第一个字符首字母小写*/ + private java.lang.String firstLetter; public String getId() { return id; @@ -49,4 +51,12 @@ public class SysCategoryModel { public void setCode(String code) { this.code = code; } + + public String getFirstLetter() { + return firstLetter; + } + + public void setFirstLetter(String firstLetter) { + this.firstLetter = firstLetter; + } } diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index a100706..a37c7d2 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -136,6 +136,12 @@ public interface ISysBaseAPI extends CommonAPI { */ public List queryAllSysCategory(); + /** + * 查询子集合 + * @return + */ + public List queryCategoryByPid(String pid); + /** * 14查询所有部门 作为字典信息 id -->value,departName -->text diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java index 95ba24b..8ed07fe 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java @@ -77,6 +77,11 @@ public class SysCategory implements Serializable, Comparable { */ private java.lang.Integer tenantId; + /** + * name第一个字符首字母小写 + */ + private java.lang.String firstLetter; + /** * 子节点列表 - 非数据库字段 */ diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 478976c..0a9ff4c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -713,6 +714,15 @@ public class SysBaseApiImpl implements ISysBaseAPI { return res; } + @Override + public List queryCategoryByPid(String pid) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",pid); + List list = categoryMapper.selectList(qw); + return BeanUtil.copyToList(list, SysCategoryModel.class); + } + + @Override public List queryFilterTableDictInfo(String table, String text, String code, String filterSql) { return sysDictService.queryTableDictItemsByCodeAndFilter(table, text, code, filterSql); diff --git a/pom.xml b/pom.xml index dacb49e..ca29bdf 100644 --- a/pom.xml +++ b/pom.xml @@ -454,7 +454,7 @@ dev - true + false @@ -466,7 +466,7 @@ uat - false + true