Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

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;
 }

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;
+
 }

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<Object> queryAreaDict(@RequestParam("id") String id) {
+        return Result.ok(sysBaseAPI.queryCategoryByPid(id));
+    }
+}

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;

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<String, Object> map = new HashMap<>();

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<String, Object> map = new HashMap<>();

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;

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;

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<Object> save(@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) {
         if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) {

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;
+    }
 }

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<SysCategoryModel> queryAllSysCategory();
 
+    /**
+     * 查询子集合
+     * @return
+     */
+    public List<SysCategoryModel> queryCategoryByPid(String pid);
+
 
     /**
      * 14查询所有部门 作为字典信息 id -->value,departName -->text

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<SysCategory> {
      */
     private java.lang.Integer tenantId;
 
+    /**
+     * name第一个字符首字母小写
+     */
+    private java.lang.String firstLetter;
+
     /**
      * 子节点列表 - 非数据库字段
      */

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<SysCategoryModel> queryCategoryByPid(String pid) {
+        QueryWrapper<SysCategory> qw = new QueryWrapper<>();
+        qw.eq("pid",pid);
+        List<SysCategory> list = categoryMapper.selectList(qw);
+        return BeanUtil.copyToList(list, SysCategoryModel.class);
+    }
+
+
     @Override
     public List<DictModel> queryFilterTableDictInfo(String table, String text, String code, String filterSql) {
         return sysDictService.queryTableDictItemsByCodeAndFilter(table, text, code, filterSql);

pom.xml

@@ -454,7 +454,7 @@
             <id>dev</id>
             <activation>
                 <!--默认激活配置-->
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
                 <!--当前环境-->
@@ -466,7 +466,7 @@
             <id>uat</id>
             <activation>
                 <!--默认激活配置-->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <!--当前环境-->