Tenlion/tenlion-module
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决包名冲突问题

Browse Source
This commit is contained in:
cuibaocheng 2021-06-03 15:50:51 +08:00
parent 82c7f08a0c
commit 5d0d076509
25 changed files with 40 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplate/IPicturesTemplateService.java
View File

@ -1,8 +1,8 @@
package cn.com.tenlion.buildingpictures.service.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateVO;
import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.ListPage;

8
interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/IPicturesTemplateAreaService.java
View File

@ -1,9 +1,9 @@
package cn.com.tenlion.buildingpictures.service.picturestemplatearea;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.ListPage;

2
interface-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialdata/MaterialDataService.java
View File

@ -5,8 +5,6 @@ import cn.com.tenlion.materialstore.pojo.dtos.materialdata.MaterialDataDTO;
import cn.com.tenlion.materialstore.pojo.vos.materialdata.MaterialDataVO;
import ink.wgink.util.ReflectUtil;
import java.util.List;
public interface MaterialDataService {
/**

6
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplate/PicturesTemplateController.java
View File

@ -1,8 +1,8 @@
package cn.com.tenlion.buildingpictures.controller.apis.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService;
import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController;

8
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java
View File

@ -1,9 +1,9 @@
package cn.com.tenlion.buildingpictures.controller.apis.picturestemplatearea;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController;

2
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/dao/picturestemplate/IPicturesTemplateDao.java
View File

@ -1,6 +1,6 @@
package cn.com.tenlion.buildingpictures.dao.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SaveException;
import ink.wgink.exceptions.SearchException;

2
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/dao/picturestemplatearea/IPicturesTemplateAreaDao.java
View File

@ -1,6 +1,6 @@
package cn.com.tenlion.buildingpictures.dao.picturestemplatearea;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SaveException;
import ink.wgink.exceptions.SearchException;

8
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplate/impl/PicturesTemplateServiceImpl.java
View File

@ -2,10 +2,10 @@ package cn.com.tenlion.buildingpictures.service.picturestemplate.impl;
import cn.com.tenlion.buildingpictures.dao.picturestemplate.IPicturesTemplateDao;
import cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService;

8
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/impl/PicturesTemplateAreaServiceImpl.java
View File

@ -1,10 +1,10 @@
package cn.com.tenlion.buildingpictures.service.picturestemplatearea.impl;
import cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;

4
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatebuilding/impl/PicturesTemplateBuildingServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.impl;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService;

2
module-building-pictures/src/main/resources/mybatis/mapper/picturestemplate/picturesmplate-mapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.tenlion.buildingpictures.dao.picturestemplate.IPicturesTemplateDao">
<resultMap id="picturesTemplateDTO" type="cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO">
<resultMap id="picturesTemplateDTO" type="cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO">
<id column="pictures_template_id" property="picturesTemplateId"/>
<result column="pictures_template_code" property="picturesTemplateCode"/>
<result column="pictures_template_background_image" property="picturesTemplateBackgroundImage"/>

2
module-building-pictures/src/main/resources/mybatis/mapper/picturestemplatearea/picturesmplatearea-mapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao">
<resultMap id="picturesTemplateAreaDTO" type="cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO">
<resultMap id="picturesTemplateAreaDTO" type="cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO">
<id column="pictures_template_area_id" property="picturesTemplateAreaId"/>
<result column="pictures_template_id" property="picturesTemplateId"/>
<result column="template_area_source" property="templateAreaSource"/>

12
module-material-store/src/main/java/cn/com/tenlion/materialstore/controller/api/materialdata/MaterialDataController.java
View File

@ -1,26 +1,14 @@
package cn.com.tenlion.materialstore.controller.api.materialdata;
import cn.com.tenlion.materialstore.pojo.dtos.materialdata.MaterialDataDTO;
import cn.com.tenlion.materialstore.pojo.dtos.materialphoto.MaterialPhotoDTO;
import cn.com.tenlion.materialstore.pojo.vos.materialphoto.MaterialPhotoVO;
import cn.com.tenlion.materialstore.service.materialdata.MaterialDataService;
import cn.com.tenlion.materialstore.service.materialphoto.IMaterialPhotoService;
import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController;
import ink.wgink.interfaces.consts.ISystemConstant;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.ErrorResult;
import ink.wgink.pojo.result.SuccessResult;
import ink.wgink.pojo.result.SuccessResultData;
import ink.wgink.pojo.result.SuccessResultList;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @ClassName: MaterialDataController
* @Description: 图片素材

1
module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialdata/impl/MaterialDataServiceImpl.java
View File

@ -25,7 +25,6 @@ import cn.com.tenlion.materialstore.service.materialvideo.IMaterialVideoService;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.app.AppTokenUser;
import ink.wgink.util.ReflectUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;

4
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/picturestemplate/PicturesTemplateDTO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateDTO.java
View File

@ -1,6 +1,6 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplate;
package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplate/PicturesTemplateFileDTO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplate;
package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaDTO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea;
package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/dtos/picturestemplatearea/PicturesTemplateAreaFileDTO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea;
package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/vos/picturestemplate/PicturesTemplateContentVO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateContentVO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplate;
package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate;
import ink.wgink.annotation.CheckEmptyAnnotation;
import io.swagger.annotations.ApiModel;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/vos/picturestemplate/PicturesTemplateVO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplate/PicturesTemplateVO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplate;
package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate;
import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaAllVO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea;
package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
import ink.wgink.annotation.CheckEmptyAnnotation;
import io.swagger.annotations.ApiModel;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaPiointVO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea;
package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatearea/PicturesTemplateAreaVO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea;
package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation;

2
pojo-building-pictures/src/main/java/cn/com/tenlion/materialstore/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java → pojo-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/pojo/vos/picturestemplatebuilding/PicturesTemplateBuildingVO.java
View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatebuilding;
package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatebuilding;
import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation;

2
pojo-material-store/src/main/java/cn/com/tenlion/materialstore/pojo/vos/materialdata/MaterialDataVO.java
View File

@ -1,8 +1,8 @@
package cn.com.tenlion.materialstore.pojo.vos.materialdata;
import cn.com.tenlion.materialstore.pojo.vos.materialmap.MaterialMapVO;
import cn.com.tenlion.materialstore.pojo.vos.materialaudio.MaterialAudioVO;
import cn.com.tenlion.materialstore.pojo.vos.materiallink.MaterialLinkVO;
import cn.com.tenlion.materialstore.pojo.vos.materialmap.MaterialMapVO;
import cn.com.tenlion.materialstore.pojo.vos.materialphoto.MaterialPhotoVO;
import cn.com.tenlion.materialstore.pojo.vos.materialtext.MaterialTextVO;
import cn.com.tenlion.materialstore.pojo.vos.materialvideo.MaterialVideoVO;