删除无用模块

hx-dingding/pom.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.fjhx</groupId>
-        <artifactId>bytesailing</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <artifactId>hx-dingding</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-base</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>dingtalk</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>alibaba-dingtalk-service-sdk</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.taobao</groupId>
-            <artifactId>lippi-oapi-encrpt</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.github.biezhi</groupId>
-            <artifactId>TinyPinyin</artifactId>
-            <version>2.0.3.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-common</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

hx-dingding/src/main/java/com/fjhx/dingding/constant/Constant.java

@@ -1,36 +0,0 @@
-package com.fjhx.dingding.constant;
-
-/**
- * https://open-dev.dingtalk.com/fe/app#/appMgr/provider/h5/131175/17
- * https://open.dingtalk.com/document/isvapp/configure-synchttp-push
- * https://open.dingtalk.com/document/isvapp/application-development-process-of-third-party-enterprises
- */
-public class Constant {
-
-    /**
-     * 应用的SuiteKey，登录开发者后台，点击应用管理，进入应用详情可见
-     * https://open-dev.dingtalk.com/fe/app#/appMgr/provider/h5/131175/1
-     */
-    public static final String SUITE_KEY = "suite8j0xog63udtsaq7g";
-
-    /**
-     * 应用的SuiteSecret，登录开发者后台，点击应用管理，进入应用详情可见
-     * https://open-dev.dingtalk.com/fe/app#/appMgr/provider/h5/131175/1
-     */
-    public static final String SUITE_SECRET = "NdbWhD6Iu9n5h-3IKXeepmPwmcFbOw9Em7UeiJKyq3_Wa8LgmJ-G6b8SmsOJMrMc";
-
-    /**
-     * 回调URL签名用。应用的签名Token, 登录开发者后台，点击应用管理，进入应用详情可见
-     * https://open-dev.dingtalk.com/fe/app#/appMgr/provider/h5/131175/17
-     */
-    public static final String TOKEN = "SJE6L77NzUB4b2HqsY2ELpRg5uD9HJn6dQ";
-
-    /**
-     * 回调URL加解密用。应用的"数据加密密钥"，登录开发者后台，点击应用管理，进入应用详情可见
-     * https://open-dev.dingtalk.com/fe/app#/appMgr/provider/h5/131175/17
-     */
-    public static final String ENCODING_AES_KEY = "FFTCrWbBbdDauMGImmno7g6RSFKDF6HllywGl932b8o";
-
-
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/controller/DingController.java

@@ -1,100 +0,0 @@
-package com.fjhx.dingding.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.dingtalk.oapi.lib.aes.DingTalkEncryptor;
-import com.fjhx.dingding.constant.Constant;
-import com.fjhx.dingding.entity.dto.GetUserTokenDto;
-import com.fjhx.dingding.service.DingService;
-import com.ruoyi.common.annotation.NonInterception;
-import com.ruoyi.common.annotation.TenantIgnore;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/open")
-public class DingController {
-
-    @Autowired
-    private DingService dingService;
-
-    /**
-     * 创建应用，验证回调URL创建有效事件（第一次保存回调URL之前）
-     */
-    private static final String EVENT_CHECK_CREATE_SUITE_URL = "check_create_suite_url";
-
-    /**
-     * 创建应用，验证回调URL变更有效事件（第一次保存回调URL之后）
-     */
-    private static final String EVENT_CHECK_UPDATE_SUITE_URL = "check_update_suite_url";
-
-    /**
-     * 推送事件
-     */
-    private static final String SYNC_HTTP_PUSH_HIGH = "SYNC_HTTP_PUSH_HIGH";
-
-    /**
-     * https://open.dingtalk.com/document/isvapp/configure-synchttp-push
-     * https://open.dingtalk.com/document/isvapp/authorization-event-1
-     */
-    @TenantIgnore
-    @NonInterception
-    @PostMapping(value = "/dingCallback")
-    public Object dingCallback(
-            @RequestParam(value = "signature") String signature,
-            @RequestParam(value = "timestamp") Long timestamp,
-            @RequestParam(value = "nonce") String nonce,
-            @RequestBody(required = false) JSONObject body) {
-
-        String params = "signature:" + signature + " timestamp:" + timestamp + " nonce:" + nonce + " body:" + body;
-
-        try {
-            DingTalkEncryptor dingTalkEncryptor = new DingTalkEncryptor(
-                    Constant.TOKEN, Constant.ENCODING_AES_KEY, Constant.SUITE_KEY);
-
-            // 从post请求的body中获取回调信息的加密数据进行解密处理
-            String encrypt = body.getString("encrypt");
-            String plainText = dingTalkEncryptor.getDecryptMsg(signature, timestamp.toString(), nonce, encrypt);
-            JSONObject callBackContent = JSON.parseObject(plainText);
-
-            // 根据回调事件类型做不同的业务处理
-            String eventType = callBackContent.getString("EventType");
-            switch (eventType) {
-
-                case EVENT_CHECK_CREATE_SUITE_URL:
-                    log.info("验证新创建的回调URL有效性: " + plainText);
-                    break;
-
-                case EVENT_CHECK_UPDATE_SUITE_URL:
-                    log.info("验证更新回调URL有效性: " + plainText);
-                    break;
-
-                case SYNC_HTTP_PUSH_HIGH:
-                    log.info("推送回调：" + plainText);
-                    dingService.pushHigh(callBackContent);
-                    break;
-                default:
-                    // 其他类型事件处理
-                    log.info("其他回调：" + plainText);
-                    // dingService.saveCallback(callBackContent);
-            }
-
-            // 返回success的加密信息表示回调处理成功
-            return dingTalkEncryptor.getEncryptedMap("success", timestamp, nonce);
-        } catch (Exception e) {
-            // 失败的情况，应用的开发者应该通过告警感知，并干预修复
-            log.error("钉钉回调异常" + params, e);
-            return "fail";
-        }
-
-    }
-
-    @TenantIgnore
-    @PostMapping(value = "/dingApi/getUserToken")
-    public String getUserToken(@RequestBody GetUserTokenDto dto) {
-        return dingService.getUserToken(dto);
-    }
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/entity/dto/GetUserTokenDto.java

@@ -1,14 +0,0 @@
-package com.fjhx.dingding.entity.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class GetUserTokenDto {
-
-    private String code;
-
-    private String corpId;
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/entity/suite/po/SuiteTicketInfo.java

@@ -1,41 +0,0 @@
-package com.fjhx.dingding.entity.suite.po;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BaseIdPo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author
- * @since 2023-05-05
- */
-@Getter
-@Setter
-@TableName("suite_ticket_info")
-public class SuiteTicketInfo extends BaseIdPo {
-
-    private String suiteTicket;
-
-    private String corpId;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/mapper/suite/SuiteTicketInfoMapper.java

@@ -1,17 +0,0 @@
-package com.fjhx.dingding.mapper.suite;
-
-import com.fjhx.dingding.entity.suite.po.SuiteTicketInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-public interface SuiteTicketInfoMapper extends BaseMapper<SuiteTicketInfo> {
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/service/DingService.java

@@ -1,12 +0,0 @@
-package com.fjhx.dingding.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fjhx.dingding.entity.dto.GetUserTokenDto;
-
-public interface DingService {
-
-    void pushHigh(JSONObject callBackContent);
-
-    String getUserToken(GetUserTokenDto dto);
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/service/impl/DingServiceImpl.java

@@ -1,350 +0,0 @@
-package com.fjhx.dingding.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
-import com.dingtalk.api.response.OapiV2UserGetResponse;
-import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.dingding.entity.dto.GetUserTokenDto;
-import com.fjhx.dingding.service.DingService;
-import com.fjhx.dingding.utils.DingUtil;
-import com.fjhx.tenant.entity.tenant.po.TenantInfo;
-import com.fjhx.tenant.service.tenant.impl.TenantInfoServiceImpl;
-import com.ruoyi.common.constant.StatusConstant;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.utils.ConfigUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class DingServiceImpl implements DingService {
-
-    @Autowired
-    private TenantInfoServiceImpl tenantInfoService;
-
-    @Autowired
-    private PlatformTransactionManager platformTransactionManager;
-
-    @Autowired
-    private TransactionDefinition transactionDefinition;
-
-    @Autowired
-    private ISysDeptService sysDeptService;
-
-    @Autowired
-    private ISysUserService sysUserService;
-
-    @Autowired
-    private ISysRoleService sysRoleService;
-
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    private SysPermissionService permissionService;
-
-    /**
-     * https://open.dingtalk.com/document/isvapp/data-formats
-     */
-    @Override
-    public void pushHigh(JSONObject callBackContent) {
-        JSONArray bizData = callBackContent.getJSONArray("bizData");
-
-        for (JSONObject jsonObject : bizData.toJavaList(JSONObject.class)) {
-            switch (jsonObject.getInteger("biz_type")) {
-                case 2:
-                    saveSuiteTicketInfo(jsonObject);
-                    break;
-                case 4:
-                    corpAuthorization(jsonObject);
-                    break;
-            }
-        }
-
-    }
-
-    @Override
-    public String getUserToken(GetUserTokenDto dto) {
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-        OapiV2UserGetuserinfoResponse.UserGetByCodeResponse userInfo = DingUtil.getUserInfo(dto.getCorpId(), dto.getCode());
-        String userid = userInfo.getUserid();
-        SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getDdUserId, userid));
-        if (sysUser == null) {
-
-            TenantInfo tenantInfo = tenantInfoService.getOne(Wrappers.<TenantInfo>lambdaQuery()
-                    .eq(TenantInfo::getCorpid, dto.getCorpId()));
-
-            sysUser = new SysUser();
-            OapiV2UserGetResponse.UserGetResponse userDetail = DingUtil.getUserDetail(dto.getCorpId(), userid);
-            List<Long> deptIdList = userDetail.getDeptIdList();
-            if (deptIdList.size() > 0) {
-                Long deptId = deptIdList.get(0);
-                SysDept sysDept = sysDeptService.getOne(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDingDeptId, deptId));
-                if (sysDept != null) {
-                    sysUser.setDeptId(sysDept.getDeptId());
-                }
-            }
-            sysUser.setTenantId(tenantInfo.getTenantId());
-            sysUser.setUserName("admin");
-            sysUser.setNickName(userInfo.getName());
-            sysUser.setPassword(SecurityUtils.encryptPassword(RandomUtil.randomString(6)));
-            sysUser.setStatus("0");
-            sysUser.setCreateBy(SecurityUtils.getUsername());
-            sysUser.setCreateTime(new Date());
-            sysUserService.save(sysUser);
-
-            SysRole sysRole = sysRoleService.getOne(Wrappers.<SysRole>lambdaQuery()
-                    .eq(SysRole::getTenantId, tenantInfo.getTenantId())
-                    .eq(SysRole::getRoleKey, "admin")
-            );
-
-            // 角色用户id关联
-            sysRoleService.insertAuthUsers(sysRole.getRoleId(), new Long[]{sysUser.getUserId()});
-        }
-
-        SysUser user = sysUserService.selectUserByUserName(sysUser.getTenantId(), sysUser.getUserName());
-        LoginUser loginUser = new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
-        recordLoginInfo(sysUser.getUserId());
-        String token = tokenService.createToken(loginUser);
-
-        DynamicDataSourceContextHolder.poll();
-        return token;
-    }
-
-    /**
-     * 保存 suite_ticket
-     */
-    private void saveSuiteTicketInfo(JSONObject bizData) {
-        String suiteTicket = bizData.getJSONObject("biz_data").getString("suiteTicket");
-        ConfigUtil.set("dd_suite_ticket", suiteTicket);
-    }
-
-    /**
-     * 企业授权
-     * <p>
-     * https://open.dingtalk.com/document/isvapp/obtains-the-authorization-information-after-the-enterprise-activates-the-application
-     */
-    private void corpAuthorization(JSONObject bizData) {
-
-        String itemBizDataStr = bizData.getString("biz_data");
-        JSONObject jsonObject = JSON.parseObject(itemBizDataStr);
-
-        String syncAction = jsonObject.getString("syncAction");
-
-        switch (syncAction) {
-
-            // 企业授权
-            case "org_suite_auth":
-                orgSuiteAuth(jsonObject);
-                break;
-
-            // 企业变更授权范围
-            case "org_suite_change":
-
-                break;
-
-            // 表示企业解除授权
-            case "org_suite_relieve":
-                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-                // 企业id
-                String corpid = bizData.getString("corp_id");
-
-                // 禁用租户
-                tenantInfoService.update(Wrappers.<TenantInfo>lambdaUpdate()
-                        .eq(TenantInfo::getCorpid, corpid)
-                        .set(TenantInfo::getStatus, StatusConstant.DISABLE)
-                );
-                DynamicDataSourceContextHolder.poll();
-                break;
-        }
-
-    }
-
-    /**
-     * 企业授权
-     */
-    private void orgSuiteAuth(JSONObject bizData) {
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-
-        JSONObject authCorpInfo = bizData.getJSONObject("auth_corp_info");
-
-        // 企业id
-        String corpid = authCorpInfo.getString("corpid");
-        // 企业名称
-        String corpName = authCorpInfo.getString("corp_name");
-        String userId = bizData.getJSONObject("auth_user_info").getString("userId");
-
-        // 企业id存在则跳过
-        TenantInfo tempTenantInfo = tenantInfoService.getOne(q -> q.eq(TenantInfo::getCorpid, corpid));
-        if (tempTenantInfo != null) {
-            if (ObjectUtil.equals(tempTenantInfo.getStatus(), StatusConstant.DISABLE)) {
-                tempTenantInfo.setStatus(StatusConstant.ENABLE);
-                tenantInfoService.updateById(tempTenantInfo);
-            }
-            return;
-        }
-
-        // 获取tenantId
-        String firstLetter = PinyinUtil.getFirstLetter(corpName, "");
-        String tenantId = "dd-" + firstLetter;
-
-        List<TenantInfo> list = tenantInfoService.list(q -> q
-                .likeRight(TenantInfo::getTenantId, "dd-" + firstLetter));
-
-        List<String> tenantIdList = list.stream().map(TenantInfo::getTenantId).collect(Collectors.toList());
-
-        if (list.size() > 0) {
-
-            String tempTenantId;
-            do {
-                tempTenantId = tenantId + "-" + RandomUtil.randomString(3);
-            } while (!tenantIdList.contains(tempTenantId));
-
-            tenantId = tempTenantId;
-
-        }
-
-        // 创建租户
-        TenantInfo tenantInfo = new TenantInfo();
-        tenantInfo.setTenantId(tenantId);
-        tenantInfo.setEnterpriseName(corpName);
-        tenantInfo.setStatus(StatusConstant.ENABLE);
-        tenantInfo.setFlowStatus(2);
-        tenantInfo.setCorpid(corpid);
-
-        // 创建部门
-        List<SysDept> deptList = new ArrayList<>();
-        addDeptList(corpid, deptList, tenantId, 1L, 0L);
-
-        OapiV2UserGetResponse.UserGetResponse userDetail = DingUtil.getUserDetail(corpid, userId);
-
-        // 创建用户
-        SysUser sysUser = new SysUser();
-        List<Long> deptIdList = userDetail.getDeptIdList();
-        if (deptIdList.size() > 0) {
-            Map<Long, Long> collect = deptList.stream().collect(Collectors.toMap(SysDept::getDingDeptId, SysDept::getDeptId));
-            sysUser.setDeptId(collect.get(deptIdList.get(0)));
-        }
-        sysUser.setTenantId(tenantId);
-        sysUser.setUserType(2);
-        sysUser.setJobNumber(userDetail.getJobNumber());
-        sysUser.setUserName("admin");
-        sysUser.setNickName(corpName + "管理员");
-        sysUser.setPassword(SecurityUtils.encryptPassword(RandomUtil.randomString(6)));
-        sysUser.setStatus("0");
-        sysUser.setCreateTime(new Date());
-        sysUser.setUpdateTime(new Date());
-        sysUser.setDdUserId(userId);
-
-        SysRole sysRole = new SysRole();
-        sysRole.setRoleName("管理员");
-        sysRole.setRoleKey("admin");
-        sysRole.setRoleSort(1);
-        sysRole.setDataScope("1");
-        sysRole.setStatus("0");
-        sysRole.setTenantId(tenantId);
-        sysRole.setCreateTime(new Date());
-        sysRole.setUpdateTime(new Date());
-
-        log.info("钉钉回调创建租户，tenantInfo：{}", JSON.toJSONString(tenantInfo));
-        log.info("钉钉回调创建部门，deptList：{}", JSON.toJSONString(deptList));
-        log.info("钉钉回调创建用户，sysUser：{}", JSON.toJSONString(sysUser));
-        log.info("钉钉回调创建角色，sysRole：{}", JSON.toJSONString(sysRole));
-
-        TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
-        try {
-            // 保存租户
-            tenantInfoService.save(tenantInfo);
-            // 保存部门
-            sysDeptService.saveBatch(deptList);
-            // 保存用户
-            sysUserService.save(sysUser);
-            // 保存角色
-            sysRoleService.save(sysRole);
-            // 角色用户id关联
-            sysRoleService.insertAuthUsers(sysRole.getRoleId(), new Long[]{sysUser.getUserId()});
-            // 提交事务
-            platformTransactionManager.commit(transactionStatus);
-
-            DynamicDataSourceContextHolder.poll();
-        } catch (Exception e) {
-            // 回滚事务
-            platformTransactionManager.rollback(transactionStatus);
-            throw new ServiceException("保存数据失败");
-        }
-    }
-
-    /**
-     * 添加部门列表
-     */
-    private void addDeptList(String corpid, List<SysDept> deptList, String tenantId, Long dingParentId, Long myParentId) {
-
-        List<OapiV2DepartmentListsubResponse.DeptBaseResponse> tempDeptList = DingUtil.getDeptList(corpid, dingParentId);
-
-        if (ObjectUtil.isEmpty(tempDeptList)) {
-            return;
-        }
-
-        for (OapiV2DepartmentListsubResponse.DeptBaseResponse deptBaseResponse : tempDeptList) {
-            SysDept sysDept = new SysDept();
-            sysDept.setDeptId(IdWorker.getId());
-            sysDept.setParentId(myParentId);
-            sysDept.setDeptName(deptBaseResponse.getName());
-            sysDept.setOrderNum(1);
-            sysDept.setStatus("0");
-            sysDept.setType(0);
-            sysDept.setTenantId(tenantId);
-            sysDept.setCreateTime(new Date());
-            sysDept.setDingDeptId(deptBaseResponse.getDeptId());
-
-            deptList.add(sysDept);
-
-            addDeptList(corpid, deptList, tenantId, deptBaseResponse.getDeptId(), sysDept.getDeptId());
-        }
-    }
-
-    /**
-     * 记录登录信息
-     *
-     * @param userId 用户ID
-     */
-    public void recordLoginInfo(Long userId) {
-        SysUser sysUser = new SysUser();
-        sysUser.setUserId(userId);
-        sysUser.setLoginIp(IpUtils.getIpAddr());
-        sysUser.setLoginDate(DateUtils.getNowDate());
-        sysUserService.updateUserProfile(sysUser);
-    }
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/service/suite/SuiteTicketInfoService.java

@@ -1,17 +0,0 @@
-package com.fjhx.dingding.service.suite;
-
-import com.fjhx.dingding.entity.suite.po.SuiteTicketInfo;
-import com.ruoyi.common.core.service.BaseService;
-
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-public interface SuiteTicketInfoService extends BaseService<SuiteTicketInfo> {
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/service/suite/impl/SuiteTicketInfoServiceImpl.java

@@ -1,21 +0,0 @@
-package com.fjhx.dingding.service.suite.impl;
-
-import com.fjhx.dingding.entity.suite.po.SuiteTicketInfo;
-import com.fjhx.dingding.mapper.suite.SuiteTicketInfoMapper;
-import com.fjhx.dingding.service.suite.SuiteTicketInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-@Service
-public class SuiteTicketInfoServiceImpl extends ServiceImpl<SuiteTicketInfoMapper, SuiteTicketInfo> implements SuiteTicketInfoService {
-
-}

hx-dingding/src/main/java/com/fjhx/dingding/utils/DingUtil.java

@@ -1,154 +0,0 @@
-package com.fjhx.dingding.utils;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.aliyun.dingtalkoauth2_1_0.Client;
-import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenRequest;
-import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenResponseBody;
-import com.aliyun.tea.TeaException;
-import com.aliyun.teaopenapi.models.Config;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiV2DepartmentListsubRequest;
-import com.dingtalk.api.request.OapiV2UserGetRequest;
-import com.dingtalk.api.request.OapiV2UserGetuserinfoRequest;
-import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
-import com.dingtalk.api.response.OapiV2UserGetResponse;
-import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse;
-import com.fjhx.dingding.constant.Constant;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.system.utils.ConfigUtil;
-import com.taobao.api.ApiException;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-
-/**
- * 钉钉第三方企业应用 - h5微应用
- *
- * <p>
- * <a href="https://open.dingtalk.com/document/isvapp/basic-concepts"> 基础概念 </a>
- * <a href="https://open.dingtalk.com/document/isvapp/api-overview"> 钉钉api总览 </a>
- * <a href="https://open.dingtalk.com/document/isvapp/third-party-enterprise-application-logon-free"> 免登流程 </a>
- * </p>
- */
-
-@Slf4j
-public class DingUtil {
-
-    private static final RedisCache redisCache = SpringUtil.getBean(RedisCache.class);
-    private static final String corpAccessTokenRedisKey = "corpAccessToken:";
-
-    /**
-     * 获取第三方应用授权企业的accessToken
-     * https://open.dingtalk.com/document/isvapp/obtain-the-access_token-of-the-authorized-enterprise
-     */
-    public static String getCorpAccessToken(String corpId) {
-
-        String redisKey = corpAccessTokenRedisKey + corpId;
-        String corpAccessToken = redisCache.getCacheObject(redisKey);
-        if (StrUtil.isNotBlank(corpAccessToken)) {
-            return corpAccessToken;
-        }
-
-        String suiteTicket = ConfigUtil.get("dd_suite_ticket");
-
-        if (StrUtil.isBlank(suiteTicket)) {
-            throw new ServiceException("没有找到suite_ticket");
-        }
-
-        GetCorpAccessTokenRequest getCorpAccessTokenRequest = new GetCorpAccessTokenRequest()
-                .setSuiteKey(Constant.SUITE_KEY)
-                .setSuiteSecret(Constant.SUITE_SECRET)
-                .setAuthCorpId(corpId)
-                .setSuiteTicket(suiteTicket);
-
-        try {
-            Client client = getClient2();
-            GetCorpAccessTokenResponseBody body = client.getCorpAccessToken(getCorpAccessTokenRequest).getBody();
-            redisCache.setCacheObject(redisKey, body.getAccessToken(), Convert.toInt(body.getExpireIn() - 60), TimeUnit.SECONDS);
-            return body.getAccessToken();
-        } catch (Exception e) {
-
-            TeaException teaException;
-
-            if (e instanceof TeaException) {
-                teaException = (TeaException) e;
-            } else {
-                teaException = new TeaException(e.getMessage(), e);
-            }
-
-            String errCode = teaException.getCode();
-            String errMsg = teaException.getMessage();
-
-            if (StrUtil.isAllNotBlank(errCode, errMsg)) {
-                log.error("钉钉授权认证失败： code：{}，message：{}", errCode, errMsg);
-                throw new ServiceException(errMsg);
-            } else {
-                log.error("钉钉授权认证失败", teaException);
-                throw new ServiceException("发生未知异常，钉钉授权认证失败");
-            }
-
-        }
-    }
-
-    /**
-     * 通过免登码获取用户信息
-     * https://open.dingtalk.com/document/isvapp/obtain-the-userid-of-a-user-by-using-the-log-free
-     */
-    public static OapiV2UserGetuserinfoResponse.UserGetByCodeResponse getUserInfo(String corpId, String code) {
-        try {
-            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo");
-            OapiV2UserGetuserinfoRequest req = new OapiV2UserGetuserinfoRequest();
-            req.setCode(code);
-            String corpAccessToken = getCorpAccessToken(corpId);
-            OapiV2UserGetuserinfoResponse rsp = client.execute(req, corpAccessToken);
-            return rsp.getResult();
-        } catch (Exception e) {
-            log.error("通过免登码获取用户信息失败", e);
-            throw new ServiceException("通过免登码获取用户信息失败");
-        }
-    }
-
-    public static OapiV2UserGetResponse.UserGetResponse getUserDetail(String corpId, String userId) {
-        try {
-            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/get");
-            OapiV2UserGetRequest req = new OapiV2UserGetRequest();
-            req.setUserid(userId);
-            String corpAccessToken = getCorpAccessToken(corpId);
-            OapiV2UserGetResponse rsp = client.execute(req, corpAccessToken);
-            return rsp.getResult();
-        } catch (ApiException e) {
-            log.error("获取用户详情失败", e);
-            throw new ServiceException("获取用户详情失败");
-        }
-    }
-
-
-    public static List<OapiV2DepartmentListsubResponse.DeptBaseResponse> getDeptList(String corpId, Long deptId) {
-        try {
-            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/department/listsub");
-            OapiV2DepartmentListsubRequest req = new OapiV2DepartmentListsubRequest();
-            req.setDeptId(deptId);
-            req.setLanguage("zh_CN");
-            String corpAccessToken = getCorpAccessToken(corpId);
-            OapiV2DepartmentListsubResponse rsp = client.execute(req, corpAccessToken);
-            return rsp.getResult();
-        } catch (Exception e) {
-            log.error("获取用户部门失败", e);
-            throw new ServiceException("获取用户部门失败");
-        }
-    }
-
-    private static com.aliyun.dingtalkoauth2_1_0.Client getClient2() throws Exception {
-        Config config = new Config();
-        config.protocol = "https";
-        config.regionId = "central";
-        return new com.aliyun.dingtalkoauth2_1_0.Client(config);
-    }
-
-}

hx-dingding/src/main/resources/mapper/suite/SuiteTicketInfoMapper.xml

@@ -1,4 +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.fjhx.dingding.mapper.suite.SuiteTicketInfoMapper">
-</mapper>

hx-ehsd/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.fjhx</groupId>
-        <artifactId>bytesailing</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <artifactId>hx-ehsd</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-base</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-customer</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-account</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-purchase</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-sale</artifactId>
-        </dependency>
-    </dependencies>
-</project>

hx-ehsd/src/main/java/com/fjhx/ehsd/controller/delivery/DeliveryController.java

@@ -1,63 +0,0 @@
-package com.fjhx.ehsd.controller.delivery;
-
-import cn.hutool.http.server.SimpleServer;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.dto.ContractProductDto;
-import com.fjhx.sale.entity.contract.dto.ContractProductSelectDto;
-import com.fjhx.sale.entity.contract.vo.ContractProductVo;
-import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
-import com.fjhx.sale.entity.sample.vo.SampleVo;
-import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.sample.SampleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 交接单
- * </p>
- *
- * @author  czj
- * @since 2023-05-05
- */
-@RestController
-@RequestMapping("/delivery")
-public class DeliveryController {
-
-    @Autowired
-    private ContractProductService contractProductService;
-
-    @Autowired
-    private SampleService sampleService;
-
-    /**
-     * 交接单--分页
-     */
-    @PostMapping("/page")
-    public Page<ContractProductVo> page(@RequestBody ContractProductSelectDto dto) {
-        return contractProductService.getEHSDPage(dto);
-    }
-
-    /**
-     * 合同交接单--分页
-     */
-    @PostMapping("/contractHandoverPage")
-    public Page<ContractProductVo> contractHandoverPage(@RequestBody ContractProductSelectDto dto) {
-        return contractProductService.contractHandoverPage(dto);
-    }
-
-    /**
-     * 样品交接单列表
-     */
-    @PostMapping("/sampleHandoverList")
-    public Page<ContractProductVo> sampleHandoverList(@RequestBody SampleSelectDto dto) {
-        return  sampleService.sampleHandoverList(dto);
-    }
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/controller/freight/FreightForwarderController.java

@@ -1,68 +0,0 @@
-package com.fjhx.ehsd.controller.freight;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.ehsd.entity.freight.vo.FreightForwarderVo;
-import com.fjhx.ehsd.entity.freight.dto.FreightForwarderSelectDto;
-import com.fjhx.ehsd.entity.freight.dto.FreightForwarderDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.ehsd.service.freight.FreightForwarderService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 货代公司管理 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-@RestController
-@RequestMapping("/freightForwarder")
-public class FreightForwarderController {
-
-    @Autowired
-    private FreightForwarderService freightForwarderService;
-
-    /**
-     * 货代公司管理分页
-     */
-    @PostMapping("/page")
-    public Page<FreightForwarderVo> page(@RequestBody FreightForwarderSelectDto dto) {
-        return freightForwarderService.getPage(dto);
-    }
-
-    /**
-     * 货代公司管理明细
-     */
-    @PostMapping("/detail")
-    public FreightForwarderVo detail(@RequestBody BaseSelectDto dto) {
-        return freightForwarderService.detail(dto.getId());
-    }
-
-    /**
-     * 货代公司管理新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody FreightForwarderDto freightForwarderDto) {
-        freightForwarderService.add(freightForwarderDto);
-    }
-
-    /**
-     * 货代公司管理编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody FreightForwarderDto freightForwarderDto) {
-        freightForwarderService.edit(freightForwarderDto);
-    }
-
-    /**
-     * 货代公司管理删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        freightForwarderService.delete(dto.getId());
-    }
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/controller/quality/StayQualityController.java

@@ -1,40 +0,0 @@
-package com.fjhx.ehsd.controller.quality;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.dto.ContractProductSelectDto;
-import com.fjhx.sale.entity.contract.vo.ContractProductVo;
-import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
-import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.sample.SampleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 待质检
- * </p>
- *
- * @author  czj
- * @since 2023-05-05
- */
-@RestController
-@RequestMapping("/stay/quality")
-public class StayQualityController {
-
-    @Autowired
-    private ContractProductService contractProductService;
-
-    /**
-     * 待质检--分页
-     */
-    @PostMapping("/page")
-    public Page<ContractProductVo> page(@RequestBody ContractProductSelectDto dto) {
-        return contractProductService.getEHSDQualityPage(dto);
-    }
-
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/freight/dto/FreightForwarderDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.ehsd.entity.freight.dto;
-
-import com.fjhx.ehsd.entity.freight.po.FreightForwarder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 货代公司管理新增编辑入参实体
- *
- * @author 
- * @since 2023-05-05
- */
-@Getter
-@Setter
-public class FreightForwarderDto extends FreightForwarder {
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/freight/dto/FreightForwarderSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.ehsd.entity.freight.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 货代公司管理列表查询入参实体
- *
- * @author 
- * @since 2023-05-05
- */
-@Getter
-@Setter
-public class FreightForwarderSelectDto extends BaseSelectDto {
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/freight/po/FreightForwarder.java

@@ -1,82 +0,0 @@
-package com.fjhx.ehsd.entity.freight.po;
-
-import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 货代公司管理
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-@Getter
-@Setter
-@TableName("freight_forwarder")
-public class FreightForwarder extends BasePo {
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 公司电话
-     */
-    private String companyTel;
-
-    /**
-     * 省份
-     */
-    private String province;
-
-    /**
-     * 城市
-     */
-    private String city;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 联系人
-     */
-    private String personName;
-
-    /**
-     * 联系电话
-     */
-    private String personTel;
-
-    /**
-     * 联系人邮箱
-     */
-    private String personMail;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String unifiedCode;
-
-    /**
-     * 银行
-     */
-    private String bankName;
-
-    /**
-     * 账户名
-     */
-    private String bankAccountName;
-
-    /**
-     * 账户
-     */
-    private String bankAccount;
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/freight/vo/FreightForwarderVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.ehsd.entity.freight.vo;
-
-import com.fjhx.ehsd.entity.freight.po.FreightForwarder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 货代公司管理列表查询返回值实体
- *
- * @author 
- * @since 2023-05-05
- */
-@Getter
-@Setter
-public class FreightForwarderVo extends FreightForwarder {
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/mapper/freight/FreightForwarderMapper.java

@@ -1,26 +0,0 @@
-package com.fjhx.ehsd.mapper.freight;
-
-import com.fjhx.ehsd.entity.freight.po.FreightForwarder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.ehsd.entity.freight.vo.FreightForwarderVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * <p>
- * 货代公司管理 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-public interface FreightForwarderMapper extends BaseMapper<FreightForwarder> {
-
-    /**
-     * 货代公司管理分页
-     */
-    Page<FreightForwarderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<FreightForwarder> wrapper);
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/service/freight/FreightForwarderService.java

@@ -1,46 +0,0 @@
-package com.fjhx.ehsd.service.freight;
-
-import com.fjhx.ehsd.entity.freight.po.FreightForwarder;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.ehsd.entity.freight.vo.FreightForwarderVo;
-import com.fjhx.ehsd.entity.freight.dto.FreightForwarderSelectDto;
-import com.fjhx.ehsd.entity.freight.dto.FreightForwarderDto;
-
-
-/**
- * <p>
- * 货代公司管理 服务类
- * </p>
- *
- * @author 
- * @since 2023-05-05
- */
-public interface FreightForwarderService extends BaseService<FreightForwarder> {
-
-    /**
-     * 货代公司管理分页
-     */
-    Page<FreightForwarderVo> getPage(FreightForwarderSelectDto dto);
-
-    /**
-     * 货代公司管理明细
-     */
-    FreightForwarderVo detail(Long id);
-
-    /**
-     * 货代公司管理新增
-     */
-    void add(FreightForwarderDto freightForwarderDto);
-
-    /**
-     * 货代公司管理编辑
-     */
-    void edit(FreightForwarderDto freightForwarderDto);
-
-    /**
-     * 货代公司管理删除
-     */
-    void delete(Long id);
-
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/service/freight/impl/FreightForwarderServiceImpl.java

@@ -1,61 +0,0 @@
-package com.fjhx.ehsd.service.freight.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.ehsd.entity.freight.dto.FreightForwarderDto;
-import com.fjhx.ehsd.entity.freight.dto.FreightForwarderSelectDto;
-import com.fjhx.ehsd.entity.freight.po.FreightForwarder;
-import com.fjhx.ehsd.entity.freight.vo.FreightForwarderVo;
-import com.fjhx.ehsd.mapper.freight.FreightForwarderMapper;
-import com.fjhx.ehsd.service.freight.FreightForwarderService;
-import com.fjhx.item.entity.product.po.ProductInfo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- * 货代公司管理 服务实现类
- * </p>
- *
- * @author
- * @since 2023-05-05
- */
-@Service
-public class FreightForwarderServiceImpl extends ServiceImpl<FreightForwarderMapper, FreightForwarder> implements FreightForwarderService {
-
-    @Override
-    public Page<FreightForwarderVo> getPage(FreightForwarderSelectDto dto) {
-        IWrapper<FreightForwarder> wrapper = getWrapper();
-        wrapper.like("ff", FreightForwarder::getCompanyName, dto.getKeyword());
-        wrapper.orderByDesc("ff", FreightForwarder::getId);
-        Page<FreightForwarderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
-    }
-
-    @Override
-    public FreightForwarderVo detail(Long id) {
-        FreightForwarder FreightForwarder = this.getById(id);
-        FreightForwarderVo result = BeanUtil.toBean(FreightForwarder, FreightForwarderVo.class);
-        return result;
-    }
-
-    @Override
-    public void add(FreightForwarderDto freightForwarderDto) {
-        this.nameDuplication(FreightForwarder::getCompanyName, freightForwarderDto.getCompanyName(), "公司名称重复");
-        this.save(freightForwarderDto);
-    }
-
-    @Override
-    public void edit(FreightForwarderDto freightForwarderDto) {
-        this.nameDuplication(FreightForwarder::getCompanyName, freightForwarderDto.getCompanyName(), freightForwarderDto.getId(), "公司名称重复");
-        this.updateById(freightForwarderDto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
-}

hx-ehsd/src/main/resources/mapper/freight/FreightForwarderMapper.xml

@@ -1,27 +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.fjhx.ehsd.mapper.freight.FreightForwarderMapper">
-    <select id="getPage" resultType="com.fjhx.ehsd.entity.freight.vo.FreightForwarderVo">
-        select
-            ff.id,
-            ff.company_name,
-            ff.company_tel,
-            ff.province,
-            ff.city,
-            ff.address,
-            ff.person_name,
-            ff.person_tel,
-            ff.person_mail,
-            ff.unified_code,
-            ff.bank_name,
-            ff.bank_account_name,
-            ff.bank_account,
-            ff.create_user,
-            ff.create_time,
-            ff.update_user,
-            ff.update_time
-        from freight_forwarder ff
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-jxst/pom.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.fjhx</groupId>
-        <artifactId>bytesailing</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <artifactId>hx-jxst</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-customer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mes</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

hx-jxst/src/main/java/com/fjhx/jxst/controller/after/AfterSalesRecordController.java

@@ -1,60 +0,0 @@
-package com.fjhx.jxst.controller.after;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.after.vo.AfterSalesRecordVo;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordSelectDto;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.jxst.service.after.AfterSalesRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 售后记录 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-@RestController
-@RequestMapping("/afterSalesRecord")
-public class AfterSalesRecordController {
-
-    @Autowired
-    private AfterSalesRecordService afterSalesRecordService;
-
-    /**
-     * 售后记录分页
-     */
-    @PostMapping("/page")
-    public Page<AfterSalesRecordVo> page(@RequestBody AfterSalesRecordSelectDto dto) {
-        return afterSalesRecordService.getPage(dto);
-    }
-
-    /**
-     * 售后记录明细
-     */
-    @PostMapping("/detail")
-    public AfterSalesRecordVo detail(@RequestBody BaseSelectDto dto) {
-        return afterSalesRecordService.detail(dto.getId());
-    }
-
-    /**
-     * 售后记录新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody AfterSalesRecordDto afterSalesRecordDto) {
-        afterSalesRecordService.add(afterSalesRecordDto);
-    }
-    /**
-     * 售后记录提交
-     */
-    @PostMapping("/afterSales")
-    public void afterSales(@RequestBody AfterSalesRecordDto afterSalesRecordDto) {
-        afterSalesRecordService.afterSales(afterSalesRecordDto);
-    }
-
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/controller/after/AfterSalesRecordDetailController.java

@@ -1,19 +0,0 @@
-package com.fjhx.jxst.controller.after;
-
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * <p>
- * 售后记录明细 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-@RestController
-@RequestMapping("/afterSalesRecordDetail")
-public class AfterSalesRecordDetailController {
-
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/controller/sales/SalesContractController.java

@@ -1,52 +0,0 @@
-package com.fjhx.jxst.controller.sales;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
-import com.fjhx.jxst.entity.sales.dto.SalesContractSelectDto;
-import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.jxst.service.sales.SalesContractService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * <p>
- * 销售合同 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-@RestController
-@RequestMapping("/salesContract")
-public class SalesContractController {
-
-    @Autowired
-    private SalesContractService salesContractService;
-
-    /**
-     * 销售合同分页
-     */
-    @PostMapping("/page")
-    public Page<SalesContractVo> page(@RequestBody SalesContractSelectDto dto) {
-        return salesContractService.getPage(dto);
-    }
-
-    /**
-     * 销售合同明细
-     */
-    @PostMapping("/detail")
-    public SalesContractVo detail(@RequestBody BaseSelectDto dto) {
-        return salesContractService.detail(dto.getId());
-    }
-
-    /**
-     * 销售合同新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody SalesContractDto salesContractDto) {
-        salesContractService.add(salesContractDto);
-    }
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/controller/sales/SalesContractDetailsController.java

@@ -1,19 +0,0 @@
-package com.fjhx.jxst.controller.sales;
-
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * <p>
- * 销售合同明细 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-@RestController
-@RequestMapping("/salesContractDetails")
-public class SalesContractDetailsController {
-
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/dto/AfterSalesRecordDetailDto.java

@@ -1,23 +0,0 @@
-package com.fjhx.jxst.entity.after.dto;
-
-import com.fjhx.file.entity.ObsFile;
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 售后记录明细新增编辑入参实体
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-public class AfterSalesRecordDetailDto extends AfterSalesRecordDetail {
-    /**
-     * 现场照片列表
-     */
-    private List<ObsFile> fileList;
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/dto/AfterSalesRecordDetailSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.entity.after.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 售后记录明细列表查询入参实体
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-public class AfterSalesRecordDetailSelectDto extends BaseSelectDto {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/dto/AfterSalesRecordDto.java

@@ -1,25 +0,0 @@
-package com.fjhx.jxst.entity.after.dto;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecord;
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 售后记录新增编辑入参实体
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-public class AfterSalesRecordDto extends AfterSalesRecord {
-
-    /**
-     * 售后明细列表
-     */
-    private List<AfterSalesRecordDetailDto> afterSalesRecordDetailList;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/dto/AfterSalesRecordSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.entity.after.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 售后记录列表查询入参实体
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-public class AfterSalesRecordSelectDto extends BaseSelectDto {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/po/AfterSalesRecord.java

@@ -1,51 +0,0 @@
-package com.fjhx.jxst.entity.after.po;
-
-import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 售后记录
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-@TableName("after_sales_record")
-public class AfterSalesRecord extends BasePo {
-
-    /**
-     * 产品sn
-     */
-    private String productSn;
-
-    /**
-     * 售后人id
-     */
-    private Long afterSalesPersonId;
-
-    /**
-     * 售后原因
-     */
-    private String remark;
-
-    /**
-     * 产品编号
-     */
-    private String code;
-
-    /**
-     * 销售状态
-     */
-    private int status;
-    /**
-     * 产品id
-     */
-    private Long productId;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/po/AfterSalesRecordDetail.java

@@ -1,45 +0,0 @@
-package com.fjhx.jxst.entity.after.po;
-
-import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotEmpty;
-
-/**
- * <p>
- * 售后记录明细
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-@TableName("after_sales_record_detail")
-public class AfterSalesRecordDetail extends BasePo {
-
-    /**
-     * 售后记录id
-     */
-    private Long afterSalesRecordId;
-
-    /**
-     * 配件id
-     */
-    @NotEmpty(message = "配件id不能为空")
-    private Long accessoriesId;
-
-    /**
-     * 售后数量 备用字段
-     */
-    private Long quantity;
-
-    /**
-     * 售后记录
-     */
-    private String remark;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/vo/AfterSalesRecordDetailVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.entity.after.vo;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 售后记录明细列表查询返回值实体
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-public class AfterSalesRecordDetailVo extends AfterSalesRecordDetail {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/vo/AfterSalesRecordVo.java

@@ -1,34 +0,0 @@
-package com.fjhx.jxst.entity.after.vo;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecord;
-import com.fjhx.mes.entity.bom.vo.BomDetailVo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 售后记录列表查询返回值实体
- *
- * @author 
- * @since 2023-05-25
- */
-@Getter
-@Setter
-public class AfterSalesRecordVo extends AfterSalesRecord {
-
-    /**
-     * 产品名称
-     */
-    private String productName;
-
-    /**
-     * bomInfoId
-     */
-    private Long bomInfoId;
-
-    /**
-     * bom明细列表
-     */
-    List<BomDetailVo> bomDetailList;
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDetailsDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.entity.sales.dto;
-
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 销售合同明细新增编辑入参实体
- *
- * @author 
- * @since 2023-05-16
- */
-@Getter
-@Setter
-public class SalesContractDetailsDto extends SalesContractDetails {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDetailsSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.entity.sales.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 销售合同明细列表查询入参实体
- *
- * @author 
- * @since 2023-05-16
- */
-@Getter
-@Setter
-public class SalesContractDetailsSelectDto extends BaseSelectDto {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDto.java

@@ -1,25 +0,0 @@
-package com.fjhx.jxst.entity.sales.dto;
-
-import com.fjhx.jxst.entity.sales.po.SalesContract;
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 销售合同新增编辑入参实体
- *
- * @author
- * @since 2023-05-16
- */
-@Getter
-@Setter
-public class SalesContractDto extends SalesContract {
-
-    /**
-     * 明细列表
-     */
-    List<SalesContractDetails> salesContractDetailsList;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.entity.sales.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 销售合同列表查询入参实体
- *
- * @author 
- * @since 2023-05-16
- */
-@Getter
-@Setter
-public class SalesContractSelectDto extends BaseSelectDto {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContract.java

@@ -1,69 +0,0 @@
-package com.fjhx.jxst.entity.sales.po;
-
-import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 销售合同
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-@Getter
-@Setter
-@TableName("sales_contract")
-public class SalesContract extends BasePo {
-
-    /**
-     * 客户id
-     */
-    private Long customerId;
-
-    /**
-     * 交货日期
-     */
-    private Date deliveryDate;
-
-    /**
-     * 付款方式 租户字典
-     */
-    private String payMethod;
-
-    /**
-     * 运费支付方 甲方/乙方
-     */
-    private String freightPayer;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 流程id
-     */
-    private Long flowId;
-
-    /**
-     * 流程key
-     */
-    private String flowKey;
-
-    /**
-     * 合同金额
-     */
-    private BigDecimal contractAmount;
-
-    /**
-     * 合同编号
-     */
-    private String code;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContractDetails.java

@@ -1,48 +0,0 @@
-package com.fjhx.jxst.entity.sales.po;
-
-import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 销售合同明细
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-@Getter
-@Setter
-@TableName("sales_contract_details")
-public class SalesContractDetails extends BasePo {
-
-    /**
-     * 销售合同id
-     */
-    private Long salesContractId;
-
-    /**
-     * 产品id
-     */
-    private Long productId;
-
-    /**
-     * 单价
-     */
-    private BigDecimal unitPrice;
-
-    /**
-     * 数量
-     */
-    private BigDecimal quantity;
-
-    /**
-     * 是否定制
-     */
-    private String isCustomized;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractDetailsVo.java

@@ -1,22 +0,0 @@
-package com.fjhx.jxst.entity.sales.vo;
-
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 销售合同明细列表查询返回值实体
- *
- * @author 
- * @since 2023-05-16
- */
-@Getter
-@Setter
-public class SalesContractDetailsVo extends SalesContractDetails {
-
-    /**
-     * 产品名称
-     */
-    private String productName;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractVo.java

@@ -1,30 +0,0 @@
-package com.fjhx.jxst.entity.sales.vo;
-
-import com.fjhx.jxst.entity.sales.po.SalesContract;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 销售合同列表查询返回值实体
- *
- * @author
- * @since 2023-05-16
- */
-@Getter
-@Setter
-public class SalesContractVo extends SalesContract {
-
-    /**
-     * 客户名称
-     */
-    private String customerName;
-
-    /**
-     * 销售合同明细
-     */
-    private List<SalesContractDetailsVo> contractDetailsList;
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/flow/SalesContractFlow.java

@@ -1,57 +0,0 @@
-//package com.fjhx.jxst.flow;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.fjhx.flow.core.FlowDelegate;
-//import com.fjhx.flow.enums.FlowStatusEnum;
-//import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
-//import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-//import com.fjhx.jxst.service.sales.SalesContractDetailsService;
-//import com.fjhx.jxst.service.sales.SalesContractService;
-//import com.fjhx.mes.entity.work.dto.WorkOrderDto;
-//import com.fjhx.mes.entity.work.po.WorkOrder;
-//import com.fjhx.mes.service.work.WorkOrderService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//
-//@Component
-//public class SalesContractFlow extends FlowDelegate {
-//
-//    @Autowired
-//    private SalesContractService salesContractService;
-//    @Autowired
-//    private SalesContractDetailsService salesContractDetailsService;
-//    @Autowired
-//    private WorkOrderService workOrderService;
-//    @Override
-//    public String getFlowKey() {
-//        return "jxst_sales_contract_flow";
-//    }
-//
-//    @Override
-//    public Long start(Long flowId, JSONObject submitData) {
-//        SalesContractDto salesContractDto = submitData.toJavaObject(SalesContractDto.class);
-//        salesContractDto.setFlowId(flowId);
-//        salesContractDto.setFlowKey(getFlowKey());
-//        salesContractService.add(salesContractDto);
-//        return salesContractDto.getId();
-//    }
-//
-//    @Override
-//    public void end(Long flowId, Long businessId, JSONObject submitData) {
-//        //按产品往“工单管理”中插入对应的工单数据
-//        List<SalesContractDetails> salesContractDetailsList = salesContractDetailsService.list(q -> q.eq(SalesContractDetails::getSalesContractId, businessId));
-//        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
-//            WorkOrderDto workOrder = new WorkOrderDto();
-//            workOrder.setSourceId(businessId);
-//            workOrder.setSource("sales_contract");//销售合同
-//            workOrder.setProductId(salesContractDetails.getProductId());
-//            workOrder.setQuantity(salesContractDetails.getQuantity());
-//            workOrder.setIsCustomized(salesContractDetails.getIsCustomized());
-//            //添加工单
-//            workOrderService.add(workOrder);
-//        }
-//    }
-//
-//}

hx-jxst/src/main/java/com/fjhx/jxst/mapper/after/AfterSalesRecordDetailMapper.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.mapper.after;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * <p>
- * 售后记录明细 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-public interface AfterSalesRecordDetailMapper extends BaseMapper<AfterSalesRecordDetail> {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/mapper/after/AfterSalesRecordMapper.java

@@ -1,26 +0,0 @@
-package com.fjhx.jxst.mapper.after;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.after.vo.AfterSalesRecordVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * <p>
- * 售后记录 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-public interface AfterSalesRecordMapper extends BaseMapper<AfterSalesRecord> {
-
-    /**
-     * 售后记录分页
-     */
-    Page<AfterSalesRecordVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AfterSalesRecord> wrapper);
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/mapper/sales/SalesContractDetailsMapper.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.mapper.sales;
-
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * <p>
- * 销售合同明细 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-public interface SalesContractDetailsMapper extends BaseMapper<SalesContractDetails> {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/mapper/sales/SalesContractMapper.java

@@ -1,26 +0,0 @@
-package com.fjhx.jxst.mapper.sales;
-
-import com.fjhx.jxst.entity.sales.po.SalesContract;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * <p>
- * 销售合同 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-public interface SalesContractMapper extends BaseMapper<SalesContract> {
-
-    /**
-     * 销售合同分页
-     */
-    Page<SalesContractVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SalesContract> wrapper);
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/after/AfterSalesRecordDetailService.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.service.after;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import com.ruoyi.common.core.service.BaseService;
-
-
-/**
- * <p>
- * 售后记录明细 服务类
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-public interface AfterSalesRecordDetailService extends BaseService<AfterSalesRecordDetail> {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/after/AfterSalesRecordService.java

@@ -1,41 +0,0 @@
-package com.fjhx.jxst.service.after;
-
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.fjhx.jxst.entity.after.po.AfterSalesRecord;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.after.vo.AfterSalesRecordVo;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordSelectDto;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordDto;
-
-
-/**
- * <p>
- * 售后记录 服务类
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-public interface AfterSalesRecordService extends BaseService<AfterSalesRecord> {
-
-    /**
-     * 售后记录分页
-     */
-    Page<AfterSalesRecordVo> getPage(AfterSalesRecordSelectDto dto);
-
-    /**
-     * 售后记录明细
-     */
-    AfterSalesRecordVo detail(Long id);
-
-    /**
-     * 售后记录新增
-     */
-    void add(AfterSalesRecordDto afterSalesRecordDto);
-
-    /**
-     * 售后提交
-     */
-    void afterSales(AfterSalesRecordDto afterSalesRecordDto);
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/after/impl/AfterSalesRecordDetailServiceImpl.java

@@ -1,21 +0,0 @@
-package com.fjhx.jxst.service.after.impl;
-
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import com.fjhx.jxst.mapper.after.AfterSalesRecordDetailMapper;
-import com.fjhx.jxst.service.after.AfterSalesRecordDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- * 售后记录明细 服务实现类
- * </p>
- *
- * @author 
- * @since 2023-05-25
- */
-@Service
-public class AfterSalesRecordDetailServiceImpl extends ServiceImpl<AfterSalesRecordDetailMapper, AfterSalesRecordDetail> implements AfterSalesRecordDetailService {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/after/impl/AfterSalesRecordServiceImpl.java

@@ -1,160 +0,0 @@
-package com.fjhx.jxst.service.after.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.fjhx.common.utils.Assert;
-import com.fjhx.file.utils.ObsFileUtil;
-import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordDetailDto;
-import com.fjhx.jxst.entity.after.po.AfterSalesRecord;
-import com.fjhx.jxst.entity.after.po.AfterSalesRecordDetail;
-import com.fjhx.jxst.mapper.after.AfterSalesRecordMapper;
-import com.fjhx.jxst.service.after.AfterSalesRecordDetailService;
-import com.fjhx.jxst.service.after.AfterSalesRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.jxst.utils.CodeEnum;
-import com.fjhx.mes.entity.bom.po.BomDetail;
-import com.fjhx.mes.entity.bom.po.BomInfo;
-import com.fjhx.mes.entity.bom.vo.BomDetailVo;
-import com.fjhx.mes.entity.production.vo.ProductionTaskDetailVo;
-import com.fjhx.mes.entity.work.po.WorkOrder;
-import com.fjhx.mes.entity.work.po.WorkOrderBom;
-import com.fjhx.mes.service.bom.BomDetailService;
-import com.fjhx.mes.service.bom.BomInfoService;
-import com.fjhx.mes.service.production.ProductionTaskDetailService;
-import com.fjhx.mes.service.work.WorkOrderBomService;
-import com.fjhx.mes.service.work.WorkOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.after.vo.AfterSalesRecordVo;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.jxst.entity.after.dto.AfterSalesRecordDto;
-import cn.hutool.core.bean.BeanUtil;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * <p>
- * 售后记录 服务实现类
- * </p>
- *
- * @author
- * @since 2023-05-25
- */
-@Service
-public class AfterSalesRecordServiceImpl extends ServiceImpl<AfterSalesRecordMapper, AfterSalesRecord> implements AfterSalesRecordService {
-
-    @Autowired
-    private ProductionTaskDetailService productionTaskDetailService;
-    @Autowired
-    private WorkOrderService workOrderService;
-    @Autowired
-    private ProductInfoService productInfoService;
-    @Autowired
-    private WorkOrderBomService workOrderBomService;
-    @Autowired
-    private BomInfoService bomInfoService;
-    @Autowired
-    private BomDetailService bomDetailService;
-    @Autowired
-    private AfterSalesRecordDetailService afterSalesRecordDetailService;
-
-    @Override
-    public Page<AfterSalesRecordVo> getPage(AfterSalesRecordSelectDto dto) {
-        IWrapper<AfterSalesRecord> wrapper = getWrapper();
-        wrapper.orderByDesc("asr", AfterSalesRecord::getId);
-        Page<AfterSalesRecordVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        List<AfterSalesRecordVo> records = page.getRecords();
-        //赋值产品信息
-        productInfoService.attributeAssign(records, AfterSalesRecordVo::getProductId, (item, productInfo) -> {
-            item.setProductName(productInfo.getName());
-        });
-        return page;
-    }
-
-    @Override
-    public AfterSalesRecordVo detail(Long id) {
-        AfterSalesRecord AfterSalesRecord = this.getById(id);
-        AfterSalesRecordVo result = BeanUtil.toBean(AfterSalesRecord, AfterSalesRecordVo.class);
-
-        //赋值产品信息
-        productInfoService.attributeAssign(Arrays.asList(result), AfterSalesRecordVo::getProductId, (item, productInfo) -> {
-            item.setProductName(productInfo.getName());
-        });
-
-        ProductionTaskDetailVo productionTaskDetailVo = productionTaskDetailService.snInfo(result.getProductSn());
-        if (ObjectUtil.isEmpty(productionTaskDetailVo)){
-            return result;
-        }
-        //获取工单信息
-        WorkOrder workOrder = workOrderService.getById(productionTaskDetailVo.getWorkOrderId());
-        //查询BOM信息
-        BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()).eq(BomInfo::getCurrentVersion,1));
-        Assert.notEmpty(bomInfo,"查询不到产品的BOM信息");
-        result.setBomInfoId(bomInfo.getId());
-
-        List<BomDetailVo> bomDetailList = new ArrayList<>();
-        //判断是否定制
-        if("1".equals(workOrder.getIsCustomized())){
-            //是定制
-            List<WorkOrderBom> list = workOrderBomService.list(q -> q.eq(WorkOrderBom::getWorkOrderId, workOrder.getId()));
-            bomDetailList = BeanUtil.copyToList(list, BomDetailVo.class);
-        }else{
-            //不是定制
-            List<BomDetail> list = bomDetailService.list(q -> q.eq(BomDetail::getBomInfoId, bomInfo.getId()));
-            bomDetailList = BeanUtil.copyToList(list, BomDetailVo.class);
-        }
-        Assert.notEmpty(bomDetailList,"查询不到产品的BOM明细");
-        //给bom明细赋值产品名称
-        productInfoService.attributeAssign(bomDetailList, BomDetailVo::getProductId, (item, productInfo) -> {
-            item.setProductName(productInfo.getName());
-        });
-
-        //赋值售后明细
-        Map<Long, AfterSalesRecordDetail> afterSalesRecordDetailMap = afterSalesRecordDetailService.mapKEntity(AfterSalesRecordDetail::getAccessoriesId,
-                q -> q.eq(AfterSalesRecordDetail::getAfterSalesRecordId, id));
-        for (BomDetailVo bomDetailVo : bomDetailList) {
-            AfterSalesRecordDetail afterSalesRecordDetail = afterSalesRecordDetailMap.get(bomDetailVo.getProductId());
-            bomDetailVo.setAfterSalesRecordDetail(afterSalesRecordDetail);
-        }
-
-        result.setBomDetailList(bomDetailList);
-        return result;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(AfterSalesRecordDto afterSalesRecordDto) {
-        Assert.notEmpty(afterSalesRecordDto.getProductId(),"产品id不能为空");
-        Assert.notEmpty(afterSalesRecordDto.getProductSn(),"产品sn不能为空");
-        afterSalesRecordDto.setCode(CodeEnum.AFTER_SALES.getCode());
-        this.save(afterSalesRecordDto);
-    }
-
-    @DSTransactional
-    @Override
-    public void afterSales(AfterSalesRecordDto afterSalesRecordDto) {
-        Assert.notEmpty(afterSalesRecordDto.getId(),"售后id不能为空");
-        Assert.notEmpty(afterSalesRecordDto.getAfterSalesRecordDetailList(),"售后明细列表不能为空");
-        afterSalesRecordDto.setStatus(1);//修改为售后完成
-        this.updateById(afterSalesRecordDto);
-        List<AfterSalesRecordDetailDto> afterSalesRecordDetailList = afterSalesRecordDto.getAfterSalesRecordDetailList();
-        for (AfterSalesRecordDetailDto afterSalesRecordDetailDto : afterSalesRecordDetailList) {
-            long id = IdWorker.getId();
-            afterSalesRecordDetailDto.setId(id);
-            afterSalesRecordDetailDto.setAfterSalesRecordId(afterSalesRecordDto.getId());
-            ObsFileUtil.saveFile(afterSalesRecordDetailDto.getFileList(),id);
-        }
-        List<AfterSalesRecordDetail> afterSalesRecordDetails = BeanUtil.copyToList(afterSalesRecordDetailList, AfterSalesRecordDetail.class);
-        afterSalesRecordDetailService.saveBatch(afterSalesRecordDetails);
-    }
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/SalesContractDetailsService.java

@@ -1,17 +0,0 @@
-package com.fjhx.jxst.service.sales;
-
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import com.ruoyi.common.core.service.BaseService;
-
-
-/**
- * <p>
- * 销售合同明细 服务类
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-public interface SalesContractDetailsService extends BaseService<SalesContractDetails> {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/SalesContractService.java

@@ -1,36 +0,0 @@
-package com.fjhx.jxst.service.sales;
-
-import com.fjhx.jxst.entity.sales.po.SalesContract;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
-import com.fjhx.jxst.entity.sales.dto.SalesContractSelectDto;
-import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
-
-
-/**
- * <p>
- * 销售合同 服务类
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-public interface SalesContractService extends BaseService<SalesContract> {
-
-    /**
-     * 销售合同分页
-     */
-    Page<SalesContractVo> getPage(SalesContractSelectDto dto);
-
-    /**
-     * 销售合同明细
-     */
-    SalesContractVo detail(Long id);
-
-    /**
-     * 销售合同新增
-     */
-    void add(SalesContractDto salesContractDto);
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractDetailsServiceImpl.java

@@ -1,21 +0,0 @@
-package com.fjhx.jxst.service.sales.impl;
-
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import com.fjhx.jxst.mapper.sales.SalesContractDetailsMapper;
-import com.fjhx.jxst.service.sales.SalesContractDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- * 销售合同明细 服务实现类
- * </p>
- *
- * @author 
- * @since 2023-05-16
- */
-@Service
-public class SalesContractDetailsServiceImpl extends ServiceImpl<SalesContractDetailsMapper, SalesContractDetails> implements SalesContractDetailsService {
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -1,107 +0,0 @@
-package com.fjhx.jxst.service.sales.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.customer.entity.customer.po.Customer;
-import com.fjhx.customer.service.customer.CustomerService;
-import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
-import com.fjhx.jxst.entity.sales.dto.SalesContractSelectDto;
-import com.fjhx.jxst.entity.sales.po.SalesContract;
-import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
-import com.fjhx.jxst.entity.sales.vo.SalesContractDetailsVo;
-import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
-import com.fjhx.jxst.mapper.sales.SalesContractMapper;
-import com.fjhx.jxst.service.sales.SalesContractDetailsService;
-import com.fjhx.jxst.service.sales.SalesContractService;
-import com.fjhx.jxst.utils.CodeEnum;
-import com.fjhx.wms.entity.stock.vo.StockVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * <p>
- * 销售合同 服务实现类
- * </p>
- *
- * @author
- * @since 2023-05-16
- */
-@Service
-public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, SalesContract> implements SalesContractService {
-
-    @Autowired
-    private SalesContractDetailsService salesContractDetailsService;
-    @Autowired
-    private CustomerService customerService;
-    @Autowired
-    private ProductInfoService productInfoService;
-
-    @Override
-    public Page<SalesContractVo> getPage(SalesContractSelectDto dto) {
-        IWrapper<SalesContract> wrapper = getWrapper();
-        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
-            List<Customer> list = customerService.list(q -> q.like(Customer::getName, dto.getKeyword()));
-            if (ObjectUtil.isNotEmpty(list)) {
-                List<Long> ids = list.stream().map(Customer::getId).collect(Collectors.toList());
-                wrapper.and(q -> q.in(SalesContract::getCustomerId, ids).or().like(SalesContractVo::getContractAmount, dto.getKeyword()));
-            }else{
-                wrapper.and(q -> q.like(SalesContractVo::getContractAmount, dto.getKeyword()));
-            }
-        }
-        wrapper.orderByDesc("sc", SalesContract::getId);
-        Page<SalesContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        List<SalesContractVo> records = page.getRecords();
-        //赋值客户名称
-        customerService.attributeAssign(records, SalesContractVo::getCustomerId, (item, customer) -> {
-            item.setCustomerName(customer.getName());
-        });
-        return page;
-    }
-
-    @Override
-    public SalesContractVo detail(Long id) {
-        SalesContract SalesContract = this.getById(id);
-        SalesContractVo result = BeanUtil.toBean(SalesContract, SalesContractVo.class);
-        List<SalesContractDetails> salesContractDetailsList = salesContractDetailsService.list(q -> q.eq(SalesContractDetails::getSalesContractId, result.getId()));
-        List<SalesContractDetailsVo> salesContractDetailsVos = BeanUtil.copyToList(salesContractDetailsList, SalesContractDetailsVo.class);
-        //赋值产品信息
-        productInfoService.attributeAssign(salesContractDetailsVos, SalesContractDetailsVo::getProductId, (item, productInfo) -> {
-            item.setProductName(productInfo.getName());
-        });
-        result.setContractDetailsList(salesContractDetailsVos);
-        //赋值客户名称
-        customerService.attributeAssign(Arrays.asList(result), SalesContractVo::getCustomerId, (item, customer) -> {
-            item.setCustomerName(customer.getName());
-        });
-        return result;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(SalesContractDto salesContractDto) {
-        List<SalesContractDetails> salesContractDetailsList = salesContractDto.getSalesContractDetailsList();
-        BigDecimal count = BigDecimal.ZERO;
-        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
-            count.add(salesContractDetails.getUnitPrice().multiply(salesContractDetails.getQuantity()));
-        }
-        salesContractDto.setContractAmount(count);
-        salesContractDto.setCode(CodeEnum.SALES_CONTRACT.getCode());
-        this.save(salesContractDto);
-        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
-            salesContractDetails.setSalesContractId(salesContractDto.getId());
-        }
-        salesContractDetailsService.saveBatch(salesContractDetailsList);
-    }
-
-}

hx-jxst/src/main/java/com/fjhx/jxst/utils/CodeEnum.java

@@ -1,100 +0,0 @@
-package com.fjhx.jxst.utils;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.jxst.service.sales.SalesContractService;
-import com.ruoyi.common.exception.ServiceException;
-import lombok.Getter;
-
-import java.util.Date;
-import java.util.Map;
-
-@Getter
-public enum CodeEnum {
-
-    // 销售合同
-    SALES_CONTRACT("SC", "yyMM-", "code", 3, SalesContractService.class),
-    // 销售合同
-    AFTER_SALES("SB", "yyMM-", "code", 3, SalesContractService.class);
-
-    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
-        this.prefix = prefix;
-        this.dateFormat = dateFormat;
-        this.length = length;
-        this.codeFieldName = codeFieldName;
-        this.service = SpringUtil.getBean(serviceCls);
-    }
-
-    // 编码前缀
-    private final String prefix;
-    // 编码加日期规则
-    private final String dateFormat;
-    // 长度
-    private final Integer length;
-    // 编码字段名
-    private final String codeFieldName;
-    // service
-    private final IService<?> service;
-
-    /**
-     * 获取键值对
-     */
-    public String getCode() {
-        String itemPrefix;
-
-        if (ObjectUtil.isNotEmpty(dateFormat)) {
-            Date date = new Date();
-            String format = DateUtil.format(date, dateFormat);
-            itemPrefix = prefix + format;
-        } else {
-            itemPrefix = prefix;
-        }
-
-        Object obj = service.query()
-                .likeRight(codeFieldName, itemPrefix)
-                .orderByDesc(codeFieldName)
-                .last("limit 1")
-                .one();
-
-        if (obj == null) {
-            return itemPrefix + autoGenericCode(length, 0);
-        }
-
-        Map<String, Object> map = Convert.toMap(String.class, Object.class, obj);
-
-        String code = Convert.toStr(map.get(CharSequenceUtil.toCamelCase(codeFieldName)));
-        Integer codeNum = Convert.toInt(code.substring(itemPrefix.length()));
-        if (ObjectUtil.isEmpty(codeNum)) {
-            throw new ServiceException("自定义编码与系统编码生成规则冲突，暂时无法生成编码，请联系管理员");
-        }
-
-        return itemPrefix + autoGenericCode(length, codeNum);
-    }
-
-    /**
-     * 获取键值对
-     */
-    public String getCode(String code) {
-        if (ObjectUtil.isNotEmpty(code)) {
-            Long count = service.query().eq(codeFieldName, code).count();
-            if (count != 0) {
-                throw new ServiceException("编码已存在");
-            }
-            return code;
-        } else {
-            return getCode();
-        }
-    }
-
-    /**
-     * 不够位数的在前面补0，保留num的长度位数字
-     */
-    private static String autoGenericCode(int length, Integer codeNum) {
-        return String.format("%0" + length + "d", codeNum + 1);
-    }
-
-}

hx-jxst/src/main/resources/mapper/after/AfterSalesRecordDetailMapper.xml

@@ -1,4 +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.fjhx.jxst.mapper.after.AfterSalesRecordDetailMapper">
-</mapper>

hx-jxst/src/main/resources/mapper/after/AfterSalesRecordMapper.xml

@@ -1,21 +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.fjhx.jxst.mapper.after.AfterSalesRecordMapper">
-    <select id="getPage" resultType="com.fjhx.jxst.entity.after.vo.AfterSalesRecordVo">
-        select
-            asr.id,
-            asr.product_sn,
-            asr.after_sales_person_id,
-            asr.remark,
-            asr.code,
-            asr.product_id,
-            asr.status,
-            asr.create_user,
-            asr.create_time,
-            asr.update_user,
-            asr.update_time
-        from after_sales_record asr
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-jxst/src/main/resources/mapper/sales/SalesContractDetailsMapper.xml

@@ -1,4 +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.fjhx.jxst.mapper.sales.SalesContractDetailsMapper">
-</mapper>

hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -1,22 +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.fjhx.jxst.mapper.sales.SalesContractMapper">
-    <select id="getPage" resultType="com.fjhx.jxst.entity.sales.vo.SalesContractVo">
-        select
-            sc.id,
-            sc.customer_id,
-            sc.delivery_date,
-            sc.pay_method,
-            sc.freight_payer,
-            sc.remark,
-            sc.create_user,
-            sc.create_time,
-            sc.update_user,
-            sc.update_time,
-            (SELECT sum(unit_price * quantity) FROM sales_contract_details WHERE sales_contract_id = sc.id) contractAmount,
-            sc.flow_id
-        from sales_contract sc
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-jxst/src/main/resources/mapper/work/WorkOrderBomMapper.xml

@@ -1,5 +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.fjhx.mes.mapper.work.WorkOrderBomMapper">
-
-</mapper>

hx-jxst/src/main/resources/mapper/work/WorkOrderProductionProcessesMapper.xml

@@ -1,5 +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.fjhx.mes.mapper.work.WorkOrderProductionProcessesMapper">
-
-</mapper>

hx-mail/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.fjhx</groupId>
-        <artifactId>bytesailing</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <artifactId>hx-mail</artifactId>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-base</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-common</artifactId>
-        </dependency>
-
-        <!-- mail -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-customer</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

hx-mail/src/main/java/com/fjhx/mail/config/MailServiceConfig.java

@@ -1,30 +0,0 @@
-package com.fjhx.mail.config;
-
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MailServiceConfig {
-
-    /**
-     * 国内邮箱服务url
-     */
-    public static String urlPrefix;
-
-    /**
-     * 国外邮箱服务url
-     */
-    public static String abroadUrlPrefix;
-
-    @Value("${mail.urlPrefix}")
-    public void setUrlPrefix(String urlPrefix) {
-        MailServiceConfig.urlPrefix = urlPrefix;
-    }
-
-    @Value("${mail.abroadUrlPrefix}")
-    public void setAbroadUserUrlPrefix(String abroadUserUrlPrefix) {
-        MailServiceConfig.abroadUrlPrefix = abroadUserUrlPrefix;
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/enterprise/EnterpriseDomainController.java

@@ -1,75 +0,0 @@
-package com.fjhx.mail.controller.enterprise;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.mail.entity.enterprise.dto.EnterpriseDomainDto;
-import com.fjhx.mail.entity.enterprise.dto.EnterpriseDomainSelectDto;
-import com.fjhx.mail.entity.enterprise.vo.EnterpriseDomainVo;
-import com.fjhx.mail.service.enterprise.EnterpriseDomainService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 企业邮箱域名 前端控制器
- * </p>
- *
- * @author
- * @since 2023-04-06
- */
-//@DS(SourceConstant.MAIL)
-@RestController
-@RequestMapping("/enterpriseDomain")
-public class EnterpriseDomainController {
-
-    @Autowired
-    private EnterpriseDomainService enterpriseDomainService;
-
-    /**
-     * 企业邮箱域名分页
-     */
-    @PostMapping("/page")
-    public Page<EnterpriseDomainVo> page(@RequestBody EnterpriseDomainSelectDto dto) {
-        return enterpriseDomainService.getPage(dto);
-    }
-
-    /**
-     * 企业邮箱域名明细
-     */
-    @PostMapping("/detail")
-    public EnterpriseDomainVo detail(@RequestBody BaseSelectDto dto) {
-        return enterpriseDomainService.detail(dto.getId());
-    }
-
-    /**
-     * 企业邮箱域名新增
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody EnterpriseDomainDto enterpriseDomainDto) {
-        enterpriseDomainService.add(enterpriseDomainDto);
-    }
-
-    /**
-     * 企业邮箱域名编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody EnterpriseDomainDto enterpriseDomainDto) {
-        enterpriseDomainService.edit(enterpriseDomainDto);
-    }
-
-    /**
-     * 企业邮箱域名删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        enterpriseDomainService.delete(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/enterprise/EnterpriseMailboxController.java

@@ -1,78 +0,0 @@
-package com.fjhx.mail.controller.enterprise;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.mail.entity.enterprise.dto.EnterpriseMailboxDto;
-import com.fjhx.mail.entity.enterprise.dto.EnterpriseMailboxSelectDto;
-import com.fjhx.mail.entity.enterprise.vo.EnterpriseMailboxVo;
-import com.fjhx.mail.service.enterprise.EnterpriseMailboxService;
-import com.ruoyi.common.annotation.NonInterception;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 企业邮箱 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-06
- */
-//@DS(SourceConstant.MAIL)
-@RestController
-@RequestMapping("/enterpriseMailbox")
-public class EnterpriseMailboxController {
-
-    @Autowired
-    private EnterpriseMailboxService enterpriseMailboxService;
-
-    /**
-     * 企业邮箱分页
-     */
-    @PostMapping("/page")
-    public Page<EnterpriseMailboxVo> page(@RequestBody EnterpriseMailboxSelectDto dto) {
-        return enterpriseMailboxService.getPage(dto);
-    }
-
-    /**
-     * 企业邮箱明细
-     */
-    @PostMapping("/detail")
-    public EnterpriseMailboxVo detail(@RequestBody BaseSelectDto dto) {
-        return enterpriseMailboxService.detail(dto.getId());
-    }
-
-    /**
-     * 企业邮箱新增
-     */
-    @NonInterception
-    @PostMapping("/add")
-    public JSONObject add(@Validated @RequestBody EnterpriseMailboxDto enterpriseMailboxDto) {
-        return enterpriseMailboxService.add(enterpriseMailboxDto);
-    }
-
-    /**
-     * 企业邮箱编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody EnterpriseMailboxDto enterpriseMailboxDto) {
-        enterpriseMailboxService.edit(enterpriseMailboxDto);
-    }
-
-    /**
-     * 企业邮箱删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        enterpriseMailboxService.delete(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/message/InfoController.java

@@ -1,51 +0,0 @@
-package com.fjhx.mail.controller.message;
-
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson2.JSON;
-import com.fjhx.mail.config.MailServiceConfig;
-import com.fjhx.mail.service.message.InfoService;
-import com.ruoyi.common.annotation.NonInterception;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.exception.ServiceException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Slf4j
-@RestController
-@RequestMapping("/mailInfo")
-public class InfoController {
-
-    @Autowired
-    private InfoService infoService;
-
-    /**
-     * 获取员工邮箱
-     */
-    @PostMapping("/getUserList")
-    public List<SysUser> getUserList() {
-        return infoService.getExistMailUserList();
-    }
-
-    /**
-     * 获取用户邮箱列表
-     */
-    @NonInterception
-    @PostMapping("/getUserEmailList")
-    public Object getUserEmailList(@RequestBody BaseSelectDto dto) {
-        Long id = dto.getId();
-        if (id == null) {
-            throw new ServiceException("用户id不能为空");
-        }
-
-        String get = HttpUtil.get(MailServiceConfig.urlPrefix + "getUserEmailList/" + id);
-        return JSON.parseObject(get);
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/message/MailController.java

@@ -1,107 +0,0 @@
-package com.fjhx.mail.controller.message;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.fjhx.mail.config.MailServiceConfig;
-import com.fjhx.mail.entity.dto.GetMessagePageDto;
-import com.fjhx.mail.entity.message.dto.DeleteBatchMailDto;
-import com.fjhx.mail.entity.message.dto.DeleteMailDto;
-import com.fjhx.mail.entity.message.dto.SendDto;
-import com.fjhx.mail.entity.message.dto.SetSeenDto;
-import com.fjhx.mail.service.message.InfoService;
-import com.ruoyi.common.annotation.NonInterception;
-import com.ruoyi.common.utils.SecurityUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/mailService")
-public class MailController {
-
-    @Autowired
-    private InfoService infoService;
-
-    /**
-     * 获取用户邮箱列表
-     */
-    @NonInterception
-    @GetMapping("/getUserEmailList")
-    public Object getUserEmailList() {
-        String get = HttpUtil.get(MailServiceConfig.urlPrefix + "getUserEmailList/" + SecurityUtils.getUserId());
-        return JSON.parseObject(get);
-    }
-
-    /**
-     * 获取用户邮箱列表
-     */
-    @NonInterception
-    @PostMapping("/getMessagePage")
-    public Object getMessagePage(@RequestBody JSONObject dtoJson) {
-        dtoJson.remove("id");//解决前端传的字符串id
-        GetMessagePageDto dto = BeanUtil.copyProperties(dtoJson, GetMessagePageDto.class);
-        return infoService.getMessagePage(dto);
-
-//        String post = HttpUtil.post(MailServiceConfig.urlPrefix + "getMessagePage", JSONObject.toJSONString(dto));
-//        return JSON.parseObject(post);
-    }
-
-    /**
-     * 获取用户邮箱明细
-     */
-    @NonInterception
-    @PostMapping("/getMessageDetail")
-    public Object getMessageDetail(@RequestBody JSONObject dto) {
-        String post = HttpUtil.post(MailServiceConfig.urlPrefix + "getMessageDetail", dto.toJSONString());
-        return JSON.parseObject(post);
-    }
-
-    /**
-     * 发送邮件
-     */
-    @NonInterception
-    @PostMapping("/sendMail")
-    public Object sendMail(@RequestBody SendDto dto) {
-        String result = infoService.sendMail(dto);
-        return JSON.parseObject(result);
-    }
-
-    /**
-     * 删除邮件
-     */
-    @PostMapping("/deleteMail")
-    public void deleteMail(@Validated @RequestBody DeleteMailDto dto) {
-        infoService.deleteMail(dto);
-    }
-
-    /**
-     * 批量删除邮件
-     */
-    @PostMapping("/deleteBatchMail")
-    public void deleteBatchMail(@Validated @RequestBody DeleteBatchMailDto dto) {
-        infoService.deleteBatchMail(dto);
-    }
-
-    /**
-     * 设置已读
-     */
-    @NonInterception
-    @PostMapping("/setSeen")
-    public JSONObject setSeen(@Validated @RequestBody SetSeenDto dto) {
-        return infoService.setSeen(dto);
-    }
-
-    /**
-     * 取消已读
-     */
-    @NonInterception
-    @PostMapping("/cancelSeen")
-    public JSONObject cancelSeen(@Validated @RequestBody SetSeenDto dto) {
-        return infoService.cancelSeen(dto);
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyContactPersonController.java

@@ -1,72 +0,0 @@
-package com.fjhx.mail.controller.my;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.my.dto.MyContactPersonDto;
-import com.fjhx.mail.entity.my.dto.MyContactPersonSelectDto;
-import com.fjhx.mail.entity.my.vo.MyContactPersonVo;
-import com.fjhx.mail.service.my.MyContactPersonService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 联系人 前端控制器
- * </p>
- *
- * @author
- * @since 2023-06-09
- */
-@RestController
-@RequestMapping("/myContactPerson")
-public class MyContactPersonController {
-
-    @Autowired
-    private MyContactPersonService myContactPersonService;
-
-    /**
-     * 联系人分页
-     */
-    @PostMapping("/page")
-    public Page<MyContactPersonVo> page(@RequestBody MyContactPersonSelectDto dto) {
-        return myContactPersonService.getPage(dto);
-    }
-
-    /**
-     * 联系人明细
-     */
-    @PostMapping("/detail")
-    public MyContactPersonVo detail(@RequestBody BaseSelectDto dto) {
-        return myContactPersonService.detail(dto.getId());
-    }
-
-    /**
-     * 联系人新增
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody MyContactPersonDto myContactPersonDto) {
-        myContactPersonService.add(myContactPersonDto);
-    }
-
-    /**
-     * 联系人编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@Validated @RequestBody MyContactPersonDto myContactPersonDto) {
-        myContactPersonService.edit(myContactPersonDto);
-    }
-
-    /**
-     * 联系人删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        myContactPersonService.delete(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyCustomerController.java

@@ -1,28 +0,0 @@
-package com.fjhx.mail.controller.my;
-
-import com.fjhx.customer.entity.customer.po.Customer;
-import com.fjhx.mail.service.my.MyCustomerService;
-import com.ruoyi.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 我的客户
- */
-@RestController
-@RequestMapping("/myCustomer")
-public class MyCustomerController {
-
-    @Autowired
-    private MyCustomerService myCustomerService;
-
-    @PostMapping("/list")
-    public List<Customer> list() {
-        return myCustomerService.getList(SecurityUtils.getUserId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyFolderController.java

@@ -1,74 +0,0 @@
-package com.fjhx.mail.controller.my;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fjhx.mail.entity.my.dto.MyFolderDto;
-import com.fjhx.mail.entity.my.dto.MyFolderSelectDto;
-import com.fjhx.mail.entity.my.vo.MyFolderVo;
-import com.fjhx.mail.service.my.MyFolderService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 我的文件夹 前端控制器
- * </p>
- *
- * @author
- * @since 2023-05-29
- */
-@RestController
-@RequestMapping("/myFolder")
-public class MyFolderController {
-
-    @Autowired
-    private MyFolderService myFolderService;
-
-    /**
-     * 我的文件树形
-     */
-    @PostMapping("/tree")
-    public List<JSONObject> tree(@Validated @RequestBody MyFolderSelectDto dto) {
-        return myFolderService.tree(dto);
-    }
-
-    /**
-     * 我的文件夹明细
-     */
-    @PostMapping("/detail")
-    public MyFolderVo detail(@RequestBody BaseSelectDto dto) {
-        return myFolderService.detail(dto.getId());
-    }
-
-    /**
-     * 我的文件夹新增
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody MyFolderDto myFolderDto) {
-        myFolderService.add(myFolderDto);
-    }
-
-    /**
-     * 我的文件夹编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody MyFolderDto myFolderDto) {
-        myFolderService.edit(myFolderDto);
-    }
-
-    /**
-     * 我的文件夹删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        myFolderService.delete(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyFolderMessageController.java

@@ -1,65 +0,0 @@
-package com.fjhx.mail.controller.my;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.my.dto.MyFolderMessageAddBathDto;
-import com.fjhx.mail.entity.my.dto.MyFolderMessageDto;
-import com.fjhx.mail.entity.my.dto.MyFolderMessageSelectDto;
-import com.fjhx.mail.entity.my.vo.MessageVo;
-import com.fjhx.mail.service.my.MyFolderMessageService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 我的文件夹关联邮件 前端控制器
- * </p>
- *
- * @author
- * @since 2023-05-29
- */
-@RestController
-@RequestMapping("/myFolderMessage")
-public class MyFolderMessageController {
-
-    @Autowired
-    private MyFolderMessageService myFolderMessageService;
-
-    /**
-     * 我的文件夹关联邮件分页
-     */
-    @PostMapping("/page")
-    public Page<MessageVo> page(@Validated @RequestBody MyFolderMessageSelectDto dto) {
-        return myFolderMessageService.getPage(dto);
-    }
-
-    /**
-     * 我的文件夹关联邮件添加
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody MyFolderMessageDto dto) {
-        myFolderMessageService.add(dto);
-    }
-
-    /**
-     * 我的文件夹关联邮件添加
-     */
-    @PostMapping("/addBath")
-    public void addBath(@Validated @RequestBody MyFolderMessageAddBathDto dto) {
-        myFolderMessageService.addBath(dto);
-    }
-
-    /**
-     * 我的文件夹关联邮件删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        myFolderMessageService.delete(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyTagController.java

@@ -1,83 +0,0 @@
-package com.fjhx.mail.controller.my;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.my.dto.MyTagDto;
-import com.fjhx.mail.entity.my.dto.MyTagSelectDto;
-import com.fjhx.mail.entity.my.po.MyTag;
-import com.fjhx.mail.entity.my.vo.MyTagVo;
-import com.fjhx.mail.service.my.MyTagService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 我的标签 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-05-29
- */
-@RestController
-@RequestMapping("/myTag")
-public class MyTagController {
-
-    @Autowired
-    private MyTagService myTagService;
-
-    /**
-     * 我的标签分页
-     */
-    @PostMapping("/page")
-    public Page<MyTagVo> page(@RequestBody MyTagSelectDto dto) {
-        return myTagService.getPage(dto);
-    }
-
-    /**
-     * 我的标签明细
-     */
-    @PostMapping("/detail")
-    public MyTagVo detail(@RequestBody BaseSelectDto dto) {
-        return myTagService.detail(dto.getId());
-    }
-
-    /**
-     * 我的标签新增
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody MyTagDto myTagDto) {
-        myTagService.add(myTagDto);
-    }
-
-    /**
-     * 我的标签编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody MyTagDto myTagDto) {
-        myTagService.edit(myTagDto);
-    }
-
-    /**
-     * 我的标签删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        myTagService.delete(dto.getId());
-    }
-
-    /**
-     * 获取邮件标签
-     */
-    @PostMapping("/getListByMessageId")
-    public List<MyTag> getListByMessageId(@RequestBody BaseSelectDto dto) {
-        return myTagService.getListByMessageId(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyTagMessageController.java

@@ -1,74 +0,0 @@
-package com.fjhx.mail.controller.my;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.my.dto.MyTagMessageAddBathDto;
-import com.fjhx.mail.entity.my.dto.MyTagMessageDto;
-import com.fjhx.mail.entity.my.dto.MyTagMessageSelectDto;
-import com.fjhx.mail.entity.my.po.MyTagMessage;
-import com.fjhx.mail.entity.my.vo.MessageVo;
-import com.fjhx.mail.service.my.MyTagMessageService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 我的标签关联邮件 前端控制器
- * </p>
- *
- * @author
- * @since 2023-05-29
- */
-@RestController
-@RequestMapping("/myTagMessage")
-public class MyTagMessageController {
-
-    @Autowired
-    private MyTagMessageService myTagMessageService;
-
-    /**
-     * 我的标签关联邮件分页
-     */
-    @PostMapping("/page")
-    public Page<MessageVo> page(@Validated @RequestBody MyTagMessageSelectDto dto) {
-        return myTagMessageService.getPage(dto);
-    }
-
-    /**
-     * 我的标签关联邮件新增
-     */
-    @PostMapping("/add")
-    public void add(@Validated @RequestBody MyTagMessageDto myTagMessageDto) {
-        myTagMessageService.add(myTagMessageDto);
-    }
-
-    /**
-     * 我的标签关联邮件批量新增
-     */
-    @PostMapping("/addBath")
-    public void addBath(@Validated @RequestBody MyTagMessageAddBathDto dto) {
-        myTagMessageService.addBath(dto);
-    }
-
-    /**
-     * 我的标签关联邮件删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        myTagMessageService.delete(dto.getId());
-    }
-
-    /**
-     * 我的标签关联邮件删除
-     */
-    @PostMapping("/deleteTag")
-    public void deleteTag(@RequestBody MyTagMessage myTagMessage) {
-        myTagMessageService.deleteTag(myTagMessage);
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/open/OpenMailController.java

@@ -1,37 +0,0 @@
-package com.fjhx.mail.controller.open;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.redis.RedisCache;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-//@DS(SourceConstant.ITEM)
-@RestController
-@RequestMapping("/open/mail")
-public class OpenMailController {
-
-    @Autowired
-    private RedisCache redisCache;
-
-    /**
-     * 获取在线用户id
-     */
-    @GetMapping("/getOnlineUserIdList")
-    public Set<Long> getOnlineUserIdList() {
-        Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
-        return keys.stream().map(key -> {
-            LoginUser user = redisCache.getCacheObject(key);
-            return user.getUserId();
-        }).collect(Collectors.toSet());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/personal/PersonalMailboxController.java

@@ -1,78 +0,0 @@
-package com.fjhx.mail.controller.personal;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.mail.entity.personal.dto.PersonalMailboxDto;
-import com.fjhx.mail.entity.personal.dto.PersonalMailboxSelectDto;
-import com.fjhx.mail.entity.personal.vo.PersonalMailboxVo;
-import com.fjhx.mail.service.personal.PersonalMailboxService;
-import com.ruoyi.common.annotation.NonInterception;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 个人邮箱 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-06
- */
-//@DS(SourceConstant.MAIL)
-@RestController
-@RequestMapping("/personalMailbox")
-public class PersonalMailboxController {
-
-    @Autowired
-    private PersonalMailboxService personalMailboxService;
-
-    /**
-     * 个人邮箱分页
-     */
-    @PostMapping("/page")
-    public Page<PersonalMailboxVo> page(@RequestBody PersonalMailboxSelectDto dto) {
-        return personalMailboxService.getPage(dto);
-    }
-
-    /**
-     * 个人邮箱明细
-     */
-    @PostMapping("/detail")
-    public PersonalMailboxVo detail(@RequestBody BaseSelectDto dto) {
-        return personalMailboxService.detail(dto.getId());
-    }
-
-    /**
-     * 个人邮箱新增
-     */
-    @NonInterception
-    @PostMapping("/add")
-    public JSONObject add(@Validated @RequestBody PersonalMailboxDto personalMailboxDto) {
-        return personalMailboxService.add(personalMailboxDto);
-    }
-
-    /**
-     * 个人邮箱编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody PersonalMailboxDto personalMailboxDto) {
-        personalMailboxService.edit(personalMailboxDto);
-    }
-
-    /**
-     * 个人邮箱删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        personalMailboxService.delete(dto.getId());
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/controller/signature/MailSignatureController.java

@@ -1,78 +0,0 @@
-package com.fjhx.mail.controller.signature;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.signature.vo.MailSignatureVo;
-import com.fjhx.mail.entity.signature.dto.MailSignatureSelectDto;
-import com.fjhx.mail.entity.signature.dto.MailMailSignatureDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.mail.service.signature.MailSignatureService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 签名 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-08-24
- */
-@RestController
-@RequestMapping("/mailSignature")
-public class MailSignatureController {
-
-    @Autowired
-    private MailSignatureService mailSignatureService;
-
-    /**
-     * 签名分页
-     */
-    @PostMapping("/page")
-    public Page<MailSignatureVo> page(@RequestBody MailSignatureSelectDto dto) {
-        return mailSignatureService.getPage(dto);
-    }
-
-    /**
-     * 签名明细
-     */
-    @PostMapping("/detail")
-    public MailSignatureVo detail(@RequestBody BaseSelectDto dto) {
-        return mailSignatureService.detail(dto.getId());
-    }
-
-    /**
-     * 签名新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody MailMailSignatureDto mailSignatureDto) {
-        mailSignatureService.add(mailSignatureDto);
-    }
-
-    /**
-     * 签名编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody MailMailSignatureDto mailSignatureDto) {
-        mailSignatureService.edit(mailSignatureDto);
-    }
-
-    /**
-     * 签名删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        mailSignatureService.delete(dto.getId());
-    }
-
-    /**
-     * 获取模板名称列表
-     */
-    @GetMapping("/getTemplateList")
-    public List<String> getTemplateList(){
-        return mailSignatureService.getTemplateList();
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/dto/GetMessagePageDto.java

@@ -1,38 +0,0 @@
-package com.fjhx.mail.entity.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class GetMessagePageDto extends BaseSelectDto {
-
-    /**
-     * 邮箱id
-     */
-    private Long mailboxId;
-
-    /**
-     * 文件夹id
-     */
-    private Long folderId;
-
-    /**
-     * 类型
-     * 1、个人邮箱
-     * 2、企业邮箱
-     */
-    private Integer type;
-
-    /**
-     * 邮件id
-     */
-    private Long messageId;
-
-    /**
-     * 往来地址
-     */
-    private String dealingsEmail;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/dto/EnterpriseDomainDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.enterprise.dto;
-
-import com.fjhx.mail.entity.enterprise.po.EnterpriseDomain;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 企业邮箱域名新增编辑入参实体
- *
- * @author 
- * @since 2023-04-06
- */
-@Getter
-@Setter
-public class EnterpriseDomainDto extends EnterpriseDomain {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/dto/EnterpriseDomainSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.enterprise.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 企业邮箱域名列表查询入参实体
- *
- * @author 
- * @since 2023-04-06
- */
-@Getter
-@Setter
-public class EnterpriseDomainSelectDto extends BaseSelectDto {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/dto/EnterpriseMailboxDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.enterprise.dto;
-
-import com.fjhx.mail.entity.enterprise.po.EnterpriseMailbox;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 企业邮箱新增编辑入参实体
- *
- * @author 
- * @since 2023-04-06
- */
-@Getter
-@Setter
-public class EnterpriseMailboxDto extends EnterpriseMailbox {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/dto/EnterpriseMailboxSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.enterprise.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 企业邮箱列表查询入参实体
- *
- * @author 
- * @since 2023-04-06
- */
-@Getter
-@Setter
-public class EnterpriseMailboxSelectDto extends BaseSelectDto {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseDomain.java

@@ -1,72 +0,0 @@
-package com.fjhx.mail.entity.enterprise.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * <p>
- * 企业邮箱域名
- * </p>
- *
- * @author
- * @since 2023-04-06
- */
-@Getter
-@Setter
-@TableName("enterprise_domain")
-public class EnterpriseDomain extends BasePo {
-
-    /**
-     * 域名
-     */
-    @NotBlank(message = "邮箱域名不能为空")
-    private String domainName;
-
-    /**
-     * 类型：1国内 2国外
-     */
-    @NotNull(message = "是否海外邮箱不能为空")
-    private Integer type;
-
-    /**
-     * 收件host
-     */
-    @NotBlank(message = "收件服务器地址不能为空")
-    private String receiveHost;
-
-    /**
-     * 收件端口
-     */
-    @NotNull(message = "收件端口不能为空")
-    private Integer receivePort;
-
-    /**
-     * 收件协议
-     */
-    @NotBlank(message = "收件协议不能为空")
-    private String receiveProtocol;
-
-    /**
-     * 发件host
-     */
-    @NotBlank(message = "发件服务器地址不能为空")
-    private String sendHost;
-
-    /**
-     * 发件端口
-     */
-    @NotNull(message = "发件端口不能为空")
-    private Integer sendPort;
-
-    /**
-     * 发件协议
-     */
-    @NotBlank(message = "发件协议不能为空")
-    private String sendProtocol;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseFolder.java

@@ -1,47 +0,0 @@
-package com.fjhx.mail.entity.enterprise.po;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BaseIdPo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * <p>
- * 企业邮箱文件夹
- * </p>
- *
- * @author
- * @since 2023-04-07
- */
-@Getter
-@Setter
-@TableName("enterprise_folder")
-public class EnterpriseFolder extends BaseIdPo {
-
-    /**
-     * 邮箱id
-     */
-    private Long mailboxId;
-
-    /**
-     * 文件夹名称
-     */
-    private String name;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseMailbox.java

@@ -1,68 +0,0 @@
-package com.fjhx.mail.entity.enterprise.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BasePo;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * <p>
- * 企业邮箱
- * </p>
- *
- * @author 
- * @since 2023-04-06
- */
-@Getter
-@Setter
-@TableName("enterprise_mailbox")
-public class EnterpriseMailbox extends BasePo {
-
-    /**
-     * 企业邮箱域名id
-     */
-    @NotNull(message = "企业邮箱域名id不能为空")
-    private Long domainId;
-
-    /**
-     * mail账号前缀
-     */
-    @NotBlank(message = "邮箱地址不能为空")
-    private String mailUserPrefix;
-
-    /**
-     * mail授权码
-     */
-    @NotBlank(message = "授权码不能为空")
-    private String mailPassword;
-
-    /**
-     * 状态：1启用 0禁用
-     */
-    private Integer status;
-
-    /**
-     * 同步邮件状态: 1同步 0不同步
-     */
-    private Integer syncStatus;
-
-    /**
-     * 默认邮箱: 1默认 0非默认
-     */
-    private Integer defaultStatus;
-
-    /**
-     * 用户id
-     */
-    @NotNull(message = "绑定用户id不能为空")
-    private Long userId;
-
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseMessage.java

@@ -1,88 +0,0 @@
-package com.fjhx.mail.entity.enterprise.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BaseIdPo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * <p>
- * 企业邮件
- * </p>
- *
- * @author 
- * @since 2023-05-29
- */
-@Getter
-@Setter
-@TableName("enterprise_message")
-public class EnterpriseMessage extends BaseIdPo {
-
-    /**
-     * 邮件uid
-     */
-    private Long uid;
-
-    /**
-     * 邮箱id
-     */
-    private Long mailboxId;
-
-    /**
-     * 文件夹id
-     */
-    private Long folderId;
-
-    /**
-     * 文件夹名称
-     */
-    private String folderName;
-
-    /**
-     * 邮件标题
-     */
-    private String subject;
-
-    /**
-     * 发件人email
-     */
-    private String fromEmail;
-
-    /**
-     * 发件人名称
-     */
-    private String fromPersonalName;
-
-    /**
-     * 发件类型
-     */
-    private String fromType;
-
-    /**
-     * 发件时间
-     */
-    private Date sendDate;
-
-    /**
-     * 收件时间
-     */
-    private Date receivedDate;
-
-    /**
-     * 同步状态 1已同步 0未同步
-     */
-    private Integer syncStatus;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/vo/EnterpriseDomainVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.enterprise.vo;
-
-import com.fjhx.mail.entity.enterprise.po.EnterpriseDomain;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 企业邮箱域名列表查询返回值实体
- *
- * @author 
- * @since 2023-04-06
- */
-@Getter
-@Setter
-public class EnterpriseDomainVo extends EnterpriseDomain {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/vo/EnterpriseMailboxVo.java

@@ -1,73 +0,0 @@
-package com.fjhx.mail.entity.enterprise.vo;
-
-import com.fjhx.mail.entity.enterprise.po.EnterpriseMailbox;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * 企业邮箱列表查询返回值实体
- *
- * @author
- * @since 2023-04-06
- */
-@Getter
-@Setter
-public class EnterpriseMailboxVo extends EnterpriseMailbox {
-
-    /**
-     * 域名
-     */
-    @NotBlank(message = "邮箱域名不能为空")
-    private String domainName;
-
-    /**
-     * 类型：1国内 2国外
-     */
-    @NotNull(message = "是否海外邮箱不能为空")
-    private Integer type;
-
-    /**
-     * 收件host
-     */
-    @NotBlank(message = "收件服务器地址不能为空")
-    private String receiveHost;
-
-    /**
-     * 收件端口
-     */
-    @NotNull(message = "收件端口不能为空")
-    private Integer receivePort;
-
-    /**
-     * 收件协议
-     */
-    @NotBlank(message = "收件协议不能为空")
-    private String receiveProtocol;
-
-    /**
-     * 发件host
-     */
-    @NotBlank(message = "发件服务器地址不能为空")
-    private String sendHost;
-
-    /**
-     * 发件端口
-     */
-    @NotNull(message = "发件端口不能为空")
-    private Integer sendPort;
-
-    /**
-     * 发件协议
-     */
-    @NotBlank(message = "发件协议不能为空")
-    private String sendProtocol;
-
-    /**
-     * 用户名称
-     */
-    private String userName;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/message/dto/DeleteBatchMailDto.java

@@ -1,23 +0,0 @@
-package com.fjhx.mail.entity.message.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Getter
-@Setter
-public class DeleteBatchMailDto {
-
-    /**
-     * 1个人邮箱 2企业邮箱
-     */
-    @NotNull(message = "类型不能为空")
-    private Integer type;
-
-    @NotEmpty(message = "邮件id不能为空")
-    private List<Long> idList;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/message/dto/DeleteMailDto.java

@@ -1,21 +0,0 @@
-package com.fjhx.mail.entity.message.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-@Getter
-@Setter
-public class DeleteMailDto {
-
-    /**
-     * 1个人邮箱 2企业邮箱
-     */
-    @NotNull(message = "类型不能为空")
-    private Integer type;
-
-    @NotNull(message = "邮件id不能为空")
-    private Long id;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/message/dto/SendDto.java

@@ -1,92 +0,0 @@
-package com.fjhx.mail.entity.message.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Getter
-@Setter
-public class SendDto {
-
-    /**
-     * 1个人邮箱 2企业邮箱
-     */
-    @NotNull(message = "类型不能为空")
-    private Integer type;
-
-    /**
-     * 邮箱id
-     */
-    @NotNull(message = "邮箱id不能为空")
-    private Long mailboxId;
-
-    /**
-     * 发送
-     */
-    @NotEmpty(message = "发送人不能为空")
-    private List<Address> to;
-
-    /**
-     * 抄送
-     */
-    private List<Address> cc;
-
-    /**
-     * 密送
-     */
-    private List<Address> bcc;
-
-    /**
-     * 回复
-     */
-    private List<Address> replyTo;
-
-    /**
-     * 标题
-     */
-    @NotBlank(message = "标题不能为空")
-    private String subject;
-
-    /**
-     * 正文
-     */
-    private String content;
-
-    /**
-     * 附件
-     */
-    @Valid
-    private List<FileInfo> fileList;
-
-    @Getter
-    @Setter
-    public static class Address {
-        @NotBlank(message = "发件地址不能为空")
-        private String address;
-        private String personal;
-    }
-
-    @Getter
-    @Setter
-    public static class FileInfo {
-
-        /**
-         * 文件名称
-         */
-        @NotBlank(message = "文件名称不能为空")
-        private String fileName;
-
-        /**
-         * 文件路径
-         */
-        @NotBlank(message = "文件路径不能为空")
-        private String fileUrl;
-
-    }
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/message/dto/SetSeenDto.java

@@ -1,32 +0,0 @@
-package com.fjhx.mail.entity.message.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Getter
-@Setter
-public class SetSeenDto {
-
-    @NotNull(message = "文件夹名称不能为空")
-    private String folderName;
-
-    @NotEmpty(message = "邮件uid不能为空")
-    private List<Long> uidList;
-
-    /**
-     * 1个人邮箱 2企业邮箱
-     */
-    @NotNull(message = "类型不能为空")
-    private Integer type;
-
-    /**
-     * 邮箱id
-     */
-    @NotNull(message = "邮箱id不能为空")
-    private Long mailboxId;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/message/po/MessageAttachment.java

@@ -1,34 +0,0 @@
-package com.fjhx.mail.entity.message.po;
-
-import com.ruoyi.common.core.domain.BaseIdPo;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 企业邮件附件
- * </p>
- *
- * @author
- * @since 2023-12-25
- */
-@Getter
-@Setter
-public class MessageAttachment extends BaseIdPo {
-
-    /**
-     * 邮件主表id
-     */
-    private Long messageId;
-
-    /**
-     * 附件名称
-     */
-    private String name;
-
-    /**
-     * 附件url
-     */
-    private String url;
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyContactPersonDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.my.dto;
-
-import com.fjhx.mail.entity.my.po.MyContactPerson;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 联系人新增编辑入参实体
- *
- * @author
- * @since 2023-06-09
- */
-@Getter
-@Setter
-public class MyContactPersonDto extends MyContactPerson {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyContactPersonSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.my.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 联系人列表查询入参实体
- *
- * @author
- * @since 2023-06-09
- */
-@Getter
-@Setter
-public class MyContactPersonSelectDto extends BaseSelectDto {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.mail.entity.my.dto;
-
-import com.fjhx.mail.entity.my.po.MyFolder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 我的文件夹新增编辑入参实体
- *
- * @author 
- * @since 2023-05-29
- */
-@Getter
-@Setter
-public class MyFolderDto extends MyFolder {
-
-}

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderMessageAddBathDto.java

@@ -1,26 +0,0 @@
-package com.fjhx.mail.entity.my.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Getter
-@Setter
-public class MyFolderMessageAddBathDto {
-
-    /**
-     * 我的文件夹id
-     */
-    @NotNull(message = "我的文件夹id不能为空")
-    private Long myFolderId;
-
-    /**
-     * 邮件id列表
-     */
-    @NotEmpty(message = "邮件id列表不能为空")
-    private List<Long> messageIdList;
-
-}