动态相关代码结构调整

nightFragrance-massage/src/main/java/com/ylx/merchant/controller/CustomerMerchantController.java

@@ -3,7 +3,7 @@ package com.ylx.merchant.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.R;
 import com.ylx.massage.service.IMaTechnicianService;
-import com.ylx.massage.service.ITechnicianMomentService;
+import com.ylx.moment.service.ITechnicianMomentService;
 import com.ylx.massage.service.MerchantApplyFileService;
 import com.ylx.merchant.domain.dto.*;
 import com.ylx.merchant.domain.vo.*;

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TechnicianMomentController.java → nightFragrance-massage/src/main/java/com/ylx/moment/controller/TechnicianMomentController.java

@@ -1,11 +1,9 @@
-package com.ylx.web.controller.massage;
+package com.ylx.moment.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.ylx.common.annotation.Log;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.model.WxLoginUser;
-import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.dto.MomentAuditDTO;
 import com.ylx.massage.domain.dto.MomentManageQueryDTO;
@@ -19,13 +17,12 @@ import com.ylx.massage.domain.vo.MomentListVO;
 import com.ylx.massage.domain.vo.MomentManageVO;
 import com.ylx.massage.domain.vo.MomentSimpleDetailVO;
 import com.ylx.massage.domain.vo.MyMomentVO;
-import com.ylx.massage.service.ITechnicianMomentService;
+import com.ylx.moment.service.ITechnicianMomentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/MomentMedia.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/MomentMedia.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain;
+package com.ylx.moment.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TechnicianMoment.java → nightFragrance-massage/src/main/java/com/ylx/moment/domain/TechnicianMoment.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain;
+package com.ylx.moment.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/MomentMediaMapper.java → nightFragrance-massage/src/main/java/com/ylx/moment/mapper/MomentMediaMapper.java

@@ -1,7 +1,7 @@
-package com.ylx.massage.mapper;
+package com.ylx.moment.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ylx.massage.domain.MomentMedia;
+import com.ylx.moment.domain.MomentMedia;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TechnicianMomentMapper.java → nightFragrance-massage/src/main/java/com/ylx/moment/mapper/TechnicianMomentMapper.java

@@ -1,7 +1,7 @@
-package com.ylx.massage.mapper;
+package com.ylx.moment.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ylx.massage.domain.TechnicianMoment;
+import com.ylx.moment.domain.TechnicianMoment;
 import com.ylx.massage.domain.vo.MomentAuditStatusCountVO;
 import com.ylx.merchant.domain.dto.MerchantMomentDTO;
 import com.ylx.merchant.domain.vo.MomentVO;

nightFragrance-massage/src/main/java/com/ylx/massage/service/ITechnicianMomentService.java → nightFragrance-massage/src/main/java/com/ylx/moment/service/ITechnicianMomentService.java

@@ -1,7 +1,7 @@
-package com.ylx.massage.service;
+package com.ylx.moment.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ylx.massage.domain.TechnicianMoment;
+import com.ylx.moment.domain.TechnicianMoment;
 import com.ylx.massage.domain.dto.EditMomentDTO;
 import com.ylx.massage.domain.dto.MomentAuditDTO;
 import com.ylx.massage.domain.dto.MomentManageQueryDTO;

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TechnicianMomentServiceImpl.java → nightFragrance-massage/src/main/java/com/ylx/moment/service/impl/TechnicianMomentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.service.impl;
+package com.ylx.moment.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,21 +7,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.MaTechnician;
-import com.ylx.massage.domain.MomentMedia;
-import com.ylx.massage.domain.TJs;
-import com.ylx.massage.domain.TechnicianMoment;
+import com.ylx.moment.domain.MomentMedia;
+import com.ylx.moment.domain.TechnicianMoment;
 import com.ylx.massage.domain.dto.EditMomentDTO;
 import com.ylx.massage.domain.dto.MomentAuditDTO;
 import com.ylx.massage.domain.dto.MomentManageQueryDTO;
 import com.ylx.massage.domain.dto.PublishMomentDTO;
 import com.ylx.massage.domain.vo.*;
 import com.ylx.massage.mapper.MaTechnicianMapper;
-import com.ylx.massage.mapper.MomentMediaMapper;
+import com.ylx.moment.mapper.MomentMediaMapper;
 import com.ylx.massage.mapper.TJsMapper;
-import com.ylx.massage.mapper.TechnicianMomentMapper;
-import com.ylx.massage.service.ITechnicianMomentService;
+import com.ylx.moment.mapper.TechnicianMomentMapper;
 import com.ylx.merchant.domain.dto.MerchantMomentDTO;
 import com.ylx.merchant.domain.vo.MomentVO;
+import com.ylx.moment.service.ITechnicianMomentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

nightFragrance-massage/src/main/resources/mapper/massage/MomentMediaMapper.xml → nightFragrance-massage/src/main/resources/mapper/moment/MomentMediaMapper.xml

@@ -1,9 +1,9 @@
 <?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.ylx.massage.mapper.MomentMediaMapper">
+<mapper namespace="com.ylx.moment.mapper.MomentMediaMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ylx.massage.domain.MomentMedia">
+    <resultMap id="BaseResultMap" type="com.ylx.moment.domain.MomentMedia">
         <id column="id" property="id"/>
         <result column="moment_id" property="momentId"/>
         <result column="media_url" property="mediaUrl"/>

nightFragrance-massage/src/main/resources/mapper/massage/TechnicianMomentMapper.xml → nightFragrance-massage/src/main/resources/mapper/moment/TechnicianMomentMapper.xml

@@ -1,9 +1,9 @@
 <?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.ylx.massage.mapper.TechnicianMomentMapper">
+<mapper namespace="com.ylx.moment.mapper.TechnicianMomentMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ylx.massage.domain.TechnicianMoment">
+    <resultMap id="BaseResultMap" type="com.ylx.moment.domain.TechnicianMoment">
         <id column="id" property="id"/>
         <result column="technician_id" property="technicianId"/>
         <result column="title" property="title"/>

nightFragrance-massage/src/test/java/com/ylx/massage/mapper/MomentMediaMapperXmlTest.java

@@ -21,7 +21,7 @@ public class MomentMediaMapperXmlTest {
 
     private String readMapperXml() throws Exception {
         InputStream inputStream = getClass().getClassLoader()
-                .getResourceAsStream("mapper/massage/MomentMediaMapper.xml");
+                .getResourceAsStream("mapper/moment/MomentMediaMapper.xml");
         assertNotNull(inputStream, "MomentMediaMapper.xml should exist");
         byte[] bytes = new byte[inputStream.available()];
         int read = inputStream.read(bytes);

nightFragrance-massage/src/test/java/com/ylx/massage/mapper/TechnicianMomentMapperXmlTest.java

@@ -92,7 +92,7 @@ public class TechnicianMomentMapperXmlTest {
 
     private String readMapperXml() throws Exception {
         InputStream inputStream = getClass().getClassLoader()
-                .getResourceAsStream("mapper/massage/TechnicianMomentMapper.xml");
+                .getResourceAsStream("mapper/moment/TechnicianMomentMapper.xml");
         assertNotNull(inputStream, "TechnicianMomentMapper.xml should exist");
         byte[] bytes = new byte[inputStream.available()];
         int read = inputStream.read(bytes);

nightFragrance-massage/src/test/java/com/ylx/massage/service/impl/TechnicianMomentServiceImplTest.java

@@ -3,12 +3,13 @@ package com.ylx.massage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.MaTechnician;
-import com.ylx.massage.domain.MomentMedia;
-import com.ylx.massage.domain.TechnicianMoment;
+import com.ylx.moment.domain.MomentMedia;
+import com.ylx.moment.domain.TechnicianMoment;
 import com.ylx.massage.domain.vo.MomentAuditStatusCountVO;
 import com.ylx.massage.mapper.MaTechnicianMapper;
-import com.ylx.massage.mapper.MomentMediaMapper;
-import com.ylx.massage.mapper.TechnicianMomentMapper;
+import com.ylx.moment.mapper.MomentMediaMapper;
+import com.ylx.moment.mapper.TechnicianMomentMapper;
+import com.ylx.moment.service.impl.TechnicianMomentServiceImpl;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.test.util.ReflectionTestUtils;