清理模块

hx-admin/pom.xml

@@ -29,11 +29,6 @@
             <artifactId>hx-supply</artifactId>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>com.fjhx</groupId>-->
-        <!--            <artifactId>hx-iot</artifactId>-->
-        <!--        </dependency>-->
-
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-wms</artifactId>
@@ -66,33 +61,14 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
             <artifactId>hx-sale</artifactId>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>com.fjhx</groupId>-->
-        <!--            <artifactId>hx-victoriatourist</artifactId>-->
-        <!--        </dependency>-->
-
-        <!--        <dependency>-->
-        <!--            <groupId>com.fjhx</groupId>-->
-        <!--            <artifactId>hx-dingding</artifactId>-->
-        <!--        </dependency>-->
-
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-ehsd</artifactId>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>com.fjhx</groupId>-->
-        <!--            <artifactId>hx-jxst</artifactId>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-form</artifactId>

hx-form/pom.xml

@@ -50,10 +50,6 @@
         </dependency>
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
             <artifactId>hx-purchase</artifactId>
         </dependency>
         <dependency>

hx-form/src/main/java/com/fjhx/form/service/impl/StatisticsServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.form.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.po.AccountPayment;
@@ -13,14 +12,6 @@ import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.form.mapper.StatisticsMapper;
 import com.fjhx.form.service.StatisticsService;
-import com.fjhx.mail.entity.enterprise.po.EnterpriseMailbox;
-import com.fjhx.mail.entity.enterprise.po.EnterpriseMessage;
-import com.fjhx.mail.entity.personal.po.PersonalMailbox;
-import com.fjhx.mail.entity.personal.po.PersonalMessage;
-import com.fjhx.mail.service.enterprise.EnterpriseMailboxService;
-import com.fjhx.mail.service.enterprise.EnterpriseMessageService;
-import com.fjhx.mail.service.personal.PersonalMailboxService;
-import com.fjhx.mail.service.personal.PersonalMessageService;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.sale.entity.contract.po.Contract;
@@ -43,14 +34,6 @@ import java.util.*;
 @Service
 public class StatisticsServiceImpl implements StatisticsService {
     @Autowired
-    private PersonalMailboxService personalMailboxService;
-    @Autowired
-    private PersonalMessageService personalMessageService;
-    @Autowired
-    private EnterpriseMailboxService enterpriseMailboxService;
-    @Autowired
-    private EnterpriseMessageService enterpriseMessageService;
-    @Autowired
     private FlowExampleService flowExampleService;
     @Autowired
     private AccountRunningWaterService accountRunningWaterService;
@@ -76,18 +59,18 @@ public class StatisticsServiceImpl implements StatisticsService {
 
         //统计未读邮件数
         Long unreadMailCount = 0L;
-        List<Long> mailboxIds = personalMailboxService.listObject(PersonalMailbox::getId, q -> q.eq(PersonalMailbox::getUserId, userId));
-        if (ObjectUtil.isNotEmpty(mailboxIds)) {
-            unreadMailCount += personalMessageService.count(q -> q
-                    .in(PersonalMessage::getMailboxId, mailboxIds)
-            );
-        }
-        List<Long> eMailboxIds = enterpriseMailboxService.listObject(EnterpriseMailbox::getId, q -> q.eq(EnterpriseMailbox::getUserId, userId));
-        if (ObjectUtil.isNotEmpty(eMailboxIds)) {
-            unreadMailCount += enterpriseMessageService.count(q -> q
-                    .in(EnterpriseMessage::getMailboxId, eMailboxIds)
-            );
-        }
+//        List<Long> mailboxIds = personalMailboxService.listObject(PersonalMailbox::getId, q -> q.eq(PersonalMailbox::getUserId, userId));
+//        if (ObjectUtil.isNotEmpty(mailboxIds)) {
+//            unreadMailCount += personalMessageService.count(q -> q
+//                    .in(PersonalMessage::getMailboxId, mailboxIds)
+//            );
+//        }
+//        List<Long> eMailboxIds = enterpriseMailboxService.listObject(EnterpriseMailbox::getId, q -> q.eq(EnterpriseMailbox::getUserId, userId));
+//        if (ObjectUtil.isNotEmpty(eMailboxIds)) {
+//            unreadMailCount += enterpriseMessageService.count(q -> q
+//                    .in(EnterpriseMessage::getMailboxId, eMailboxIds)
+//            );
+//        }
         //统计待审批数据
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         long waitFlowCount = flowExampleService.count(q -> q.eq(FlowExample::getStatus, 1).eq(FlowExample::getHandleUserId, userId));

hx-oa/src/main/java/com/fjhx/oa/utils/Notice.java

@@ -6,14 +6,11 @@ import com.fjhx.oa.entity.schedule.po.ScheduleDetails;
 import com.fjhx.oa.entity.schedule.po.ScheduleInfo;
 import com.fjhx.oa.service.schedule.ScheduleDetailsService;
 import com.fjhx.oa.service.schedule.ScheduleInfoService;
-//import com.fjhx.socket.service.WebSocketServer;
 import com.ruoyi.framework.mybatis.holder.TenantHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 
-import javax.annotation.PostConstruct;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -37,8 +34,8 @@ public class Notice {
     /**
      * 启动时和每天0点 查询当天的日程
      */
-    @PostConstruct
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @PostConstruct
+//    @Scheduled(cron = "0 0 0 * * ?")
     public void getNoticeList() {
         TenantHolder.setIgnore(true);
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -53,7 +50,7 @@ public class Notice {
     /**
      * 每10秒检查一次
      */
-    @Scheduled(cron = "0/10 * * * * ?")
+//    @Scheduled(cron = "0/10 * * * * ?")
     public void sendNoticeTime() {
         TenantHolder.setIgnore(true);
         List<ScheduleInfo> scheduleInfos = new ArrayList<>();

hx-sale/pom.xml

@@ -37,18 +37,6 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-purchase</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -25,12 +25,6 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.mail.entity.enterprise.po.EnterpriseDomain;
-import com.fjhx.mail.entity.enterprise.po.EnterpriseMailbox;
-import com.fjhx.mail.entity.personal.po.PersonalMailbox;
-import com.fjhx.mail.service.enterprise.EnterpriseDomainService;
-import com.fjhx.mail.service.enterprise.EnterpriseMailboxService;
-import com.fjhx.mail.service.personal.PersonalMailboxService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
@@ -104,12 +98,6 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     @Autowired
     private AccountManagementService accountManagementService;
     @Autowired
-    private PersonalMailboxService personalMailboxService;
-    @Autowired
-    private EnterpriseMailboxService enterpriseMailboxService;
-    @Autowired
-    private EnterpriseDomainService enterpriseDomainService;
-    @Autowired
     private SampleShipmentService sampleShipmentService;
     @Autowired
     private ContractTemplateService contractTemplateService;
@@ -130,9 +118,9 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     public Page<SampleVo> getPage(SampleSelectDto dto) {
         IWrapper<Sample> wrapper = getWrapper();
         SysUser sysUser = UserUtil.getUserInfo();
-        if(StringUtils.isEmpty(sysUser.getUserCode())){//不是业务员看所有
+        if (StringUtils.isEmpty(sysUser.getUserCode())) {//不是业务员看所有
             return pageCommon(dto, wrapper);
-        }else{//是业务员
+        } else {//是业务员
             List<Long> authIdList = customerService.getAuthIdList();
             if (authIdList.size() == 0) {
                 return new Page<>();
@@ -143,13 +131,13 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
     }
 
-    public Page<SampleVo> pageCommon(SampleSelectDto dto, IWrapper<Sample> wrapper){
+    public Page<SampleVo> pageCommon(SampleSelectDto dto, IWrapper<Sample> wrapper) {
         wrapper.orderByDesc("t1", Sample::getCreateTime);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Sample::getStatus, dto.getStatus());
-        }else{
+        } else {
             wrapper.eq("t1", Sample::getIsChange, "0");//列表只展示未变更得数据
-            wrapper.ne("t1",Sample::getIsShow,1);
+            wrapper.ne("t1", Sample::getIsShow, 1);
             wrapper.between("t1", Sample::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
         }
         if (StringUtils.isNotEmpty(dto.getUserId())) {
@@ -207,11 +195,11 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     @Override
     public SampleVo detail(Long id) {
         Sample sample = this.getById(id);
-        Assert.notEmpty(sample,"查询不到样品单信息");
+        Assert.notEmpty(sample, "查询不到样品单信息");
         SampleVo result = BeanUtil.toBean(sample, SampleVo.class);
         //赋值模板名称
         ContractTemplate contractTemplate = contractTemplateService.getById(result.getContractTemplateId());
-        if(ObjectUtil.isNotEmpty(contractTemplate)) {
+        if (ObjectUtil.isNotEmpty(contractTemplate)) {
             result.setContractTemplateName(contractTemplate.getTemplateName());
         }
         // 卖方信息
@@ -233,13 +221,13 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         result.setBuyCityName(areaMap.get(result.getBuyCityId()));
         //赋值收款账号
         AccountManagement accountManagement = accountManagementService.getById(result.getShroffAccountId());
-        if(ObjectUtil.isNotEmpty(accountManagement)){
+        if (ObjectUtil.isNotEmpty(accountManagement)) {
             result.setShroffAccountName(accountManagement.getName());
         }
 
         //赋值产品信息
         List<SampleProduct> sampleProductList = sampleProductService.list(q -> q.eq(SampleProduct::getSampleId, result.getId()));
-        productInfoService.attributeAssign(sampleProductList,SampleProduct::getProductId,(item,product)->{
+        productInfoService.attributeAssign(sampleProductList, SampleProduct::getProductId, (item, product) -> {
             item.setProductNameCn(product.getName());
         });
         result.setSampleProductList(sampleProductList);
@@ -249,7 +237,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         //赋值出货信息
         List<SampleShipment> sampleShipmentList = sampleShipmentService.list(q -> q.eq(SampleShipment::getSampleId, result.getId()));
         List<SampleShipmentVo> sampleShipmentVos = BeanUtil.copyToList(sampleShipmentList, SampleShipmentVo.class);
-        productInfoService.attributeAssign(sampleShipmentVos,SampleShipmentVo::getProductId, (item, productInfo) -> {
+        productInfoService.attributeAssign(sampleShipmentVos, SampleShipmentVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCode());
             item.setProductName(productInfo.getName());
         });
@@ -338,6 +326,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
     /**
      * 修改数据
+     *
      * @param sample
      */
     @Transactional(rollbackFor = Exception.class)
@@ -501,19 +490,19 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
             contractPdfInfoVo.setCreateUserNameEn(sysUser.getNickNameEn());//英文名
         }
         //赋值创建人邮箱地址
-        List<EnterpriseMailbox> enterpriseMailboxList = enterpriseMailboxService.list(q -> q.eq(EnterpriseMailbox::getUserId, sample.getCreateUser()));
+//        List<EnterpriseMailbox> enterpriseMailboxList = enterpriseMailboxService.list(q -> q.eq(EnterpriseMailbox::getUserId, sample.getCreateUser()));
         String eMailAddress = "";
-        if (ObjectUtil.isNotEmpty(enterpriseMailboxList)) {
-            //优先获取企业邮箱
-            EnterpriseMailbox enterpriseMailbox = enterpriseMailboxList.get(0);
-            EnterpriseDomain enterpriseDomain = enterpriseDomainService.getById(enterpriseMailbox.getDomainId());
-            eMailAddress = enterpriseMailbox.getMailUserPrefix() + "@" + enterpriseDomain.getDomainName();
-        } else {
-            List<PersonalMailbox> personalMailboxList = personalMailboxService.list(q -> q.eq(PersonalMailbox::getUserId, sample.getCreateUser()));
-            if (ObjectUtil.isNotEmpty(personalMailboxList)) {
-                eMailAddress = personalMailboxList.get(0).getMailUser();
-            }
-        }
+//        if (ObjectUtil.isNotEmpty(enterpriseMailboxList)) {
+//            //优先获取企业邮箱
+//            EnterpriseMailbox enterpriseMailbox = enterpriseMailboxList.get(0);
+//            EnterpriseDomain enterpriseDomain = enterpriseDomainService.getById(enterpriseMailbox.getDomainId());
+//            eMailAddress = enterpriseMailbox.getMailUserPrefix() + "@" + enterpriseDomain.getDomainName();
+//        } else {
+//            List<PersonalMailbox> personalMailboxList = personalMailboxService.list(q -> q.eq(PersonalMailbox::getUserId, sample.getCreateUser()));
+//            if (ObjectUtil.isNotEmpty(personalMailboxList)) {
+//                eMailAddress = personalMailboxList.get(0).getMailUser();
+//            }
+//        }
         contractPdfInfoVo.setCreateUserEmail(eMailAddress);
 
     }

pom.xml

@@ -16,7 +16,6 @@
         <module>hx-customer</module>
         <module>hx-ehsd</module>
         <module>hx-item</module>
-        <module>hx-mail</module>
         <module>hx-mes</module>
         <module>hx-supply</module>
         <module>hx-wms</module>
@@ -27,10 +26,6 @@
         <module>hx-sale</module>
         <module>hx-form</module>
         <module>hx-jushuitan</module>
-        <!--        <module>hx-iot</module>-->
-        <!--        <module>hx-jxst</module>-->
-        <!--        <module>hx-victoriatourist</module>-->
-        <!--        <module>hx-dingding</module>-->
     </modules>
 
     <properties>
@@ -86,11 +81,6 @@
             </dependency>
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>hx-mail</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
                 <artifactId>hx-mes</artifactId>
                 <version>${hx.version}</version>
             </dependency>