feature 代码提交

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysFileItemServiceImpl.java

@@ -1,12 +0,0 @@
-package com.rongwei.bscommon.sys.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.FileItemMapper;
-import com.rongwei.bscommon.sys.service.FileItemService;
-import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
-import org.springframework.stereotype.Service;
-
-@Service("sysFileServiceImpl")
-public class SysFileItemServiceImpl extends ServiceImpl<FileItemMapper, SysFileItemDo> implements FileItemService {
-
-}

qhse-common/src/main/java/com/rongwei/bscommon/system/config/QHSEConfig.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.system.config;
+
+import lombok.Data;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.stereotype.Component;
+
+/**
+ * QHSEConfig class
+ *
+ * @author XH
+ * @date 2025/08/25
+ */
+@Data
+@Component
+@RefreshScope
+public class QHSEConfig {
+    @Value("${sms.send:true}")
+    private boolean sendSms;
+    @Value("${sms.tempId:SMS_493240217}")
+    private String smsTempId;
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/MaterialOutboundDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.MaterialOutboundDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/MaterialOutboundDetailsDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/MaterialOutboundDetailsRecordDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/MaterialOutboundRecordDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.MaterialOutboundRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/MobileVehicleProcessingDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.MobileVehicleProcessingDo;

qhse-common/src/main/java/com/rongwei/bscommon/system/dao/QHSEUserDao.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.rwadmincommon.system.domain.SysUserDo;
+
+/**
+ * QHSEUserDao class
+ *
+ * @author XH
+ * @date 2025/08/25
+ */
+public interface QHSEUserDao extends BaseMapper<SysUserDo> {
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhMapper.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.rongwei.bsentity.domain.QhseRohhDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-08-18 17:05:53
 * @Entity generator.domain.QhseRohh
 */
-public interface QhseRohhMapper extends BaseMapper<QhseRohhDo> {
+public interface QhseRohhDao extends BaseMapper<QhseRohhDo> {
 
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhEventMapper.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -10,7 +10,7 @@ import com.rongwei.bsentity.domain.QhseRohhEventDo;
 * @createDate 2025-08-20 10:58:59
 * @Entity generator.domain.QhseRohhEvent
 */
-public interface QhseRohhEventMapper extends BaseMapper<QhseRohhEventDo> {
+public interface QhseRohhEventDao extends BaseMapper<QhseRohhEventDo> {
 
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRectificationMapper.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-08-18 17:05:53
 * @Entity generator.domain.QhseRohhRectification
 */
-public interface QhseRohhRectificationMapper extends BaseMapper<QhseRohhRectificationDo> {
+public interface QhseRohhRectificationDao extends BaseMapper<QhseRohhRectificationDo> {
 
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRpMapper.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.rongwei.bsentity.domain.QhseRohhRpDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-08-18 17:05:53
 * @Entity generator.domain.QhseRohhRp
 */
-public interface QhseRohhRpMapper extends BaseMapper<QhseRohhRpDo> {
+public interface QhseRohhRpDao extends BaseMapper<QhseRohhRpDo> {
 
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhValidateMapper.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.rongwei.bsentity.domain.QhseRohhValidateDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-08-18 17:05:53
 * @Entity generator.domain.QhseRohhValidate
 */
-public interface QhseRohhValidateMapper extends BaseMapper<QhseRohhValidateDo> {
+public interface QhseRohhValidateDao extends BaseMapper<QhseRohhValidateDo> {
 
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseTargetResponsibilityDocumentDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseTargetResponsibilityDocumentSignatureDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.rongwei.bsentity.domain.QhseTargetResponsibilityDocumentSignatureDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseVisitorManagementDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/SendRecordDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.SendRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/StudyFileDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.StudyFileDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/StudyFilePersonDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.rongwei.bsentity.domain.StudyFilePersonDo;
 import com.rongwei.rwcommon.base.BaseDao;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/StudyFilePersonRecordDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.StudyFilePersonRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/StudyFileRecordDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.StudyFileRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/SysPagePartDao.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.dao;
+package com.rongwei.bscommon.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

qhse-common/src/main/java/com/rongwei/bscommon/sys/fegin/AdminFeginService.java

@@ -1,11 +1,11 @@
-package com.rongwei.bscommon.sys.fegin;
+package com.rongwei.bscommon.system.fegin;
 
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-@FeignClient(value = "rw-admin",fallback = AdminFeginServiceImpl.class)
-public interface AdminFeginService {
+@FeignClient(value = "rw-admin",fallback = QhseAdminFeginServiceImpl.class, contextId = "qhseAdminService")
+public interface QhseAdminFeginService {
 
 
     @PostMapping(value = "/sys/generalCRUD/generalMsInsert")

qhse-common/src/main/java/com/rongwei/bscommon/sys/fegin/AdminFeginServiceImpl.java

@@ -1,11 +1,11 @@
-package com.rongwei.bscommon.sys.fegin;
+package com.rongwei.bscommon.system.fegin;
 
 
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.stereotype.Component;
 
 @Component
-public class AdminFeginServiceImpl implements AdminFeginService {
+public class QhseAdminFeginServiceImpl implements QhseAdminFeginService {
 
 
     @Override

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/AliyunSmsService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/FileFormatConversionService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import javax.servlet.http.HttpServletResponse;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/MaterialOutboundDetailsRecordService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/MaterialOutboundDetailsService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/MaterialOutboundRecordService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.MaterialOutboundRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/MaterialOutboundService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.MaterialOutboundDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/MobileVehicleProcessingService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.MobileVehicleProcessingDo;

qhse-common/src/main/java/com/rongwei/bscommon/system/service/QHSELoginService.java

@@ -0,0 +1,14 @@
+package com.rongwei.bscommon.system.service;
+
+import com.rongwei.rwadmincommon.system.domain.UserLoginVo;
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * QHSELoginService class
+ *
+ * @author XH
+ * @date 2025/08/22
+ */
+public interface QHSELoginService {
+    R sendSmsCode(UserLoginVo userLogin);
+}

qhse-common/src/main/java/com/rongwei/bscommon/system/service/QHSEUserService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.rwadmincommon.system.domain.SysUserDo;
+
+/**
+ * QHSEUserService class
+ *
+ * @author XH
+ * @date 2025/08/25
+ */
+public interface QHSEUserService extends IService<SysUserDo> {
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhEventService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.QhseRohhEventDo;
 import com.baomidou.mybatisplus.extension.service.IService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRectificationService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
 import com.baomidou.mybatisplus.extension.service.IService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRpService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.QhseRohhRpDo;
 import com.baomidou.mybatisplus.extension.service.IService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.QhseRohhDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhValidateService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.QhseRohhValidateDo;
 import com.baomidou.mybatisplus.extension.service.IService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseTargetResponsibilityDocumentService.java

@@ -1,11 +1,9 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.QhseTargetResponsibilityDocumentDo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /**
 * @author libai

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseTargetResponsibilityDocumentSignatureService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.QhseTargetResponsibilityDocumentSignatureDo;
 import com.baomidou.mybatisplus.extension.service.IService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseVisitorManagementService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/RedisService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/RohhService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.vo.ROHHEventVo;
 import com.rongwei.bsentity.vo.TaskTransferVo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/SendRecordService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.SendRecordDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/StudyFilePersonRecordService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.StudyFilePersonRecordDo;
 import com.rongwei.rwcommon.base.BaseService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/StudyFilePersonService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.StudyFilePersonDo;
 import com.rongwei.rwcommon.base.BaseService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/StudyFileRecordService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.domain.StudyFileRecordDo;
 import com.rongwei.rwcommon.base.BaseService;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/StudyFileService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.rongwei.bsentity.Dto.StudyFileProduceHistoryDto;
 import com.rongwei.bsentity.domain.StudyFileDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/SysPagePartService.java

@@ -1,8 +1,7 @@
-package com.rongwei.bscommon.sys.service;
+package com.rongwei.bscommon.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.SysPagePartDo;
-import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 
 
 /**

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/AliyunSmsServiceImpl.java

@@ -1,12 +1,12 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.aliyun.tea.TeaException;
 import com.aliyun.teautil.models.RuntimeOptions;
-import com.rongwei.bscommon.sys.service.AliyunSmsService;
-import com.rongwei.bscommon.sys.service.SendRecordService;
-import com.rongwei.bscommon.sys.utils.QHSEUtils;
+import com.rongwei.bscommon.system.service.AliyunSmsService;
+import com.rongwei.bscommon.system.service.SendRecordService;
+import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.bsentity.domain.SendRecordDo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import lombok.extern.slf4j.Slf4j;
@@ -71,20 +71,16 @@ public class AliyunSmsServiceImpl implements AliyunSmsService {
             // 保存发送记录
             saveSendRecord(resp, sendSmsRequest);
         } catch (TeaException error) {
-            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
-            // 错误 message
             log.error("发送短信结果：{}", error.getMessage());
-            // 诊断地址
             log.error("诊断地址：{}", error.getData().get("Recommend"));
-            com.aliyun.teautil.Common.assertAsString(error.message);
+            log.error("短信发送异常 模板编号为：{},参数:{},手机号：{} - 原因: {} | 异常类型: {}", templateId, templateParam, phone, error.getMessage(), error.getClass().getSimpleName(), error);
+            throw new RuntimeException(error.getMessage());
         } catch (Exception _error) {
             TeaException error = new TeaException(_error.getMessage(), _error);
-            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
-            // 错误 message
             log.error("发送短信结果：{}", error.getMessage());
-            // 诊断地址
             log.error("诊断地址：{}", error.getData().get("Recommend"));
-            com.aliyun.teautil.Common.assertAsString(error.message);
+            log.error("短信发送异常 模板编号为：{},参数:{},手机号：{} - 原因: {} | 异常类型: {}", templateId, templateParam, phone, error.getMessage(), error.getClass().getSimpleName(), error);
+            throw new RuntimeException(error.getMessage());
         }
         return resp;
     }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/FileFormatConversionServiceImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.aspose.cells.*;
 import com.aspose.pdf.FontRepository;
@@ -8,12 +8,11 @@ import com.aspose.pdf.TextState;
 import com.aspose.words.Document;
 import com.aspose.words.FontSettings;
 import com.aspose.words.SaveOptions;
-import com.rongwei.bscommon.sys.service.FileFormatConversionService;
-import com.rongwei.bscommon.sys.utils.AsposeLicenseConfig;
-import com.rongwei.bscommon.sys.utils.QHSEConstant;
-import com.rongwei.bscommon.sys.utils.QHSEUtils;
+import com.rongwei.bscommon.system.service.FileFormatConversionService;
+import com.rongwei.bscommon.system.utils.AsposeLicenseConfig;
+import com.rongwei.bscommon.system.utils.QHSEConstant;
+import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
-import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.slf4j.Logger;
@@ -35,9 +34,9 @@ import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.ContentType.STREAM;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.DEFAULT_WATER_MARK;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.FileType.*;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.ContentType.STREAM;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.DEFAULT_WATER_MARK;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.FileType.*;
 
 /**
  * FileFormatConversionServiceImpl class
@@ -50,10 +49,10 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
     private static final Logger log = LoggerFactory.getLogger(FileFormatConversionServiceImpl.class);
 
     @Autowired
-    private SysFileItemServiceImpl sysFileItemServiceImpl;
+    private QhseQhseItemServiceImpl qhseFileItemServiceImpl;
 
     public SysFileItemDo fileCheck(String id) {
-        SysFileItemDo sysFileItemDo = sysFileItemServiceImpl.getById(id);
+        SysFileItemDo sysFileItemDo = qhseFileItemServiceImpl.getById(id);
         if (sysFileItemDo == null) {
             throw new RuntimeException("无法根据ID获取到文件信息");
         }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaterialOutboundDetailsRecordServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.MaterialOutboundDetailsRecordDao;
-import com.rongwei.bscommon.sys.service.MaterialOutboundDetailsRecordService;
+import com.rongwei.bscommon.system.dao.MaterialOutboundDetailsRecordDao;
+import com.rongwei.bscommon.system.service.MaterialOutboundDetailsRecordService;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsRecordDo;
 import org.springframework.stereotype.Service;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaterialOutboundDetailsServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.MaterialOutboundDetailsDao;
-import com.rongwei.bscommon.sys.service.MaterialOutboundDetailsService;
+import com.rongwei.bscommon.system.dao.MaterialOutboundDetailsDao;
+import com.rongwei.bscommon.system.service.MaterialOutboundDetailsService;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsDo;
 import org.springframework.stereotype.Service;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaterialOutboundRecordServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.MaterialOutboundRecordDao;
-import com.rongwei.bscommon.sys.service.MaterialOutboundRecordService;
+import com.rongwei.bscommon.system.dao.MaterialOutboundRecordDao;
+import com.rongwei.bscommon.system.service.MaterialOutboundRecordService;
 import com.rongwei.bsentity.domain.MaterialOutboundRecordDo;
 import org.springframework.stereotype.Service;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaterialOutboundServiceImpl.java

@@ -1,12 +1,12 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.MaterialOutboundDao;
-import com.rongwei.bscommon.sys.service.MaterialOutboundDetailsRecordService;
-import com.rongwei.bscommon.sys.service.MaterialOutboundDetailsService;
-import com.rongwei.bscommon.sys.service.MaterialOutboundRecordService;
-import com.rongwei.bscommon.sys.service.MaterialOutboundService;
-import com.rongwei.bscommon.sys.utils.QHSEUtils;
+import com.rongwei.bscommon.system.dao.MaterialOutboundDao;
+import com.rongwei.bscommon.system.service.MaterialOutboundDetailsRecordService;
+import com.rongwei.bscommon.system.service.MaterialOutboundDetailsService;
+import com.rongwei.bscommon.system.service.MaterialOutboundRecordService;
+import com.rongwei.bscommon.system.service.MaterialOutboundService;
+import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsDo;
 import com.rongwei.bsentity.domain.MaterialOutboundDetailsRecordDo;
 import com.rongwei.bsentity.domain.MaterialOutboundDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MobileVehicleProcessingServiceImpl.java

@@ -1,10 +1,10 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.MobileVehicleProcessingDao;
-import com.rongwei.bscommon.sys.service.AliyunSmsService;
-import com.rongwei.bscommon.sys.service.MobileVehicleProcessingService;
+import com.rongwei.bscommon.system.dao.MobileVehicleProcessingDao;
+import com.rongwei.bscommon.system.service.AliyunSmsService;
+import com.rongwei.bscommon.system.service.MobileVehicleProcessingService;
 import com.rongwei.bsentity.domain.MobileVehicleProcessingDo;
 import com.rongwei.rwcommon.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/QHSELoginServiceImpl.java

@@ -0,0 +1,89 @@
+package com.rongwei.bscommon.system.service.impl;
+
+import com.rongwei.bscommon.system.config.QHSEConfig;
+import com.rongwei.bscommon.system.service.AliyunSmsService;
+import com.rongwei.bscommon.system.service.QHSELoginService;
+import com.rongwei.rwadmincommon.system.domain.UserLoginVo;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.Random;
+
+/**
+ * QHSELoginServiceImpl class
+ *
+ * @author XH
+ * @date 2025/08/22
+ */
+@Service
+public class QHSELoginServiceImpl implements QHSELoginService {
+    private static final Logger log = LoggerFactory.getLogger(QHSELoginServiceImpl.class);
+
+    @Autowired
+    private QHSEUserServiceImpl qhseUserService;
+
+    @Value("${sms.send:true}")
+    private boolean sendSms;
+    @Value("${sms.tempId:SMS_493240217}")
+    private String smsTempId;
+    @Autowired
+    private QHSEConfig qhseConfig;
+    @Autowired
+    private RedisServiceImpl redisService;
+    @Autowired
+    private AliyunSmsService aliyunSmsService;
+
+    @Override
+    public R sendSmsCode(UserLoginVo userLogin) {
+        String smsTempId1 = qhseConfig.getSmsTempId();
+        return  R.ok(smsTempId1);
+        // System.out.println(smsTempId1);
+        // String username = userLogin.getUsername();
+        // List<SysUserDo> sysUserDos = qhseUserService.list(new LambdaQueryWrapper<SysUserDo>()
+        //         .eq(BaseDo::getDeleted, "0").eq(SysUserDo::getAccount, username));
+        // if(sysUserDos.isEmpty()){
+        //     throw new RuntimeException("该账号不存在请重新输入");
+        // }
+        // if(sysUserDos.size() > 1){
+        //     throw new RuntimeException("该账号不存在请重新输入");
+        // }
+        // SysUserDo sysUserDo = sysUserDos.get(0);
+        // String mobile = sysUserDo.getMobile();
+        // if(StringUtils.isBlank(sysUserDo.getMobile())){
+        //     throw new RuntimeException("手机号码不存在");
+        // }
+        // //密码校验
+        // String secPas = SecurityUtil.getSaltMd5AndSha(userLogin.getPassword(), sysUserDo.getId());
+        // if (!secPas.equals(sysUserDo.getPassword())) {
+        //     throw new RuntimeException("用户名密码不正确");
+        // }
+        // // 生成6位数验证码
+        // String smsCode = generateSms();
+        // Map<String, Object> map = new HashMap<>();
+        // map.put("smsCode", smsCode);
+        // if(!sendSms){
+        //     redisService.redisCatchInit("smscode-" + mobile, smsCode, 60);
+        //     return R.ok(map);
+        // }
+        // try {
+        //     aliyunSmsService.sendSms(smsTempId,new HashMap<String,String>(){{
+        //         put("code",smsCode);
+        //     }},mobile);
+        // }catch (Exception e){
+        //     log.error("验证码发送失败原因为");
+        // }
+        // redisService.redisCatchInit("smscode-" + mobile, smsCode, 60);
+        //
+        // return R.ok(map);
+    }
+
+    public  String generateSms() {
+        int code = new Random().nextInt(1000000); // 生成0-999999的随机数
+        return String.format("%06d", code); // 格式化为6位，不足补零
+    }
+
+}

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/QHSEUserServiceImpl.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.system.dao.QHSEUserDao;
+import com.rongwei.bscommon.system.service.QHSEUserService;
+import com.rongwei.rwadmincommon.system.domain.SysUserDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * QHSEUserServiceImpl class
+ *
+ * @author XH
+ * @date 2025/08/25
+ */
+@Service
+public class QHSEUserServiceImpl extends ServiceImpl<QHSEUserDao, SysUserDo>
+        implements QHSEUserService {
+}

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhEventServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.rongwei.bscommon.sys.dao.QhseRohhEventMapper;
-import com.rongwei.bscommon.sys.service.QhseRohhEventService;
+import com.rongwei.bscommon.system.dao.QhseRohhEventDao;
+import com.rongwei.bscommon.system.service.QhseRohhEventService;
 import com.rongwei.bsentity.domain.QhseRohhEventDo;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @createDate 2025-08-20 10:58:59
  */
 @Service
-public class QhseRohhEventServiceImpl extends ServiceImpl<QhseRohhEventMapper, QhseRohhEventDo>
+public class QhseRohhEventServiceImpl extends ServiceImpl<QhseRohhEventDao, QhseRohhEventDo>
         implements QhseRohhEventService {
 
 }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRectificationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.rongwei.bscommon.sys.dao.QhseRohhRectificationMapper;
-import com.rongwei.bscommon.sys.service.QhseRohhRectificationService;
+import com.rongwei.bscommon.system.dao.QhseRohhRectificationDao;
+import com.rongwei.bscommon.system.service.QhseRohhRectificationService;
 import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 * @createDate 2025-08-18 17:05:53
 */
 @Service
-public class QhseRohhRectificationServiceImpl extends ServiceImpl<QhseRohhRectificationMapper, QhseRohhRectificationDo>
+public class QhseRohhRectificationServiceImpl extends ServiceImpl<QhseRohhRectificationDao, QhseRohhRectificationDo>
     implements QhseRohhRectificationService {
 
 }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRpServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.rongwei.bscommon.sys.dao.QhseRohhRpMapper;
-import com.rongwei.bscommon.sys.service.QhseRohhRpService;
+import com.rongwei.bscommon.system.dao.QhseRohhRpDao;
+import com.rongwei.bscommon.system.service.QhseRohhRpService;
 import com.rongwei.bsentity.domain.QhseRohhRpDo;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 * @createDate 2025-08-18 17:05:53
 */
 @Service
-public class QhseRohhRpServiceImpl extends ServiceImpl<QhseRohhRpMapper, QhseRohhRpDo>
+public class QhseRohhRpServiceImpl extends ServiceImpl<QhseRohhRpDao, QhseRohhRpDo>
     implements QhseRohhRpService{
 
 }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.QhseRohhMapper;
-import com.rongwei.bscommon.sys.service.QhseRohhService;
+import com.rongwei.bscommon.system.dao.QhseRohhDao;
+import com.rongwei.bscommon.system.service.QhseRohhService;
 import com.rongwei.bsentity.domain.QhseRohhDo;
 import org.springframework.stereotype.Service;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * @createDate 2025-08-18 17:05:53
  */
 @Service
-public class QhseRohhServiceImpl extends ServiceImpl<QhseRohhMapper, QhseRohhDo> implements QhseRohhService {
+public class QhseRohhServiceImpl extends ServiceImpl<QhseRohhDao, QhseRohhDo> implements QhseRohhService {
 
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhValidateServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.QhseRohhValidateMapper;
-import com.rongwei.bscommon.sys.service.QhseRohhValidateService;
+import com.rongwei.bscommon.system.dao.QhseRohhValidateDao;
+import com.rongwei.bscommon.system.service.QhseRohhValidateService;
 import com.rongwei.bsentity.domain.QhseRohhValidateDo;
 
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 * @createDate 2025-08-18 17:05:53
 */
 @Service
-public class QhseRohhValidateServiceImpl extends ServiceImpl<QhseRohhValidateMapper, QhseRohhValidateDo>
+public class QhseRohhValidateServiceImpl extends ServiceImpl<QhseRohhValidateDao, QhseRohhValidateDo>
     implements QhseRohhValidateService {
 
 }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseTargetResponsibilityDocumentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.aspose.cells.PdfCompliance;
 import com.aspose.cells.PdfSaveOptions;
@@ -6,14 +6,13 @@ import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.QhseTargetResponsibilityDocumentDao;
-import com.rongwei.bscommon.sys.service.QhseTargetResponsibilityDocumentService;
-import com.rongwei.bscommon.sys.utils.WordMergeHandler;
-import com.rongwei.bscommon.sys.utils.WordUtils;
+import com.rongwei.bscommon.system.dao.QhseTargetResponsibilityDocumentDao;
+import com.rongwei.bscommon.system.service.QhseTargetResponsibilityDocumentService;
+import com.rongwei.bscommon.system.utils.WordMergeHandler;
+import com.rongwei.bscommon.system.utils.WordUtils;
 import com.rongwei.bsentity.domain.QhseTargetResponsibilityDocumentDo;
 import com.rongwei.bsentity.domain.QhseTargetResponsibilityDocumentSignatureDo;
 import com.rongwei.rwcommon.base.BaseDo;
-import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.slf4j.Logger;
@@ -33,12 +32,12 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.DatePattern.DATE_PATTERN_YMD_CN;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.FILE_SEPARATOR;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.FileType.DOC;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.FileType.DOCX;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.PartType.PARTY_A;
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.PartType.PARTY_B;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.DatePattern.DATE_PATTERN_YMD_CN;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.FILE_SEPARATOR;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.FileType.DOC;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.FileType.DOCX;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.PartType.PARTY_A;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.PartType.PARTY_B;
 
 /**
  * @author libai
@@ -56,7 +55,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
 
     private static final Logger log = LoggerFactory.getLogger(QhseTargetResponsibilityDocumentServiceImpl.class);
     @Autowired
-    private SysFileItemServiceImpl sysFileItemServiceImpl;
+    private QhseQhseItemServiceImpl qhseFileItemServiceImpl;
 
     @Override
     public void lettersOfResponsibilitySignaturePreview(String mainId, String subTableId, HttpServletResponse response) {
@@ -169,7 +168,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
             throw new RuntimeException("无法获取到责任书信息,请联系系统管理员");
         }
         String responsibilityfiles = qhseTargetResponsibilityDocumentDo.getResponsibilityfiles();
-        SysFileItemDo tempFile = sysFileItemServiceImpl.getById(responsibilityfiles.split(FILE_SEPARATOR, 2)[1]);
+        SysFileItemDo tempFile = qhseFileItemServiceImpl.getById(responsibilityfiles.split(FILE_SEPARATOR, 2)[1]);
         if (tempFile == null) {
             log.error("责任书在目录中存在");
             throw new RuntimeException("无法获取到责任书信息,请联系系统管理员");
@@ -210,7 +209,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
         SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN_YMD_CN);
         String partAIds = signatureDataMap.getOrDefault(PARTY_A, "");
         if (StringUtils.isNotBlank(partAIds)) {
-            SysFileItemDo sysFileItemDo = sysFileItemServiceImpl.getById(partAIds);
+            SysFileItemDo sysFileItemDo = qhseFileItemServiceImpl.getById(partAIds);
             partAPath = sysFileItemDo == null ? "" : sysFileItemDo.getFullpath();
             partASignatureDate = sysFileItemDo == null ? "" : sdf.format(sysFileItemDo.getCreatedate());
             partAName = sysFileItemDo == null ? "" : sysFileItemDo.getCreateusername();
@@ -219,7 +218,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
         String partBIds = signatureDataMap.getOrDefault(PARTY_B, "");
         List<SysFileItemDo> partBPathList = new ArrayList<>();
         if (StringUtils.isNotBlank(partAIds)) {
-            partBPathList = sysFileItemServiceImpl.getBaseMapper().selectBatchIds(Arrays.asList(partBIds.split(",")));
+            partBPathList = qhseFileItemServiceImpl.getBaseMapper().selectBatchIds(Arrays.asList(partBIds.split(",")));
         }
 
         //需要填充word的模板数据

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseTargetResponsibilityDocumentSignatureServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.QhseTargetResponsibilityDocumentSignatureDao;
-import com.rongwei.bscommon.sys.service.QhseTargetResponsibilityDocumentSignatureService;
+import com.rongwei.bscommon.system.dao.QhseTargetResponsibilityDocumentSignatureDao;
+import com.rongwei.bscommon.system.service.QhseTargetResponsibilityDocumentSignatureService;
 import com.rongwei.bsentity.domain.QhseTargetResponsibilityDocumentSignatureDo;
 import org.springframework.stereotype.Service;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.aspose.cells.PdfCompliance;
 import com.aspose.cells.PdfSaveOptions;
@@ -6,14 +6,13 @@ import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.fegin.AdminFeginService;
-import com.rongwei.bscommon.sys.dao.QhseVisitorManagementDao;
-import com.rongwei.bscommon.sys.service.QhseVisitorManagementService;
-import com.rongwei.bscommon.sys.utils.WordMergeHandler;
-import com.rongwei.bscommon.sys.utils.WordUtils;
+import com.rongwei.bscommon.system.fegin.QhseAdminFeginService;
+import com.rongwei.bscommon.system.dao.QhseVisitorManagementDao;
+import com.rongwei.bscommon.system.service.QhseVisitorManagementService;
+import com.rongwei.bscommon.system.utils.WordMergeHandler;
+import com.rongwei.bscommon.system.utils.WordUtils;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
 import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
-import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
@@ -26,14 +25,13 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.QHSEConstant.FILE_SEPARATOR;
+import static com.rongwei.bscommon.system.utils.QHSEConstant.FILE_SEPARATOR;
 
 /**
  * 访客管理(QhseVisitorManagement)表服务实现类
@@ -47,7 +45,7 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private AdminFeginService adminFeginService;
+    private QhseAdminFeginService qhseAdminFeginService;
 
     @Autowired
     private QhseVisitorManagementDao qhseVisitorManagementDao;
@@ -60,11 +58,11 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
 
 
     @Autowired
-    private SysFileItemServiceImpl sysFileItemServiceImpl;
+    private QhseQhseItemServiceImpl qhseFileItemServiceImpl;
 
     @Override
     public void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
-        adminFeginService.generalMsInsert(masterSlaveInsert);
+        qhseAdminFeginService.generalMsInsert(masterSlaveInsert);
     }
 
     @Override
@@ -99,7 +97,7 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
 
         SysFileItemDo tempDo = null;
         if(StringUtils.isBlank(fileId)){
-            tempDo= sysFileItemServiceImpl.getOne(new LambdaQueryWrapper<SysFileItemDo>().eq(SysFileItemDo::getFilename, fileName).eq(SysFileItemDo::getDeleted, "0"));
+            tempDo= qhseFileItemServiceImpl.getOne(new LambdaQueryWrapper<SysFileItemDo>().eq(SysFileItemDo::getFilename, fileName).eq(SysFileItemDo::getDeleted, "0"));
         }else {
             tempDo = fileFormatConversionService.fileCheck(fileId);
         }

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RedisServiceImpl.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
@@ -6,12 +6,11 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.rongwei.bscommon.sys.service.RedisService;
+import com.rongwei.bscommon.system.service.RedisService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -20,7 +19,7 @@ import org.springframework.stereotype.Service;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-@Service("MyRedisService")
+@Service("QhseRedisService")
 public class RedisServiceImpl implements RedisService {
 
     @Value("${jwt.expire:360000}")

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RohhServiceImpl.java

@@ -1,7 +1,7 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
-import com.rongwei.bscommon.sys.service.RohhService;
-import com.rongwei.bscommon.sys.utils.QHSEUtils;
+import com.rongwei.bscommon.system.service.RohhService;
+import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.ROHHEventVo;
 import com.rongwei.bsentity.vo.TaskTransferVo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SendRecordServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.SendRecordDao;
-import com.rongwei.bscommon.sys.service.SendRecordService;
+import com.rongwei.bscommon.system.dao.SendRecordDao;
+import com.rongwei.bscommon.system.service.SendRecordService;
 import com.rongwei.bsentity.domain.SendRecordDo;
 import org.springframework.stereotype.Service;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/StudyFilePersonRecordServiceImpl.java

@@ -1,7 +1,7 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
-import com.rongwei.bscommon.sys.dao.StudyFilePersonRecordDao;
-import com.rongwei.bscommon.sys.service.StudyFilePersonRecordService;
+import com.rongwei.bscommon.system.dao.StudyFilePersonRecordDao;
+import com.rongwei.bscommon.system.service.StudyFilePersonRecordService;
 import com.rongwei.bsentity.domain.StudyFilePersonRecordDo;
 import com.rongwei.rwcommon.base.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/StudyFilePersonServiceImpl.java

@@ -1,7 +1,7 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
-import com.rongwei.bscommon.sys.dao.StudyFilePersonDao;
-import com.rongwei.bscommon.sys.service.StudyFilePersonService;
+import com.rongwei.bscommon.system.dao.StudyFilePersonDao;
+import com.rongwei.bscommon.system.service.StudyFilePersonService;
 import com.rongwei.bsentity.domain.StudyFilePersonDo;
 import com.rongwei.rwcommon.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/StudyFileRecordServiceImpl.java

@@ -1,7 +1,7 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
-import com.rongwei.bscommon.sys.dao.StudyFileRecordDao;
-import com.rongwei.bscommon.sys.service.StudyFileRecordService;
+import com.rongwei.bscommon.system.dao.StudyFileRecordDao;
+import com.rongwei.bscommon.system.service.StudyFileRecordService;
 import com.rongwei.bsentity.domain.StudyFileRecordDo;
 import com.rongwei.rwcommon.base.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/StudyFileServiceImpl.java

@@ -1,11 +1,11 @@
-package com.rongwei.bscommon.sys.service.impl;
-
-import com.rongwei.bscommon.sys.dao.StudyFileDao;
-import com.rongwei.bscommon.sys.service.StudyFilePersonRecordService;
-import com.rongwei.bscommon.sys.service.StudyFilePersonService;
-import com.rongwei.bscommon.sys.service.StudyFileRecordService;
-import com.rongwei.bscommon.sys.service.StudyFileService;
-import com.rongwei.bscommon.sys.utils.QHSEUtils;
+package com.rongwei.bscommon.system.service.impl;
+
+import com.rongwei.bscommon.system.dao.StudyFileDao;
+import com.rongwei.bscommon.system.service.StudyFilePersonRecordService;
+import com.rongwei.bscommon.system.service.StudyFilePersonService;
+import com.rongwei.bscommon.system.service.StudyFileRecordService;
+import com.rongwei.bscommon.system.service.StudyFileService;
+import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.bsentity.Dto.StudyFileProduceHistoryDto;
 import com.rongwei.bsentity.domain.StudyFileDo;
 import com.rongwei.bsentity.domain.StudyFilePersonDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysPagePartServiceImpl.java

@@ -1,8 +1,8 @@
-package com.rongwei.bscommon.sys.service.impl;
+package com.rongwei.bscommon.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.SysPagePartDao;
-import com.rongwei.bscommon.sys.service.SysPagePartService;
+import com.rongwei.bscommon.system.dao.SysPagePartDao;
+import com.rongwei.bscommon.system.service.SysPagePartService;
 import com.rongwei.bsentity.domain.SysPagePartDo;
 import org.springframework.stereotype.Service;
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/AsposeLicenseConfig.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bscommon.system.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/QHSEConstant.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bscommon.system.utils;
 
 /**
  * JXKHConstant class

qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/QHSEUtils.java

@@ -1,6 +1,6 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bscommon.system.utils;
 
-import com.rongwei.bscommon.sys.service.RedisService;
+import com.rongwei.bscommon.system.service.RedisService;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;

qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/WordMergeHandler.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bscommon.system.utils;
 
 import com.aspose.words.*;
 import com.rongwei.rwcommon.utils.StringUtils;

qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/WordUtils.java

@@ -1,7 +1,6 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bscommon.system.utils;
 
 import com.aspose.words.*;
-import com.rongwei.rwcommon.base.exception.CustomException;
 import lombok.Data;
 import org.springframework.core.io.ClassPathResource;
 

qhse-common/src/main/resources/mybatis/SysPagePartDao.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rongwei.bscommon.sys.dao.SysPagePartDao">
-    <select id="selectById" resultType="com.rongwei.bsentity.domain.SysPagePartDo">
-        SELECT * FROM sys_page_part WHERE id = #{id}
-    </select>
-</mapper>

qhse-entity/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>rw-common-utils</artifactId>
             <version>1.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.2.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhDo.java

@@ -2,16 +2,17 @@ package com.rongwei.bsentity.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 隐患任务信息
+ *
  * @TableName qhse_rohh
  */
-@TableName(value ="qhse_rohh")
+@TableName(value = "qhse_rohh")
 @Data
 public class QhseRohhDo extends BaseDo {
     /**
@@ -241,10 +242,23 @@ public class QhseRohhDo extends BaseDo {
     private String syncstate;
     /**
      * 整改退回次数
-      */
+     */
     private int rectificationreturncount;
     /**
      * 说明
      */
     private String describe;
+
+    /**
+     * 隐患视频
+     */
+    private String hdvideo;
+    /**
+     * 违规人ID
+     */
+    private String violatorid;
+    /**
+     * 违规人
+     */
+    private String violatorname;
 }

qhse-server/src/main/java/com/rongwei/BusinessServerApplication.java

@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@MapperScan("com.rongwei.bscommon.sys.dao")
+@MapperScan("com.rongwei.*.*.dao")
 @EnableScheduling
 public class BusinessServerApplication {
     public static void main(String[] args) {

qhse-server/src/main/java/com/rongwei/controller/FileFormatConversionController.java

@@ -1,6 +1,6 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.impl.FileFormatConversionServiceImpl;
+import com.rongwei.bscommon.system.service.impl.FileFormatConversionServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

qhse-server/src/main/java/com/rongwei/controller/LettersOfResponsibilityController.java

@@ -1,13 +1,12 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.impl.QhseTargetResponsibilityDocumentServiceImpl;
+import com.rongwei.bscommon.system.service.impl.QhseTargetResponsibilityDocumentServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /**
  * LettersOfResponsibilityController class

qhse-server/src/main/java/com/rongwei/controller/MaterialOutboundController.java

@@ -1,6 +1,6 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.MaterialOutboundService;
+import com.rongwei.bscommon.system.service.MaterialOutboundService;
 import com.rongwei.bsentity.domain.MaterialOutboundDo;
 import com.rongwei.rwcommon.base.R;
 import lombok.extern.slf4j.Slf4j;

qhse-server/src/main/java/com/rongwei/controller/MobileVehicleProcessingController.java

@@ -1,6 +1,6 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.MobileVehicleProcessingService;
+import com.rongwei.bscommon.system.service.MobileVehicleProcessingService;
 import com.rongwei.rwcommon.base.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

qhse-server/src/main/java/com/rongwei/controller/PagePartController.java

@@ -1,23 +0,0 @@
-package com.rongwei.controller;
-
-
-import com.rongwei.bscommon.sys.service.SysPagePartService;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("page-part")
-@Slf4j
-public class PagePartController {
-
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    SysPagePartService sysPagePartService;
-
-
-
-}

qhse-server/src/main/java/com/rongwei/controller/QHSELoginController.java

@@ -0,0 +1,36 @@
+package com.rongwei.controller;
+
+import com.rongwei.bscommon.system.service.impl.QHSELoginServiceImpl;
+import com.rongwei.rwadmincommon.system.domain.UserLoginVo;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * QHSELoginController class
+ *
+ * @author XH
+ * @date 2025/08/22
+ */
+@RestController
+@RequestMapping("/login")
+public class QHSELoginController {
+
+    private static final Logger log = LoggerFactory.getLogger(QHSELoginController.class);
+    @Autowired
+    private QHSELoginServiceImpl qhseLoginService;
+
+    /**
+     * 发送验证码
+     *
+     * @param account 账号
+     * @return 发送结果
+     */
+    @PostMapping("/sms/code")
+    public R sendSmsCode(@RequestBody UserLoginVo userLogin) {
+        log.info("发送验证码,开始发送短信");
+        return qhseLoginService.sendSmsCode(userLogin);
+    }
+}

qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -1,8 +1,7 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.QhseVisitorManagementService;
-import com.rongwei.bscommon.sys.service.SysPagePartService;
-import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
+import com.rongwei.bscommon.system.service.QhseVisitorManagementService;
+import com.rongwei.bscommon.system.service.SysPagePartService;
 import com.rongwei.bsentity.domain.SysPagePartDo;
 import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
 import com.rongwei.rwcommon.base.R;

qhse-server/src/main/java/com/rongwei/controller/RohhController.java

@@ -1,6 +1,6 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.impl.RohhServiceImpl;
+import com.rongwei.bscommon.system.service.impl.RohhServiceImpl;
 import com.rongwei.bsentity.vo.ROHHEventVo;
 import com.rongwei.bsentity.vo.TaskTransferVo;
 import com.rongwei.rwcommon.base.R;

qhse-server/src/main/java/com/rongwei/controller/SendMessageController.java

@@ -1,7 +1,7 @@
 package com.rongwei.controller;
 
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
-import com.rongwei.bscommon.sys.service.AliyunSmsService;
+import com.rongwei.bscommon.system.service.AliyunSmsService;
 import com.rongwei.bsentity.Dto.SendMessageDto;
 import com.rongwei.rwcommon.base.R;
 import lombok.extern.slf4j.Slf4j;

qhse-server/src/main/java/com/rongwei/controller/StudyFileController.java

@@ -1,6 +1,6 @@
 package com.rongwei.controller;
 
-import com.rongwei.bscommon.sys.service.StudyFileService;
+import com.rongwei.bscommon.system.service.StudyFileService;
 import com.rongwei.bsentity.Dto.StudyFileProduceHistoryDto;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;

qhse-server/src/main/resources/bootstrap-dev.yml

@@ -4,11 +4,13 @@ spring:
       config:
         file-extension: yaml
         server-addr: 127.0.0.1:8848
-        namespace: cd047569-9470-4dfb-8663-b113d01cd30f
+        namespace: 38d4d7fd-73aa-4ead-9dfb-4c50370f6874
         ext-config[0]:
           data-id: common-config.yaml
       discovery:
         server-addr: 127.0.0.1:8848
-        namespace: cd047569-9470-4dfb-8663-b113d01cd30f
+        namespace: 38d4d7fd-73aa-4ead-9dfb-4c50370f6874
+        ext-config[0]:
+          data-id: common-config.yaml