From 667815447116d20b7b875a173acda88683416907 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 21 Apr 2023 09:33:26 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=EF=BC=8C?=
 =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E6=9C=8D=E5=8A=A1=E4=BA=8B=E4=BB=B6=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcServiceRecordV2Dao.xml          | 2 +-
 .../gov-project-server/src/main/resources/mapper/IcEventDao.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
index 89f8764a30..05bcf1ad4b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
@@ -40,7 +40,7 @@
             <if test='serviceTimeEnd != null and serviceTimeEnd != ""'>
                 AND sr.SERVICE_TIME_END <![CDATA[ <= ]]> #{serviceTimeEnd}
             </if>
-        ORDER BY sr.CREATED_TIME DESC
+        ORDER BY sr.SERVICE_TIME_START DESC,sr.SERVICE_TIME_END DESC
     </select>
 
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index d7e0d5ff39..546c52b88f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -247,7 +247,7 @@
                 #{secondId}
             </foreach>
         </if>
-        order by ie.created_time desc, ie.latest_operated_time desc
+        order by ie.happen_time desc, ie.latest_operated_time desc
     </select>
 
     <select id="listEventsByPCategoryInOrg" resultType="com.epmet.dto.result.IcEventResultDTO">

From 8864442f8eab9900b1be036a8e3881e2d46c3598 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 13:54:25 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98=E4=B8=80=E4=B8=8B=EF=BC=8C=E8=A6=81=E5=8E=BB=E6=94=B9?=
 =?UTF-8?q?=E5=88=AB=E7=9A=84bug=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/entity/IcResiUserEntity.java  |  4 ++--
 .../service/impl/IcResiCollectServiceImpl.java   | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
index 7611a80a9f..a78fae885d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
@@ -42,12 +42,12 @@ public class IcResiUserEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     *
+     * 组织Id
      */
 	private String agencyId;
 
     /**
-     *
+     * 组织的pids 含agencyId本身
      */
 	private String pids;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index c519210d7b..bfecfa4671 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -15,6 +15,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.PidUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiCollectDao;
 import com.epmet.dao.IcResiMemberDao;
@@ -491,8 +492,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
             }
         }
-
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());
@@ -547,7 +552,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
         // 新增人员
         IcResiUserEntity userEntity = new IcResiUserEntity();
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 !!!
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());

From b39fe4bb2e243a070c7ae4b325f1c3540aa118dc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 14:45:27 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A1=E6=9F=A5=EF=BC=8C=E6=8B=9F=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=A5=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD=E7=BD=AE=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcEnterpriseServiceImpl.java | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
index 7867b1434b..48cd614b50 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
@@ -170,7 +171,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             enterprisePatrolRecordDao.insert(patrolRecordEntity);
         } else {
             patrolRecordEntity.setId(formDTO.getPatrolId());
-            enterprisePatrolRecordDao.updateById(patrolRecordEntity);
+            LambdaUpdateWrapper<IcEnterprisePatrolRecordEntity> update=new LambdaUpdateWrapper<>();
+            update.eq(IcEnterprisePatrolRecordEntity::getId, formDTO.getPatrolId())
+                    .set(IcEnterprisePatrolRecordEntity::getPatrolTime, formDTO.getPatrolTime())
+                    .set(IcEnterprisePatrolRecordEntity::getStaffId, formDTO.getStaffId())
+                    .set(IcEnterprisePatrolRecordEntity::getStaffName, formDTO.getStaffName())
+                    .set(IcEnterprisePatrolRecordEntity::getMobile, formDTO.getMobile())
+                    .set(IcEnterprisePatrolRecordEntity::getResult, formDTO.getResult())
+                    .set(IcEnterprisePatrolRecordEntity::getDetailed, formDTO.getDetailed())
+                    .set(IcEnterprisePatrolRecordEntity::getReviewTime, formDTO.getReviewTime());
+            enterprisePatrolRecordDao.update(null,update);
             //删除之前的图片
             enterprisePatrolAttachmentDao.deleteByPatrolId(formDTO.getPatrolId(), formDTO.getUserId());
         }
@@ -187,7 +197,19 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             sort++;
         }
         // 更新主表的最新结果和最新检查时间
-        baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), patrolRecordEntity.getPatrolTime(), patrolRecordEntity.getResult(), formDTO.getUserId());
+        // 获取一下最新的巡检时间和巡检结果
+        LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, formDTO.getEnterpriseId())
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getPatrolTime)
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime)
+                .last("limit 1");
+        IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper);
+        if (null != latestPatrol) {
+            // 更新主表的最新结果和最新检查时间
+            baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), latestPatrol.getPatrolTime(), latestPatrol.getResult(), formDTO.getUserId());
+        }else{
+            baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), null, StrConstant.EPMETY_STR, formDTO.getUserId());
+        }
         return patrolRecordEntity.getId();
     }
 
@@ -203,14 +225,27 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
         if (null == origin) {
             return;
         }
+        Date nowTime=new Date();
         //1、删除巡查记录
-        enterprisePatrolRecordDao.deleteById(patrolId);
+        LambdaUpdateWrapper<IcEnterprisePatrolRecordEntity> patrolUpdate = new LambdaUpdateWrapper<>();
+        patrolUpdate.eq(IcEnterprisePatrolRecordEntity::getId, patrolId)
+                .set(IcEnterprisePatrolRecordEntity::getUpdatedBy, currentUserId)
+                .set(IcEnterprisePatrolRecordEntity::getUpdatedTime, nowTime)
+                .set(IcEnterprisePatrolRecordEntity::getDelFlag, NumConstant.ONE_STR);
+        enterprisePatrolRecordDao.update(null, patrolUpdate);
         //2、删除之前的图片
         enterprisePatrolAttachmentDao.deleteByPatrolId(patrolId, currentUserId);
-        //3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空
+        // 3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空
         LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId());
-        if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) {
+        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId())
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getPatrolTime)
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime)
+                .last("limit 1");
+        IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper);
+        if (null != latestPatrol) {
+            // 更新主表的最新结果和最新检查时间
+            baseDao.updateLatestPatrol(origin.getEnterpriseId(), latestPatrol.getPatrolTime(), latestPatrol.getResult(), currentUserId);
+        } else {
             baseDao.updateLatestPatrol(origin.getEnterpriseId(), null, StrConstant.EPMETY_STR, currentUserId);
         }
     }

From b8d818824c6b639fcf119c3f175ecfe21aed7633 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 15:14:54 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A1=E6=9F=A5=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E6=A8=A1=E5=BF=85=E9=A1=BB=E5=A1=AB=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/excel/EnterpriseImportExcelDTO.java |   7 +++----
 .../IcEnterpriseExcelImportListener.java      |  13 +++++++++++--
 .../excel/enterprise_patrol_import_tem.xlsx   | Bin 9242 -> 9276 bytes
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java
index becc763ba3..55bbb1d60f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 
 /**
@@ -59,9 +58,9 @@ public class EnterpriseImportExcelDTO {
      * 4:100人以上】
      * 改为手输数字了
      */
-    @NotNull(message = "规模不能为空")
+    @NotBlank(message = "规模不能为空")
     @ExcelProperty(value = "规模")
-    private Integer scaleTotal;
+    private String scaleTotal;
 
     /**
      * 场所负责人
@@ -110,7 +109,7 @@ public class EnterpriseImportExcelDTO {
 
         @ColumnWidth(20)
         @ExcelProperty(value = "规模")
-        private Integer scaleTotal;
+        private String scaleTotal;
 
         @ColumnWidth(20)
         @ExcelProperty(value = "负责人")
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
index 5495dd6ff6..f6de421e4b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
@@ -5,6 +5,8 @@ import com.alibaba.excel.read.listener.ReadListener;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -67,6 +69,11 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             // log.warn("有数据吗？"+JSON.toJSONString(data));
             // 不能为空先校验数据
             ValidatorUtils.validateEntity(data);
+            try {
+                Integer.parseInt(data.getScaleTotal());
+            } catch (NumberFormatException e) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", "规模请填写数字");
+            }
             // 去除空格
             ObjectUtil.objectToTrim(data);
             // 根据网格名是否能找到网格id
@@ -92,7 +99,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             enterpriseEntity.setLatitude(StrConstant.EPMETY_STR);
             //规模
             // enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
-            enterpriseEntity.setScaleTotal(data.getScaleTotal());
+            enterpriseEntity.setScaleTotal(Integer.valueOf(data.getScaleTotal()));
             enterpriseEntity.setPlaceCategory("九小场所".equals(data.getPlaceCategoryName()) ? "0" : "1");
 
             //网格id+场所名称
@@ -118,7 +125,9 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             String errorMsg = null;
             if (e instanceof ValidateException) {
                 errorMsg = ((ValidateException) e).getMsg();
-            } else {
+            }else if(e instanceof EpmetException){
+                errorMsg=((EpmetException) e).getMsg();
+            }else {
                 errorMsg = "未知错误";
                 log.error("【企事业单位导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
             }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx
index 6981727e9b23f266ebb7d0b0eff797a54175ec81..d4ebff5dd0bc36580b0c7c2c2d33083ca588eb53 100644
GIT binary patch
delta 4910
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
W|DqZogi#0w0U`jS<mLPK=YIe|zA7#N

delta 4873
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


From 12851dcae5e55a127a3367db61c641d22355378f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 15:44:56 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A1=E6=9F=A5=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=BA=E6=89=80=E5=8C=BA=E5=9F=9F=E4=B8=BA=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/excel/handler/IcEnterpriseExcelImportListener.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
index f6de421e4b..50dfa262c5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
@@ -78,7 +78,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             ObjectUtil.objectToTrim(data);
             // 根据网格名是否能找到网格id
             if (!gridMap.containsKey(data.getGridName())) {
-                throw new ValidateException(String.format("您所在的组织，不存在【%s】", data.getGridName()));
+                throw new ValidateException(String.format("场所区域为网格名称，您所在的组织，不存在【%s】", data.getGridName()));
             }
             if(!placeTypeMap.containsKey(data.getPlaceTypeName())){
                 throw new ValidateException(String.format("【%s】场所类型不存在",data.getPlaceTypeName()));

From a895977559b0c10cbfd2a35949635b6f6ac17cca Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 16:10:14 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E8=A7=84=E6=A8=A1=E8=AF=B7=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=A1=AB=E5=86=99=E5=9C=BA=E6=89=80=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9B=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcEnterpriseExcelImportListener.java      |   2 +-
 .../excel/enterprise_patrol_import_tem.xlsx   | Bin 9276 -> 9466 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
index 50dfa262c5..99a76ad94e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
@@ -72,7 +72,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             try {
                 Integer.parseInt(data.getScaleTotal());
             } catch (NumberFormatException e) {
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", "规模请填写数字");
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", "规模请正确填写场所人数");
             }
             // 去除空格
             ObjectUtil.objectToTrim(data);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx
index d4ebff5dd0bc36580b0c7c2c2d33083ca588eb53..a20379c4b71c75d0410e2edec7c61a82881e21b4 100644
GIT binary patch
delta 1933
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
T1e4DM8j~g@5C+{K00000dD3@5

delta 1743
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


From eae97f663f42824898af2e1561b45aa1cf5a23e8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Apr 2023 16:22:31 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=9C=BA=E6=89=80=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=81=E5=9C=BA=E6=89=80=E7=B1=BB=E5=88=AB=E4=B8=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/enterprise_patrol_import_tem.xlsx   | Bin 9466 -> 9435 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx
index a20379c4b71c75d0410e2edec7c61a82881e21b4..7b748c289e42c70059f3d7c9e2c808b74e1f4e7a 100644
GIT binary patch
delta 1894
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

delta 1943
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


From d856a33edb8372bc0af44489947b6cdd66ef1a1c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 23 Apr 2023 21:15:28 +0800
Subject: [PATCH 08/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=B2=E5=A1=AB=E5=86=99=E7=9A=84=E3=80=81?=
 =?UTF-8?q?=EF=BC=88=E6=84=8F=E6=80=9D=E5=B0=B1=E6=98=AF=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E6=88=91=E5=A1=AB=E4=BA=86=E7=AC=AC=E4=B8=80=E5=88=97?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=88=97=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=BA=86?=
 =?UTF-8?q?=E3=80=82=E8=BF=99=E6=AC=A1=E6=88=91=E5=8F=AA=E5=A1=AB=E4=BA=86?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E7=AC=AC=E5=9B=9B=E5=88=97=EF=BC=8C=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E7=AC=AC=E4=BA=8C=E5=88=97=E7=A9=BA=E7=9D=80=EF=BC=8C?=
 =?UTF-8?q?=E9=82=A3=E8=BF=99=E6=AC=A1=E6=88=91=E5=AF=BC=E5=85=A5=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E4=E5=88=97=E9=83=BD=E6=9C=89=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=8A=8A1=EF=BC=8C2=E5=88=97?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BA=E7=A9=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java  | 11 +++++++++++
 .../service/impl/IcResiUserImportServiceImpl.java   |  6 +++---
 .../src/main/resources/mapper/IcResiUserDao.xml     | 13 +++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 9930c7338f..dba99aadfa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -61,6 +61,17 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      **/
     void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
 
+    /**
+     * @description: 选择性更新（只更新不为null的）
+     * @param tableName:
+     * @param id:
+     * @param map:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/23 9:03 PM
+     */
+    void updateTableSelective(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
+
     List<Map<String, Object>> selectListResiMap(@Param("customerId") String customerId,
                                                 @Param("formCode") String formCode,
                                                 @Param("conditions") List<ResiUserQueryValueDTO> conditions,
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 05e7b81853..e0b5c91837 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -547,7 +547,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 if (existingResiMap != null) {
                     // 修改居民信息
-                    icResiUserDao.upTable(tableName, existingResiMap.get("ID"), columnAndValues);
+                    icResiUserDao.updateTableSelective(tableName, existingResiMap.get("ID"), columnAndValues);
 
                     // 任意组织维度一个发生变化，则放到调动居民缓存中
                     ResiImportChangedData transferData;
@@ -747,7 +747,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 if (CollectionUtils.isNotEmpty(subInfos)) {
                     Map<String, Object> subInfo = subInfos.get(0);
                     // 附加信息存在，更新附加表内容
-                    icResiUserDao.upTable(targetTableName, subInfo.get("ID").toString(), columnAndValues);
+                    icResiUserDao.updateTableSelective(targetTableName, subInfo.get("ID").toString(), columnAndValues);
                 } else {
                     // 新增附加表信息
                     columnAndValues.put("CREATED_BY", currentUserId);
@@ -1577,7 +1577,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private void updateMainTableResiTypeFlag(IcResiUserTableEnum icResiUserTableEnum, String resiUserId) {
         HashMap<String, Boolean> map = new HashMap<>();
         map.put(icResiUserTableEnum.getMainTableFlagColumnName(), true);
-        icResiUserDao.upTable(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
+        icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 2d2e30535f..118c0c3c36 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -73,6 +73,19 @@
         WHERE id = #{id}
     </update>
 
+    <!-- 选择性更新（只更新不为null的） -->
+    <update id="updateTableSelective">
+        UPDATE ${tableName}
+        SET
+        <foreach collection="map.entrySet()" index="key" item="value" separator=",">
+            <if test="value != null and value != ''">
+                ${key} = #{value}
+            </if>
+        </foreach>
+        ,UPDATED_TIME = NOW()
+        WHERE id = #{id}
+    </update>
+
 
     <select id="selectListMapById" parameterType="map" resultType="map">
         select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId}

From 53acd4d5fc75d38bc341506c56e024f0b74c46a0 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 24 Apr 2023 10:49:29 +0800
Subject: [PATCH 09/10] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=EF=BC=9AEpmetUserRem?=
 =?UTF-8?q?oteService=E7=94=A8=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/remote/EpmetUserRemoteService.java  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java
new file mode 100644
index 0000000000..29758a6edf
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java
@@ -0,0 +1,35 @@
+package com.epmet.remote;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * epmet用户远程服务工具
+ */
+@Component
+public class EpmetUserRemoteService implements ResultDataResolver {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    /**
+     * 查询当前登录用户信息
+     * @return
+     */
+    public LoginUserDetailsResultDTO getLoginUserDetails() {
+        //    不传组织id，则基于当前组织查询
+        LoginUserDetailsFormDTO loinUserForm = new LoginUserDetailsFormDTO();
+        loinUserForm.setApp(EpmetRequestHolder.getLoginUserApp());
+        loinUserForm.setClient(EpmetRequestHolder.getLoginUserClient());
+        loinUserForm.setUserId(EpmetRequestHolder.getLoginUserId());
+        LoginUserDetailsResultDTO loginUserDetailsResultDTO = getResultDataOrThrowsException(epmetUserOpenFeignClient.getLoginUserDetails(loinUserForm), ServiceConstant.GOV_ORG_SERVER,
+                null, null, "查询当前工作人员所属组织信息失败");
+        return loginUserDetailsResultDTO;
+    }
+}

From f4f89692ffc2f7a547f903d27278b8c12756f49b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 24 Apr 2023 13:10:35 +0800
Subject: [PATCH 10/10] =?UTF-8?q?1.=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4Log?=
 =?UTF-8?q?back=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8Cjvm=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5=E3=80=82=E9=BB=98=E8=AE=A4./logs/myservice=E3=80=82?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8C=87=E5=AE=9A=E6=96=B9=E5=BC=8F=EF=BC=9A?=
 =?UTF-8?q?-Dlog.dir=3D/Volumes/data/epmetlog=EF=BC=8C=E5=88=99=E4=BC=9A?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=88=B0/Volumes/data/epmetlog/myservice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-admin-server/src/main/resources/logback-spring.xml   | 3 ++-
 epmet-auth/src/main/resources/logback-spring.xml               | 3 ++-
 epmet-gateway/src/main/resources/logback-spring.xml            | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../data-report-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../epmet-demo-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../epmet-ext-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../epmet-heart-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../epmet-job-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../epmet-message-server/src/main/resources/logback-spring.xml | 3 ++-
 .../epmet-oss-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../epmet-point-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../epmet-third-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../gov-access-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../gov-grid-server/src/main/resources/logback-spring.xml      | 3 ++-
 .../gov-issue-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../gov-mine-server/src/main/resources/logback-spring.xml      | 3 ++-
 .../gov-org-server/src/main/resources/logback-spring.xml       | 3 ++-
 .../gov-project-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../gov-voice-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../oper-access-server/src/main/resources/logback-spring.xml   | 3 ++-
 .../oper-crm-server/src/main/resources/logback-spring.xml      | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../resi-group-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../resi-guide-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../resi-hall-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../resi-home-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../resi-mine-server/src/main/resources/logback-spring.xml     | 3 ++-
 .../src/main/resources/logback-spring.xml                      | 3 ++-
 .../resi-voice-server/src/main/resources/logback-spring.xml    | 3 ++-
 .../epmet-user-server/src/main/resources/logback-spring.xml    | 3 ++-
 35 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
index 3d27fa4d07..2b7d942e79 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/admin"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/admin"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-auth/src/main/resources/logback-spring.xml b/epmet-auth/src/main/resources/logback-spring.xml
index 3ddc774384..10e7129112 100644
--- a/epmet-auth/src/main/resources/logback-spring.xml
+++ b/epmet-auth/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/auth"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/auth"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-gateway/src/main/resources/logback-spring.xml b/epmet-gateway/src/main/resources/logback-spring.xml
index 1e050e9686..652ce500c4 100644
--- a/epmet-gateway/src/main/resources/logback-spring.xml
+++ b/epmet-gateway/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gateway"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gateway"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
index c639482221..d1cb010d4f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/data-aggregator"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-aggregator"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
index 86de057fc6..53c7e59c69 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/data-report"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-report"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 7d2b7648a3..c320f80c0d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/data-statistical"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-statistical"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
index 280e9f4bb2..c639444cee 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/activiti"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/activiti"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
index dbd4fe85bb..9102439017 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/common-service"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/common-service"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
index 1b8b94ba78..4f79c1b027 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/demo"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/demo"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
index 8f428f8d5f..aa0f9f0a7b 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/ext"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/ext"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
index b03ee98c4c..2239f625db 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/heart"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/heart"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
index 36cbaf8d12..999b42342b 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/job"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/job"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
index 338e0b9495..ddb20915c4 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/message"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/message"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
index 8a71d1a810..d18ef07d28 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oss"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oss"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
index e279b43303..81366ebe09 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/point"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/point"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
index f8e2164fb7..70dde2e876 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/third"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/third"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
index 9070f33f63..521b890c6c 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-access"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-access"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
index b54d66f380..d0e5f2b64c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-grid"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-grid"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
index 26e92fef88..d31ef9d410 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-issue"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-issue"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
index 33466c3178..31d1a8af02 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-mine"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-mine"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
index f366605fba..5371a1f541 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-org"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-org"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
index a1e8c5f1b0..ad19a235ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-project"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-project"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
index 6c230be6bf..c26e31a513 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-voice"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-voice"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
index 36ddc6f222..03c538fdc0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/open-data"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/open-data"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
index e22bb16a66..080c035973 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oper-access"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-access"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
index b670ba07bf..5a0f538ff1 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oper-crm"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-crm"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
index cedd663d22..40a734010f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oper-customize"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-customize"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
index 6a517afaff..bbc34e798a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-group"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-group"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
index 126316c645..a42f347111 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-guide"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-guide"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
index a5db66cb09..049506c162 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-hall"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-hall"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
index 0b5eedfde0..490067bb31 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-home"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-home"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
index f797654dbd..a0c67122f7 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-mine"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-mine"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
index b8b3161188..1bc47d8520 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-partymember"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-partymember"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
index 408ee874df..a69c72cdd0 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-voice"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-voice"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
index 899eed6c7a..a3b40f72e6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/epmetuser"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/epmetuser"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>