提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/common/CommonController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,13 +25,12 @@ import com.xingxi.common.utils.file.FileUtils;
 
 /**
  * 通用请求处理
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/common")
-public class CommonController
-{
+public class CommonController {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
     @Autowired
@@ -40,17 +40,14 @@ public class CommonController
 
     /**
      * 通用下载请求
-     * 
+     *
      * @param fileName 文件名称
-     * @param delete 是否删除
+     * @param delete   是否删除
      */
     @GetMapping("/download")
-    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(fileName))
-            {
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+        try {
+            if (!FileUtils.checkAllowDownload(fileName)) {
                 throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
@@ -59,13 +56,10 @@ public class CommonController
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
             FileUtils.writeBytes(filePath, response.getOutputStream());
-            if (delete)
-            {
+            if (delete) {
                 FileUtils.deleteFile(filePath);
             }
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("下载文件失败", e);
         }
     }
@@ -75,10 +69,8 @@ public class CommonController
      */
     @PostMapping("/upload")
     @ResponseBody
-    public AjaxResult uploadFile(MultipartFile file) throws Exception
-    {
-        try
-        {
+    public AjaxResult uploadFile(MultipartFile file) throws Exception {
+        try {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
@@ -90,9 +82,7 @@ public class CommonController
             ajax.put("newFileName", FileUtils.getName(fileName));
             ajax.put("originalFilename", file.getOriginalFilename());
             return ajax;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
     }
@@ -102,18 +92,15 @@ public class CommonController
      */
     @PostMapping("/uploads")
     @ResponseBody
-    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
-    {
-        try
-        {
+    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception {
+        try {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             List<String> urls = new ArrayList<String>();
             List<String> fileNames = new ArrayList<String>();
             List<String> newFileNames = new ArrayList<String>();
             List<String> originalFilenames = new ArrayList<String>();
-            for (MultipartFile file : files)
-            {
+            for (MultipartFile file : files) {
                 // 上传并返回新文件名称
                 String fileName = FileUploadUtils.upload(filePath, file);
                 String url = serverConfig.getUrl() + fileName;
@@ -128,9 +115,7 @@ public class CommonController
             ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
             ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
             return ajax;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
     }
@@ -140,12 +125,9 @@ public class CommonController
      */
     @GetMapping("/download/resource")
     public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
-            throws Exception
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(resource))
-            {
+            throws Exception {
+        try {
+            if (!FileUtils.checkAllowDownload(resource)) {
                 throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
             }
             // 本地资源路径
@@ -157,9 +139,7 @@ public class CommonController
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, downloadName);
             FileUtils.writeBytes(downloadPath, response.getOutputStream());
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("下载文件失败", e);
         }
     }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/designer/controller/DesignerController.java

@@ -5,6 +5,7 @@ import com.xingxi.common.core.controller.BaseController;
 import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
+import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.common.utils.poi.ExcelUtil;
 import com.xingxi.master.designer.domain.Designer;
 import com.xingxi.master.designer.service.IDesignerService;
@@ -110,6 +111,6 @@ public class DesignerController extends BaseController {
     @PostMapping("/remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        return toAjax(designerService.deleteDesignerByIds(ids));
+        return toAjax(designerService.logicDeleteDesignerByIds(ids));
     }
 }

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/designer/add.html

@@ -18,7 +18,9 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">设计师头像：</label>
                     <div class="col-sm-8">
-                        <input name="designerAvatar" class="form-control" type="text">
+                        <img id="designerAvatarImg" width="30%" height="30%">
+                        <input type="file" class="form-control" name="designerAvatarUrl" id="designerAvatarUrl" accept="image/*"/>
+                        <input type="hidden" lass="form-control" name="designerAvatar" id="designerAvatar" />
                     </div>
                 </div>
             </div>
@@ -35,6 +37,51 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var prefix = ctx + "master/designer"
+        $('#designerAvatarUrl').change(function () {
+            var fileSize = 0;
+            fileSize = this. files[0].size;
+            fileSize=Math. round( fileSize/1024*100)/100;
+
+            if(fileSize>2048){
+                layer.msg('上传文件不得大于2M，请重新上传。', {time: 3000, icon:6});
+                return false;
+            }
+
+            if (!/image\/\w+/.test(this.files[0].type)) {
+                layer.msg('上传的不是图片文件，请重新上传。', {time: 3000, icon:6});
+                return false;
+            }
+
+            if ($(this).val()) {
+                var formdata = new FormData();
+                formdata.append("imageFile", this.files[0]);
+                $.ajax({
+                    url: ctx + "common/upload/file/image",
+                    data: formdata,
+                    type: "post",
+                    processData: false,
+                    contentType: false,
+                    beforeSend: function () {
+                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.disable();
+                    },
+                    success: function (result) {
+                        if (result.code == web_status.SUCCESS) {
+                            $('#designerAvatarImg').attr('src', result.imageUrl);
+                            $('#designerAvatar').val(result.imageUrl);
+                            $.modal.alertSuccess(result.msg)
+                        } else if (result.code == web_status.WARNING) {
+                            $.modal.alertWarning(result.msg)
+                        } else {
+                            $.modal.alertError(result.msg);
+                        }
+                        $.modal.closeLoading();
+                        $.modal.enable();
+                    }
+                })
+            }
+        });
+
         $("#form-designer-add").validate({
             focusCleanup: true
         });

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/designer/edit.html

@@ -2,133 +2,6 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
     <th:block th:include="include :: header('修改设计师')" />
-    <th:block th:include="include :: cropper-css" />
-    <style type='text/css'>
-        /* avator css start */
-        .container {
-            margin: 10px 5px 5px 5px;
-        }
-
-        .action {
-            padding: 5px 0px;
-        }
-
-        .cropped {
-            width: 200px;
-            border: 1px #ddd solid;
-            box-shadow: 0px 0px 12px #ddd;
-        }
-
-        .img-preview {
-            border-radius: 50%;
-            box-shadow: 0px 0px 12px #7e7e7e;
-            display: inline-block;
-        }
-
-        .preview-box {
-            text-align: center;
-            margin: 0px auto;
-            margin-top: 10px;
-            color: #bbb;
-        }
-
-        .preview-md {
-            width: 128px;
-            height: 128px;
-        }
-
-        .preview-sm {
-            width: 96px;
-            height: 96px;
-        }
-
-        .preview-xs {
-            width: 64px;
-            height: 64px;
-        }
-
-        .imageBox {
-            border: 1px solid #aaa;
-            overflow: hidden;
-            cursor: move;
-            box-shadow: 4px 4px 12px #B0B0B0;
-            margin: 0px auto;
-        }
-
-        .btn-custom {
-            float: right;
-            width: 46px;
-            display: inline-block;
-            margin-bottom: 10px;
-            height: 37px;
-            line-height: 37px;
-            font-size: 14px;
-            color: #FFFFFF;
-            margin: 0px 2px;
-            background-color: #f38e81;
-            border-radius: 3px;
-            text-decoration: none;
-            cursor: pointer;
-            box-shadow: 0px 0px 5px #B0B0B0;
-            border: 0px #fff solid;
-        }
-        /*选择文件上传*/
-        .new-contentarea {
-            width: 165px;
-            overflow: hidden;
-            margin: 0 auto;
-            position: relative;
-            float: left;
-        }
-
-        .new-contentarea label {
-            width: 100%;
-            height: 100%;
-            display: block;
-        }
-
-        .new-contentarea input[type=file] {
-            width: 188px;
-            height: 60px;
-            background: #333;
-            margin: 0 auto;
-            position: absolute;
-            right: 50%;
-            margin-right: -94px;
-            top: 0;
-            right/*\**/: 0px\9;
-            margin-right/*\**/: 0px\9;
-            width/*\**/: 10px\9;
-            opacity: 0;
-            filter: alpha(opacity=0);
-            z-index: 2;
-        }
-
-        a.upload-img {
-            width: 165px;
-            display: inline-block;
-            margin-bottom: 10px;
-            height: 37px;
-            line-height: 37px;
-            font-size: 14px;
-            color: #FFFFFF;
-            background-color: #f38e81;
-            border-radius: 3px;
-            text-decoration: none;
-            cursor: pointer;
-            border: 0px #fff solid;
-            box-shadow: 0px 0px 5px #B0B0B0;
-        }
-
-        a.upload-img:hover {
-            background-color: #ec7e70;
-        }
-
-        .tc {
-            text-align: center;
-        }
-        /* avator css end */
-    </style>
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -145,8 +18,11 @@
             <div class="col-xs-12">
                 <div class="form-group">
                     <label class="col-sm-3 control-label">设计师头像：</label>
-                    <input type="file" class="form-control" name="imgFile" id="bannerImg" accept="image/*"/>
-                    <input type="hidden" th:field="*{designerAvatar}" class="form-control" name="imgUrl" id="designerAvatar" />
+                    <div class="col-sm-8">
+                        <img id="designerAvatarImg"  th:src="*{designerAvatar}" width="30%" height="30%">
+                        <input type="file" class="form-control" name="designerAvatarUrl" id="designerAvatarUrl" accept="image/*"/>
+                        <input type="hidden" th:field="*{designerAvatar}" class="form-control" name="designerAvatar" id="designerAvatar" />
+                    </div>
                 </div>
             </div>
             <div class="col-xs-12">
@@ -160,10 +36,9 @@
         </form>
     </div>
     <th:block th:include="include :: footer" />
-    <th:block th:include="include :: cropper-js" />
     <script th:inline="javascript">
         var prefix = ctx + "master/designer";
-        $('#designerAvatar').change(function () {
+        $('#designerAvatarUrl').change(function () {
             var fileSize = 0;
             fileSize = this. files[0].size;
             fileSize=Math. round( fileSize/1024*100)/100;
@@ -193,8 +68,8 @@
                     },
                     success: function (result) {
                         if (result.code == web_status.SUCCESS) {
-                            $('#viewImage').attr('src', result.imageUrl);
-                            $('#bannerImgUrl').val(result.imageUrl);
+                            $('#designerAvatarImg').attr('src', result.imageUrl);
+                            $('#designerAvatar').val(result.imageUrl);
                             $.modal.alertSuccess(result.msg)
                         } else if (result.code == web_status.WARNING) {
                             $.modal.alertWarning(result.msg)

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/enums/EDelFlag.java

@@ -0,0 +1,30 @@
+package com.xingxi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @program: gululuq
+ * @description: 删除标志
+ * @author: 金
+ * @create: 2025-03-16
+ */
+@AllArgsConstructor
+@Getter
+public enum EDelFlag {
+    YES("1", "已删除"),
+    NO("0", "未删除");
+
+    private String val;
+    private String desc;
+
+    // 解析
+    public static EDelFlag parseByVal(String val) {
+        for (EDelFlag type : EDelFlag.values()) {
+            if (type.getVal().equalsIgnoreCase(val)) {
+                return type;
+            }
+        }
+        return EDelFlag.NO;
+    }
+}

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/utils/file/FileUploadUtils.java

@@ -1,5 +1,6 @@
 package com.xingxi.common.utils.file;
 
+import com.xingxi.common.aliyun.oss.AliyunOSSClient;
 import com.xingxi.common.config.RuoYiConfig;
 import com.xingxi.common.constant.Constants;
 import com.xingxi.common.exception.file.FileNameLengthLimitExceededException;
@@ -7,7 +8,9 @@ import com.xingxi.common.exception.file.FileSizeLimitExceededException;
 import com.xingxi.common.exception.file.InvalidExtensionException;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.StringUtils;
+import com.xingxi.common.utils.spring.SpringUtils;
 import com.xingxi.common.utils.uuid.Seq;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -19,8 +22,9 @@ import java.util.Objects;
 /**
  * 文件上传工具类
  *
- * @author ruoyi
+ * @author xingxi
  */
+@Slf4j
 public class FileUploadUtils {
     /**
      * 默认大小 50M
@@ -100,9 +104,22 @@ public class FileUploadUtils {
 
         String fileName = extractFilename(file);
 
-        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
-        file.transferTo(Paths.get(absPath));
-        return getPathFileName(baseDir, fileName);
+        // 切换阿里云oss
+//        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
+//        file.transferTo(Paths.get(absPath));
+//        return getPathFileName(baseDir, fileName);
+        fileName = baseDir + "/" + fileName;
+        return putObject(fileName, file);
+    }
+
+    private static String putObject(String objectName, MultipartFile file) throws IOException{
+        try {
+            AliyunOSSClient client = SpringUtils.getBean(AliyunOSSClient.class);
+            return client.putObject(objectName, file.getInputStream());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new IOException("Aliyun OSS 上传文件异常", e.getCause());
+        }
     }
 
     public static String generateFileName(MultipartFile file, String[] allowedExtension) throws Exception {

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/master/designer/service/IDesignerService.java

@@ -81,7 +81,7 @@ public interface IDesignerService {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int logicDeleteDesignerByIds(String[] ids);
+    int logicDeleteDesignerByIds(String ids);
 
     /**
      * 逻辑批量删除设计师

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/master/designer/service/impl/DesignerServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xingxi.master.designer.service.impl;
 
 import com.xingxi.common.core.text.Convert;
+import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.common.utils.DateUtils;
+import com.xingxi.common.utils.ShiroUtils;
 import com.xingxi.master.designer.domain.Designer;
 import com.xingxi.master.designer.mapper.DesignerMapper;
 import com.xingxi.master.designer.service.IDesignerService;
@@ -51,6 +53,8 @@ public class DesignerServiceImpl implements IDesignerService {
      */
     @Override
     public int insertDesigner(Designer designer) {
+        designer.setDelFlag(EDelFlag.NO.getVal());
+        designer.setCreateUser(ShiroUtils.getLoginName());
         designer.setCreateTime(DateUtils.getNowDate());
         return designerMapper.insertDesigner(designer);
     }
@@ -74,7 +78,9 @@ public class DesignerServiceImpl implements IDesignerService {
      */
     @Override
     public int updateDesigner(Designer designer) {
+        designer.setUpdateUser(ShiroUtils.getLoginName());
         designer.setUpdateTime(DateUtils.getNowDate());
+        designer.setDelFlag(EDelFlag.NO.getVal());
         return designerMapper.updateDesigner(designer);
     }
 
@@ -118,8 +124,8 @@ public class DesignerServiceImpl implements IDesignerService {
      * @return 结果
      */
     @Override
-    public int logicDeleteDesignerByIds(String[] ids) {
-        return designerMapper.logicDeleteDesignerByIds(ids);
+    public int logicDeleteDesignerByIds(String ids) {
+        return designerMapper.logicDeleteDesignerByIds(Convert.toStrArray(ids));
     }
 
     /**

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/DesignerMapper.xml

@@ -15,23 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"       column="updateTime"    />
     </resultMap>
 
-    <resultMap type="DesignerVo" id="DesignerVoResult">
-        <result property="id"               column="id"    />
-        <result property="designerName"     column="designerName"    />
-        <result property="designerAvatar"   column="designerAvatar"    />
-        <result property="description"      column="description"    />
-        <result property="delFlag"          column="delFlag"    />
-        <result property="createUser"       column="createUser"    />
-        <result property="createTime"       column="createTime"    />
-        <result property="updateUser"       column="updateUser"    />
-        <result property="updateTime"       column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectDesignerVo">
+    <sql id="selectDesigner">
         select id, designerName, designerAvatar, description, delFlag, createUser, createTime, updateUser, updateTime from m_designer
     </sql>
 
-    <sql id="selectDesignerExtVo">
+    <sql id="selectDesignerExt">
         select
             ${tableAlias}.id,
             ${tableAlias}.designerName,
@@ -46,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDesignerList" parameterType="Designer" resultMap="DesignerResult">
-        <include refid="selectDesignerVo"/>
+        <include refid="selectDesigner"/>
         <where>  
             <if test="designerName != null  and designerName != ''"> and designerName like concat('%', #{designerName}, '%')</if>
             <if test="designerAvatar != null  and designerAvatar != ''"> and designerAvatar = #{designerAvatar}</if>
@@ -60,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectDesignerById" parameterType="Long" resultMap="DesignerResult">
-        <include refid="selectDesignerVo"/>
+        <include refid="selectDesigner"/>
         where id = #{id}
     </select>
         
@@ -150,23 +138,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectDesignerVoList" parameterType="DesignerVo" resultMap="DesignerVoResult">
-        <include refid="selectDesignerExtVo"/>
-        <where>
-            <if test="designerName != null  and designerName != ''"> and ${tableAlias}.designerName like concat('%', #{designerName}, '%')</if>
-            <if test="designerAvatar != null  and designerAvatar != ''"> and ${tableAlias}.designerAvatar = #{designerAvatar}</if>
-            <if test="description != null  and description != ''"> and ${tableAlias}.description = #{description}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectDesignerVoById" parameterType="Long" resultMap="DesignerVoResult">
-            <include refid="selectDesignerExtVo"/>
-            where ${tableAlias}.id = #{id}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/IpInfoMapper.xml

@@ -16,24 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="IpInfoVo" id="IpInfoVoResult">
-        <result property="ipId"    column="ipId"    />
-        <result property="ipName"    column="ipName"    />
-        <result property="ipUrl"    column="ipUrl"    />
-        <result property="colorNo"    column="colorNo"    />
-        <result property="sort"    column="sort"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectIpInfoVo">
+    <sql id="selectIpInfo">
         select ipId, ipName, ipUrl, colorNo, sort, delFlag, createUser, createTime, updateUser, updateTime from m_ipinfo
     </sql>
 
-    <sql id="selectIpInfoExtVo">
+    <sql id="selectIpInfoExt">
         select
             ${tableAlias}.ipId,
             ${tableAlias}.ipName,
@@ -49,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectIpInfoList" parameterType="IpInfo" resultMap="IpInfoResult">
-        <include refid="selectIpInfoVo"/>
+        <include refid="selectIpInfo"/>
         <where>  
             <if test="ipName != null  and ipName != ''"> and ipName like concat('%', #{ipName}, '%')</if>
             <if test="ipUrl != null  and ipUrl != ''"> and ipUrl = #{ipUrl}</if>
@@ -64,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectIpInfoByIpId" parameterType="Long" resultMap="IpInfoResult">
-        <include refid="selectIpInfoVo"/>
+        <include refid="selectIpInfo"/>
         where ipId = #{ipId}
     </select>
         
@@ -158,24 +145,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectIpInfoVoList" parameterType="IpInfoVo" resultMap="IpInfoVoResult">
-        <include refid="selectIpInfoExtVo"/>
-        <where>
-            <if test="ipName != null  and ipName != ''"> and ${tableAlias}.ipName like concat('%', #{ipName}, '%')</if>
-            <if test="ipUrl != null  and ipUrl != ''"> and ${tableAlias}.ipUrl = #{ipUrl}</if>
-            <if test="colorNo != null  and colorNo != ''"> and ${tableAlias}.colorNo = #{colorNo}</if>
-            <if test="sort != null "> and ${tableAlias}.sort = #{sort}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectIpInfoVoByIpId" parameterType="Long" resultMap="IpInfoVoResult">
-            <include refid="selectIpInfoExtVo"/>
-            where ${tableAlias}.ipId = #{ipId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/MerchantMapper.xml

@@ -23,31 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="MerchantVo" id="MerchantVoResult">
-        <result property="mercId"    column="mercId"    />
-        <result property="mercName"    column="mercName"    />
-        <result property="mercStatus"    column="mercStatus"    />
-        <result property="mercType"    column="mercType"    />
-        <result property="contact"    column="contact"    />
-        <result property="mail"    column="mail"    />
-        <result property="mobile"    column="mobile"    />
-        <result property="address"    column="address"    />
-        <result property="personName"    column="personName"    />
-        <result property="idNumber"    column="idNumber"    />
-        <result property="companyName"    column="companyName"    />
-        <result property="companyCode"    column="companyCode"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectMerchantVo">
+    <sql id="selectMerchant">
         select mercId, mercName, mercStatus, mercType, contact, mail, mobile, address, personName, idNumber, companyName, companyCode, delFlag, createUser, createTime, updateUser, updateTime from m_merchant
     </sql>
 
-    <sql id="selectMerchantExtVo">
+    <sql id="selectMerchantExt">
         select
             ${tableAlias}.mercId,
             ${tableAlias}.mercName,
@@ -70,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectMerchantList" parameterType="Merchant" resultMap="MerchantResult">
-        <include refid="selectMerchantVo"/>
+        <include refid="selectMerchant"/>
         <where>  
             <if test="mercName != null  and mercName != ''"> and mercName like concat('%', #{mercName}, '%')</if>
             <if test="mercStatus != null  and mercStatus != ''"> and mercStatus = #{mercStatus}</if>
@@ -92,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectMerchantByMercId" parameterType="Long" resultMap="MerchantResult">
-        <include refid="selectMerchantVo"/>
+        <include refid="selectMerchant"/>
         where mercId = #{mercId}
     </select>
         
@@ -214,31 +194,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectMerchantVoList" parameterType="MerchantVo" resultMap="MerchantVoResult">
-        <include refid="selectMerchantExtVo"/>
-        <where>
-            <if test="mercName != null  and mercName != ''"> and ${tableAlias}.mercName like concat('%', #{mercName}, '%')</if>
-            <if test="mercStatus != null  and mercStatus != ''"> and ${tableAlias}.mercStatus = #{mercStatus}</if>
-            <if test="mercType != null  and mercType != ''"> and ${tableAlias}.mercType = #{mercType}</if>
-            <if test="contact != null  and contact != ''"> and ${tableAlias}.contact = #{contact}</if>
-            <if test="mail != null  and mail != ''"> and ${tableAlias}.mail = #{mail}</if>
-            <if test="mobile != null  and mobile != ''"> and ${tableAlias}.mobile = #{mobile}</if>
-            <if test="address != null  and address != ''"> and ${tableAlias}.address = #{address}</if>
-            <if test="personName != null  and personName != ''"> and ${tableAlias}.personName like concat('%', #{personName}, '%')</if>
-            <if test="idNumber != null  and idNumber != ''"> and ${tableAlias}.idNumber = #{idNumber}</if>
-            <if test="companyName != null  and companyName != ''"> and ${tableAlias}.companyName like concat('%', #{companyName}, '%')</if>
-            <if test="companyCode != null  and companyCode != ''"> and ${tableAlias}.companyCode = #{companyCode}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectMerchantVoByMercId" parameterType="Long" resultMap="MerchantVoResult">
-            <include refid="selectMerchantExtVo"/>
-            where ${tableAlias}.mercId = #{mercId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/MerchantProdMapper.xml

@@ -17,25 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="MerchantProdVo" id="MerchantProdVoResult">
-        <result property="mercProdId"    column="mercProdId"    />
-        <result property="mercId"    column="mercId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodAttrId"    column="prodAttrId"    />
-        <result property="shelfTime"    column="shelfTime"    />
-        <result property="shelfFlag"    column="shelfFlag"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectMerchantProdVo">
+    <sql id="selectMerchantProd">
         select mercProdId, mercId, prodId, prodAttrId, shelfTime, shelfFlag, delFlag, createUser, createTime, updateUser, updateTime from m_merchant_prod
     </sql>
 
-    <sql id="selectMerchantProdExtVo">
+    <sql id="selectMerchantProdExt">
         select
             ${tableAlias}.mercProdId,
             ${tableAlias}.mercId,
@@ -52,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectMerchantProdList" parameterType="MerchantProd" resultMap="MerchantProdResult">
-        <include refid="selectMerchantProdVo"/>
+        <include refid="selectMerchantProd"/>
         <where>  
             <if test="mercId != null "> and mercId = #{mercId}</if>
             <if test="prodId != null "> and prodId = #{prodId}</if>
@@ -68,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectMerchantProdByMercProdId" parameterType="Long" resultMap="MerchantProdResult">
-        <include refid="selectMerchantProdVo"/>
+        <include refid="selectMerchantProd"/>
         where mercProdId = #{mercProdId}
     </select>
         
@@ -166,25 +152,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectMerchantProdVoList" parameterType="MerchantProdVo" resultMap="MerchantProdVoResult">
-        <include refid="selectMerchantProdExtVo"/>
-        <where>
-            <if test="mercId != null "> and ${tableAlias}.mercId = #{mercId}</if>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="prodAttrId != null "> and ${tableAlias}.prodAttrId = #{prodAttrId}</if>
-            <if test="shelfTime != null "> and ${tableAlias}.shelfTime = #{shelfTime}</if>
-            <if test="shelfFlag != null  and shelfFlag != ''"> and ${tableAlias}.shelfFlag = #{shelfFlag}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectMerchantProdVoByMercProdId" parameterType="Long" resultMap="MerchantProdVoResult">
-            <include refid="selectMerchantProdExtVo"/>
-            where ${tableAlias}.mercProdId = #{mercProdId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdAttrJointMapper.xml

@@ -16,24 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdAttrJointVo" id="ProdAttrJointVoResult">
-        <result property="prodAttrJointId"    column="prodAttrJointId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodAttrId"    column="prodAttrId"    />
-        <result property="jointProdId"    column="jointProdId"    />
-        <result property="jointProdAttrId"    column="jointProdAttrId"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdAttrJointVo">
+    <sql id="selectProdAttrJoint">
         select prodAttrJointId, prodId, prodAttrId, jointProdId, jointProdAttrId, delFlag, createUser, createTime, updateUser, updateTime from m_prod_attr_joint
     </sql>
 
-    <sql id="selectProdAttrJointExtVo">
+    <sql id="selectProdAttrJointExt">
         select
             ${tableAlias}.prodAttrJointId,
             ${tableAlias}.prodId,
@@ -49,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdAttrJointList" parameterType="ProdAttrJoint" resultMap="ProdAttrJointResult">
-        <include refid="selectProdAttrJointVo"/>
+        <include refid="selectProdAttrJoint"/>
         <where>  
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
@@ -64,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdAttrJointByProdAttrJointId" parameterType="Long" resultMap="ProdAttrJointResult">
-        <include refid="selectProdAttrJointVo"/>
+        <include refid="selectProdAttrJoint"/>
         where prodAttrJointId = #{prodAttrJointId}
     </select>
         
@@ -158,24 +145,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdAttrJointVoList" parameterType="ProdAttrJointVo" resultMap="ProdAttrJointVoResult">
-        <include refid="selectProdAttrJointExtVo"/>
-        <where>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="prodAttrId != null "> and ${tableAlias}.prodAttrId = #{prodAttrId}</if>
-            <if test="jointProdId != null "> and ${tableAlias}.jointProdId = #{jointProdId}</if>
-            <if test="jointProdAttrId != null "> and ${tableAlias}.jointProdAttrId = #{jointProdAttrId}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdAttrJointVoByProdAttrJointId" parameterType="Long" resultMap="ProdAttrJointVoResult">
-            <include refid="selectProdAttrJointExtVo"/>
-            where ${tableAlias}.prodAttrJointId = #{prodAttrJointId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdAttrMapper.xml

@@ -15,23 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdAttrVo" id="ProdAttrVoResult">
-        <result property="prodAttrId"    column="prodAttrId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="attrName"    column="attrName"    />
-        <result property="attrType"    column="attrType"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdAttrVo">
+    <sql id="selectProdAttr">
         select prodAttrId, prodId, attrName, attrType, delFlag, createUser, createTime, updateUser, updateTime from m_prod_attr
     </sql>
 
-    <sql id="selectProdAttrExtVo">
+    <sql id="selectProdAttrExt">
         select
             ${tableAlias}.prodAttrId,
             ${tableAlias}.prodId,
@@ -46,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdAttrList" parameterType="ProdAttr" resultMap="ProdAttrResult">
-        <include refid="selectProdAttrVo"/>
+        <include refid="selectProdAttr"/>
         <where>  
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="attrName != null  and attrName != ''"> and attrName like concat('%', #{attrName}, '%')</if>
@@ -60,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdAttrByProdAttrId" parameterType="Long" resultMap="ProdAttrResult">
-        <include refid="selectProdAttrVo"/>
+        <include refid="selectProdAttr"/>
         where prodAttrId = #{prodAttrId}
     </select>
         
@@ -150,23 +138,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdAttrVoList" parameterType="ProdAttrVo" resultMap="ProdAttrVoResult">
-        <include refid="selectProdAttrExtVo"/>
-        <where>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="attrName != null  and attrName != ''"> and ${tableAlias}.attrName like concat('%', #{attrName}, '%')</if>
-            <if test="attrType != null  and attrType != ''"> and ${tableAlias}.attrType = #{attrType}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdAttrVoByProdAttrId" parameterType="Long" resultMap="ProdAttrVoResult">
-            <include refid="selectProdAttrExtVo"/>
-            where ${tableAlias}.prodAttrId = #{prodAttrId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdAttrPriceMapper.xml

@@ -19,27 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdAttrPriceVo" id="ProdAttrPriceVoResult">
-        <result property="prodAttrPriceId"    column="prodAttrPriceId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodAttrId"    column="prodAttrId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRoleKey"    column="buyerRoleKey"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRoleKey"    column="sellerRoleKey"    />
-        <result property="price"    column="price"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdAttrPriceVo">
+    <sql id="selectProdAttrPrice">
         select prodAttrPriceId, prodId, prodAttrId, buyerId, buyerRoleKey, sellerId, sellerRoleKey, price, delFlag, createUser, createTime, updateUser, updateTime from m_prod_attr_price
     </sql>
 
-    <sql id="selectProdAttrPriceExtVo">
+    <sql id="selectProdAttrPriceExt">
         select
             ${tableAlias}.prodAttrPriceId,
             ${tableAlias}.prodId,
@@ -58,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdAttrPriceList" parameterType="ProdAttrPrice" resultMap="ProdAttrPriceResult">
-        <include refid="selectProdAttrPriceVo"/>
+        <include refid="selectProdAttrPrice"/>
         <where>  
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
@@ -76,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdAttrPriceByProdAttrPriceId" parameterType="Long" resultMap="ProdAttrPriceResult">
-        <include refid="selectProdAttrPriceVo"/>
+        <include refid="selectProdAttrPrice"/>
         where prodAttrPriceId = #{prodAttrPriceId}
     </select>
         
@@ -182,27 +166,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdAttrPriceVoList" parameterType="ProdAttrPriceVo" resultMap="ProdAttrPriceVoResult">
-        <include refid="selectProdAttrPriceExtVo"/>
-        <where>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="prodAttrId != null "> and ${tableAlias}.prodAttrId = #{prodAttrId}</if>
-            <if test="buyerId != null "> and ${tableAlias}.buyerId = #{buyerId}</if>
-            <if test="buyerRoleKey != null  and buyerRoleKey != ''"> and ${tableAlias}.buyerRoleKey = #{buyerRoleKey}</if>
-            <if test="sellerId != null "> and ${tableAlias}.sellerId = #{sellerId}</if>
-            <if test="sellerRoleKey != null  and sellerRoleKey != ''"> and ${tableAlias}.sellerRoleKey = #{sellerRoleKey}</if>
-            <if test="price != null "> and ${tableAlias}.price = #{price}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdAttrPriceVoByProdAttrPriceId" parameterType="Long" resultMap="ProdAttrPriceVoResult">
-            <include refid="selectProdAttrPriceExtVo"/>
-            where ${tableAlias}.prodAttrPriceId = #{prodAttrPriceId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdClassMapper.xml

@@ -15,23 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdClassVo" id="ProdClassVoResult">
-        <result property="prodClassId"    column="prodClassId"    />
-        <result property="className"    column="className"    />
-        <result property="classUrl"    column="classUrl"    />
-        <result property="sort"    column="sort"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdClassVo">
+    <sql id="selectProdClass">
         select prodClassId, className, classUrl, sort, delFlag, createUser, createTime, updateUser, updateTime from m_prod_class
     </sql>
 
-    <sql id="selectProdClassExtVo">
+    <sql id="selectProdClassExt">
         select
             ${tableAlias}.prodClassId,
             ${tableAlias}.className,
@@ -46,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdClassList" parameterType="ProdClass" resultMap="ProdClassResult">
-        <include refid="selectProdClassVo"/>
+        <include refid="selectProdClass"/>
         <where>  
             <if test="className != null  and className != ''"> and className like concat('%', #{className}, '%')</if>
             <if test="classUrl != null  and classUrl != ''"> and classUrl = #{classUrl}</if>
@@ -60,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdClassByProdClassId" parameterType="Long" resultMap="ProdClassResult">
-        <include refid="selectProdClassVo"/>
+        <include refid="selectProdClass"/>
         where prodClassId = #{prodClassId}
     </select>
         
@@ -150,23 +138,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdClassVoList" parameterType="ProdClassVo" resultMap="ProdClassVoResult">
-        <include refid="selectProdClassExtVo"/>
-        <where>
-            <if test="className != null  and className != ''"> and ${tableAlias}.className like concat('%', #{className}, '%')</if>
-            <if test="classUrl != null  and classUrl != ''"> and ${tableAlias}.classUrl = #{classUrl}</if>
-            <if test="sort != null "> and ${tableAlias}.sort = #{sort}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdClassVoByProdClassId" parameterType="Long" resultMap="ProdClassVoResult">
-            <include refid="selectProdClassExtVo"/>
-            where ${tableAlias}.prodClassId = #{prodClassId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdMapper.xml

@@ -19,27 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdVo" id="ProdVoResult">
-        <result property="id"    column="id"    />
-        <result property="prodClassId"    column="prodClassId"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="ipId"    column="ipId"    />
-        <result property="designerId"    column="designerId"    />
-        <result property="description"    column="description"    />
-        <result property="prodStatus"    column="prodStatus"    />
-        <result property="thirdIdConfirmFlag"    column="thirdIdConfirmFlag"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdVo">
+    <sql id="selectProd">
         select id, prodClassId, prodName, ipId, designerId, description, prodStatus, thirdIdConfirmFlag, delFlag, createUser, createTime, updateUser, updateTime from m_prod
     </sql>
 
-    <sql id="selectProdExtVo">
+    <sql id="selectProdExt">
         select
             ${tableAlias}.id,
             ${tableAlias}.prodClassId,
@@ -58,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdList" parameterType="Prod" resultMap="ProdResult">
-        <include refid="selectProdVo"/>
+        <include refid="selectProd"/>
         <where>  
             <if test="prodClassId != null "> and prodClassId = #{prodClassId}</if>
             <if test="prodName != null  and prodName != ''"> and prodName like concat('%', #{prodName}, '%')</if>
@@ -76,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdById" parameterType="Long" resultMap="ProdResult">
-        <include refid="selectProdVo"/>
+        <include refid="selectProd"/>
         where id = #{id}
     </select>
         
@@ -182,27 +166,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdVoList" parameterType="ProdVo" resultMap="ProdVoResult">
-        <include refid="selectProdExtVo"/>
-        <where>
-            <if test="prodClassId != null "> and ${tableAlias}.prodClassId = #{prodClassId}</if>
-            <if test="prodName != null  and prodName != ''"> and ${tableAlias}.prodName like concat('%', #{prodName}, '%')</if>
-            <if test="ipId != null "> and ${tableAlias}.ipId = #{ipId}</if>
-            <if test="designerId != null "> and ${tableAlias}.designerId = #{designerId}</if>
-            <if test="description != null  and description != ''"> and ${tableAlias}.description = #{description}</if>
-            <if test="prodStatus != null  and prodStatus != ''"> and ${tableAlias}.prodStatus = #{prodStatus}</if>
-            <if test="thirdIdConfirmFlag != null  and thirdIdConfirmFlag != ''"> and ${tableAlias}.thirdIdConfirmFlag = #{thirdIdConfirmFlag}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdVoById" parameterType="Long" resultMap="ProdVoResult">
-            <include refid="selectProdExtVo"/>
-            where ${tableAlias}.id = #{id}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdPicMapper.xml

@@ -15,23 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdPicVo" id="ProdPicVoResult">
-        <result property="id"    column="id"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="picUrl"    column="picUrl"    />
-        <result property="sort"    column="sort"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdPicVo">
+    <sql id="selectProdPic">
         select id, prodId, picUrl, sort, delFlag, createUser, createTime, updateUser, updateTime from m_prod_pic
     </sql>
 
-    <sql id="selectProdPicExtVo">
+    <sql id="selectProdPicExt">
         select
             ${tableAlias}.id,
             ${tableAlias}.prodId,
@@ -46,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdPicList" parameterType="ProdPic" resultMap="ProdPicResult">
-        <include refid="selectProdPicVo"/>
+        <include refid="selectProdPic"/>
         <where>  
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="picUrl != null  and picUrl != ''"> and picUrl = #{picUrl}</if>
@@ -60,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdPicById" parameterType="Long" resultMap="ProdPicResult">
-        <include refid="selectProdPicVo"/>
+        <include refid="selectProdPic"/>
         where id = #{id}
     </select>
         
@@ -150,23 +138,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdPicVoList" parameterType="ProdPicVo" resultMap="ProdPicVoResult">
-        <include refid="selectProdPicExtVo"/>
-        <where>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="picUrl != null  and picUrl != ''"> and ${tableAlias}.picUrl = #{picUrl}</if>
-            <if test="sort != null "> and ${tableAlias}.sort = #{sort}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdPicVoById" parameterType="Long" resultMap="ProdPicVoResult">
-            <include refid="selectProdPicExtVo"/>
-            where ${tableAlias}.id = #{id}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdTagMapper.xml

@@ -14,22 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdTagVo" id="ProdTagVoResult">
-        <result property="id"    column="id"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="tagId"    column="tagId"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdTagVo">
+    <sql id="selectProdTag">
         select id, prodId, tagId, delFlag, createUser, createTime, updateUser, updateTime from m_prod_tag
     </sql>
 
-    <sql id="selectProdTagExtVo">
+    <sql id="selectProdTagExt">
         select
             ${tableAlias}.id,
             ${tableAlias}.prodId,
@@ -43,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdTagList" parameterType="ProdTag" resultMap="ProdTagResult">
-        <include refid="selectProdTagVo"/>
+        <include refid="selectProdTag"/>
         <where>  
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="tagId != null "> and tagId = #{tagId}</if>
@@ -56,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdTagById" parameterType="Long" resultMap="ProdTagResult">
-        <include refid="selectProdTagVo"/>
+        <include refid="selectProdTag"/>
         where id = #{id}
     </select>
         
@@ -142,22 +131,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdTagVoList" parameterType="ProdTagVo" resultMap="ProdTagVoResult">
-        <include refid="selectProdTagExtVo"/>
-        <where>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="tagId != null "> and ${tableAlias}.tagId = #{tagId}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdTagVoById" parameterType="Long" resultMap="ProdTagVoResult">
-            <include refid="selectProdTagExtVo"/>
-            where ${tableAlias}.id = #{id}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/ProdVendorMapper.xml

@@ -15,23 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="ProdVendorVo" id="ProdVendorVoResult">
-        <result property="prodVendorId"    column="prodVendorId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodAttrId"    column="prodAttrId"    />
-        <result property="vendorId"    column="vendorId"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectProdVendorVo">
+    <sql id="selectProdVendor">
         select prodVendorId, prodId, prodAttrId, vendorId, delFlag, createUser, createTime, updateUser, updateTime from m_prod_vendor
     </sql>
 
-    <sql id="selectProdVendorExtVo">
+    <sql id="selectProdVendorExt">
         select
             ${tableAlias}.prodVendorId,
             ${tableAlias}.prodId,
@@ -46,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProdVendorList" parameterType="ProdVendor" resultMap="ProdVendorResult">
-        <include refid="selectProdVendorVo"/>
+        <include refid="selectProdVendor"/>
         <where>  
             <if test="prodId != null "> and prodId = #{prodId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
@@ -60,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectProdVendorByProdVendorId" parameterType="Long" resultMap="ProdVendorResult">
-        <include refid="selectProdVendorVo"/>
+        <include refid="selectProdVendor"/>
         where prodVendorId = #{prodVendorId}
     </select>
         
@@ -150,23 +138,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectProdVendorVoList" parameterType="ProdVendorVo" resultMap="ProdVendorVoResult">
-        <include refid="selectProdVendorExtVo"/>
-        <where>
-            <if test="prodId != null "> and ${tableAlias}.prodId = #{prodId}</if>
-            <if test="prodAttrId != null "> and ${tableAlias}.prodAttrId = #{prodAttrId}</if>
-            <if test="vendorId != null "> and ${tableAlias}.vendorId = #{vendorId}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectProdVendorVoByProdVendorId" parameterType="Long" resultMap="ProdVendorVoResult">
-            <include refid="selectProdVendorExtVo"/>
-            where ${tableAlias}.prodVendorId = #{prodVendorId}
-    </select>
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/TagMapper.xml

@@ -13,21 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="TagVo" id="TagVoResult">
-        <result property="tagId"    column="tagId"    />
-        <result property="tagName"    column="tagName"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectTagVo">
+    <sql id="selectTag">
         select tagId, tagName, delFlag, createUser, createTime, updateUser, updateTime from m_tag
     </sql>
 
-    <sql id="selectTagExtVo">
+    <sql id="selectTagExt">
         select
             ${tableAlias}.tagId,
             ${tableAlias}.tagName,
@@ -40,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTagList" parameterType="Tag" resultMap="TagResult">
-        <include refid="selectTagVo"/>
+        <include refid="selectTag"/>
         <where>  
             <if test="tagName != null  and tagName != ''"> and tagName like concat('%', #{tagName}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and delFlag = #{delFlag}</if>
@@ -52,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectTagByTagId" parameterType="Long" resultMap="TagResult">
-        <include refid="selectTagVo"/>
+        <include refid="selectTag"/>
         where tagId = #{tagId}
     </select>
         
@@ -134,23 +124,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectTagVoList" parameterType="TagVo" resultMap="TagVoResult">
-        <include refid="selectTagExtVo"/>
-        <where>
-            <if test="tagName != null  and tagName != ''"> and ${tableAlias}.tagName like concat('%', #{tagName}, '%')</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectTagVoByTagId" parameterType="Long" resultMap="TagVoResult">
-            <include refid="selectTagExtVo"/>
-            where ${tableAlias}.tagId = #{tagId}
-    </select>
-
-
 </mapper>

08.src/Xingxi/xingxi-system/src/main/resources/mapper/master/VendorMapper.xml

@@ -20,28 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="updateTime"    />
     </resultMap>
 
-    <resultMap type="VendorVo" id="VendorVoResult">
-        <result property="vendorId"    column="vendorId"    />
-        <result property="vendorName"    column="vendorName"    />
-        <result property="contact"    column="contact"    />
-        <result property="mobile"    column="mobile"    />
-        <result property="mail"    column="mail"    />
-        <result property="address"    column="address"    />
-        <result property="refundContact"    column="refundContact"    />
-        <result property="refundMobile"    column="refundMobile"    />
-        <result property="refundAddress"    column="refundAddress"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-    </resultMap>
-
-    <sql id="selectVendorVo">
+    <sql id="selectVendor">
         select vendorId, vendorName, contact, mobile, mail, address, refundContact, refundMobile, refundAddress, delFlag, createUser, createTime, updateUser, updateTime from m_vendor
     </sql>
 
-    <sql id="selectVendorExtVo">
+    <sql id="selectVendorExt">
         select
             ${tableAlias}.vendorId,
             ${tableAlias}.vendorName,
@@ -61,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectVendorList" parameterType="Vendor" resultMap="VendorResult">
-        <include refid="selectVendorVo"/>
+        <include refid="selectVendor"/>
         <where>  
             <if test="vendorName != null  and vendorName != ''"> and vendorName like concat('%', #{vendorName}, '%')</if>
             <if test="contact != null  and contact != ''"> and contact = #{contact}</if>
@@ -80,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectVendorByVendorId" parameterType="Long" resultMap="VendorResult">
-        <include refid="selectVendorVo"/>
+        <include refid="selectVendor"/>
         where vendorId = #{vendorId}
     </select>
         
@@ -190,28 +173,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and updateTime = #{updateTime}</if>
         </where>
     </update>
-
-    <select id="selectVendorVoList" parameterType="VendorVo" resultMap="VendorVoResult">
-        <include refid="selectVendorExtVo"/>
-        <where>
-            <if test="vendorName != null  and vendorName != ''"> and ${tableAlias}.vendorName like concat('%', #{vendorName}, '%')</if>
-            <if test="contact != null  and contact != ''"> and ${tableAlias}.contact = #{contact}</if>
-            <if test="mobile != null  and mobile != ''"> and ${tableAlias}.mobile = #{mobile}</if>
-            <if test="mail != null  and mail != ''"> and ${tableAlias}.mail = #{mail}</if>
-            <if test="address != null  and address != ''"> and ${tableAlias}.address = #{address}</if>
-            <if test="refundContact != null  and refundContact != ''"> and ${tableAlias}.refundContact = #{refundContact}</if>
-            <if test="refundMobile != null  and refundMobile != ''"> and ${tableAlias}.refundMobile = #{refundMobile}</if>
-            <if test="refundAddress != null  and refundAddress != ''"> and ${tableAlias}.refundAddress = #{refundAddress}</if>
-            <if test="delFlag != null  and delFlag != ''"> and ${tableAlias}.delFlag = #{delFlag}</if>
-            <if test="createUser != null  and createUser != ''"> and ${tableAlias}.createUser = #{createUser}</if>
-            <if test="createTime != null "> and ${tableAlias}.createTime = #{createTime}</if>
-            <if test="updateUser != null  and updateUser != ''"> and ${tableAlias}.updateUser = #{updateUser}</if>
-            <if test="updateTime != null "> and ${tableAlias}.updateTime = #{updateTime}</if>
-        </where>
-    </select>
-
-    <select id="selectVendorVoByVendorId" parameterType="Long" resultMap="VendorVoResult">
-            <include refid="selectVendorExtVo"/>
-            where ${tableAlias}.vendorId = #{vendorId}
-    </select>
 </mapper>